Merge pull request #12 from Blaspsoft/blasp-refactor

regex tweaks and bug fixes

README.md

@@ -32,13 +32,7 @@ use Blaspsoft\Blasp\Facades\Blasp;
 $sentence = 'This is a fucking shit sentence';
 $check = Blasp::check($sentence);
 ```
-you can also change the default language to french
-```php
-use Blaspsoft\Blasp\Facades\Blasp;
 
-$sentence = 'Cette phrase est merdique';
-$check = Blasp::check($sentence, 'fr');
-```
 The returned object will contain the following properties:
 
 - **sourceString**: The original string you passed.
@@ -82,15 +76,8 @@ $request->merge(['sentence' => 'This is f u c k 1 n g awesome!']);
 $validated = $request->validate([
     'sentence' => ['blasp_check'],
 ]);
-
-// If the sentence contains profanities, validation will fail.
-```
-or for french
-```php
-$validated = $request->validate([
-    'sentence' => ['blasp_check:fr'],
-]);
 ```
+
 ### Configuration
 
 Blasp uses a configuration file (`config/blasp.php`) to manage the list of profanities, separators, and substitutions. You can publish the configuration file using the following Artisan command:

config/config.php

@@ -22,7 +22,7 @@
     |
     |
     */
-    'languages' => ['en', 'fr'],
+    'languages' => ['en'],
 
     /*
     |--------------------------------------------------------------------------
@@ -95,7 +95,7 @@
         '/p/' => ['p', 'ρ', 'Ρ', '¶', 'þ'],
         '/q/' => ['q'],
         '/r/' => ['r', '®'],
-        '/s/' => ['s', '5', '$', '§', 'ß', 'Ś', 'ś', 'Š', 'š'],
+        '/s/' => ['s', '5', '\$', '§', 'ß', 'Ś', 'ś', 'Š', 'š'],
         '/t/' => ['t', 'Τ', 'τ'],
         '/u/' => ['u', 'υ', 'µ', 'û', 'ü', 'ù', 'ú', 'ū', 'Û', 'Ü', 'Ù', 'Ú', 'Ū'],
         '/v/' => ['v', 'υ', 'ν'],
@@ -136,15 +136,8 @@
             'flicker',
             'analyst',
             'cocktail',
+            'musicals hit',
         ],
-        'fr' => [
-            'passeur',
-            'classe',
-            'passage',
-            'assumer',
-            'passant',
-            'bassiste',
-        ]
     ],
 
 
@@ -462,7 +455,6 @@
             'cuntass',
             'cunteyed',
             'cuntface',
-            'cuntfuck',
             'cuntfucker',
             'cunthole',
             'cuntlick',
@@ -637,7 +629,6 @@
             'fuckbutt',
             'fuckbutter',
             'fucked',
-            'fuckedup',
             'fucker',
             'fuckers',
             'fuckersucker',
@@ -652,7 +643,6 @@
             'fuckina',
             'fucking',
             'fuckingbitch',
-            'fuckingcunt',
             'fuckinnuts',
             'fuckinright',
             'fuckit',
@@ -742,7 +732,7 @@
             'hardon',
             'headfuck',
             'heeb',
-            'hells',
+            'hell',
             'herpes',
             'hijacker',
             'hijacking',
@@ -782,7 +772,6 @@
             'incest',
             'insest',
             'internet wife',
-            'intheass',
             'inthebuff',
             'jackass',
             'jackoff',
@@ -1461,37 +1450,5 @@
             'zipperhea',
             'zipper head',
         ],
-        'fr' => [
-            'con',
-            'connard',
-            'connasse',
-            'merde',
-            'merdique',
-            'putain',
-            'enculé',
-            'salope',
-            'batard',
-            'bordel',
-            'fils de pute',
-            'pute',
-            'cul',
-            'abruti',
-            'crétin',
-            'imbécile',
-            'ordure',
-            'débile',
-            'dégénéré',
-            'foutre',
-            'chiant',
-            'chiotte',
-            'bouffon',
-            'gros con',
-            'pédé',
-            'tapette',
-            'bite',
-            'couille',
-            'enfoiré',
-            'trou du cul',
-        ]
     ],
 ];

src/BlaspExpressionService.php

@@ -118,7 +118,7 @@ private function loadConfiguration(): void
 
         $this->validateChosenLanguage();
 
-        $this->profanities = config('blasp.profanities')[$this->chosenLanguage];
+        $this->profanities = config('blasp.profanities')[$this->chosenLanguage];  
         $this->separators = config('blasp.separators');
         $this->substitutions = config('blasp.substitutions');
     }
@@ -157,6 +157,7 @@ private function generateEscapedExpression(array $characters = [], array $escape
         $regex = $escapedCharacters;
 
         foreach ($characters as $character) {
+
             $regex[] = preg_quote($character, '/');
         }
 
@@ -190,8 +191,9 @@ private function generateProfanityExpression($profanity): string
 
         $expression = str_replace(self::SEPARATOR_PLACEHOLDER, $this->separatorExpression, $expression);
 
-        $expression = '/' . $expression . '(?:s?)\b/i';
-
+        // Allow for non-word characters or spaces around the profanity
+        $expression = '/' . $expression . '/i';
+
         return $expression;
     }
 

src/BlaspService.php

@@ -2,9 +2,9 @@
 
 namespace Blaspsoft\Blasp;
 
-use Blaspsoft\Blasp\Abstracts\StringNormalizer;
-use Blaspsoft\Blasp\Normalizers\Normalize;
 use Exception;
+use Blaspsoft\Blasp\Normalizers\Normalize;
+use Blaspsoft\Blasp\Abstracts\StringNormalizer;
 
 class BlaspService extends BlaspExpressionService
 {