fix: chatbox censoring

For years, chatbox has only censored messages based on the settings of the sender, not the recipient.

fixes #4982

Author: Roardom

app/Helpers/Bbcode.php

@@ -17,6 +17,7 @@
 namespace App\Helpers;
 
 use App\Models\WhitelistedImageUrl;
+use Illuminate\Support\Str;
 
 class Bbcode
 {
@@ -284,6 +285,19 @@ public function parse(?string $source, bool $replaceLineBreaks = true): string
         $source ??= '';
         $source = htmlspecialchars($source, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML5, 'UTF-8');
 
+        // Censor words
+        foreach (config('censor.redact') as $word) {
+            if (preg_match(\sprintf('/\b%s(?=[.,]|$|\s)/mi', $word), (string) $source)) {
+                $source = str_replace($word, \sprintf("<span class='censor'>%s</span>", $word), (string) $source);
+            }
+        }
+
+        foreach (config('censor.replace') as $word => $replacementWord) {
+            if (Str::contains($source, $word)) {
+                $source = str_replace($word, $replacementWord, (string) $source);
+            }
+        }
+
         // Replace all void elements since they don't have closing tags
         $source = str_replace('[*]', '<li>', (string) $source);
         $source = str_replace('[hr]', '<hr>', $source);

app/Repositories/ChatRepository.php

@@ -23,16 +23,13 @@
 use App\Models\Chatroom;
 use App\Models\Message;
 use App\Models\User;
+use App\Models\UserEcho;
 use Illuminate\Support\Str;
 
 class ChatRepository
 {
     public function message(int $userId, int $roomId, string $message, ?int $receiver = null, ?int $bot = null): Message
     {
-        if (User::find($userId)->settings->censor) {
-            $message = $this->censorMessage($message);
-        }
-
         $message = Message::create([
             'user_id'     => $userId,
             'chatroom_id' => $roomId,
@@ -50,12 +47,6 @@ public function message(int $userId, int $roomId, string $message, ?int $receive
 
     public function botMessage(int $botId, int $roomId, string $message, ?int $receiver = null): void
     {
-        $user = User::find($receiver);
-
-        if ($user->settings->censor) {
-            $message = $this->censorMessage($message);
-        }
-
         $save = Message::create([
             'bot_id'      => $botId,
             'user_id'     => 1,
@@ -77,10 +68,6 @@ public function botMessage(int $botId, int $roomId, string $message, ?int $recei
 
     public function privateMessage(int $userId, int $roomId, string $message, ?int $receiver = null, ?int $bot = null, ?bool $ignore = null): Message
     {
-        if (User::find($userId)->settings->censor) {
-            $message = $this->censorMessage($message);
-        }
-
         $save = Message::create([
             'user_id'     => $userId,
             'chatroom_id' => 0,
@@ -246,21 +233,4 @@ public function systemChatroom(int|Chatroom|string|null $room = null): int
 
         return $room;
     }
-
-    protected function censorMessage(string $message): string
-    {
-        foreach (config('censor.redact') as $word) {
-            if (preg_match(\sprintf('/\b%s(?=[.,]|$|\s)/mi', $word), (string) $message)) {
-                $message = str_replace($word, \sprintf("<span class='censor'>%s</span>", $word), (string) $message);
-            }
-        }
-
-        foreach (config('censor.replace') as $word => $replacementWord) {
-            if (Str::contains($message, $word)) {
-                $message = str_replace($word, $replacementWord, (string) $message);
-            }
-        }
-
-        return $message;
-    }
 }

resources/sass/components/_bbcode-rendered.scss

@@ -534,4 +534,10 @@
             padding-right: 1ch;
         }
     }
+
+    /* Censor */
+
+    &.bbcode-rendered__censor .censor:not(:hover) {
+        filter: blur(0.5em);
+    }
 }

resources/views/blocks/chat.blade.php

@@ -1,5 +1,5 @@
 @php
-    $user = App\Models\User::with(['chatroom', 'group'])->find(auth()->id());
+    $user = App\Models\User::with(['chatroom', 'group', 'settings'])->find(auth()->id());
 @endphp
 
 <section
@@ -318,7 +318,11 @@ class="chatbox-message__avatar"
                                         </figure>
                                     </aside>
                                     <section
-                                        class="chatbox-message__content bbcode-rendered"
+                                        @class([
+                                            'bbcode-rendered',
+                                            'chatbox-message__content',
+                                            'bbcode-rendered__censor' => $user->settings->censor
+                                        ])"
                                         x-show="! (message.bot && message.bot.id >= 1 && (! message.user || message.user.id < 2))"
                                         x-html="message.message"
                                     ></section>