Merge pull request #5261 from Roardom/combine-chatbox-echoes-audibles

(Refactor) Combine chatbox audibles and echoes into conversations

Author: Roardom

app/Bots/NerdBot.php

@@ -17,15 +17,13 @@
 namespace App\Bots;
 
 use App\Events\Chatter;
-use App\Http\Resources\UserAudibleResource;
-use App\Http\Resources\UserEchoResource;
+use App\Http\Resources\ChatConversationResource;
 use App\Models\Ban;
 use App\Models\Bot;
+use App\Models\ChatConversation;
 use App\Models\Peer;
 use App\Models\Torrent;
 use App\Models\User;
-use App\Models\UserAudible;
-use App\Models\UserEcho;
 use App\Models\Warning;
 use App\Repositories\ChatRepository;
 use Illuminate\Support\Carbon;
@@ -282,31 +280,17 @@ public function pm(): true|\Illuminate\Http\Response
         $message = $this->message;
 
         if ($type === 'message' || $type === 'private') {
-            // Create echo for user if missing
-            $affected = UserEcho::query()->upsert([[
-                'user_id' => $target->id,
-                'bot_id'  => $this->bot->id,
-            ]], ['user_id', 'bot_id']);
+            // Create chat conversation for user if missing
+            $affected = ChatConversation::query()->upsert([[
+                'user_id'    => $target->id,
+                'bot_id'     => $this->bot->id,
+                'status'     => false,
+                'deleted_at' => null,
+            ]], ['user_id', 'bot_id'], ['deleted_at']);
 
             if ($affected === 1) {
-                Chatter::dispatch('echo', $target->id, UserEchoResource::collection(
-                    UserEcho::query()
-                        ->with(['user', 'room', 'target', 'bot'])
-                        ->where('user_id', '=', $target->id)
-                        ->get()
-                ));
-            }
-
-            // Create audible for user if missing
-            $affected = UserAudible::query()->upsert([[
-                'user_id' => $target->id,
-                'bot_id'  => $this->bot->id,
-                'status'  => false,
-            ]], ['user_id', 'bot_id']);
-
-            if ($affected === 1) {
-                Chatter::dispatch('audible', $target->id, UserAudibleResource::collection(
-                    UserAudible::query()
+                Chatter::dispatch('conversations', $target->id, ChatConversationResource::collection(
+                    ChatConversation::query()
                         ->with(['user', 'room', 'target', 'bot'])
                         ->where('user_id', '=', $target->id)
                         ->get()

app/Bots/SystemBot.php

@@ -17,13 +17,11 @@
 namespace App\Bots;
 
 use App\Events\Chatter;
-use App\Http\Resources\UserAudibleResource;
-use App\Http\Resources\UserEchoResource;
+use App\Http\Resources\ChatConversationResource;
 use App\Models\Bot;
+use App\Models\ChatConversation;
 use App\Models\Gift;
 use App\Models\User;
-use App\Models\UserAudible;
-use App\Models\UserEcho;
 use App\Notifications\NewBon;
 use App\Repositories\ChatRepository;
 
@@ -164,31 +162,17 @@ public function pm(): \Illuminate\Http\Response|true
         $message = $this->message;
 
         if ($type === 'message' || $type === 'private') {
-            // Create echo for user if missing
-            $affected = UserEcho::query()->upsert([[
-                'user_id' => $target->id,
-                'bot_id'  => $this->bot->id,
-            ]], ['user_id', 'bot_id']);
+            // Create conversation for user if missing
+            $affected = ChatConversation::query()->upsert([[
+                'user_id'    => $target->id,
+                'bot_id'     => $this->bot->id,
+                'status'     => false,
+                'deleted_at' => null,
+            ]], ['user_id', 'bot_id'], ['deleted_at']);
 
             if ($affected === 1) {
-                Chatter::dispatch('echo', $target->id, UserEchoResource::collection(
-                    UserEcho::query()
-                        ->with(['user', 'room', 'target', 'bot'])
-                        ->where('user_id', '=', $target->id)
-                        ->get()
-                ));
-            }
-
-            // Create audible for user if missing
-            $affected = UserAudible::query()->upsert([[
-                'user_id' => $target->id,
-                'bot_id'  => $this->bot->id,
-                'status'  => false,
-            ]], ['user_id', 'bot_id']);
-
-            if ($affected === 1) {
-                Chatter::dispatch('audible', $target->id, UserAudibleResource::collection(
-                    UserAudible::query()
+                Chatter::dispatch('conversations', $target->id, ChatConversationResource::collection(
+                    ChatConversation::query()
                         ->with(['user', 'room', 'target', 'bot'])
                         ->where('user_id', '=', $target->id)
                         ->get()

app/Events/Chatter.php

@@ -30,7 +30,7 @@ class Chatter implements ShouldBroadcastNow
     use InteractsWithSockets;
     use SerializesModels;
 
-    public ?AnonymousResourceCollection $echoes = null;
+    public ?AnonymousResourceCollection $conversations = null;
 
     public ?ChatMessageResource $message = null;
 
@@ -42,30 +42,25 @@ class Chatter implements ShouldBroadcastNow
      */
     public ?array $ping = null;
 
-    public ?AnonymousResourceCollection $audibles = null;
-
     /**
      * Chatter Constructor.
      */
     public function __construct(
-        /** @var 'echo'|'audible'|'new.message'|'new.bot'|'new.ping' $type */
+        /** @var 'conversations'|'new.message'|'new.bot'|'new.ping' $type */
         public string $type,
         public int $target,
         /** @var (
-         *      $type is 'echo'        ? AnonymousResourceCollection
-         *   : ($type is 'audible'     ? AnonymousResourceCollection
-         *   : ($type is 'new.message' ? ChatMessageResource
-         *   : ($type is 'new.bot'     ? ChatMessageResource
-         *   : ($type is 'new.ping'    ? array{type: 'bot'|'target', id: int}
+         *      $type is 'conversations' ? AnonymousResourceCollection
+         *   : ($type is 'new.message'   ? ChatMessageResource
+         *   : ($type is 'new.bot'       ? ChatMessageResource
+         *   : ($type is 'new.ping'      ? array{type: 'bot'|'target', id: int}
          *   : never
-         * ))))) $payload
+         * )))) $payload
          */
         mixed $payload,
     ) {
-        if ($type == 'echo') {
-            $this->echoes = $payload;
-        } elseif ($type == 'audible') {
-            $this->audibles = $payload;
+        if ($type == 'conversations') {
+            $this->conversations = $payload;
         } elseif ($type == 'new.message') {
             $this->message = $payload;
         } elseif ($type == 'new.bot') {