Merge pull request ppy#10767 from nanaya/smiley-replacer

Cache smiley regexps
venix12 · Nov 30, 2023 · e198386 · e198386
2 parents 8c390d8 + 985d7cc
commit e198386
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/app/Libraries/BBCodeForDB.php b/app/Libraries/BBCodeForDB.php
@@ -324,22 +324,13 @@ public function parseSize($text)
         );
     }
 
-    // copied from www/forum/includes/message_parser.php#L1196
-
     public function parseSmiley($text)
     {
-        $smilies = app('smilies')->all();
-
-        $match = [];
-        $replace = [];
+        $replacer = app('smilies')->replacer();
 
-        foreach ($smilies as $smiley) {
-            $match[] = '(?<=^|[\n .])'.preg_quote($smiley['code'], '#').'(?![^<>]*>)';
-            $replace[] = '<!-- s'.$smiley['code'].' --><img src="{SMILIES_PATH}/'.$smiley['smiley_url'].'" alt="'.$smiley['code'].'" title="'.$smiley['emotion'].'" /><!-- s'.$smiley['code'].' -->';
-        }
-        if (count($match)) {
+        if (count($replacer['patterns']) > 0) {
             // Make sure the delimiter # is added in front and at the end of every element within $match
-            $text = trim(preg_replace(explode(chr(0), '#'.implode('#'.chr(0).'#', $match).'#'), $replace, $text));
+            $text = trim(preg_replace($replacer['patterns'], $replacer['replacements'], $text));
         }
 
         return $text;

diff --git a/app/Libraries/Smilies.php b/app/Libraries/Smilies.php
@@ -19,6 +19,23 @@ public function all(): array
         return $this->memoize(__FUNCTION__, fn () => $this->fetch());
     }
 
+    public function replacer(): array
+    {
+        return $this->memoize(__FUNCTION__, function () {
+            $smilies = $this->all();
+
+            $patterns = [];
+            $replacements = [];
+
+            foreach ($smilies as $smiley) {
+                $patterns[] = '#(?<=^|[\n .])'.preg_quote($smiley['code'], '#').'(?![^<>]*>)#';
+                $replacements[] = '<!-- s'.$smiley['code'].' --><img src="{SMILIES_PATH}/'.$smiley['smiley_url'].'" alt="'.$smiley['code'].'" title="'.$smiley['emotion'].'" /><!-- s'.$smiley['code'].' -->';
+            }
+
+            return compact('patterns', 'replacements');
+        });
+    }
+
     private function fetch(): array
     {
         return Smiley::orderBy(\DB::raw('LENGTH(code)'), 'desc')->get()->toArray();