From b8fd94312caeaca211dc6966a087619b3e513079 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Wed, 22 Nov 2023 09:33:52 -0700
Subject: [PATCH 01/47] add migration steps

---
 ...00000_create_user_message_chains_table.php | 35 +++++++++++++++++
 ...1_22_000001_create_user_messages_table.php | 38 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
 create mode 100644 database/migrations/platform/2023_11_22_000001_create_user_messages_table.php

diff --git a/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php b/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
new file mode 100644
index 0000000000..96026e5e14
--- /dev/null
+++ b/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::create('user_message_chains', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('title');
+            $table->unsignedBigInteger('sender_id')->nullable();
+            $table->unsignedBigInteger('recipient_id')->nullable();
+            $table->integer('num_messages')->default(0);
+            $table->integer('sender_num_unread')->default(0);
+            $table->integer('recipient_num_unread')->default(0);
+            $table->timestampTz('sender_deleted_at')->nullable();
+            $table->timestampTz('recipient_deleted_at')->nullable();
+
+            $table->index('sender_id');
+            $table->index('recipient_id');
+
+            $table->foreign('sender_id')->references('ID')->on('UserAccounts')->onDelete('set null');
+            $table->foreign('recipient_id')->references('ID')->on('UserAccounts')->onDelete('set null');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('user_message_chains');
+    }
+};
diff --git a/database/migrations/platform/2023_11_22_000001_create_user_messages_table.php b/database/migrations/platform/2023_11_22_000001_create_user_messages_table.php
new file mode 100644
index 0000000000..f834440a68
--- /dev/null
+++ b/database/migrations/platform/2023_11_22_000001_create_user_messages_table.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::create('user_messages', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('chain_id');
+            $table->unsignedBigInteger('author_id');
+            $table->text('body');
+            $table->timestampTz('created_at')->useCurrent();
+
+            $table->index('chain_id');
+
+            $table->foreign('chain_id')->references('ID')->on('user_message_chains')->onDelete('cascade');
+            $table->foreign('author_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
+        });
+
+        Schema::table('Messages', function (Blueprint $table) {
+            $table->unsignedBigInteger('migrated_id')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('Messages', function (Blueprint $table) {
+            $table->dropColumn('migrated_id');
+        });
+
+        Schema::dropIfExists('user_messages');
+    }
+};

From 4af4d3c8081bc26962160ee8a27b0779d5902f8e Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Wed, 22 Nov 2023 10:50:44 -0700
Subject: [PATCH 02/47] add sync command

---
 app/Community/Commands/SyncMessages.php   | 87 ++++++++++++++++++++---
 app/Community/Models/UserMessage.php      | 47 ++++++++++++
 app/Community/Models/UserMessageChain.php | 55 ++++++++++++++
 3 files changed, 179 insertions(+), 10 deletions(-)
 create mode 100644 app/Community/Models/UserMessage.php
 create mode 100644 app/Community/Models/UserMessageChain.php

diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/SyncMessages.php
index 0f89c6e0e8..668d78d7be 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/SyncMessages.php
@@ -4,16 +4,15 @@
 
 namespace App\Community\Commands;
 
-use App\Support\Sync\SyncTrait;
-use Exception;
+use App\Community\Models\Message;
+use App\Community\Models\UserMessage;
+use App\Community\Models\UserMessageChain;
+use App\Site\Models\User;
 use Illuminate\Console\Command;
 
 class SyncMessages extends Command
 {
-    use SyncTrait;
-
-    protected $signature = 'ra:sync:messages {id?} {--f|full} {--p|no-post}';
-
+    protected $signature = 'ra:sync:messages';
     protected $description = 'Sync messages';
 
     public function __construct()
@@ -21,11 +20,79 @@ public function __construct()
         parent::__construct();
     }
 
-    /**
-     * @throws Exception
-     */
     public function handle(): void
     {
-        $this->sync('messages');
+        $count = Message::whereNull('migrated_id')->count();
+
+        $progressBar = $this->output->createProgressBar($count);
+        $progressBar->start();
+
+        // have to do this in batches to prevent exhausting memory
+        // due to requesting payloads (message content)
+        for ($i = 0; $i < $count; $i += 100) {
+            $messages = Message::whereNull('migrated_id')->orderBy('ID')->limit(100)->get();
+            /** @var Message $message */
+            foreach ($messages as $message) {
+                $this->migrateMessage($message);
+                $progressBar->advance();
+            }
+        }
+
+        $progressBar->finish();
+        $this->line(PHP_EOL);
+    }
+
+    private function migrateMessage(Message $message)
+    {
+        $userFrom = User::where('User', $message->UserFrom)->first();
+        $userTo = User::where('User', $message->UserTo)->first();
+        if (!$userFrom || !$userTo) {
+            // sender or recipient was deleted. ignore message
+            $message->migrated_id = 0;
+            $message->save();
+            return;
+        }
+
+        if (strtolower(substr($message->Title, 0, 4)) == 're: ') {
+            $parent = Message::where('Title', '=', substr($message->Title, 4))
+                ->where('UserFrom', '=', $message->UserTo)
+                ->where('UserTo', '=', $message->UserFrom)
+                ->where('ID', '<', $message->ID)
+                ->first();
+        } else {
+            $parent = null;
+        }
+
+        if ($parent === null) {
+            $userMessageChain = new UserMessageChain([
+                'title' => $message->Title,
+                'sender_id' => $userFrom->ID,
+                'recipient_id' => $userTo->ID,
+            ]);
+        } else {
+            $migratedParent = UserMessage::where('id', $parent->migrated_id)->firstOrFail();
+            $userMessageChain = UserMessageChain::where('id', $migratedParent->chain_id)->firstOrFail();
+        }
+
+        $userMessageChain->num_messages++;
+        if ($message->Unread) {
+            if ($userMessageChain->recipient_id == $userTo->ID) {
+                $userMessageChain->recipient_num_unread++;
+            } else {
+                $userMessageChain->sender_num_unread++;
+            }
+        }
+        $userMessageChain->save();
+
+        $userMessage = new UserMessage([
+            'chain_id' => $userMessageChain->id,
+            'author_id' => $userFrom->ID,
+            'body' => $message->Payload,
+            'created_at' => $message->TimeSent,
+        ]);
+        $userMessage->save();
+
+        $message->migrated_id = $userMessage->id;
+        $message->save();
     }
 }
diff --git a/app/Community/Models/UserMessage.php b/app/Community/Models/UserMessage.php
new file mode 100644
index 0000000000..53abf813fc
--- /dev/null
+++ b/app/Community/Models/UserMessage.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Models;
+
+use App\Site\Models\User;
+use App\Support\Database\Eloquent\BaseModel;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Laravel\Scout\Searchable;
+
+class UserMessage extends BaseModel
+{
+    protected $table = 'user_messages';
+
+    public const CREATED_AT = 'created_at';
+    public const UPDATED_AT = null;
+
+    protected $fillable = [
+        'chain_id',
+        'author_id',
+        'body',
+        'created_at',
+    ];
+
+    protected $casts = [
+        'created_at' => 'datetime',
+    ];
+
+    // == accessors
+
+    // == mutators
+
+    // == relations
+
+    /**
+     * @return BelongsTo<User, UserMessage>
+     */
+    public function author(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'author_id');
+    }
+
+    // == scopes
+}
diff --git a/app/Community/Models/UserMessageChain.php b/app/Community/Models/UserMessageChain.php
new file mode 100644
index 0000000000..121d05b3cc
--- /dev/null
+++ b/app/Community/Models/UserMessageChain.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Models;
+
+use App\Site\Models\User;
+use App\Support\Database\Eloquent\BaseModel;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Laravel\Scout\Searchable;
+
+class UserMessageChain extends BaseModel
+{
+    protected $table = 'user_message_chains';
+
+    public const CREATED_AT = null;
+    public const UPDATED_AT = null;
+
+    protected $fillable = [
+        'title',
+        'sender_id',
+        'recipient_id',
+    ];
+    
+    protected $casts = [
+        'sender_deleted_at' => 'datetime',
+        'recipient_deleted_at' => 'datetime',
+    ];
+
+    // == accessors
+
+    // == mutators
+
+    // == relations
+
+    /**
+     * @return BelongsTo<User, UserMessageChain>
+     */
+    public function sender(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'sender_id');
+    }
+
+    /**
+     * @return BelongsTo<User, UserMessageChain>
+     */
+    public function recipient(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'recipient_id');
+    }
+
+    // == scopes
+}

From 095f543c17b4362d7c22b9e85092b5357b05f9b9 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Wed, 22 Nov 2023 13:13:54 -0700
Subject: [PATCH 03/47] add message viewer

---
 .../UserMessageChainController.php            | 55 +++++++++++++++++
 app/Community/RouteServiceProvider.php        | 11 ++--
 .../components/message/breadcrumbs.blade.php  | 10 +++
 .../message/view-chain-page.blade.php         | 61 +++++++++++++++++++
 .../paginator.blade.php                       |  4 ++
 .../completion-progress-page.blade.php        |  2 +-
 6 files changed, 137 insertions(+), 6 deletions(-)
 create mode 100644 app/Community/Controllers/UserMessageChainController.php
 create mode 100644 resources/views/community/components/message/breadcrumbs.blade.php
 create mode 100644 resources/views/community/components/message/view-chain-page.blade.php
 rename resources/views/{platform/components/completion-progress-page => components}/paginator.blade.php (97%)

diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
new file mode 100644
index 0000000000..4d880a6857
--- /dev/null
+++ b/app/Community/Controllers/UserMessageChainController.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Controllers;
+
+use App\Community\Enums\TicketState;
+use App\Community\Models\Ticket;
+use App\Community\Models\UserMessage;
+use App\Community\Models\UserMessageChain;
+use App\Http\Controller;
+use App\Platform\Models\Game;
+use App\Platform\Models\PlayerGame;
+use App\Platform\Models\System;
+use App\Site\Models\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UserMessageChainController extends Controller
+{
+    public function __invoke(Request $request): View
+    {
+        $chainId = $request->route('chain');
+
+        $messageChain = UserMessageChain::firstWhere('id', $chainId);
+        if (!$messageChain) {
+            abort(404);
+        }
+
+        $user = $request->user();
+        if ($messageChain->sender_id != $user->id && $messageChain->recipient_id != $user->id) {
+            // TODO: abort(404);
+        }
+
+        $pageSize = 20;
+        $currentPage = (int) $request->input('page.number') ?? 1;
+        if ($currentPage < 1) {
+            $currentPage = 1;
+        }
+        $totalPages = (int) (($messageChain->num_messages + 19) / 20);
+
+        $messages = UserMessage::where('chain_id', $chainId)
+            ->offset(($currentPage - 1) * $pageSize)
+            ->limit($pageSize)
+            ->get();
+
+        return view('community.components.message.view-chain-page', [
+            'messageChain' => $messageChain,
+            'messages' => $messages,
+            'totalPages' => $totalPages,
+            'currentPage' => $currentPage,
+        ]);
+    }
+}
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index 5d03aa21ee..f0f3063f8a 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -5,6 +5,7 @@
 namespace App\Community;
 
 use App\Community\Controllers\ContactController;
+use App\Community\Controllers\UserMessageChainController;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Route;
 
@@ -228,11 +229,11 @@ protected function mapWebRoutes(): void
 
                 //     // Route::get('history', [PlayerHistoryController::class, 'index'])->name('history.index');
 
-                //     /*
-                //      * inbox
-                //      */
-                //     Route::resource('message', MessageController::class)->except('index', 'edit', 'update');
-                //     Route::resource('messages', MessageController::class)->only('index')->names(['index' => 'message.index']);
+                /*
+                 * inbox
+                 */
+                Route::get('message/{chain}', UserMessageChainController::class)->name('message.view-chain');
+                //Route::resource('messages', MessageController::class)->only('index')->names(['index' => 'message.index']);
 
                 //     /*
                 //      * tickets
diff --git a/resources/views/community/components/message/breadcrumbs.blade.php b/resources/views/community/components/message/breadcrumbs.blade.php
new file mode 100644
index 0000000000..723a3a8385
--- /dev/null
+++ b/resources/views/community/components/message/breadcrumbs.blade.php
@@ -0,0 +1,10 @@
+@props([
+    'targetUsername' => '',
+    'currentPage' => '',
+])
+
+<div class='navpath'>
+    <a href='/inbox.php'>Messages</a>
+    &raquo;
+    <span class="font-bold">{{ $currentPage }}</span>
+</div>
diff --git a/resources/views/community/components/message/view-chain-page.blade.php b/resources/views/community/components/message/view-chain-page.blade.php
new file mode 100644
index 0000000000..e5ec3baf01
--- /dev/null
+++ b/resources/views/community/components/message/view-chain-page.blade.php
@@ -0,0 +1,61 @@
+@props([
+    'messageChain' => null,
+    'messages' => [],
+    'currentPage' => 1,
+    'totalPages' => 1,
+])
+
+<?php
+
+use App\Site\Enums\UserPreference;
+use App\Site\Models\User;
+use App\Support\Shortcode\Shortcode;
+use Illuminate\Support\Carbon;
+
+$userTo = User::firstWhere('ID', $messageChain->recipient_id);
+$userFrom = User::firstWhere('ID', $messageChain->sender_id);
+
+$isShowAbsoluteDatesPreferenceSet = BitSet(request()->user()->websitePrefs, UserPreference::Forum_ShowAbsoluteDates);
+$monthAgo = Carbon::now()->subMonth(1);
+
+?>
+
+<x-app-layout
+    pageTitle="{{ $messageChain->title }}"
+    pageDescription="Conversation between {{ $userFrom->User }} and {{ $userTo->User }}"
+>
+    <x-message.breadcrumbs currentPage="{{ $messageChain->title }}" />
+
+    <div class="w-full flex mt-2">
+        <div class="w-full flex justify-end">
+            <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
+        </div>
+    </div>
+
+    <div class="flex flex-col gap-y-1">
+        @foreach ($messages as $message)
+            <div class="embedded">
+                <div class="flex justify-between items-center">
+                    <div>
+                    {!! userAvatar($message->author_id == $userTo->ID ? $userTo->User : $userFrom->User, iconSize: 16) !!}
+                    <?php $humanDate = $message->created_at->format('F j Y, g:ia'); ?>
+                    @if ($isShowAbsoluteDatesPreferenceSet)
+                        <span class='smalldate'>{{ $humanDate }}</span>
+                    @elseif ($message->created_at < $monthAgo)
+                        <span class='smalldate'>{{ $humanDate }}</span>
+                    @else
+                        <span class='smalldate cursor-help' title='{{ $humanDate }}'>{{ $message->created_at->diffForHumans() }}</span>
+                    @endif
+                    </div>
+                </div>
+
+                <p class="comment text-overflow-wrap">{!! Shortcode::render($message->body) !!}</p>
+            </div>
+        @endforeach
+    </div>
+
+    <div class="w-full flex justify-end mt-2">
+        <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
+    </div>
+
+</x-app-layout>
diff --git a/resources/views/platform/components/completion-progress-page/paginator.blade.php b/resources/views/components/paginator.blade.php
similarity index 97%
rename from resources/views/platform/components/completion-progress-page/paginator.blade.php
rename to resources/views/components/paginator.blade.php
index b5c5915980..3345cc26eb 100644
--- a/resources/views/platform/components/completion-progress-page/paginator.blade.php
+++ b/resources/views/components/paginator.blade.php
@@ -4,6 +4,10 @@
 ])
 
 <?php
+if ($totalPages < 2) {
+    return;
+}
+
 $baseUrl = request()->url();
 $queryParams = request()->query();
 
diff --git a/resources/views/platform/completion-progress-page.blade.php b/resources/views/platform/completion-progress-page.blade.php
index aa0b70e82f..6cc1a9f0f4 100644
--- a/resources/views/platform/completion-progress-page.blade.php
+++ b/resources/views/platform/completion-progress-page.blade.php
@@ -82,7 +82,7 @@
 
         @if ($totalPages > 0)
             <div class="w-full flex justify-end mt-2">
-                <x-completion-progress-page.paginator :totalPages="$totalPages" :currentPage="$currentPage" />
+                <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
             </div>
         @endif
     </div>

From 15530850fd55f448202811209fd5d883488967e1 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Wed, 22 Nov 2023 15:51:39 -0700
Subject: [PATCH 04/47] add inbox

---
 app/Community/Commands/SyncMessages.php       |  10 +-
 .../Controllers/UserMessagesController.php    |  57 ++++++++
 app/Community/RouteServiceProvider.php        |   3 +-
 app/Helpers/render/user.php                   |  27 ++--
 ...00000_create_user_message_chains_table.php |   2 +
 public/request/message/delete.php             |   8 +-
 .../components/message/list-page.blade.php    | 137 ++++++++++++++++++
 .../message/view-chain-page.blade.php         |  18 ++-
 8 files changed, 241 insertions(+), 21 deletions(-)
 create mode 100644 app/Community/Controllers/UserMessagesController.php
 create mode 100644 resources/views/community/components/message/list-page.blade.php

diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/SyncMessages.php
index 668d78d7be..c791b26d06 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/SyncMessages.php
@@ -75,10 +75,14 @@ private function migrateMessage(Message $message)
         }
 
         $userMessageChain->num_messages++;
-        if ($message->Unread) {
-            if ($userMessageChain->recipient_id == $userTo->ID) {
+        if ($userMessageChain->recipient_id == $userTo->ID) {
+            $userMessageChain->sender_last_post_at = $message->TimeSent;
+            if ($message->Unread) {
                 $userMessageChain->recipient_num_unread++;
-            } else {
+            }
+        } else {
+            $userMessageChain->recipient_last_post_at = $message->TimeSent;
+            if ($message->Unread) {
                 $userMessageChain->sender_num_unread++;
             }
         }
diff --git a/app/Community/Controllers/UserMessagesController.php b/app/Community/Controllers/UserMessagesController.php
new file mode 100644
index 0000000000..6df9a85d54
--- /dev/null
+++ b/app/Community/Controllers/UserMessagesController.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Controllers;
+
+use App\Community\Enums\TicketState;
+use App\Community\Models\Ticket;
+use App\Community\Models\UserMessage;
+use App\Community\Models\UserMessageChain;
+use App\Http\Controller;
+use App\Platform\Models\Game;
+use App\Platform\Models\PlayerGame;
+use App\Platform\Models\System;
+use App\Site\Models\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class UserMessagesController extends Controller
+{
+    public function __invoke(Request $request): View
+    {
+        $user = $request->user();
+
+        $respondedMessages = UserMessageChain::where('sender_id', $user->id)
+            ->whereNull('sender_deleted_at')
+            ->whereNotNull('recipient_last_post_at');
+
+        $receivedMessages = UserMessageChain::where('recipient_id', $user->id)
+            ->whereNull('recipient_deleted_at');
+
+        $messages = $respondedMessages->union($receivedMessages);
+        $totalMessages = $messages->count();
+
+        $pageSize = 20;
+        $currentPage = (int) $request->input('page.number') ?? 1;
+        if ($currentPage < 1) {
+            $currentPage = 1;
+        }
+        $totalPages = (int) (($totalMessages + 19) / 20);
+
+        $messages = $messages
+            ->orderBy(DB::raw(greatestStatement(['COALESCE(recipient_last_post_at,0)', 'sender_last_post_at'])), 'DESC')
+            ->offset(($currentPage - 1) * $pageSize)
+            ->limit($pageSize)
+            ->get();
+
+        return view('community.components.message.list-page', [
+            'messages' => $messages,
+            'totalPages' => $totalPages,
+            'currentPage' => $currentPage,
+            'unreadCount' => $user->UnreadMessageCount,
+            'totalMessages' => $totalMessages,
+        ]);
+    }
+}
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index f0f3063f8a..39a5e52dff 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -6,6 +6,7 @@
 
 use App\Community\Controllers\ContactController;
 use App\Community\Controllers\UserMessageChainController;
+use App\Community\Controllers\UserMessagesController;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Route;
 
@@ -233,7 +234,7 @@ protected function mapWebRoutes(): void
                  * inbox
                  */
                 Route::get('message/{chain}', UserMessageChainController::class)->name('message.view-chain');
-                //Route::resource('messages', MessageController::class)->only('index')->names(['index' => 'message.index']);
+                Route::get('messages', UserMessagesController::class)->name('message.inbox');
 
                 //     /*
                 //      * tickets
diff --git a/app/Helpers/render/user.php b/app/Helpers/render/user.php
index d10e2f0d1e..3b20ae4b5c 100644
--- a/app/Helpers/render/user.php
+++ b/app/Helpers/render/user.php
@@ -10,7 +10,7 @@
  * Create the user and tooltip div that is shown when you hover over a username or user avatar.
  */
 function userAvatar(
-    ?string $username,
+    string|User|null $user,
     ?bool $label = null,
     ?bool $icon = null,
     int $iconSize = 32,
@@ -18,19 +18,26 @@ function userAvatar(
     ?string $link = null,
     bool|string|array $tooltip = true,
 ): string {
-    if (empty($username)) {
+    if (!$user) {
         return '';
     }
 
-    $user = Cache::store('array')->remember(
-        CacheKey::buildUserCardDataCacheKey($username),
-        Carbon::now()->addMonths(3),
-        function () use ($username): ?array {
-            $foundUser = User::firstWhere('User', $username);
-
-            return $foundUser ? $foundUser->toArray() : null;
+    if (is_string($user)) {
+        $username = $user;
+        if (empty($username)) {
+            return '';
         }
-    );
+
+        $user = Cache::store('array')->remember(
+            CacheKey::buildUserCardDataCacheKey($username),
+            Carbon::now()->addMonths(3),
+            function () use ($username): ?array {
+                $foundUser = User::firstWhere('User', $username);
+
+                return $foundUser ? $foundUser->toArray() : null;
+            }
+        );
+    }
 
     if (!$user) {
         $userSanitized = $username;
diff --git a/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php b/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
index 96026e5e14..4f59d23729 100644
--- a/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
+++ b/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
@@ -17,6 +17,8 @@ public function up(): void
             $table->integer('num_messages')->default(0);
             $table->integer('sender_num_unread')->default(0);
             $table->integer('recipient_num_unread')->default(0);
+            $table->timestampTz('sender_last_post_at')->nullable();
+            $table->timestampTz('recipient_last_post_at')->nullable();
             $table->timestampTz('sender_deleted_at')->nullable();
             $table->timestampTz('recipient_deleted_at')->nullable();
 
diff --git a/public/request/message/delete.php b/public/request/message/delete.php
index 650d940d3d..962ba7d10c 100644
--- a/public/request/message/delete.php
+++ b/public/request/message/delete.php
@@ -8,11 +8,9 @@
 }
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'message' => 'required|integer|exists:Messages,ID',
+    'message' => 'required|integer|exists:user_message_chains,ID',
 ]);
 
-if (DeleteMessage($user, (int) $input['message'])) {
-    return back()->with('success', __('legacy.success.delete'));
-}
+return redirect(route('message.inbox'));
 
-return back()->withErrors(__('legacy.error.error'));
+//return back()->withErrors(__('legacy.error.error'));
diff --git a/resources/views/community/components/message/list-page.blade.php b/resources/views/community/components/message/list-page.blade.php
new file mode 100644
index 0000000000..79affc0df6
--- /dev/null
+++ b/resources/views/community/components/message/list-page.blade.php
@@ -0,0 +1,137 @@
+@props([
+    'messages' => [],
+    'currentPage' => 1,
+    'totalPages' => 1,
+    'unreadCount' => 0,
+    'totalMessages' => 0,
+])
+
+<?php
+
+use App\Site\Enums\UserPreference;
+use App\Site\Models\User;
+use App\Support\Shortcode\Shortcode;
+use Illuminate\Support\Carbon;
+
+$user = request()->user();
+$isShowAbsoluteDatesPreferenceSet = BitSet($user->websitePrefs, UserPreference::Forum_ShowAbsoluteDates);
+$monthAgo = Carbon::now()->subMonth(1);
+
+?>
+
+<script>
+function deleteMessage(id) {
+    if (confirm('Are you sure you want to delete this message?')) {
+        $.post('/request/message/delete.php', {
+            chain: id,
+            user: "{{ $user->User }}"
+        })
+    }
+}
+</script>
+
+<x-app-layout
+    pageTitle="Inbox"
+    pageDescription="Messages involving {{ $user->User }}"
+>
+    <x-message.breadcrumbs currentPage="Inbox" />
+
+    <div class='ml-2'>You have {{ $unreadCount }} unread of {{ $totalMessages }} total messages.</div>
+
+    <div class="w-full flex mt-2">
+        <div class="mr-6">
+            <button class='btn'>Outbox</button>
+        </div>
+        <div class="mr-6">
+            <button class='btn'>New Message</button>
+        </div>
+        <div class="w-full flex justify-end">
+            <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
+        </div>
+    </div>
+
+    <div><table class='table-highlight mb-4'><tbody>
+
+    <tr>
+        <th style='width:20%'>From</th>
+        <th style='width:55%'>Title</th>
+        <th style='width:10%' class='text-right'>Messages</th>
+        <th style='width:15%' class='text-right'>Last Message</th>
+    </tr>
+    @foreach ($messages as $message)
+        <?php 
+            $mostRecentUpdate = Carbon::parse($message->sender_last_post_at);
+            if ($message->recipient_last_post_at) {
+                $mostRecentReply = Carbon::parse($message->recipient_last_post_at);
+                if ($mostRecentReply > $mostRecentUpdate) {
+                    $mostRecentUpdate = $mostRecentReply;
+                }
+            }
+            $humanDate = $mostRecentUpdate->format('F j Y, g:ia');
+
+            $otherUser = ($user->id == $message->recipient_id) ?
+                User::firstWhere('ID', $message->sender_id) :
+                User::firstWhere('ID', $message->recipient_id);
+
+
+            $num_unread = 0;
+            if ($message->recipient_id == $user->id && $message->recipient_num_unread > 0) {
+                $num_unread = $message->recipient_num_unread;
+            } elseif ($message->sender_id == $user->id && $message->sender_num_unread > 0) {
+                $num_unread = $message->sender_num_unread;
+            }
+        ?>
+        <tr>
+            <td>
+                @if ($num_unread > 0)
+                    <b>
+                @endif
+                {!! userAvatar($otherUser, iconSize: 24) !!}
+                @if ($num_unread > 0)
+                    </b>
+                @endif
+            </td>
+
+            <td>
+                <a href='{{ route('message.view-chain', $message->id) }}'>
+                    @if ($num_unread > 0)
+                        <b>
+                    @endif
+                    @if ($message->sender_id == $user->id)
+                        RE:
+                    @endif
+                    {{ $message->title }}
+                    @if ($num_unread > 0)
+                        </b>
+                    @endif
+                </a>
+            </td>
+
+            <td class='text-right'>
+                @if ($num_unread == 0)
+                    {{ $message->num_messages }}
+                @elseif ($num_unread == $message->num_messages)
+                    <b>{{ $num_unread }} (unread)</b>
+                @else
+                    {{ $message->num_messages }} <b>({{ $num_unread }} unread)</b>
+                @endif
+            </td>
+
+            <td class='text-right'>
+                @if ($isShowAbsoluteDatesPreferenceSet)
+                    <span class='smalldate'>{{ $humanDate }}</span>
+                @elseif ($mostRecentUpdate < $monthAgo)
+                    <span class='smalldate'>{{ $humanDate }}</span>
+                @else
+                    <span class='smalldate cursor-help' title='{{ $humanDate }}'>{{ $mostRecentUpdate->diffForHumans() }}</span>
+                @endif
+            </td>
+        </tr>
+    @endforeach
+    </tbody></table></div>
+
+    <div class="w-full flex justify-end mt-2">
+        <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
+    </div>
+
+</x-app-layout>
diff --git a/resources/views/community/components/message/view-chain-page.blade.php b/resources/views/community/components/message/view-chain-page.blade.php
index e5ec3baf01..c5cfd6ed9b 100644
--- a/resources/views/community/components/message/view-chain-page.blade.php
+++ b/resources/views/community/components/message/view-chain-page.blade.php
@@ -20,13 +20,27 @@
 
 ?>
 
+<script>
+function deleteMessage() {
+    if (confirm('Are you sure you want to delete this message?')) {
+        $.post('/request/message/delete.php', {
+            chain: {{ $messageChain->id }},
+            user: "{{ request()->user()->User }}"
+        })
+    }
+}
+</script>
+
 <x-app-layout
     pageTitle="{{ $messageChain->title }}"
     pageDescription="Conversation between {{ $userFrom->User }} and {{ $userTo->User }}"
 >
-    <x-message.breadcrumbs currentPage="{{ $messageChain->title }}" />
+    <x-message.breadcrumbs currentPage="{!! $messageChain->title !!}" />
 
     <div class="w-full flex mt-2">
+        <div class="mr-6">
+            <button class='btn btn-danger' onclick='deleteMessage()'>Delete</button>
+        </div>
         <div class="w-full flex justify-end">
             <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
         </div>
@@ -37,7 +51,7 @@
             <div class="embedded">
                 <div class="flex justify-between items-center">
                     <div>
-                    {!! userAvatar($message->author_id == $userTo->ID ? $userTo->User : $userFrom->User, iconSize: 16) !!}
+                    {!! userAvatar($message->author_id == $userTo->ID ? $userTo : $userFrom, iconSize: 16) !!}
                     <?php $humanDate = $message->created_at->format('F j Y, g:ia'); ?>
                     @if ($isShowAbsoluteDatesPreferenceSet)
                         <span class='smalldate'>{{ $humanDate }}</span>

From 1a36a0d0ed85bab28a107da13dd16fc928374b45 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Wed, 22 Nov 2023 16:42:56 -0700
Subject: [PATCH 05/47] add outbox

---
 .../Controllers/UserMessagesController.php    | 28 ++++++++++++++++++-
 app/Community/RouteServiceProvider.php        |  1 +
 .../components/message/breadcrumbs.blade.php  |  2 +-
 .../components/message/list-page.blade.php    | 26 +++++++++++++----
 4 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/app/Community/Controllers/UserMessagesController.php b/app/Community/Controllers/UserMessagesController.php
index 6df9a85d54..19faed40dd 100644
--- a/app/Community/Controllers/UserMessagesController.php
+++ b/app/Community/Controllers/UserMessagesController.php
@@ -14,6 +14,7 @@
 use App\Platform\Models\System;
 use App\Site\Models\User;
 use Illuminate\Contracts\View\View;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -31,6 +32,11 @@ public function __invoke(Request $request): View
             ->whereNull('recipient_deleted_at');
 
         $messages = $respondedMessages->union($receivedMessages);
+        return $this->buildList($messages, $request, 'inbox');
+    }
+
+    private function buildList(Builder $messages, Request $request, string $mode): View
+    {
         $totalMessages = $messages->count();
 
         $pageSize = 20;
@@ -50,8 +56,28 @@ public function __invoke(Request $request): View
             'messages' => $messages,
             'totalPages' => $totalPages,
             'currentPage' => $currentPage,
-            'unreadCount' => $user->UnreadMessageCount,
+            'unreadCount' => $request->user()->UnreadMessageCount,
             'totalMessages' => $totalMessages,
+            'mode' => $mode,
         ]);
     }
+
+    public function outbox(Request $request): View
+    {
+        $user = $request->user();
+
+        $respondedMessages = UserMessageChain::where('recipient_id', $user->id)
+            ->whereNull('recipient_deleted_at')
+            ->whereRaw('recipient_last_post_at > sender_last_post_at');
+
+        $sentMessages = UserMessageChain::where('sender_id', $user->id)
+            ->whereNull('sender_deleted_at')
+            ->where(function ($query){
+                $query->whereNull('recipient_last_post_at')
+                ->orWhereRaw('sender_last_post_at > recipient_last_post_at');
+            });
+
+        $messages = $respondedMessages->union($sentMessages);
+        return $this->buildList($messages, $request, 'outbox');
+    }
 }
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index 39a5e52dff..9310ac70fc 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -235,6 +235,7 @@ protected function mapWebRoutes(): void
                  */
                 Route::get('message/{chain}', UserMessageChainController::class)->name('message.view-chain');
                 Route::get('messages', UserMessagesController::class)->name('message.inbox');
+                Route::get('messages/outbox', [UserMessagesController::class, 'outbox'])->name('message.outbox');
 
                 //     /*
                 //      * tickets
diff --git a/resources/views/community/components/message/breadcrumbs.blade.php b/resources/views/community/components/message/breadcrumbs.blade.php
index 723a3a8385..e259aa5ea1 100644
--- a/resources/views/community/components/message/breadcrumbs.blade.php
+++ b/resources/views/community/components/message/breadcrumbs.blade.php
@@ -4,7 +4,7 @@
 ])
 
 <div class='navpath'>
-    <a href='/inbox.php'>Messages</a>
+    <a href='{{ route('message.inbox') }}'>Messages</a>
     &raquo;
     <span class="font-bold">{{ $currentPage }}</span>
 </div>
diff --git a/resources/views/community/components/message/list-page.blade.php b/resources/views/community/components/message/list-page.blade.php
index 79affc0df6..2378f1223d 100644
--- a/resources/views/community/components/message/list-page.blade.php
+++ b/resources/views/community/components/message/list-page.blade.php
@@ -4,6 +4,7 @@
     'totalPages' => 1,
     'unreadCount' => 0,
     'totalMessages' => 0,
+    'mode' => 'inbox',
 ])
 
 <?php
@@ -13,6 +14,9 @@
 use App\Support\Shortcode\Shortcode;
 use Illuminate\Support\Carbon;
 
+$pageTitle = ($mode == 'outbox') ? 'Outbox' : 'Inbox';
+$toFromLabel = ($mode == 'outbox') ? 'To' : 'From';
+
 $user = request()->user();
 $isShowAbsoluteDatesPreferenceSet = BitSet($user->websitePrefs, UserPreference::Forum_ShowAbsoluteDates);
 $monthAgo = Carbon::now()->subMonth(1);
@@ -31,16 +35,26 @@ function deleteMessage(id) {
 </script>
 
 <x-app-layout
-    pageTitle="Inbox"
+    pageTitle="{{ $pageTitle }}"
     pageDescription="Messages involving {{ $user->User }}"
 >
-    <x-message.breadcrumbs currentPage="Inbox" />
-
-    <div class='ml-2'>You have {{ $unreadCount }} unread of {{ $totalMessages }} total messages.</div>
+    <x-message.breadcrumbs currentPage="{{ $pageTitle }}" />
+
+    <div class='ml-2'>
+        @if ($mode == 'outbox')
+            You have {{ $totalMessages }} sent messages.
+        @else
+            You have {{ $unreadCount }} unread of {{ $totalMessages }} total messages.
+        @endif
+    </div>
 
     <div class="w-full flex mt-2">
         <div class="mr-6">
-            <button class='btn'>Outbox</button>
+            @if ($mode == 'outbox')
+                <a href='{{ route('message.inbox') }}'><button class='btn'>Inbox</button></a>
+            @else
+                <a href='{{ route('message.outbox') }}'><button class='btn'>Outbox</button></a>
+            @endif
         </div>
         <div class="mr-6">
             <button class='btn'>New Message</button>
@@ -53,7 +67,7 @@ function deleteMessage(id) {
     <div><table class='table-highlight mb-4'><tbody>
 
     <tr>
-        <th style='width:20%'>From</th>
+        <th style='width:20%'>{{ $toFromLabel }}</th>
         <th style='width:55%'>Title</th>
         <th style='width:10%' class='text-right'>Messages</th>
         <th style='width:15%' class='text-right'>Last Message</th>

From 4752ffa5af357a065baa661b91f9dfe9067764da Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Wed, 22 Nov 2023 21:30:41 -0700
Subject: [PATCH 06/47] support replying to messages

---
 .../UserMessageChainController.php            |  68 +++++-
 app/Community/Models/UserMessageChain.php     |   2 +
 public/request/message/create.php             |  40 ++++
 .../message/view-chain-page.blade.php         |  12 +-
 ....blade.php => shortcode-buttons.blade.php} |   0
 .../input/shortcode-textarea.blade.php        |  60 ++++++
 tests/Feature/Community/MessagesTest.php      | 197 ++++++++++++++++++
 7 files changed, 377 insertions(+), 2 deletions(-)
 create mode 100644 public/request/message/create.php
 rename resources/views/components/input/{shortcode.blade.php => shortcode-buttons.blade.php} (100%)
 create mode 100644 resources/views/components/input/shortcode-textarea.blade.php
 create mode 100644 tests/Feature/Community/MessagesTest.php

diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
index 4d880a6857..c87fb31ba6 100644
--- a/app/Community/Controllers/UserMessageChainController.php
+++ b/app/Community/Controllers/UserMessageChainController.php
@@ -15,6 +15,7 @@
 use App\Site\Models\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 class UserMessageChainController extends Controller
@@ -30,7 +31,7 @@ public function __invoke(Request $request): View
 
         $user = $request->user();
         if ($messageChain->sender_id != $user->id && $messageChain->recipient_id != $user->id) {
-            // TODO: abort(404);
+            abort(404);
         }
 
         $pageSize = 20;
@@ -40,6 +41,15 @@ public function __invoke(Request $request): View
         }
         $totalPages = (int) (($messageChain->num_messages + 19) / 20);
 
+        if ($currentPage == $totalPages) {
+            if ($userMessageChain->recipient_id == $user->ID) {
+                $userMessageChain->recipient_num_unread = 0;
+            } else {
+                $userMessageChain->sender_num_unread = 0;
+            }
+            $userMessageChain->save();
+        }
+
         $messages = UserMessage::where('chain_id', $chainId)
             ->offset(($currentPage - 1) * $pageSize)
             ->limit($pageSize)
@@ -52,4 +62,60 @@ public function __invoke(Request $request): View
             'currentPage' => $currentPage,
         ]);
     }
+
+    public static function newChain(User $userFrom, User $userTo, string $title, string $body): void
+    {
+        $userMessageChain = new UserMessageChain([
+            'title' => $title,
+            'sender_id' => $userFrom->ID,
+            'recipient_id' => $userTo->ID,
+        ]);
+
+        UserMessageChainController::addToChain($userMessageChain, $userFrom, $body);
+    }
+
+    public static function addToChain(UserMessageChain $userMessageChain, User $userFrom, string $body): void
+    {
+        $now = Carbon::now();
+
+        $userMessageChain->num_messages++;
+        if ($userMessageChain->recipient_id == $userFrom->ID) {
+            $userMessageChain->recipient_last_post_at = $now;
+            $userMessageChain->sender_num_unread++;
+            $userMessageChain->sender_deleted_at = null;
+        } else {
+            $userMessageChain->sender_last_post_at = $now;
+            $userMessageChain->recipient_num_unread++;
+            $userMessageChain->recipient_deleted_at = null;
+        }
+        $userMessageChain->save();
+        
+        $userMessage = new UserMessage([
+            'chain_id' => $userMessageChain->id,
+            'author_id' => $userFrom->ID,
+            'body' => $body,
+        ]);
+        $userMessage->save();
+        
+        // TODO: dispatch message sent event
+        //       - update UnreadMessageCount
+        //       - send email
+    }
+
+    public static function deleteChain(UserMessageChain $userMessageChain, User $user): void
+    {
+        $now = Carbon::now();
+
+        if ($userMessageChain->recipient_id == $user->ID) {
+            $userMessageChain->recipient_num_unread = 0;
+            $userMessageChain->recipient_deleted_at = $now;
+        } else {
+            $userMessageChain->sender_num_unread = 0;
+            $userMessageChain->sender_deleted_at = $now;
+        }
+
+        $userMessageChain->save();
+        
+        // TODO: hard delete if both deleted_at fields are not null?
+    }
 }
diff --git a/app/Community/Models/UserMessageChain.php b/app/Community/Models/UserMessageChain.php
index 121d05b3cc..d9ca95932f 100644
--- a/app/Community/Models/UserMessageChain.php
+++ b/app/Community/Models/UserMessageChain.php
@@ -27,6 +27,8 @@ class UserMessageChain extends BaseModel
     protected $casts = [
         'sender_deleted_at' => 'datetime',
         'recipient_deleted_at' => 'datetime',
+        'sender_last_post_at' => 'datetime',
+        'recipient_last_post_at' => 'datetime',
     ];
 
     // == accessors
diff --git a/public/request/message/create.php b/public/request/message/create.php
new file mode 100644
index 0000000000..49e96b928a
--- /dev/null
+++ b/public/request/message/create.php
@@ -0,0 +1,40 @@
+<?php
+
+use App\Community\Controllers\UserMessageChainController;
+use App\Community\Models\UserMessage;
+use App\Community\Models\UserMessageChain;
+use App\Site\Enums\Permissions;
+use App\Site\Models\User;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Validator;
+
+if (!authenticateFromCookie($user, $permissions, $userDetail) || $permissions < Permissions::Registered) {
+    return back()->withErrors(__('legacy.error.permissions'));
+}
+
+/** @var User $user */
+$user = request()->user();
+
+$input = Validator::validate(Arr::wrap(request()->post()), [
+    'chain' => 'nullable|integer',
+    'body' => 'required|string',
+    'title' => 'required_without:chain',
+    'recipient' => 'required_without:chain|exists:UserAccounts,User',
+]);
+
+if (array_key_exists('chain', $input) && $input['chain'] != null) {
+    $userMessageChain = UserMessageChain::firstWhere('id', $input['chain']);
+    if (!$userMessageChain) {
+        return back()->withErrors(__('legacy.error.error'));
+    }
+    if ($userMessageChain->recipient_id != $user->ID && $userMessageChain->sender_id != $user->ID) {
+        return back()->withErrors(__('legacy.error.error'));
+    }
+    UserMessageChainController::addToChain($userMessageChain, $user, $input['body']);
+} else {
+    $recipient = User::firstWhere('User', $input['recipient']);
+    UserMessageChainController::newChain($user, $recipient, $input['title'], $input['body']);
+}
+
+return redirect(route("message.view-chain", $userMessageChain->id));
diff --git a/resources/views/community/components/message/view-chain-page.blade.php b/resources/views/community/components/message/view-chain-page.blade.php
index c5cfd6ed9b..314180a8fa 100644
--- a/resources/views/community/components/message/view-chain-page.blade.php
+++ b/resources/views/community/components/message/view-chain-page.blade.php
@@ -18,6 +18,10 @@
 $isShowAbsoluteDatesPreferenceSet = BitSet(request()->user()->websitePrefs, UserPreference::Forum_ShowAbsoluteDates);
 $monthAgo = Carbon::now()->subMonth(1);
 
+$shortcodePostData = [
+    'chain' => $messageChain->id,
+];
+
 ?>
 
 <script>
@@ -37,7 +41,7 @@ function deleteMessage() {
 >
     <x-message.breadcrumbs currentPage="{!! $messageChain->title !!}" />
 
-    <div class="w-full flex mt-2">
+    <div class="w-full flex my-2">
         <div class="mr-6">
             <button class='btn btn-danger' onclick='deleteMessage()'>Delete</button>
         </div>
@@ -68,6 +72,12 @@ function deleteMessage() {
         @endforeach
     </div>
 
+    <x-input.shortcode-textarea
+        submitTarget='/request/message/create.php'
+        :postData="$shortcodePostData"
+        watermark='Enter your message here...'
+    />
+
     <div class="w-full flex justify-end mt-2">
         <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
     </div>
diff --git a/resources/views/components/input/shortcode.blade.php b/resources/views/components/input/shortcode-buttons.blade.php
similarity index 100%
rename from resources/views/components/input/shortcode.blade.php
rename to resources/views/components/input/shortcode-buttons.blade.php
diff --git a/resources/views/components/input/shortcode-textarea.blade.php b/resources/views/components/input/shortcode-textarea.blade.php
new file mode 100644
index 0000000000..9479c69719
--- /dev/null
+++ b/resources/views/components/input/shortcode-textarea.blade.php
@@ -0,0 +1,60 @@
+@props([
+    'submitTarget' => '',
+    'postData' => [],
+    'enabled' => true,
+    'watermark' => '',
+    'maxLength' => 60000,
+    'initialValue' => '',
+])
+
+<?php
+
+$inputEnabled = $enabled ? '' : 'disabled';
+$buttonEnabled = $enabled ? ":disabled='!isValid'" : "disabled";
+
+$loadingIconSrc = asset('assets/images/icon/loading.gif');
+
+?>
+
+<div class='mt-4'>
+    <div>
+        {!! RenderShortcodeButtons(); !!}
+    </div>
+
+    <script>
+    function disableRepost() {
+        var btn = $('#postBtn');
+        btn.attr('disabled', true);
+        btn.html('Sending...');
+    }
+    </script>
+
+    <form action='{{ $submitTarget }}' method='post' x-data='{ isValid: true }'>
+        {{ csrf_field() }}
+        @foreach ($postData as $key => $value)
+            <input type='hidden' name='{{ $key }}' value='{{ $value }}'>
+        @endforeach
+        <textarea
+            id="commentTextarea"
+            class="w-full mb-2"
+            rows="10" cols="63"
+            {!! $inputEnabled !!}
+            maxlength="{{ $maxLength }}"
+            name="body"
+            placeholder="{{ $watermark }}"
+            x-on:input="autoExpandTextInput($el); isValid = window.getStringByteCount($event.target.value) <= {{ $maxLength }};"
+        >{{ $initialValue }}</textarea>
+
+        <div class="flex justify-between mb-2">
+            <span class="textarea-counter" data-textarea-id="commentTextarea">0 / 60000</span>
+
+            <div>
+                <img id="preview-loading-icon" src="{!! $loadingIconSrc !!}" style="opacity: 0;" width="16" height="16" alt="Loading...">
+                <button id="preview-button" type="button" class="btn" onclick="window.loadPostPreview()" {!! $buttonEnabled !!}>Preview</button>
+                <button id="postBtn" class="btn" onclick="this.form.submit(); disableRepost();" {!! $buttonEnabled !!}>Submit</button>
+            </div>
+        </div>
+
+        <div id='post-preview'></div>
+    </form>
+<div>
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
new file mode 100644
index 0000000000..3a38e4f013
--- /dev/null
+++ b/tests/Feature/Community/MessagesTest.php
@@ -0,0 +1,197 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Community;
+
+use App\Community\Controllers\UserMessageChainController;
+use App\Community\Enums\AwardType;
+use App\Community\Models\UserMessage;
+use App\Community\Models\UserMessageChain;
+use App\Platform\Enums\UnlockMode;
+use App\Platform\Models\Achievement;
+use App\Platform\Models\Game;
+use App\Platform\Models\PlayerBadge;
+use App\Platform\Models\System;
+use App\Site\Enums\Permissions;
+use App\Site\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Carbon;
+use Tests\Feature\Platform\Concerns\TestsPlayerAchievements;
+use Tests\Feature\Platform\Concerns\TestsPlayerBadges;
+use Tests\TestCase;
+
+class MessagesTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function testCreateMessageChain(): void
+    {
+        $now = Carbon::now()->floorSecond();
+        Carbon::setTestNow($now);
+
+        /** @var User $user1 */
+        $user1 = User::factory()->create();
+        /** @var User $user2 */
+        $user2 = User::factory()->create();
+
+        // user1 sends message to user2
+        UserMessageChainController::newChain($user1, $user2, 'This is a message', 'This is the message body.');
+
+        $chain = UserMessageChain::firstWhere('id', 1);
+        $this->assertJson($chain->toJson(), json_encode([
+            'id' => 1,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 1,
+            'sender_num_unread' => 0,
+            'recipient_num_unread' => 1,
+            'sender_last_post_at' => $now,
+            'recipient_last_post_at' => null,
+            'sender_deleted_at' => null,
+            'recipient_deleted_at' => null,
+        ]));
+        $message = UserMessage::firstWhere('id', 1);
+        $this->assertJson($message->toJson(), json_encode([
+            'id' => 1,
+            'chain_id' => 1,
+            'author_id' => $user1->ID,
+            'body' => 'This is the message body.',
+            'created_at' => $now,
+        ]));
+
+        // user2 responds
+        $chain->recipient_num_unread = 0;
+        $chain->save();
+        $now2 = $now->addMinutes(5);
+        Carbon::setTestNow($now2);
+
+        UserMessageChainController::addToChain($chain, $user2, 'This is a response.');
+
+        $chain->refresh();
+        $this->assertJson($chain->toJson(), json_encode([
+            'id' => 1,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 2,
+            'sender_num_unread' => 1,
+            'recipient_num_unread' => 0,
+            'sender_last_post_at' => $now,
+            'recipient_last_post_at' => $now2,
+            'sender_deleted_at' => null,
+            'recipient_deleted_at' => null,
+        ]));
+        $message = UserMessage::firstWhere('id', 2);
+        $this->assertJson($message->toJson(), json_encode([
+            'id' => 2,
+            'chain_id' => 1,
+            'author_id' => $user2->ID,
+            'body' => 'This is a response.',
+            'created_at' => $now2,
+        ]));
+
+        // user2 responds again
+        $now3 = $now->addMinutes(5);
+        Carbon::setTestNow($now3);
+
+        UserMessageChainController::addToChain($chain, $user2, 'This is another response.');
+
+        $chain->refresh();
+        $this->assertJson($chain->toJson(), json_encode([
+            'id' => 1,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 3,
+            'sender_num_unread' => 2,
+            'recipient_num_unread' => 0,
+            'sender_last_post_at' => $now,
+            'recipient_last_post_at' => $now3,
+            'sender_deleted_at' => null,
+            'recipient_deleted_at' => null,
+        ]));
+        $message = UserMessage::firstWhere('id', 3);
+        $this->assertJson($message->toJson(), json_encode([
+            'id' => 3,
+            'chain_id' => 1,
+            'author_id' => $user2->ID,
+            'body' => 'This is another response.',
+            'created_at' => $now3,
+        ]));
+
+        // user1 responds
+        $chain->sender_num_unread = 0;
+        $chain->save();
+        $now4 = $now->addMinutes(5);
+        Carbon::setTestNow($now4);
+
+        UserMessageChainController::addToChain($chain, $user1, 'This is a third response.');
+
+        $chain->refresh();
+        $this->assertJson($chain->toJson(), json_encode([
+            'id' => 1,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 4,
+            'sender_num_unread' => 0,
+            'recipient_num_unread' => 1,
+            'sender_last_post_at' => $now4,
+            'recipient_last_post_at' => $now3,
+            'sender_deleted_at' => null,
+            'recipient_deleted_at' => null,
+        ]));
+        $message = UserMessage::firstWhere('id', 4);
+        $this->assertJson($message->toJson(), json_encode([
+            'id' => 4,
+            'chain_id' => 1,
+            'author_id' => $user1->ID,
+            'body' => 'This is a third response.',
+            'created_at' => $now4,
+        ]));
+
+        // user1 deletes
+        $now5 = $now->addMinutes(5);
+        Carbon::setTestNow($now5);
+
+        UserMessageChainController::deleteChain($chain, $user1);
+
+        $chain->refresh();
+        $this->assertJson($chain->toJson(), json_encode([
+            'id' => 1,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 4,
+            'sender_num_unread' => 0,
+            'recipient_num_unread' => 1,
+            'sender_last_post_at' => $now4,
+            'recipient_last_post_at' => $now3,
+            'sender_deleted_at' => $now5,
+            'recipient_deleted_at' => null,
+        ]));
+
+        // user2 deletes
+        $now6 = $now->addMinutes(5);
+        Carbon::setTestNow($now6);
+
+        UserMessageChainController::deleteChain($chain, $user2);
+
+        $chain->refresh();
+        $this->assertJson($chain->toJson(), json_encode([
+            'id' => 1,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 4,
+            'sender_num_unread' => 0,
+            'recipient_num_unread' => 1,
+            'sender_last_post_at' => $now4,
+            'recipient_last_post_at' => $now3,
+            'sender_deleted_at' => $now5,
+            'recipient_deleted_at' => $now6,
+        ]));
+    }
+}

From da2dce67af1140cc3d9124ecb1ca085af23e77f8 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 07:51:43 -0700
Subject: [PATCH 07/47] support creating new messages

---
 .../UserMessageChainController.php            | 22 ++++++--
 .../Controllers/UserMessagesController.php    |  2 +-
 app/Community/RouteServiceProvider.php        |  3 +-
 public/request/message/create.php             |  8 +--
 public/userInfo.php                           |  2 +-
 .../components/message/icon.blade.php         |  3 +-
 .../components/message/list-page.blade.php    | 18 +++++--
 .../message/new-chain-page.blade.php          | 50 +++++++++++++++++++
 .../message/view-chain-page.blade.php         | 22 ++++----
 .../input/shortcode-textarea.blade.php        | 49 ++++++++----------
 .../input/user-select-image.blade.php         | 15 ++++++
 .../components/input/user-select.blade.php    | 20 ++++++++
 .../views/components/menu/account.blade.php   |  3 +-
 13 files changed, 160 insertions(+), 57 deletions(-)
 create mode 100644 resources/views/community/components/message/new-chain-page.blade.php
 create mode 100644 resources/views/components/input/user-select-image.blade.php
 create mode 100644 resources/views/components/input/user-select.blade.php

diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
index c87fb31ba6..e79bea398f 100644
--- a/app/Community/Controllers/UserMessageChainController.php
+++ b/app/Community/Controllers/UserMessageChainController.php
@@ -42,12 +42,14 @@ public function __invoke(Request $request): View
         $totalPages = (int) (($messageChain->num_messages + 19) / 20);
 
         if ($currentPage == $totalPages) {
-            if ($userMessageChain->recipient_id == $user->ID) {
-                $userMessageChain->recipient_num_unread = 0;
+            if ($messageChain->recipient_id == $user->ID) {
+                $messageChain->recipient_num_unread = 0;
             } else {
-                $userMessageChain->sender_num_unread = 0;
+                $messageChain->sender_num_unread = 0;
             }
-            $userMessageChain->save();
+            $messageChain->save();
+
+            // TODO: dispatch event to update num unread messages
         }
 
         $messages = UserMessage::where('chain_id', $chainId)
@@ -63,7 +65,16 @@ public function __invoke(Request $request): View
         ]);
     }
 
-    public static function newChain(User $userFrom, User $userTo, string $title, string $body): void
+    public function pageCreate(Request $request): View
+    {
+        $toUser = $request->input('to') ?? '';
+
+        return view('community.components.message.new-chain-page', [
+            'toUser' => $toUser
+        ]);
+    }
+
+    public static function newChain(User $userFrom, User $userTo, string $title, string $body): UserMessageChain
     {
         $userMessageChain = new UserMessageChain([
             'title' => $title,
@@ -72,6 +83,7 @@ public static function newChain(User $userFrom, User $userTo, string $title, str
         ]);
 
         UserMessageChainController::addToChain($userMessageChain, $userFrom, $body);
+        return $userMessageChain;
     }
 
     public static function addToChain(UserMessageChain $userMessageChain, User $userFrom, string $body): void
diff --git a/app/Community/Controllers/UserMessagesController.php b/app/Community/Controllers/UserMessagesController.php
index 19faed40dd..4075c0cfb5 100644
--- a/app/Community/Controllers/UserMessagesController.php
+++ b/app/Community/Controllers/UserMessagesController.php
@@ -62,7 +62,7 @@ private function buildList(Builder $messages, Request $request, string $mode): V
         ]);
     }
 
-    public function outbox(Request $request): View
+    public function pageOutbox(Request $request): View
     {
         $user = $request->user();
 
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index 9310ac70fc..bcd3f27c26 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -233,9 +233,10 @@ protected function mapWebRoutes(): void
                 /*
                  * inbox
                  */
+                Route::get('message/new', [UserMessageChainController::class, 'pageCreate'])->name('message.new');
                 Route::get('message/{chain}', UserMessageChainController::class)->name('message.view-chain');
                 Route::get('messages', UserMessagesController::class)->name('message.inbox');
-                Route::get('messages/outbox', [UserMessagesController::class, 'outbox'])->name('message.outbox');
+                Route::get('messages/outbox', [UserMessagesController::class, 'pageOutbox'])->name('message.outbox');
 
                 //     /*
                 //      * tickets
diff --git a/public/request/message/create.php b/public/request/message/create.php
index 49e96b928a..457361a1ae 100644
--- a/public/request/message/create.php
+++ b/public/request/message/create.php
@@ -32,9 +32,9 @@
         return back()->withErrors(__('legacy.error.error'));
     }
     UserMessageChainController::addToChain($userMessageChain, $user, $input['body']);
-} else {
-    $recipient = User::firstWhere('User', $input['recipient']);
-    UserMessageChainController::newChain($user, $recipient, $input['title'], $input['body']);
+    return redirect(route("message.view-chain", $userMessageChain->id));
 }
 
-return redirect(route("message.view-chain", $userMessageChain->id));
+$recipient = User::firstWhere('User', $input['recipient']);
+$userMessageChain = UserMessageChainController::newChain($user, $recipient, $input['title'], $input['body']);
+return redirect(route("message.outbox"));
diff --git a/public/userInfo.php b/public/userInfo.php
index 2023b1dcf2..97dbeeb04f 100644
--- a/public/userInfo.php
+++ b/public/userInfo.php
@@ -248,7 +248,7 @@ function resize() {
             echo "<button class='btn btn-link'>Unblock</button>";
             echo "</form>";
         }
-        echo "<a class='btn btn-link' href='/createmessage.php?t=$userPage'>Message</a>";
+        echo "<a class='btn btn-link' href='" . route('message.new') . "?to=$userPage'>Message</a>";
         echo "</div>";
 
         if ($areTheyFollowingMe) {
diff --git a/resources/views/community/components/message/icon.blade.php b/resources/views/community/components/message/icon.blade.php
index df81809308..84ff210c0f 100644
--- a/resources/views/community/components/message/icon.blade.php
+++ b/resources/views/community/components/message/icon.blade.php
@@ -1,6 +1,5 @@
 <div class="navitem {{ $class ?? '' }}">
-    {{--<a class="nav-link" href="{{ route('message.index') }}" title="{{ __res('message') }}" data-toggle="tooltip">--}}
-    <a class="nav-link" href="{{ url('inbox.php') }}" title="{{ __res('message') }}" data-toggle="tooltip">
+    <a class="nav-link" href="{{ route('message.inbox') }}" title="{{ __res('message') }}" data-toggle="tooltip">
         <x-fas-envelope />
         @if($count ?? 0)
             <div class="text-danger absolute translate-x-3 -translate-y-1 text-[8px]">
diff --git a/resources/views/community/components/message/list-page.blade.php b/resources/views/community/components/message/list-page.blade.php
index 2378f1223d..b614392e7b 100644
--- a/resources/views/community/components/message/list-page.blade.php
+++ b/resources/views/community/components/message/list-page.blade.php
@@ -11,7 +11,6 @@
 
 use App\Site\Enums\UserPreference;
 use App\Site\Models\User;
-use App\Support\Shortcode\Shortcode;
 use Illuminate\Support\Carbon;
 
 $pageTitle = ($mode == 'outbox') ? 'Outbox' : 'Inbox';
@@ -40,6 +39,11 @@ function deleteMessage(id) {
 >
     <x-message.breadcrumbs currentPage="{{ $pageTitle }}" />
 
+    <div class="mt-3 w-full flex gap-x-3">
+        {!! userAvatar($user->User, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
+        <h1 class="mt-[10px] w-full">{{ $user->User }}'s {{ $pageTitle }}</h1>
+    </div>
+
     <div class='ml-2'>
         @if ($mode == 'outbox')
             You have {{ $totalMessages }} sent messages.
@@ -57,7 +61,7 @@ function deleteMessage(id) {
             @endif
         </div>
         <div class="mr-6">
-            <button class='btn'>New Message</button>
+            <a href='{{ route('message.new') }}'><button class='btn'>New Message</button></a>
         </div>
         <div class="w-full flex justify-end">
             <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
@@ -111,8 +115,14 @@ function deleteMessage(id) {
                     @if ($num_unread > 0)
                         <b>
                     @endif
-                    @if ($message->sender_id == $user->id)
-                        RE:
+                    @if ($mode == 'outbox')
+                        @if ($message->recipient_id == $user->id)
+                            RE:
+                        @endif
+                    @else
+                        @if ($message->sender_id == $user->id)
+                            RE:
+                        @endif
                     @endif
                     {{ $message->title }}
                     @if ($num_unread > 0)
diff --git a/resources/views/community/components/message/new-chain-page.blade.php b/resources/views/community/components/message/new-chain-page.blade.php
new file mode 100644
index 0000000000..e3321756ce
--- /dev/null
+++ b/resources/views/community/components/message/new-chain-page.blade.php
@@ -0,0 +1,50 @@
+@props([
+    'toUser' => '',
+])
+
+<x-app-layout
+    pageTitle="New Message"
+    pageDescription="Create a new message"
+>
+    <x-message.breadcrumbs currentPage="New Message" />
+
+    <div class="w-full flex gap-x-3">
+        <h1 class="mt-[10px] w-full">New Message</h1>
+    </div>
+
+    <form action='/request/message/create.php' method='post' x-data='{ isValid: true }'>
+        {{ csrf_field() }}
+        <div><table class='mb-4'><tbody>
+            <tr>
+                <td><label for='recipient'>User:</label></td>
+                <td>
+                    <div class="w-full">
+                        <div style="float:right">
+                            <x-input.user-select-image for="recipient" :user="$toUser" size="48" />
+                        </div>
+                        <!-- TODO: why won't this field align properly? -->
+                        <div style='vertical-align:middle'>
+                            <x-input.user-select name="recipient" :user="$toUser" />
+                        </div>
+                    </div>
+                </td>
+            </tr>
+
+            <tr>
+                <td><label for='title'>Subject:</label></td>
+                <td><input class='w-full' type='text' value='' id='title' name='title' required /></td>
+            </tr>
+
+            <tr>
+                <td><label for='commentTextarea'>Message:</label></td>
+                <td>
+                    <x-input.shortcode-textarea
+                        name='body'
+                        watermark='Enter your message here...'
+                    />
+                </td>
+            </tr>
+        </tbody></table></div>
+    </form>
+
+</x-app-layout>
diff --git a/resources/views/community/components/message/view-chain-page.blade.php b/resources/views/community/components/message/view-chain-page.blade.php
index 314180a8fa..f23368ed38 100644
--- a/resources/views/community/components/message/view-chain-page.blade.php
+++ b/resources/views/community/components/message/view-chain-page.blade.php
@@ -18,10 +18,6 @@
 $isShowAbsoluteDatesPreferenceSet = BitSet(request()->user()->websitePrefs, UserPreference::Forum_ShowAbsoluteDates);
 $monthAgo = Carbon::now()->subMonth(1);
 
-$shortcodePostData = [
-    'chain' => $messageChain->id,
-];
-
 ?>
 
 <script>
@@ -41,6 +37,10 @@ function deleteMessage() {
 >
     <x-message.breadcrumbs currentPage="{!! $messageChain->title !!}" />
 
+    <div class="mt-3 w-full flex gap-x-3">
+        <h1 class="mt-[10px] w-full">{!! $messageChain->title !!}</h1>
+    </div>
+    
     <div class="w-full flex my-2">
         <div class="mr-6">
             <button class='btn btn-danger' onclick='deleteMessage()'>Delete</button>
@@ -72,11 +72,15 @@ function deleteMessage() {
         @endforeach
     </div>
 
-    <x-input.shortcode-textarea
-        submitTarget='/request/message/create.php'
-        :postData="$shortcodePostData"
-        watermark='Enter your message here...'
-    />
+    <form action='/request/message/create.php' method='post' x-data='{ isValid: true }'>
+        {{ csrf_field() }}
+        <input type='hidden' name='chain' value='{{ $messageChain->id }}' />
+
+        <x-input.shortcode-textarea
+            name='body'
+            watermark='Enter your message here...'
+        />
+    </form>
 
     <div class="w-full flex justify-end mt-2">
         <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
diff --git a/resources/views/components/input/shortcode-textarea.blade.php b/resources/views/components/input/shortcode-textarea.blade.php
index 9479c69719..d67faa50c1 100644
--- a/resources/views/components/input/shortcode-textarea.blade.php
+++ b/resources/views/components/input/shortcode-textarea.blade.php
@@ -1,6 +1,5 @@
 @props([
-    'submitTarget' => '',
-    'postData' => [],
+    'name' => 'body',
     'enabled' => true,
     'watermark' => '',
     'maxLength' => 60000,
@@ -29,32 +28,26 @@ function disableRepost() {
     }
     </script>
 
-    <form action='{{ $submitTarget }}' method='post' x-data='{ isValid: true }'>
-        {{ csrf_field() }}
-        @foreach ($postData as $key => $value)
-            <input type='hidden' name='{{ $key }}' value='{{ $value }}'>
-        @endforeach
-        <textarea
-            id="commentTextarea"
-            class="w-full mb-2"
-            rows="10" cols="63"
-            {!! $inputEnabled !!}
-            maxlength="{{ $maxLength }}"
-            name="body"
-            placeholder="{{ $watermark }}"
-            x-on:input="autoExpandTextInput($el); isValid = window.getStringByteCount($event.target.value) <= {{ $maxLength }};"
-        >{{ $initialValue }}</textarea>
-
-        <div class="flex justify-between mb-2">
-            <span class="textarea-counter" data-textarea-id="commentTextarea">0 / 60000</span>
-
-            <div>
-                <img id="preview-loading-icon" src="{!! $loadingIconSrc !!}" style="opacity: 0;" width="16" height="16" alt="Loading...">
-                <button id="preview-button" type="button" class="btn" onclick="window.loadPostPreview()" {!! $buttonEnabled !!}>Preview</button>
-                <button id="postBtn" class="btn" onclick="this.form.submit(); disableRepost();" {!! $buttonEnabled !!}>Submit</button>
-            </div>
+    <textarea
+        id="commentTextarea"
+        class="w-full mb-2"
+        rows="10" cols="63"
+        {!! $inputEnabled !!}
+        maxlength="{{ $maxLength }}"
+        name="{{ $name }}"
+        placeholder="{{ $watermark }}"
+        x-on:input="autoExpandTextInput($el); isValid = window.getStringByteCount($event.target.value) <= {{ $maxLength }};"
+    >{{ $initialValue }}</textarea>
+
+    <div class="flex justify-between mb-2">
+        <span class="textarea-counter" data-textarea-id="commentTextarea">0 / 60000</span>
+
+        <div>
+            <img id="preview-loading-icon" src="{!! $loadingIconSrc !!}" style="opacity: 0;" width="16" height="16" alt="Loading...">
+            <button id="preview-button" type="button" class="btn" onclick="window.loadPostPreview()" {!! $buttonEnabled !!}>Preview</button>
+            <button id="postBtn" class="btn" onclick="this.form.submit(); disableRepost();" {!! $buttonEnabled !!}>Submit</button>
         </div>
+    </div>
 
-        <div id='post-preview'></div>
-    </form>
+    <div id='post-preview'></div>
 <div>
diff --git a/resources/views/components/input/user-select-image.blade.php b/resources/views/components/input/user-select-image.blade.php
new file mode 100644
index 0000000000..05dda24ac4
--- /dev/null
+++ b/resources/views/components/input/user-select-image.blade.php
@@ -0,0 +1,15 @@
+@props([
+    'for' => '',
+    'user' => '',
+    'size' => 64,
+])
+
+<?php
+    if (empty($user)) {
+        $user = '_User';
+    }
+    $imageSource = media_asset("/UserPic/$user.png");
+?>
+
+<img class='searchusericon' src='{{ $imageSource }}'
+     width='{{ $size }}' height='{{ $size }}' />
diff --git a/resources/views/components/input/user-select.blade.php b/resources/views/components/input/user-select.blade.php
new file mode 100644
index 0000000000..5788573863
--- /dev/null
+++ b/resources/views/components/input/user-select.blade.php
@@ -0,0 +1,20 @@
+@props([
+    'name' => '',
+    'user' => '',
+])
+
+<script>
+function onUserChange(fieldName) {
+    var fieldValue = $('#' + fieldName).val();
+    if (fieldValue.length > 2) {
+        var fieldIcon = $('.' + fieldName + 'Icon');
+        if (fieldIcon) {
+            fieldIcon.attr('src', mediaAsset('/UserPic/' + fieldName + '.png'));
+        }
+    }
+}
+</script>
+
+<input type="text" name="{{ $name }}" id="{{ $name }}"
+    class="searchuser" value="{{ $user }}"
+    onblur="onUserChange('{{ $name }}'); return false;" />
diff --git a/resources/views/components/menu/account.blade.php b/resources/views/components/menu/account.blade.php
index c911055f3b..b43852eaa9 100644
--- a/resources/views/components/menu/account.blade.php
+++ b/resources/views/components/menu/account.blade.php
@@ -85,8 +85,7 @@
         <x-dropdown-item :link="url('history.php')">History</x-dropdown-item>
         {{--<x-dropdown-item :link="route('follower.index')">{{ __res('follower') }}</x-dropdown-item>--}}
         <x-dropdown-item :link="url('friends.php')">Following</x-dropdown-item>
-        {{--<x-dropdown-item :link="route('inbox')">{{ __('Inbox') }}</x-dropdown-item>--}}
-        <x-dropdown-item :link="url('inbox.php')">Messages</x-dropdown-item>
+        <x-dropdown-item :link="route('message.inbox')">{{ __('Inbox') }}</x-dropdown-item>
         <div class="dropdown-divider"></div>
         <x-dropdown-item :link="url('reorderSiteAwards.php')">Reorder Site Awards</x-dropdown-item>
         {{--<x-dropdown-item :link="route('settings')">{{ __res('setting') }}</x-dropdown-item>--}}

From 5c5aebcc5a0d550844e9734b174221ffa8469ab3 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 09:00:51 -0700
Subject: [PATCH 08/47] hook up delete

---
 public/request/message/delete.php             | 19 ++++++++++++++++---
 .../message/view-chain-page.blade.php         |  3 +++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/public/request/message/delete.php b/public/request/message/delete.php
index 962ba7d10c..cf3a262da9 100644
--- a/public/request/message/delete.php
+++ b/public/request/message/delete.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Community\Controllers\UserMessageChainController;
+use App\Community\Models\UserMessageChain;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 
@@ -8,9 +10,20 @@
 }
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'message' => 'required|integer|exists:user_message_chains,ID',
+    'chain' => 'required|integer|exists:user_message_chains,id',
 ]);
 
-return redirect(route('message.inbox'));
+/** @var User $user */
+$user = request()->user();
 
-//return back()->withErrors(__('legacy.error.error'));
+$userMessageChain = UserMessageChain::firstWhere('id', $input['chain']);
+if (!$userMessageChain) {
+    return back()->withErrors(__('legacy.error.error'));
+}
+if ($userMessageChain->recipient_id != $user->ID && $userMessageChain->sender_id != $user->ID) {
+    return back()->withErrors(__('legacy.error.error'));
+}
+
+UserMessageChainController::deleteChain($userMessageChain, $user);
+
+response()->json(['message' => __('legacy.success.ok')]);
diff --git a/resources/views/community/components/message/view-chain-page.blade.php b/resources/views/community/components/message/view-chain-page.blade.php
index f23368ed38..ef735860ae 100644
--- a/resources/views/community/components/message/view-chain-page.blade.php
+++ b/resources/views/community/components/message/view-chain-page.blade.php
@@ -27,6 +27,9 @@ function deleteMessage() {
             chain: {{ $messageChain->id }},
             user: "{{ request()->user()->User }}"
         })
+            .done(function () {
+                window.location.href = "{{ route('message.inbox') }}";
+            })
     }
 }
 </script>

From 45fccb772ac6a8b7949e631e09482570cb6e10c1 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 09:41:07 -0700
Subject: [PATCH 09/47] automatically delete messages from blocked users

---
 .../UserMessageChainController.php            |  24 +-
 app/Community/Models/UserRelation.php         |  15 ++
 tests/Feature/Community/MessagesTest.php      | 245 ++++++++++++++----
 3 files changed, 228 insertions(+), 56 deletions(-)

diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
index e79bea398f..7d80734d77 100644
--- a/app/Community/Controllers/UserMessageChainController.php
+++ b/app/Community/Controllers/UserMessageChainController.php
@@ -5,9 +5,11 @@
 namespace App\Community\Controllers;
 
 use App\Community\Enums\TicketState;
+use App\Community\Enums\UserRelationship;
 use App\Community\Models\Ticket;
 use App\Community\Models\UserMessage;
 use App\Community\Models\UserMessageChain;
+use App\Community\Models\UserRelation;
 use App\Http\Controller;
 use App\Platform\Models\Game;
 use App\Platform\Models\PlayerGame;
@@ -93,12 +95,26 @@ public static function addToChain(UserMessageChain $userMessageChain, User $user
         $userMessageChain->num_messages++;
         if ($userMessageChain->recipient_id == $userFrom->ID) {
             $userMessageChain->recipient_last_post_at = $now;
-            $userMessageChain->sender_num_unread++;
-            $userMessageChain->sender_deleted_at = null;
+
+            $relationship = UserRelation::getRelationship($userMessageChain->sender->User, $userFrom->User);
+            if ($relationship == UserRelationship::Blocked) {
+                $userMessageChain->sender_num_unread = 0;
+                $userMessageChain->sender_deleted_at = $now;
+            } else {
+                $userMessageChain->sender_num_unread++;
+                $userMessageChain->sender_deleted_at = null;
+            }
         } else {
             $userMessageChain->sender_last_post_at = $now;
-            $userMessageChain->recipient_num_unread++;
-            $userMessageChain->recipient_deleted_at = null;
+
+            $relationship = UserRelation::getRelationship($userMessageChain->recipient->User, $userFrom->User);
+            if ($relationship == UserRelationship::Blocked) {
+                $userMessageChain->recipient_num_unread = 0;
+                $userMessageChain->recipient_deleted_at = $now;
+            } else {
+                $userMessageChain->recipient_num_unread++;
+                $userMessageChain->recipient_deleted_at = null;
+            }
         }
         $userMessageChain->save();
         
diff --git a/app/Community/Models/UserRelation.php b/app/Community/Models/UserRelation.php
index fd721914fd..9a3b31c693 100644
--- a/app/Community/Models/UserRelation.php
+++ b/app/Community/Models/UserRelation.php
@@ -4,6 +4,7 @@
 
 namespace App\Community\Models;
 
+use App\Community\Enums\UserRelationship;
 use App\Support\Database\Eloquent\BaseModel;
 
 class UserRelation extends BaseModel
@@ -15,11 +16,25 @@ class UserRelation extends BaseModel
     public const CREATED_AT = 'Created';
     public const UPDATED_AT = 'Updated';
 
+    protected $fillable = [
+        'User',
+        'Friend',
+        'Friendship',
+    ];
+
     // == accessors
 
     // == mutators
 
     // == relations
 
+    public static function getRelationship(string $user, string $relatedUser): int
+    {
+        $relation = UserRelation::where('User', $user)
+            ->where('Friend', $relatedUser)
+            ->first();
+        return $relation ? $relation->Friendship : UserRelationship::NotFollowing;
+    }
+
     // == scopes
 }
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 3a38e4f013..23cf53bb57 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -6,8 +6,10 @@
 
 use App\Community\Controllers\UserMessageChainController;
 use App\Community\Enums\AwardType;
+use App\Community\Enums\UserRelationship;
 use App\Community\Models\UserMessage;
 use App\Community\Models\UserMessageChain;
+use App\Community\Models\UserRelation;
 use App\Platform\Enums\UnlockMode;
 use App\Platform\Models\Achievement;
 use App\Platform\Models\Game;
@@ -36,10 +38,8 @@ public function testCreateMessageChain(): void
         $user2 = User::factory()->create();
 
         // user1 sends message to user2
-        UserMessageChainController::newChain($user1, $user2, 'This is a message', 'This is the message body.');
-
-        $chain = UserMessageChain::firstWhere('id', 1);
-        $this->assertJson($chain->toJson(), json_encode([
+        $chain = UserMessageChainController::newChain($user1, $user2, 'This is a message', 'This is the message body.');
+        $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
             'sender_id' => $user1->ID,
@@ -47,30 +47,28 @@ public function testCreateMessageChain(): void
             'num_messages' => 1,
             'sender_num_unread' => 0,
             'recipient_num_unread' => 1,
-            'sender_last_post_at' => $now,
+            'sender_last_post_at' => $now->toDateTimeString(),
             'recipient_last_post_at' => null,
             'sender_deleted_at' => null,
             'recipient_deleted_at' => null,
-        ]));
-        $message = UserMessage::firstWhere('id', 1);
-        $this->assertJson($message->toJson(), json_encode([
+        ]);
+        $this->assertDatabaseHas('user_messages', [
             'id' => 1,
             'chain_id' => 1,
             'author_id' => $user1->ID,
             'body' => 'This is the message body.',
-            'created_at' => $now,
-        ]));
+            'created_at' => $now->toDateTimeString(),
+        ]);
 
         // user2 responds
         $chain->recipient_num_unread = 0;
         $chain->save();
-        $now2 = $now->addMinutes(5);
+        $now2 = $now->clone()->addMinutes(5);
         Carbon::setTestNow($now2);
 
         UserMessageChainController::addToChain($chain, $user2, 'This is a response.');
 
-        $chain->refresh();
-        $this->assertJson($chain->toJson(), json_encode([
+        $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
             'sender_id' => $user1->ID,
@@ -78,28 +76,26 @@ public function testCreateMessageChain(): void
             'num_messages' => 2,
             'sender_num_unread' => 1,
             'recipient_num_unread' => 0,
-            'sender_last_post_at' => $now,
-            'recipient_last_post_at' => $now2,
+            'sender_last_post_at' => $now->toDateTimeString(),
+            'recipient_last_post_at' => $now2->toDateTimeString(),
             'sender_deleted_at' => null,
             'recipient_deleted_at' => null,
-        ]));
-        $message = UserMessage::firstWhere('id', 2);
-        $this->assertJson($message->toJson(), json_encode([
+        ]);
+        $this->assertDatabaseHas('user_messages', [
             'id' => 2,
             'chain_id' => 1,
             'author_id' => $user2->ID,
             'body' => 'This is a response.',
-            'created_at' => $now2,
-        ]));
+            'created_at' => $now2->toDateTimeString(),
+        ]);
 
         // user2 responds again
-        $now3 = $now->addMinutes(5);
+        $now3 = $now2->clone()->addMinutes(5);
         Carbon::setTestNow($now3);
 
         UserMessageChainController::addToChain($chain, $user2, 'This is another response.');
 
-        $chain->refresh();
-        $this->assertJson($chain->toJson(), json_encode([
+        $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
             'sender_id' => $user1->ID,
@@ -107,30 +103,29 @@ public function testCreateMessageChain(): void
             'num_messages' => 3,
             'sender_num_unread' => 2,
             'recipient_num_unread' => 0,
-            'sender_last_post_at' => $now,
-            'recipient_last_post_at' => $now3,
+            'sender_last_post_at' => $now->toDateTimeString(),
+            'recipient_last_post_at' => $now3->toDateTimeString(),
             'sender_deleted_at' => null,
             'recipient_deleted_at' => null,
-        ]));
-        $message = UserMessage::firstWhere('id', 3);
-        $this->assertJson($message->toJson(), json_encode([
+        ]);
+        $this->assertDatabaseHas('user_messages', [
             'id' => 3,
             'chain_id' => 1,
             'author_id' => $user2->ID,
             'body' => 'This is another response.',
             'created_at' => $now3,
-        ]));
+        ]);
 
         // user1 responds
         $chain->sender_num_unread = 0;
         $chain->save();
-        $now4 = $now->addMinutes(5);
+        $now4 = $now3->clone()->addMinutes(5);
         Carbon::setTestNow($now4);
 
         UserMessageChainController::addToChain($chain, $user1, 'This is a third response.');
 
         $chain->refresh();
-        $this->assertJson($chain->toJson(), json_encode([
+        $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
             'sender_id' => $user1->ID,
@@ -138,28 +133,26 @@ public function testCreateMessageChain(): void
             'num_messages' => 4,
             'sender_num_unread' => 0,
             'recipient_num_unread' => 1,
-            'sender_last_post_at' => $now4,
-            'recipient_last_post_at' => $now3,
+            'sender_last_post_at' => $now4->toDateTimeString(),
+            'recipient_last_post_at' => $now3->toDateTimeString(),
             'sender_deleted_at' => null,
             'recipient_deleted_at' => null,
-        ]));
-        $message = UserMessage::firstWhere('id', 4);
-        $this->assertJson($message->toJson(), json_encode([
+        ]);
+        $this->assertDatabaseHas('user_messages', [
             'id' => 4,
             'chain_id' => 1,
             'author_id' => $user1->ID,
             'body' => 'This is a third response.',
-            'created_at' => $now4,
-        ]));
+            'created_at' => $now4->toDateTimeString(),
+        ]);
 
         // user1 deletes
-        $now5 = $now->addMinutes(5);
+        $now5 = $now4->clone()->addMinutes(5);
         Carbon::setTestNow($now5);
 
         UserMessageChainController::deleteChain($chain, $user1);
 
-        $chain->refresh();
-        $this->assertJson($chain->toJson(), json_encode([
+        $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
             'sender_id' => $user1->ID,
@@ -167,31 +160,179 @@ public function testCreateMessageChain(): void
             'num_messages' => 4,
             'sender_num_unread' => 0,
             'recipient_num_unread' => 1,
-            'sender_last_post_at' => $now4,
-            'recipient_last_post_at' => $now3,
-            'sender_deleted_at' => $now5,
+            'sender_last_post_at' => $now4->toDateTimeString(),
+            'recipient_last_post_at' => $now3->toDateTimeString(),
+            'sender_deleted_at' => $now5->toDateTimeString(),
             'recipient_deleted_at' => null,
-        ]));
+        ]);
 
         // user2 deletes
-        $now6 = $now->addMinutes(5);
+        $now6 = $now5->clone()->addMinutes(5);
         Carbon::setTestNow($now6);
 
         UserMessageChainController::deleteChain($chain, $user2);
 
         $chain->refresh();
-        $this->assertJson($chain->toJson(), json_encode([
+        $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
             'sender_id' => $user1->ID,
             'recipient_id' => $user2->ID,
             'num_messages' => 4,
             'sender_num_unread' => 0,
+            'recipient_num_unread' => 0,
+            'sender_last_post_at' => $now4->toDateTimeString(),
+            'recipient_last_post_at' => $now3->toDateTimeString(),
+            'sender_deleted_at' => $now5->toDateTimeString(),
+            'recipient_deleted_at' => $now6->toDateTimeString(),
+        ]);
+    }
+
+    public function testBlockedUser(): void
+    {
+        $now = Carbon::now()->floorSecond();
+        Carbon::setTestNow($now);
+
+        /** @var User $user1 */
+        $user1 = User::factory()->create();
+        /** @var User $user2 */
+        $user2 = User::factory()->create();
+
+        // user1 has user2 blocked
+        $relation = new UserRelation([
+            'User' => $user1->User,
+            'Friend' => $user2->User,
+            'Friendship' => UserRelationship::Blocked,
+        ]);
+        $relation->save();
+
+        // message from user2 is automatically marked as deleted by user1
+        $chain = UserMessageChainController::newChain($user2, $user1, 'This is a message', 'This is the message body.');
+        $this->assertDatabaseHas('user_message_chains', [
+            'id' => 1,
+            'title' => 'This is a message',
+            'sender_id' => $user2->ID,
+            'recipient_id' => $user1->ID,
+            'num_messages' => 1,
+            'sender_num_unread' => 0,
+            'recipient_num_unread' => 0,
+            'sender_last_post_at' => $now->toDateTimeString(),
+            'recipient_last_post_at' => null,
+            'sender_deleted_at' => null,
+            'recipient_deleted_at' => $now->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('user_messages', [
+            'id' => 1,
+            'chain_id' => 1,
+            'author_id' => $user2->ID,
+            'body' => 'This is the message body.',
+            'created_at' => $now->toDateTimeString(),
+        ]);
+
+        // additional message from user2 is also marked as deleted by user1
+        $now2 = $now->clone()->addMinutes(5);
+        Carbon::setTestNow($now2);
+
+        UserMessageChainController::addToChain($chain, $user2, 'This is a response.');
+
+        $this->assertDatabaseHas('user_message_chains',[
+            'id' => 1,
+            'title' => 'This is a message',
+            'sender_id' => $user2->ID,
+            'recipient_id' => $user1->ID,
+            'num_messages' => 2,
+            'sender_num_unread' => 0,
+            'recipient_num_unread' => 0,
+            'sender_last_post_at' => $now2->toDateTimeString(),
+            'recipient_last_post_at' => null,
+            'sender_deleted_at' => null,
+            'recipient_deleted_at' => $now2->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('user_messages',  [
+            'id' => 2,
+            'chain_id' => 1,
+            'author_id' => $user2->ID,
+            'body' => 'This is a response.',
+            'created_at' => $now2->toDateTimeString(),
+        ]);
+
+        // message from user1 is delivered to user2
+        Carbon::setTestNow($now);
+
+        $chain = UserMessageChainController::newChain($user1, $user2, 'This is a message', 'This is the message body.');
+        $this->assertDatabaseHas('user_message_chains',[
+            'id' => 2,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 1,
+            'sender_num_unread' => 0,
             'recipient_num_unread' => 1,
-            'sender_last_post_at' => $now4,
-            'recipient_last_post_at' => $now3,
-            'sender_deleted_at' => $now5,
-            'recipient_deleted_at' => $now6,
-        ]));
+            'sender_last_post_at' => $now->toDateTimeString(),
+            'recipient_last_post_at' => null,
+            'sender_deleted_at' => null,
+            'recipient_deleted_at' => null,
+        ]);
+        $message = UserMessage::firstWhere('id', 1);
+        $this->assertDatabaseHas('user_messages',  [
+            'id' => 3,
+            'chain_id' => 2,
+            'author_id' => $user1->ID,
+            'body' => 'This is the message body.',
+            'created_at' => $now->toDateTimeString(),
+        ]);
+
+        // additional message from user1 is also delivered
+        Carbon::setTestNow($now2);
+
+        UserMessageChainController::addToChain($chain, $user1, 'This is a response.');
+
+        $this->assertDatabaseHas('user_message_chains',[
+            'id' => 2,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 2,
+            'sender_num_unread' => 0,
+            'recipient_num_unread' => 2,
+            'sender_last_post_at' => $now2->toDateTimeString(),
+            'recipient_last_post_at' => null,
+            'sender_deleted_at' => null,
+            'recipient_deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('user_messages',  [
+            'id' => 4,
+            'chain_id' => 2,
+            'author_id' => $user1->ID,
+            'body' => 'This is a response.',
+            'created_at' => $now2->toDateTimeString(),
+        ]);
+
+        // response from user2 is automatically deleted
+        $now3 = $now2->clone()->addMinutes(5);
+        Carbon::setTestNow($now3);
+
+        UserMessageChainController::addToChain($chain, $user2, 'This is another response.');
+
+        $this->assertDatabaseHas('user_message_chains',[
+            'id' => 2,
+            'title' => 'This is a message',
+            'sender_id' => $user1->ID,
+            'recipient_id' => $user2->ID,
+            'num_messages' => 3,
+            'sender_num_unread' => 0,
+            'recipient_num_unread' => 2,
+            'sender_last_post_at' => $now2->toDateTimeString(),
+            'recipient_last_post_at' => $now3->toDateTimeString(),
+            'sender_deleted_at' => $now3->toDateTimeString(),
+            'recipient_deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('user_messages',  [
+            'id' => 5,
+            'chain_id' => 2,
+            'author_id' => $user2->ID,
+            'body' => 'This is another response.',
+            'created_at' => $now3->toDateTimeString(),
+        ]);
     }
 }

From 7243944825687f3194662d18a941668f5fc5e436 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 12:01:01 -0700
Subject: [PATCH 10/47] support for deleted users

---
 app/Site/Actions/ClearAccountDataAction.php   |  3 +++
 .../components/message/list-page.blade.php    |  5 ++--
 .../message/view-chain-page.blade.php         | 24 +++++++++++--------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/Site/Actions/ClearAccountDataAction.php b/app/Site/Actions/ClearAccountDataAction.php
index f3d3d37175..fb45892f74 100644
--- a/app/Site/Actions/ClearAccountDataAction.php
+++ b/app/Site/Actions/ClearAccountDataAction.php
@@ -39,6 +39,9 @@ public function execute(User $user): void
         // TODO $user->subscriptions()->delete();
         DB::statement('DELETE FROM Subscription WHERE UserID = :userId', ['userId' => $user->ID]);
 
+        DB::statement('UPDATE user_message_chains SET sender_deleted_at=NOW() WHERE sender_id = :userId', ['userId' => $user->ID]);
+        DB::statement('UPDATE user_message_chains SET recipient_deleted_at=NOW() WHERE recipient_id = :userId', ['userId' => $user->ID]);
+
         DB::statement("UPDATE UserAccounts u SET
             u.Password = null,
             u.SaltedPass = '',
diff --git a/resources/views/community/components/message/list-page.blade.php b/resources/views/community/components/message/list-page.blade.php
index b614392e7b..674099772f 100644
--- a/resources/views/community/components/message/list-page.blade.php
+++ b/resources/views/community/components/message/list-page.blade.php
@@ -88,9 +88,8 @@ function deleteMessage(id) {
             $humanDate = $mostRecentUpdate->format('F j Y, g:ia');
 
             $otherUser = ($user->id == $message->recipient_id) ?
-                User::firstWhere('ID', $message->sender_id) :
-                User::firstWhere('ID', $message->recipient_id);
-
+                User::withTrashed()->firstWhere('ID', $message->sender_id) :
+                User::withTrashed()->firstWhere('ID', $message->recipient_id);
 
             $num_unread = 0;
             if ($message->recipient_id == $user->id && $message->recipient_num_unread > 0) {
diff --git a/resources/views/community/components/message/view-chain-page.blade.php b/resources/views/community/components/message/view-chain-page.blade.php
index ef735860ae..4c0a16a770 100644
--- a/resources/views/community/components/message/view-chain-page.blade.php
+++ b/resources/views/community/components/message/view-chain-page.blade.php
@@ -12,8 +12,8 @@
 use App\Support\Shortcode\Shortcode;
 use Illuminate\Support\Carbon;
 
-$userTo = User::firstWhere('ID', $messageChain->recipient_id);
-$userFrom = User::firstWhere('ID', $messageChain->sender_id);
+$userTo = User::withTrashed()->firstWhere('ID', $messageChain->recipient_id);
+$userFrom = User::withTrashed()->firstWhere('ID', $messageChain->sender_id);
 
 $isShowAbsoluteDatesPreferenceSet = BitSet(request()->user()->websitePrefs, UserPreference::Forum_ShowAbsoluteDates);
 $monthAgo = Carbon::now()->subMonth(1);
@@ -75,15 +75,19 @@ function deleteMessage() {
         @endforeach
     </div>
 
-    <form action='/request/message/create.php' method='post' x-data='{ isValid: true }'>
-        {{ csrf_field() }}
-        <input type='hidden' name='chain' value='{{ $messageChain->id }}' />
+    @if ($userFrom->trashed() || $userTo->trashed())
+        <div class="mt-4"><i>Cannot reply to deleted user.</i></div>
+    @else
+        <form action='/request/message/create.php' method='post' x-data='{ isValid: true }'>
+            {{ csrf_field() }}
+            <input type='hidden' name='chain' value='{{ $messageChain->id }}' />
 
-        <x-input.shortcode-textarea
-            name='body'
-            watermark='Enter your message here...'
-        />
-    </form>
+            <x-input.shortcode-textarea
+                name='body'
+                watermark='Enter your message here...'
+            />
+        </form>
+    @endif
 
     <div class="w-full flex justify-end mt-2">
         <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />

From a96e9c16607323ed81cb54eda6e04993297fada5 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 20:05:47 -0700
Subject: [PATCH 11/47] update UnreadMessageCount

---
 .../UserMessageChainController.php            | 55 +++++++++++++++----
 app/Site/Models/User.php                      |  1 +
 tests/Feature/Community/MessagesTest.php      | 45 +++++++++++++--
 3 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
index 7d80734d77..0500f6729e 100644
--- a/app/Community/Controllers/UserMessageChainController.php
+++ b/app/Community/Controllers/UserMessageChainController.php
@@ -44,14 +44,8 @@ public function __invoke(Request $request): View
         $totalPages = (int) (($messageChain->num_messages + 19) / 20);
 
         if ($currentPage == $totalPages) {
-            if ($messageChain->recipient_id == $user->ID) {
-                $messageChain->recipient_num_unread = 0;
-            } else {
-                $messageChain->sender_num_unread = 0;
-            }
-            $messageChain->save();
-
-            // TODO: dispatch event to update num unread messages
+            // if viewing last page, mark all messages in the chain as read
+            UserMessageChainController::markRead($messageChain, $user);
         }
 
         $messages = UserMessage::where('chain_id', $chainId)
@@ -104,6 +98,8 @@ public static function addToChain(UserMessageChain $userMessageChain, User $user
                 $userMessageChain->sender_num_unread++;
                 $userMessageChain->sender_deleted_at = null;
             }
+
+            $userTo = User::firstWhere('id', $userMessageChain->sender_id);
         } else {
             $userMessageChain->sender_last_post_at = $now;
 
@@ -115,6 +111,8 @@ public static function addToChain(UserMessageChain $userMessageChain, User $user
                 $userMessageChain->recipient_num_unread++;
                 $userMessageChain->recipient_deleted_at = null;
             }
+
+            $userTo = User::firstWhere('id', $userMessageChain->recipient_id);
         }
         $userMessageChain->save();
         
@@ -125,9 +123,42 @@ public static function addToChain(UserMessageChain $userMessageChain, User $user
         ]);
         $userMessage->save();
         
-        // TODO: dispatch message sent event
-        //       - update UnreadMessageCount
-        //       - send email
+        UserMessageChainController::updateUnreadMessageCount($userTo);
+
+        // TODO: send email
+    }
+
+    private static function updateUnreadMessageCount(User $user): void
+    {
+        $unreadReplies = UserMessageChain::where('sender_id', $user->id)
+            ->whereNull('sender_deleted_at')
+            ->sum('sender_num_unread');
+
+        $unreadMessages = UserMessageChain::where('recipient_id', $user->id)
+            ->whereNull('recipient_deleted_at')
+            ->sum('recipient_num_unread');
+
+        $user->UnreadMessageCount = $unreadMessages + $unreadReplies;
+        $user->save();
+    }
+
+    public static function markRead(UserMessageChain $userMessageChain, User $user): void
+    {
+        if ($userMessageChain->recipient_id == $user->ID) {
+            if ($userMessageChain->recipient_num_unread) {
+                $userMessageChain->recipient_num_unread = 0;
+                $userMessageChain->save();
+
+                UserMessageChainController::updateUnreadMessageCount($user);
+            }
+        } else {
+            if ($userMessageChain->sender_num_unread) {
+                $userMessageChain->sender_num_unread = 0;
+                $userMessageChain->save();
+
+                UserMessageChainController::updateUnreadMessageCount($user);
+            }
+        }
     }
 
     public static function deleteChain(UserMessageChain $userMessageChain, User $user): void
@@ -145,5 +176,7 @@ public static function deleteChain(UserMessageChain $userMessageChain, User $use
         $userMessageChain->save();
         
         // TODO: hard delete if both deleted_at fields are not null?
+
+        UserMessageChainController::updateUnreadMessageCount($user);
     }
 }
diff --git a/app/Site/Models/User.php b/app/Site/Models/User.php
index c21dcbbd2e..09dda6e848 100644
--- a/app/Site/Models/User.php
+++ b/app/Site/Models/User.php
@@ -158,6 +158,7 @@ class User extends Authenticatable implements CommunityMember, Developer, HasCom
         "LastLogin",
         "avatarUrl",
         'Created',
+        'UnreadMessageCount',
     ];
 
     protected $appends = [
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 23cf53bb57..05768a7448 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -60,9 +60,14 @@ public function testCreateMessageChain(): void
             'created_at' => $now->toDateTimeString(),
         ]);
 
+        $user2->refresh();
+        $this->assertEquals(1, $user2->UnreadMessageCount);
+
         // user2 responds
-        $chain->recipient_num_unread = 0;
-        $chain->save();
+        UserMessageChainController::markRead($chain, $user2);
+        $user2->refresh();
+        $this->assertEquals(0, $user2->UnreadMessageCount);
+
         $now2 = $now->clone()->addMinutes(5);
         Carbon::setTestNow($now2);
 
@@ -89,6 +94,9 @@ public function testCreateMessageChain(): void
             'created_at' => $now2->toDateTimeString(),
         ]);
 
+        $user1->refresh();
+        $this->assertEquals(1, $user1->UnreadMessageCount);
+
         // user2 responds again
         $now3 = $now2->clone()->addMinutes(5);
         Carbon::setTestNow($now3);
@@ -116,9 +124,14 @@ public function testCreateMessageChain(): void
             'created_at' => $now3,
         ]);
 
+        $user1->refresh();
+        $this->assertEquals(2, $user1->UnreadMessageCount);
+
         // user1 responds
-        $chain->sender_num_unread = 0;
-        $chain->save();
+        UserMessageChainController::markRead($chain, $user1);
+        $user1->refresh();
+        $this->assertEquals(0, $user1->UnreadMessageCount);
+
         $now4 = $now3->clone()->addMinutes(5);
         Carbon::setTestNow($now4);
 
@@ -146,6 +159,9 @@ public function testCreateMessageChain(): void
             'created_at' => $now4->toDateTimeString(),
         ]);
 
+        $user2->refresh();
+        $this->assertEquals(1, $user2->UnreadMessageCount);
+
         // user1 deletes
         $now5 = $now4->clone()->addMinutes(5);
         Carbon::setTestNow($now5);
@@ -166,6 +182,9 @@ public function testCreateMessageChain(): void
             'recipient_deleted_at' => null,
         ]);
 
+        $user2->refresh();
+        $this->assertEquals(1, $user2->UnreadMessageCount);
+
         // user2 deletes
         $now6 = $now5->clone()->addMinutes(5);
         Carbon::setTestNow($now6);
@@ -186,6 +205,9 @@ public function testCreateMessageChain(): void
             'sender_deleted_at' => $now5->toDateTimeString(),
             'recipient_deleted_at' => $now6->toDateTimeString(),
         ]);
+
+        $user2->refresh();
+        $this->assertEquals(0, $user2->UnreadMessageCount);
     }
 
     public function testBlockedUser(): void
@@ -229,6 +251,9 @@ public function testBlockedUser(): void
             'created_at' => $now->toDateTimeString(),
         ]);
 
+        $user1->refresh();
+        $this->assertEquals(0, $user1->UnreadMessageCount);
+
         // additional message from user2 is also marked as deleted by user1
         $now2 = $now->clone()->addMinutes(5);
         Carbon::setTestNow($now2);
@@ -256,6 +281,9 @@ public function testBlockedUser(): void
             'created_at' => $now2->toDateTimeString(),
         ]);
 
+        $user1->refresh();
+        $this->assertEquals(0, $user1->UnreadMessageCount);
+
         // message from user1 is delivered to user2
         Carbon::setTestNow($now);
 
@@ -282,6 +310,9 @@ public function testBlockedUser(): void
             'created_at' => $now->toDateTimeString(),
         ]);
 
+        $user2->refresh();
+        $this->assertEquals(1, $user2->UnreadMessageCount);
+
         // additional message from user1 is also delivered
         Carbon::setTestNow($now2);
 
@@ -308,6 +339,9 @@ public function testBlockedUser(): void
             'created_at' => $now2->toDateTimeString(),
         ]);
 
+        $user2->refresh();
+        $this->assertEquals(2, $user2->UnreadMessageCount);
+
         // response from user2 is automatically deleted
         $now3 = $now2->clone()->addMinutes(5);
         Carbon::setTestNow($now3);
@@ -334,5 +368,8 @@ public function testBlockedUser(): void
             'body' => 'This is another response.',
             'created_at' => $now3->toDateTimeString(),
         ]);
+
+        $user1->refresh();
+        $this->assertEquals(0, $user1->UnreadMessageCount);
     }
 }

From c2419ec619522ec75135a90c833ca8906ee20414 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 21:20:26 -0700
Subject: [PATCH 12/47] send private message emails

---
 .../UserMessageChainController.php            |  7 +-
 app/Helpers/util/mail.php                     | 14 ++-
 tests/Feature/Community/MessagesTest.php      | 34 +++++--
 tests/Feature/Site/Concerns/TestsMail.php     | 90 +++++++++++++++++++
 4 files changed, 133 insertions(+), 12 deletions(-)
 create mode 100644 tests/Feature/Site/Concerns/TestsMail.php

diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
index 0500f6729e..2179b71f16 100644
--- a/app/Community/Controllers/UserMessageChainController.php
+++ b/app/Community/Controllers/UserMessageChainController.php
@@ -14,6 +14,7 @@
 use App\Platform\Models\Game;
 use App\Platform\Models\PlayerGame;
 use App\Platform\Models\System;
+use App\Site\Enums\UserPreference;
 use App\Site\Models\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
@@ -125,7 +126,11 @@ public static function addToChain(UserMessageChain $userMessageChain, User $user
         
         UserMessageChainController::updateUnreadMessageCount($userTo);
 
-        // TODO: send email
+        // send email?
+        if (BitSet($userTo->websitePrefs, UserPreference::EmailOn_PrivateMessage) &&
+                $relationship != UserRelationship::Blocked) {
+            sendPrivateMessageEmail($userTo->User, $userTo->EmailAddress, $userMessageChain->title, $body, $userFrom->User);
+        }
     }
 
     private static function updateUnreadMessageCount(User $user): void
diff --git a/app/Helpers/util/mail.php b/app/Helpers/util/mail.php
index 9ba4ad08a9..7df03f40db 100644
--- a/app/Helpers/util/mail.php
+++ b/app/Helpers/util/mail.php
@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Mail\Mailer;
 use Illuminate\Mail\Transport\SesTransport;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\Mime\Email;
 
@@ -33,7 +34,16 @@ function mail_utf8(string $to, string $subject = '(No subject)', string $message
 
 function mail_log(string $to, string $subject = '(No subject)', string $message = ''): bool
 {
-    Log::debug('Mail', ['to' => $to, 'subject' => $subject, 'message' => $message]);
+    $mailParams = ['to' => $to, 'subject' => $subject, 'message' => $message];
+    Log::debug('Mail', $mailParams);
+
+    if (app()->environment('testing')) {
+        $arr = Cache::store('array')->get('test:emails');
+        if ($arr !== null) {
+            $arr[] = $mailParams;
+            Cache::store('array')->put('test:emails', $arr);
+        }
+    }
 
     return true;
 }
@@ -353,7 +363,7 @@ function SendPrivateMessageEmail(
 
     // Also used for Generic text:
     $emailTitle = "New Private Message from $fromUser";
-    $link = "<a href='" . config('app.url') . "/inbox.php'>here</a>";
+    $link = "<a href='" . route('message.inbox') . "'>here</a>";
 
     $msg = "Hello $user!<br>" .
         "You have received a new private message from $fromUser.<br><br>" .
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 05768a7448..6d5f2dc50f 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -16,16 +16,18 @@
 use App\Platform\Models\PlayerBadge;
 use App\Platform\Models\System;
 use App\Site\Enums\Permissions;
+use App\Site\Enums\UserPreference;
 use App\Site\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
-use Tests\Feature\Platform\Concerns\TestsPlayerAchievements;
-use Tests\Feature\Platform\Concerns\TestsPlayerBadges;
+use Illuminate\Support\Facades\Log;
+use Tests\Feature\Site\Concerns\TestsMail;
 use Tests\TestCase;
 
 class MessagesTest extends TestCase
 {
     use RefreshDatabase;
+    use TestsMail;
 
     public function testCreateMessageChain(): void
     {
@@ -35,9 +37,10 @@ public function testCreateMessageChain(): void
         /** @var User $user1 */
         $user1 = User::factory()->create();
         /** @var User $user2 */
-        $user2 = User::factory()->create();
+        $user2 = User::factory()->create(['websitePrefs' => (1 << UserPreference::EmailOn_PrivateMessage)]);
 
         // user1 sends message to user2
+        $this->captureEmails();
         $chain = UserMessageChainController::newChain($user1, $user2, 'This is a message', 'This is the message body.');
         $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
@@ -63,6 +66,8 @@ public function testCreateMessageChain(): void
         $user2->refresh();
         $this->assertEquals(1, $user2->UnreadMessageCount);
 
+        $this->assertEmailSent($user2, "New Private Message from {$user1->User}");
+
         // user2 responds
         UserMessageChainController::markRead($chain, $user2);
         $user2->refresh();
@@ -71,8 +76,8 @@ public function testCreateMessageChain(): void
         $now2 = $now->clone()->addMinutes(5);
         Carbon::setTestNow($now2);
 
+        $this->captureEmails();
         UserMessageChainController::addToChain($chain, $user2, 'This is a response.');
-
         $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
@@ -97,12 +102,14 @@ public function testCreateMessageChain(): void
         $user1->refresh();
         $this->assertEquals(1, $user1->UnreadMessageCount);
 
+        $this->assertEmailNotSent($user1);
+
         // user2 responds again
         $now3 = $now2->clone()->addMinutes(5);
         Carbon::setTestNow($now3);
 
+        $this->captureEmails();
         UserMessageChainController::addToChain($chain, $user2, 'This is another response.');
-
         $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
@@ -127,6 +134,8 @@ public function testCreateMessageChain(): void
         $user1->refresh();
         $this->assertEquals(2, $user1->UnreadMessageCount);
 
+        $this->assertEmailNotSent($user1);
+
         // user1 responds
         UserMessageChainController::markRead($chain, $user1);
         $user1->refresh();
@@ -135,9 +144,8 @@ public function testCreateMessageChain(): void
         $now4 = $now3->clone()->addMinutes(5);
         Carbon::setTestNow($now4);
 
+        $this->captureEmails();
         UserMessageChainController::addToChain($chain, $user1, 'This is a third response.');
-
-        $chain->refresh();
         $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
@@ -162,12 +170,14 @@ public function testCreateMessageChain(): void
         $user2->refresh();
         $this->assertEquals(1, $user2->UnreadMessageCount);
 
+        $this->assertEmailSent($user2, "New Private Message from {$user1->User}");
+
         // user1 deletes
         $now5 = $now4->clone()->addMinutes(5);
         Carbon::setTestNow($now5);
 
+        $this->captureEmails();
         UserMessageChainController::deleteChain($chain, $user1);
-
         $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
             'title' => 'This is a message',
@@ -185,12 +195,15 @@ public function testCreateMessageChain(): void
         $user2->refresh();
         $this->assertEquals(1, $user2->UnreadMessageCount);
 
+        $this->assertEmailNotSent($user1);
+        $this->assertEmailNotSent($user2);
+
         // user2 deletes
         $now6 = $now5->clone()->addMinutes(5);
         Carbon::setTestNow($now6);
 
+        $this->captureEmails();
         UserMessageChainController::deleteChain($chain, $user2);
-
         $chain->refresh();
         $this->assertDatabaseHas('user_message_chains', [
             'id' => 1,
@@ -208,6 +221,9 @@ public function testCreateMessageChain(): void
 
         $user2->refresh();
         $this->assertEquals(0, $user2->UnreadMessageCount);
+
+        $this->assertEmailNotSent($user1);
+        $this->assertEmailNotSent($user2);
     }
 
     public function testBlockedUser(): void
diff --git a/tests/Feature/Site/Concerns/TestsMail.php b/tests/Feature/Site/Concerns/TestsMail.php
new file mode 100644
index 0000000000..602f80e738
--- /dev/null
+++ b/tests/Feature/Site/Concerns/TestsMail.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Site\Concerns;
+
+use App\Site\Models\User;
+use Illuminate\Support\Facades\Cache;
+
+trait TestsMail
+{
+    protected function captureEmails()
+    {
+        // store an empty array in the immediate cache to be populated by mail_utf8().
+        // also, clears out the array between tests.
+        $emails = Cache::store('array')->put('test:emails', []);
+    }
+
+    protected function assertEmailSent(User $user, string $subject, string $body = null)
+    {
+        $emails = Cache::store('array')->get('test:emails') ?? [];
+        $matchUser = null;
+        $matchSubject = null;
+        $matchBoth = null;
+        foreach ($emails as $email) {
+            if ($email['to'] === $user->EmailAddress && $email['subject'] === $subject) {
+                if ($body === null || $body === $email['message']) {
+                    return;
+                }
+
+                $matchBoth = $email;
+            } elseif ($email['to'] === $user->EmailAddress) {
+                $matchUser = $email;
+            } elseif ($email['subject'] === $subject) {
+                $matchSubject = $email;
+            }
+        }
+
+        $expected = [
+            'to' => $user->EmailAddress,
+            'subject' => $subject,
+            'message' => $body,
+        ];
+
+        if ($matchBoth) {
+            $this->assertEquals($expected, $matchBoth);
+        } elseif ($matchUser) {
+            $this->assertEquals($expected, $matchUser);
+        } elseif ($matchSubject) {
+            $this->assertEquals($expected, $matchSubject);
+        } else {
+            $this->fail("Expected email sent to {$user->EmailAddress}. No emails captured.");
+        }
+    }
+
+    protected function assertEmailNotSent(User $user, string $subject = null, string $body = null)
+    {
+        $emails = Cache::store('array')->get('test:emails') ?? [];
+        $matchUser = null;
+        $matchUserAndSubject = null;
+        $matchAll = null;
+        foreach ($emails as $email) {
+            if ($email['to'] === $user->EmailAddress) {
+                if ($subject !== null && $subject === $email['subject']) {
+                    if ($body !== null && $body === $email['message']) {
+                        $matchAll = $email;
+                    } else {
+                        $matchUserAndSubject = $email;
+                    }
+                } else {
+                    $matchUser = $email;
+                }
+            }
+        }
+
+        $expected = [
+            'to' => $user->EmailAddress,
+            'subject' => $subject,
+            'message' => $body,
+        ];
+
+        if ($matchAll) {
+            $this->fail("Found email sent to {$user->EmailAddress} with specified subject and body");
+        } elseif ($matchUserAndSubject) {
+            $this->fail("Found email sent to {$user->EmailAddress} with specified subject");
+        } elseif ($matchUser) {
+            $this->fail("Found email sent to {$user->EmailAddress}");
+        }
+    }
+}

From 84d1c8af08c699f714990a256c651b8ea0525151 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 21:31:01 -0700
Subject: [PATCH 13/47] eliminate inbox.php

---
 app/Site/Components/NotificationIcon.php |   2 +-
 public/inbox.php                         | 187 -----------------------
 public/request/message/create.php        |   6 +-
 public/request/message/read.php          |  19 ---
 public/request/message/send.php          |  26 ----
 5 files changed, 4 insertions(+), 236 deletions(-)
 delete mode 100644 public/inbox.php
 delete mode 100644 public/request/message/read.php
 delete mode 100644 public/request/message/send.php

diff --git a/app/Site/Components/NotificationIcon.php b/app/Site/Components/NotificationIcon.php
index b38e5b33af..42f8be04a3 100644
--- a/app/Site/Components/NotificationIcon.php
+++ b/app/Site/Components/NotificationIcon.php
@@ -24,7 +24,7 @@ public function render(): View
 
         if ($user->unread_messages_count) {
             $notifications->push([
-                'link' => url('inbox.php'),
+                'link' => route('message.inbox'),
                 'title' => $user->unread_messages_count . ' ' . __res('message', (int) $user->unread_messages_count),
             ]);
         }
diff --git a/public/inbox.php b/public/inbox.php
deleted file mode 100644
index 259f439ac8..0000000000
--- a/public/inbox.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-use App\Support\Shortcode\Shortcode;
-
-$outbox = requestInputSanitized('s', 0, 'integer');
-$unreadOnly = (bool) request()->input('u');
-$displayCount = requestInputSanitized('c', 10, 'integer');
-$offset = requestInputSanitized('o', 0, 'integer');
-
-if (!authenticateFromCookie($user, $permissions, $userDetails)) {
-    abort(401);
-}
-
-if ($outbox) {
-    $unreadMessageCount = 0;
-    $totalMessageCount = GetSentMessageCount($user);
-    $allMessages = GetSentMessages($user, $offset, $displayCount);
-    RenderContentStart('Outbox');
-} else {
-    $unreadMessageCount = GetMessageCount($user, $totalMessageCount);
-    $allMessages = GetAllMessages($user, $offset, $displayCount, $unreadOnly);
-    RenderContentStart('Inbox');
-}
-?>
-<script>
-function ReadMessage(msgID) {
-    var $message = $('#msgInline' + msgID);
-    $message.toggle();
-
-    if (!$message.is(':visible')) {
-        return;
-    }
-
-    var $title = $('#msgInlineTitle' + msgID);
-    if ($title.hasClass('message-unread')) {
-        $title.removeClass('message-unread');
-        $.post('/request/message/read.php', {
-            message: msgID,
-            status: 0
-        });
-    }
-}
-
-function MarkAsUnread(msgID) {
-    var $title = $('#msgInlineTitle' + msgID);
-    $title.toggleClass('message-unread');
-    $.post('/request/message/read.php', {
-        message: msgID,
-        status: 1
-    });
-}
-</script>
-<article>
-    <div id="globalfeed">
-        <?php
-        if ($outbox) {
-            echo "<h2>Outbox</h2>";
-
-            echo "<div class='mb-5'>You have <b>$totalMessageCount</b> sent messages.</div>";
-
-            echo "<div class='flex justify-between mb-5'>";
-            echo "<a class='btn btn-link' href='/inbox.php'>Inbox</a>";
-            echo "<div class='flex gap-2'>";
-            echo "<a class='btn btn-link' href='/createmessage.php'>Create New Message</a>";
-            echo "</div>";
-            echo "</div>";
-        } else {
-            echo "<h2>Inbox</h2>";
-
-            echo "<div class='mb-5'>";
-            echo "<div>You have <b>$unreadMessageCount</b> unread of <b>$totalMessageCount</b> total messages.</div>";
-            echo "</div>";
-
-            echo "<div class='flex justify-between mb-5'>";
-            echo "<a class='btn btn-link' href='/inbox.php?s=1'>Outbox</a>";
-            echo "<div class='flex gap-2'>";
-            if ($unreadOnly) {
-                echo "<a class='btn btn-link' href='/inbox.php'>View All Messages</a>";
-            } else {
-                echo "<a class='btn btn-link' href='/inbox.php?u=1'>View Unread Only</a>";
-            }
-            echo "<a class='btn btn-link' href='/createmessage.php'>Create New Message</a>";
-            echo "</div>";
-            echo "</div>";
-        }
-
-        echo "<table class='table-highlight'><tbody>";
-
-        echo "<tr class='do-not-highlight'>";
-        echo "<th>Date</th>";
-        if ($outbox) {
-            echo "<th colspan='2' style='min-width:150px'>To</th>";
-        } else {
-            echo "<th colspan='2' style='min-width:150px'>From</th>";
-        }
-        echo "<th style='width:100%'>Title</th>";
-        echo "</tr>";
-
-        $totalMsgs = count($allMessages);
-
-        for ($i = 0; $i < $totalMsgs; $i++) {
-            $msgID = $allMessages[$i]['ID'];
-            $msgTime = $allMessages[$i]['TimeSent'];
-            $msgSentAtNice = date("d/m/y, H:i ", strtotime($msgTime));
-            // $msgTo      	= $allMessages[$i]['UserTo'];
-            $msgTitle = $allMessages[$i]['Title'];
-            $msgPayload = $allMessages[$i]['Payload'];
-            $msgType = $allMessages[$i]['Type'];
-
-            if ($outbox) {
-                $msgUser = $allMessages[$i]['UserTo'];
-                $msgUnread = false;
-            } else {
-                $msgUser = $allMessages[$i]['UserFrom'];
-                $msgUnread = ($allMessages[$i]['Unread'] == 1);
-            }
-
-            sanitize_outputs(
-                $msgUser,
-                $msgTitle,
-                $msgPayload,
-            );
-
-            $msgPayload = Shortcode::render($msgPayload);
-
-            $styleAlt = $i % 2 == 1 ? "alt" : "";
-
-            echo "<tr class='$styleAlt'>";
-
-            echo "<td style='width:15%'>";
-            echo "<span id='msgInlineTitleDate$msgID' title='$msgTime'>$msgSentAtNice</span>";
-            echo "</td>";
-
-            echo "<td style='width:34px'>";
-            echo userAvatar($msgUser, label: false);
-            echo "</td>";
-            echo "<td>";
-            echo userAvatar($msgUser, icon: false);
-            echo "</td>";
-
-            // echo "<td>" . $msgTo . "</td>";
-
-            echo "<td class='cursor-pointer " . ($msgUnread ? 'message-unread' : '') . "' id='msgInlineTitle$msgID' onclick='ReadMessage($msgID)'>";
-            echo $msgTitle;
-            echo "</td>";
-
-            echo "</tr>";
-
-            echo "<tr id='msgInline$msgID' class='$styleAlt msgPayload'>";
-            echo "<td colspan='4'>";
-            echo "<div class='comment'>$msgPayload</div>";
-
-            if (!$outbox) {
-                echo "<div class='flex justify-end gap-2'>";
-
-                echo "<form action='/request/message/delete.php' method='post' onsubmit='return confirm(\"Are you sure you want to permanently delete this message?\")'>";
-                echo csrf_field();
-                echo "<input type='hidden' name='message' value='$msgID'>";
-                echo "<button class='btn btn-danger'>Delete</button>";
-                echo "</form>";
-
-                echo "<button type='button' class='btn' onclick='MarkAsUnread($msgID)'>Mark as unread</button>";
-
-                echo "<a class='btn' href='/createmessage.php?t=$msgUser&i=$msgID'>Reply</a>";
-
-                echo "</div>";
-            }
-
-            echo "</td>";
-            echo "</tr>";
-        }
-
-        echo "</tbody></table>";
-
-        // Get message count and build paginator URL from current GET parameters
-        $messageCount = $unreadOnly ? $unreadMessageCount : $totalMessageCount;
-        unset($_GET['o']);
-        $urlPrefix = '/inbox.php?' . http_build_query($_GET) . '&o=';
-
-        echo "<div class='text-right'>";
-        RenderPaginator($messageCount, $displayCount, $offset, $urlPrefix);
-        echo "</div>";
-
-        ?>
-    </div>
-</article>
-<?php RenderContentEnd(); ?>
diff --git a/public/request/message/create.php b/public/request/message/create.php
index 457361a1ae..a5fc11b390 100644
--- a/public/request/message/create.php
+++ b/public/request/message/create.php
@@ -18,8 +18,8 @@
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
     'chain' => 'nullable|integer',
-    'body' => 'required|string',
-    'title' => 'required_without:chain',
+    'body' => 'required|string|max:60000',
+    'title' => 'required_without:chain|string|max:255',
     'recipient' => 'required_without:chain|exists:UserAccounts,User',
 ]);
 
@@ -37,4 +37,4 @@
 
 $recipient = User::firstWhere('User', $input['recipient']);
 $userMessageChain = UserMessageChainController::newChain($user, $recipient, $input['title'], $input['body']);
-return redirect(route("message.outbox"));
+return redirect(route("message.outbox"))->with('success', __('legacy.success.message_send'));
diff --git a/public/request/message/read.php b/public/request/message/read.php
deleted file mode 100644
index 332ebe4eb3..0000000000
--- a/public/request/message/read.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Validator;
-
-if (!authenticateFromCookie($user, $permissions, $userDetails)) {
-    abort(401);
-}
-
-$input = Validator::validate(Arr::wrap(request()->post()), [
-    'message' => 'required|integer|exists:Messages,ID',
-    'status' => 'required|integer|in:0,1',
-]);
-
-if (markMessageAsRead($user, $input['message'], $input['status'])) {
-    return true;
-}
-
-abort(400);
diff --git a/public/request/message/send.php b/public/request/message/send.php
deleted file mode 100644
index c35b776a59..0000000000
--- a/public/request/message/send.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Validator;
-
-if (!authenticateFromCookie($username, $permissions, $userDetail)) {
-    return back()->withErrors(__('legacy.error.permissions'));
-}
-
-$input = Validator::validate(Arr::wrap(request()->post()), [
-    'recipient' => 'required|string|exists:UserAccounts,User',
-    'subject' => 'required|string|max:255',
-    'message' => 'required|string|max:60000',
-]);
-
-$recipient = $input['recipient'];
-
-if (isUserBlocking($recipient, $username)) {
-    return redirect(url('inbox.php?s=1'))->with('success', __('legacy.success.message_send'));
-}
-
-if (CreateNewMessage($username, $recipient, $input['subject'], $input['message'])) {
-    return redirect(url('inbox.php?s=1'))->with('success', __('legacy.success.message_send'));
-}
-
-return back()->withErrors(__('legacy.error.error'));

From 021331788003e6fd047545cccdb09dc3decd0225 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 21:44:32 -0700
Subject: [PATCH 14/47] eliminate createmessage.php

---
 .../UserMessageChainController.php            |   6 +-
 app/Helpers/render/ticket.php                 |   2 +-
 config/missing-page-redirector.php            |   1 -
 public/createmessage.php                      | 106 ------------------
 public/friends.php                            |   2 +-
 public/managehashes.php                       |   2 +-
 public/ticketmanager.php                      |   4 +-
 .../message/new-chain-page.blade.php          |   5 +-
 resources/views/community/contact.blade.php   |  16 +--
 9 files changed, 22 insertions(+), 122 deletions(-)
 delete mode 100644 public/createmessage.php

diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
index 2179b71f16..1132bd700a 100644
--- a/app/Community/Controllers/UserMessageChainController.php
+++ b/app/Community/Controllers/UserMessageChainController.php
@@ -65,9 +65,13 @@ public function __invoke(Request $request): View
     public function pageCreate(Request $request): View
     {
         $toUser = $request->input('to') ?? '';
+        $subject = $request->input('subject') ?? '';
+        $message = $request->input('message') ?? '';
 
         return view('community.components.message.new-chain-page', [
-            'toUser' => $toUser
+            'toUser' => $toUser,
+            'subject' => $subject,
+            'message' => $message,
         ]);
     }
 
diff --git a/app/Helpers/render/ticket.php b/app/Helpers/render/ticket.php
index aa24f82c75..20622d2bc7 100644
--- a/app/Helpers/render/ticket.php
+++ b/app/Helpers/render/ticket.php
@@ -31,7 +31,7 @@ function ticketAvatar(
         resource: 'ticket',
         id: $ticket->id,
         label: "Ticket #{$ticket->id}",
-        link: 'ticketmanager.php?i=' . $ticket->id,
+        link: '/ticketmanager.php?i=' . $ticket->id,
         tooltip: is_array($tooltip) ? renderAchievementCard($tooltip) : $tooltip,
         class: "ticket-avatar $ticketStateClass",
         iconUrl: media_asset("/Badge/" . $ticket->badgeName . ".png"),
diff --git a/config/missing-page-redirector.php b/config/missing-page-redirector.php
index 752a437274..b5097abe57 100644
--- a/config/missing-page-redirector.php
+++ b/config/missing-page-redirector.php
@@ -90,7 +90,6 @@
          */
         '/controlpanel.php' => '/settings',
         '/friends.php' => '/friends',
-        '/createmessage.php' => '/message/create',
         '/inbox.php' => '/messages',
         '/gamecompare.php' => '/user/{f}/game/{ID}/compare',
         '/manageuserpic.php' => '/settings',
diff --git a/public/createmessage.php b/public/createmessage.php
deleted file mode 100644
index 63f37a1751..0000000000
--- a/public/createmessage.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-use App\Site\Enums\Permissions;
-use App\Support\Shortcode\Shortcode;
-
-if (!authenticateFromCookie($user, $permissions, $userDetails, Permissions::Registered)) {
-    abort(401);
-}
-
-$messageTo = requestInputSanitized('t', '');
-$messageContextID = requestInputSanitized('i', -1);
-
-$messageOutgoingPayload = requestInputSanitized('p', '');
-
-$messageContextTitle = requestInputSanitized('s', '');
-$messageContextPayload = '';
-$messageContextData = null;
-
-if ($messageContextID != -1) {
-    $messageContextData = GetMessage($user, $messageContextID);
-    $messageContextTitle = "RE: " . $messageContextData['Title'];
-    $messageContextPayload = $messageContextData['Payload'];
-    sanitize_outputs($messageContextPayload);
-    $messageContextPayload = Shortcode::render($messageContextPayload);
-}
-
-$messageContextTitle = htmlspecialchars($messageContextTitle, ENT_QUOTES);
-
-RenderContentStart("Send Message");
-?>
-<script>
-$(function () {
-    // Focus on the first relevant field
-    var $recipient = $('#recipient');
-    if ($recipient.val().length === 0) {
-        $recipient.focus();
-    } else {
-        $('#commentTextarea').focus();
-    }
-});
-
-function onUserChange() {
-    var recipient = $('#recipient').val();
-    if (recipient.length > 2) {
-        $('.searchusericon').attr('src', mediaAsset('/UserPic/' + recipient + '.png'));
-    }
-}
-
-$(document).ready(onUserChange);
-</script>
-<article>
-    <?php
-    echo "<div class='navpath'>";
-    echo "<a href='inbox.php'>Inbox</a>";
-    echo " &raquo; <b>Send Message</b></a>";
-    echo "</div>";
-
-    echo "<h2>New Message</h2>";
-
-    if ($messageContextData !== null) {
-        echo "In reply to ";
-        echo userAvatar($messageContextData['UserFrom']);
-        echo " who wrote:<br><br>";
-        echo "<div class='comment'>$messageContextPayload</div>";
-    }
-
-    echo "<form action='/request/message/send.php' method='post'>";
-    echo csrf_field();
-
-    echo "<table>";
-    echo "<tbody>";
-
-    $destUser = mb_strlen($messageTo) > 2 ? $messageTo : '_User';
-    echo "<tr>";
-    echo "<td>User:</td>";
-    echo "<td><input type='text' value='$messageTo' name='recipient' id='recipient' onblur='onUserChange(); return false;' class='searchuser' required></td>";
-    echo "<td style='width:10%'><img style='float:right' class='searchusericon' src='" . media_asset('/UserPic/' . $destUser . '.png') . "' width='64' height='64'/></td>";
-    echo "</tr>";
-    echo "<tr><td>Subject: </td><td colspan='2'><input class='w-full' type='text' value='$messageContextTitle' name='subject' required></td></tr>";
-    echo "<tr><td>Message:</td><td colspan='2'>";
-    RenderShortcodeButtons();
-    echo "<textarea oninput='autoExpandTextInput(this)' id='commentTextarea' class='w-full forum messageTextarea' style='height:160px' rows='5' cols='61' name='message' placeholder='Enter your message here...' required>$messageOutgoingPayload</textarea></td></tr>";
-
-    $loadingIconSrc = asset('assets/images/icon/loading.gif');
-
-    echo <<<HTML
-        <tr>
-            <td></td>
-            <td colspan="2">
-                <div class="flex justify-end items-center">
-                    <img id="preview-loading-icon" src="$loadingIconSrc" style="opacity: 0;" width="16" height="16" alt="Loading...">
-                    <button id="preview-button" type="button" class="btn" onclick="window.loadPostPreview()">Preview</button>
-                    <button class="btn">Send Message</button>
-                </div>
-            </td>
-        </tr>
-    HTML;
-
-    echo "</tbody>";
-    echo "</table>";
-    echo "</form>";
-
-    echo "<div id='post-preview'></div>";
-    ?>
-</article>
-<?php RenderContentEnd(); ?>
diff --git a/public/friends.php b/public/friends.php
index 1c1645318d..707d8ba31d 100644
--- a/public/friends.php
+++ b/public/friends.php
@@ -124,7 +124,7 @@ function RenderUserList(string $header, array $users, int $friendshipType, array
             echo "<td style='vertical-align:middle;'>";
             echo "<div class='flex justify-end gap-2'>";
 
-            echo "<a class='btn btn-link' href='/createmessage.php?t=$followingUser'>Message</a>";
+            echo "<a class='btn btn-link' href='" . route('message.new') . "?to=$followingUser'>Message</a>";
 
             echo "<form class='inline-block' action='/request/user/update-relationship.php' method='post'>";
             echo csrf_field();
diff --git a/public/managehashes.php b/public/managehashes.php
index 1199bb3756..6483ab0004 100644
--- a/public/managehashes.php
+++ b/public/managehashes.php
@@ -113,7 +113,7 @@ function UnlinkHash(user, gameID, hash, elem) {
     }
     echo "</div>";
 
-    echo "<br><div class='text-danger'><b>Warning:</b> PLEASE be careful with this tool. If in doubt, <a href='/createmessage.php?t=RAdmin&s=Attempt to Unlink $gameTitle'>leave a message for admins</a> and they'll help sort it.</div>";
+    echo "<br><div class='text-danger'><b>Warning:</b> PLEASE be careful with this tool. If in doubt, <a href='" . route('message.new') . "?to=RAdmin&subject=Attempt+to+Unlink+" . urlencode($gameTitle) ."&message=%5Bgame=$gameID%5D'>leave a message for admins</a> and they'll help sort it.</div>";
 
     echo "<br/><div id='hashCount'>Currently this game has <b>$numLinks</b> unique hashes registered for it:</div>";
 
diff --git a/public/ticketmanager.php b/public/ticketmanager.php
index ebf055c3c8..ed0da96aee 100644
--- a/public/ticketmanager.php
+++ b/public/ticketmanager.php
@@ -726,10 +726,10 @@
                 echo "<td>Reporter:</td>";
                 echo "<td colspan='7'>";
                 echo "<div>";
-                $msgPayload = "Hi [user=$reportedBy], I'm contacting you about ticket retroachievements.org/ticketmanager.php?i=$ticketID ";
+                $msgPayload = "Hi [user=$reportedBy], I'm contacting you about [ticket=$ticketID]";
                 $msgPayload = rawurlencode($msgPayload);
                 $msgTitle = rawurlencode("Bug Report ($gameTitle)");
-                echo "<a href='createmessage.php?t=$reportedBy&amp;s=$msgTitle&p=$msgPayload'>Contact the reporter - $reportedBy</a>";
+                echo "<a href='" . route('message.new') . "?to=$reportedBy&subject=$msgTitle&message=$msgPayload'>Contact the reporter - $reportedBy</a>";
                 echo "</div>";
                 echo "</td>";
                 echo "</tr>";
diff --git a/resources/views/community/components/message/new-chain-page.blade.php b/resources/views/community/components/message/new-chain-page.blade.php
index e3321756ce..79ccd61162 100644
--- a/resources/views/community/components/message/new-chain-page.blade.php
+++ b/resources/views/community/components/message/new-chain-page.blade.php
@@ -1,5 +1,7 @@
 @props([
     'toUser' => '',
+    'subject' => '',
+    'message' => '',
 ])
 
 <x-app-layout
@@ -32,7 +34,7 @@
 
             <tr>
                 <td><label for='title'>Subject:</label></td>
-                <td><input class='w-full' type='text' value='' id='title' name='title' required /></td>
+                <td><input class='w-full' type='text' value='{{ $subject }}' id='title' name='title' required /></td>
             </tr>
 
             <tr>
@@ -41,6 +43,7 @@
                     <x-input.shortcode-textarea
                         name='body'
                         watermark='Enter your message here...'
+                        initialValue="{{ $message }}"
                     />
                 </td>
             </tr>
diff --git a/resources/views/community/contact.blade.php b/resources/views/community/contact.blade.php
index a4b137d984..0b5039d699 100644
--- a/resources/views/community/contact.blade.php
+++ b/resources/views/community/contact.blade.php
@@ -5,7 +5,7 @@
                 <h2>Admins and Moderators</h2>
 
                 <p class="mb-0">
-                    <a href='/createmessage.php?t=RAdmin'>Send a message to RAdmin</a> for:
+                    <a href='{{ route("message.new") }}?to=RAdmin'>Send a message to RAdmin</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -20,7 +20,7 @@
                 <h2>Developer Compliance</h2>
 
                 <p class="mb-0">
-                    <a href='/createmessage.php?t=DevCompliance'>Send a message to DevCompliance</a> for:
+                    <a href='{{ route("message.new") }}?to=DevCompliance'>Send a message to DevCompliance</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -34,7 +34,7 @@
                 <h2>Quality Assurance</h2>
 
                 <p class="mb-0">
-                    <a href='/createmessage.php?t=QATeam'>Send a message to QATeam</a> for:
+                    <a href='{{ route("message.new") }}?to=QATeam'>Send a message to QATeam</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -51,7 +51,7 @@
                 <h2>DevQuest</h2>
 
                 <p class="mb-3">
-                    <a href='/createmessage.php?t=DevQuest'>Send a message to DevQuest</a> for
+                    <a href='{{ route("message.new") }}?to=DevQuest'>Send a message to DevQuest</a> for
                     submissions, questions, ideas, or reporting issues related to
                     <a href='/game/5686'>DevQuest</a>.
                 </p>
@@ -63,7 +63,7 @@
                 <h2>Cheating Reports</h2>
 
                 <p class="mb-3">
-                    <a href="/createmessage.php?t=RACheats">Send a message to RACheats</a>
+                    <a href="{{ route("message.new") }}?to=RACheats">Send a message to RACheats</a>
                     if you believe someone is in violation of our
                     <a href="https://docs.retroachievements.org/Global-Leaderboard-and-Achievement-Hunting-Rules/#not-allowed">Global Leaderboard and Achievement Hunting Rules</a>.
                 </p>
@@ -81,7 +81,7 @@
                 <h2>RANews</h2>
 
                 <p class="mb-0">
-                    <a href='/createmessage.php?t=RANews'>Send a message to RANews</a> for:
+                    <a href='{{ route("message.new") }}?to=RANews'>Send a message to RANews</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -96,13 +96,13 @@
                 <h2>RAEvents</h2>
 
                 <p class="mb-3">
-                    <a href='/createmessage.php?t=RAEvents'>Send a message to RAEvents</a> for
+                    <a href='{{ route("message.new") }}?to=RAEvents'>Send a message to RAEvents</a> for
                     submissions, questions, ideas, or reporting issues related to
                     <a href='/game/3105'>community events</a>.
                 </p>
 
                 <p class="mb-3">
-                    <a href='/createmessage.php?t=TheUnwanted'>Send a message to TheUnwanted</a> for
+                    <a href='{{ route("message.new") }}?to=TheUnwanted'>Send a message to TheUnwanted</a> for
                     submissions, questions, ideas, or reporting issues specifically related to
                     <a href='/game/4271'>The Unwanted</a>.
                 </p>

From f663c6db2268183abb6a7a1f973b8c5ef1a19fd1 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Thu, 23 Nov 2023 22:04:17 -0700
Subject: [PATCH 15/47] eliminate database/message.php

---
 app/Helpers/database/message.php   | 217 -----------------------------
 app/Helpers/database/ticket.php    |  12 +-
 app/Helpers/database/user-auth.php |   2 +-
 app/Helpers/helpers.php            |   1 -
 4 files changed, 9 insertions(+), 223 deletions(-)
 delete mode 100644 app/Helpers/database/message.php

diff --git a/app/Helpers/database/message.php b/app/Helpers/database/message.php
deleted file mode 100644
index 18bf97a02c..0000000000
--- a/app/Helpers/database/message.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-
-use App\Site\Enums\UserPreference;
-
-function CreateNewMessage(string $author, string $destUser, string $messageTitle, string $messagePayloadIn): bool
-{
-    $messagePayload = nl2br($messagePayloadIn);
-
-    sanitize_sql_inputs($author, $destUser, $messageTitle, $messagePayloadIn);
-
-    $query = "INSERT INTO Messages (UserTo, UserFrom, Title, Payload) VALUES ( '$destUser', '$author', '$messageTitle', '$messagePayloadIn')";
-
-    $db = getMysqliConnection();
-    $dbResult = mysqli_query($db, $query);
-    if ($dbResult !== false) {
-        // Message sent!
-        UpdateCachedUnreadTotals($destUser);
-
-        // Inform target?
-        if (getAccountDetails($destUser, $userDetails)) {
-            $websitePrefs = $userDetails['websitePrefs'];
-            $destEmail = $userDetails['EmailAddress'];
-
-            if (BitSet($websitePrefs, UserPreference::EmailOn_PrivateMessage)) {
-                sendPrivateMessageEmail($destUser, $destEmail, $messageTitle, $messagePayload, $author);
-            }
-        }
-
-        return true;
-    }
-    // Unconfirmed friend:
-    log_sql_fail();
-
-    return false;
-}
-
-function GetMessageCount(string $username, ?int &$totalMessageCount = null): int
-{
-    $unreadMessageCount = 0;
-    $totalMessageCount = 0;
-
-    $query = "SELECT Unread, COUNT(*) AS NumFound
-              FROM Messages
-              WHERE UserTo = :user
-              GROUP BY Unread";
-
-    $data = legacyDbFetchAll($query, ['user' => $username]);
-
-    foreach ($data as $datum) {
-        if ($datum['Unread'] == 1) {
-            $unreadMessageCount = (int) $datum['NumFound'];
-        }
-
-        $totalMessageCount += (int) $datum['NumFound'];
-    }
-
-    return $unreadMessageCount;
-}
-
-function GetSentMessageCount(string $user): int
-{
-    sanitize_sql_inputs($user);
-
-    if (!isset($user)) {
-        return 0;
-    }
-
-    $messageCount = 0;
-
-    $query = "
-        SELECT COUNT(*) AS NumFound
-        FROM Messages AS msg
-        WHERE msg.UserFrom = '$user'
-    ";
-
-    $dbResult = s_mysql_query($query);
-
-    if ($dbResult !== false) {
-        while ($data = mysqli_fetch_assoc($dbResult)) {
-            $messageCount = (int) $data['NumFound'];
-        }
-    }
-
-    return $messageCount;
-}
-
-function GetMessage(string $user, int $id): ?array
-{
-    sanitize_sql_inputs($user);
-
-    $query = "SELECT * FROM Messages AS msg
-              WHERE msg.ID='$id' AND msg.UserTo='$user'";
-
-    $dbResult = s_mysql_query($query);
-
-    if (!$dbResult) {
-        return null;
-    }
-
-    $numFound = mysqli_num_rows($dbResult);
-    if ($numFound > 0) {
-        return mysqli_fetch_assoc($dbResult);
-    }
-
-    return null;
-}
-
-function GetAllMessages(string $user, int $offset, int $count, bool $unreadOnly): array
-{
-    sanitize_sql_inputs($user);
-
-    $retval = [];
-
-    $subQuery = '';
-    if ($unreadOnly) {
-        $subQuery = " AND msg.Unread=1";
-    }
-
-    $query = "SELECT * FROM Messages AS msg
-              WHERE msg.UserTo='$user' $subQuery
-              ORDER BY msg.TimeSent DESC
-              LIMIT $offset, $count";
-
-    $dbResult = s_mysql_query($query);
-
-    if ($dbResult !== false) {
-        while ($data = mysqli_fetch_assoc($dbResult)) {
-            $retval[] = $data;
-        }
-    } else {
-        log_sql_fail();
-    }
-
-    return $retval;
-}
-
-function GetSentMessages(string $user, int $offset, int $count): array
-{
-    sanitize_sql_inputs($user);
-
-    $retval = [];
-
-    $query = "SELECT * FROM Messages AS msg
-              WHERE msg.UserFrom='$user'
-              ORDER BY msg.TimeSent DESC
-              LIMIT $offset, $count";
-
-    $dbResult = s_mysql_query($query);
-
-    if ($dbResult !== false) {
-        while ($data = mysqli_fetch_assoc($dbResult)) {
-            $retval[] = $data;
-        }
-    }
-
-    return $retval;
-}
-
-function UpdateCachedUnreadTotals(string $user): void
-{
-    sanitize_sql_inputs($user);
-
-    $query = "
-    UPDATE UserAccounts AS ua
-    SET UnreadMessageCount = (
-        SELECT COUNT(*) FROM
-        (
-            SELECT *
-            FROM Messages AS msg
-            WHERE msg.UserTo = '$user' AND msg.Unread = 1
-        ) InnerTable
-    ), Updated=NOW() WHERE ua.User = '$user'";
-
-    s_mysql_query($query);
-}
-
-function markMessageAsRead(string $user, int $messageID, bool $setAsUnread = false): bool
-{
-    sanitize_sql_inputs($user);
-
-    $newReadStatus = (int) $setAsUnread;
-
-    $query = "UPDATE Messages AS msg
-            SET msg.Unread=$newReadStatus
-            WHERE msg.ID = $messageID AND msg.UserTo = '$user'";
-
-    $dbResult = s_mysql_query($query);
-
-    if ($dbResult !== false) {
-        UpdateCachedUnreadTotals($user);
-    }
-
-    return $dbResult !== false;
-}
-
-function DeleteMessage(string $user, int $messageID): bool
-{
-    sanitize_sql_inputs($user);
-
-    $messageToDelete = GetMessage($user, $messageID);
-
-    if (!$messageToDelete) {
-        return false;
-    }
-
-    if (strtolower($messageToDelete['UserTo']) !== strtolower($user)) {
-        return false;
-    }
-
-    $query = "DELETE FROM Messages WHERE Messages.ID = $messageID";
-    $dbResult = s_mysql_query($query);
-    if ($dbResult !== false) {
-        UpdateCachedUnreadTotals($user);
-    }
-
-    return $dbResult !== false;
-}
diff --git a/app/Helpers/database/ticket.php b/app/Helpers/database/ticket.php
index f70bab23a8..6614b6bff8 100644
--- a/app/Helpers/database/ticket.php
+++ b/app/Helpers/database/ticket.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Community\Controllers\UserMessageChainController;
 use App\Community\Enums\ArticleType;
 use App\Community\Enums\SubscriptionSubjectType;
 use App\Community\Enums\TicketFilters;
@@ -146,10 +147,13 @@ function _createTicket(User $user, int $achID, int $reportType, ?int $hardcore,
 " . config('app.url') . "/ticketmanager.php?i=$ticketID"
         . " Thanks!";
 
-    $bugReportMessage = "Hi, $achAuthor!\r\n
-[user=$username] would like to report a bug with an achievement you've created:
-$bugReportDetails";
-    CreateNewMessage($username, $achAuthor, "Bug Report ($gameTitle)", $bugReportMessage);
+    $author = User::firstWhere('User', $achAuthor);
+    if ($author) {
+        $bugReportMessage = "Hi, $achAuthor!\r\n[user=$username] would like to report a bug with an achievement you've created:\r\n$bugReportDetails";
+        $chain = UserMessageChainController::newChain($user, $author, "Bug Report ($gameTitle)", $bugReportMessage);
+        UserMessageChainController::deleteChain($chain, $user); // don't put the message in the user's outbox unless the recipient replies
+        $chain->save();
+    }
 
     // notify subscribers other than the achievement's author
     // TODO dry it. why is this not (1 << 1) like in submitNewTicketsJSON?
diff --git a/app/Helpers/database/user-auth.php b/app/Helpers/database/user-auth.php
index df8b0cd196..37d4dc07d2 100644
--- a/app/Helpers/database/user-auth.php
+++ b/app/Helpers/database/user-auth.php
@@ -85,7 +85,7 @@ function authenticateForConnect(?string $username, ?string $pass = null, ?string
         'Token' => $user->appToken,
         'Score' => $user->RAPoints,
         'SoftcoreScore' => $user->RASoftcorePoints,
-        'Messages' => GetMessageCount($user, $totalMessageCount),
+        'Messages' => $user->UnreadMessageCount,
         'Permissions' => $permissions,
         'AccountType' => Permissions::toString($permissions),
     ];
diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php
index 4bbdbf2110..e30ba14f3d 100644
--- a/app/Helpers/helpers.php
+++ b/app/Helpers/helpers.php
@@ -11,7 +11,6 @@
 require_once __DIR__ . '/database/game.php';
 require_once __DIR__ . '/database/hash.php';
 require_once __DIR__ . '/database/leaderboard.php';
-require_once __DIR__ . '/database/message.php';
 require_once __DIR__ . '/database/player-achievement.php';
 require_once __DIR__ . '/database/player-game.php';
 require_once __DIR__ . '/database/player-history.php';

From 3d5f7d6cd0eedac9e6957fdfd671aa138e3f4f55 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 24 Nov 2023 07:55:04 -0700
Subject: [PATCH 16/47] hard-delete message when both users delete it

---
 .../UserMessageChainController.php            | 11 ++++++----
 tests/Feature/Community/MessagesTest.php      | 21 ++++++-------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
index 1132bd700a..9cb10ea7e7 100644
--- a/app/Community/Controllers/UserMessageChainController.php
+++ b/app/Community/Controllers/UserMessageChainController.php
@@ -181,10 +181,13 @@ public static function deleteChain(UserMessageChain $userMessageChain, User $use
             $userMessageChain->sender_num_unread = 0;
             $userMessageChain->sender_deleted_at = $now;
         }
-
-        $userMessageChain->save();
-        
-        // TODO: hard delete if both deleted_at fields are not null?
+      
+        if ($userMessageChain->recipient_deleted_at != null && $userMessageChain->sender_deleted_at != null) {
+            // this will also cascade delete the user_messages
+            $userMessageChain->delete();
+        } else {
+            $userMessageChain->save();
+        }
 
         UserMessageChainController::updateUnreadMessageCount($user);
     }
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 6d5f2dc50f..e5cb432493 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -198,26 +198,17 @@ public function testCreateMessageChain(): void
         $this->assertEmailNotSent($user1);
         $this->assertEmailNotSent($user2);
 
-        // user2 deletes
+        // user2 deletes - when both users delete the message, it's removed from the DB
         $now6 = $now5->clone()->addMinutes(5);
         Carbon::setTestNow($now6);
 
         $this->captureEmails();
         UserMessageChainController::deleteChain($chain, $user2);
-        $chain->refresh();
-        $this->assertDatabaseHas('user_message_chains', [
-            'id' => 1,
-            'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
-            'num_messages' => 4,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 0,
-            'sender_last_post_at' => $now4->toDateTimeString(),
-            'recipient_last_post_at' => $now3->toDateTimeString(),
-            'sender_deleted_at' => $now5->toDateTimeString(),
-            'recipient_deleted_at' => $now6->toDateTimeString(),
-        ]);
+        $this->assertDatabaseMissing('user_message_chains', ['id' => 1]);
+        $this->assertDatabaseMissing('user_messages', ['id' => 1]);
+        $this->assertDatabaseMissing('user_messages', ['id' => 2]);
+        $this->assertDatabaseMissing('user_messages', ['id' => 3]);
+        $this->assertDatabaseMissing('user_messages', ['id' => 4]);
 
         $user2->refresh();
         $this->assertEquals(0, $user2->UnreadMessageCount);

From 27936f07d3af483964afb57beda54e4bd9fee8c8 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Sat, 25 Nov 2023 23:28:45 -0700
Subject: [PATCH 17/47] rename tables

---
 app/Community/Commands/SyncMessages.php       | 116 ++++--
 .../Controllers/MessageThreadsController.php  | 253 ++++++++++++
 .../UserMessageChainController.php            | 194 ----------
 .../Controllers/UserMessagesController.php    |  83 ----
 app/Community/EventServiceProvider.php        |  10 +
 app/Community/Events/MessageCreated.php       |  28 ++
 .../Listeners/NotifyMessageParticipants.php   |  66 ++++
 app/Community/Models/Message.php              |  50 +--
 app/Community/Models/MessageThread.php        |  27 ++
 .../Models/MessageThreadParticipant.php       |  31 ++
 app/Community/Models/UserMessage.php          |  47 ---
 app/Community/Models/UserMessageChain.php     |  57 ---
 app/Community/Models/UserRelation.php         |   1 +
 app/Community/RouteServiceProvider.php        |  12 +-
 app/Helpers/database/ticket.php               |   7 +-
 app/Helpers/database/user-auth.php            |   2 +-
 app/Helpers/util/mail.php                     |   2 +-
 app/Site/Components/NotificationIcon.php      |   2 +-
 ...00000_create_user_message_chains_table.php |  37 --
 ...1_22_000001_create_user_messages_table.php |  38 --
 ...25_000000_create_message_threads_table.php |  24 ++
 ...001_create_message_thread_participants.php |  28 ++
 ...023_11_25_000002_update_messages_table.php | 117 ++++++
 public/managehashes.php                       |   2 +-
 public/request/message/create.php             |  33 +-
 public/request/message/delete.php             |  26 +-
 .../components/message/breadcrumbs.blade.php  |  10 -
 .../components/message/icon.blade.php         |   2 +-
 .../components/message/list-page.blade.php    |  65 +---
 ...ge.blade.php => new-thread-page.blade.php} |   5 +-
 ...e.blade.php => view-thread-page.blade.php} |  71 ++--
 .../components/user/breadcrumbs.blade.php     |   6 +
 .../views/components/menu/account.blade.php   |   2 +-
 tests/Feature/Community/MessagesTest.php      | 361 ++++++++++--------
 tests/Feature/Site/Concerns/TestsMail.php     |   4 +-
 35 files changed, 1000 insertions(+), 819 deletions(-)
 create mode 100644 app/Community/Controllers/MessageThreadsController.php
 delete mode 100644 app/Community/Controllers/UserMessageChainController.php
 delete mode 100644 app/Community/Controllers/UserMessagesController.php
 create mode 100644 app/Community/Events/MessageCreated.php
 create mode 100644 app/Community/Listeners/NotifyMessageParticipants.php
 create mode 100644 app/Community/Models/MessageThread.php
 create mode 100644 app/Community/Models/MessageThreadParticipant.php
 delete mode 100644 app/Community/Models/UserMessage.php
 delete mode 100644 app/Community/Models/UserMessageChain.php
 delete mode 100644 database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
 delete mode 100644 database/migrations/platform/2023_11_22_000001_create_user_messages_table.php
 create mode 100644 database/migrations/platform/2023_11_25_000000_create_message_threads_table.php
 create mode 100644 database/migrations/platform/2023_11_25_000001_create_message_thread_participants.php
 create mode 100644 database/migrations/platform/2023_11_25_000002_update_messages_table.php
 delete mode 100644 resources/views/community/components/message/breadcrumbs.blade.php
 rename resources/views/community/components/message/{new-chain-page.blade.php => new-thread-page.blade.php} (89%)
 rename resources/views/community/components/message/{view-chain-page.blade.php => view-thread-page.blade.php} (51%)

diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/SyncMessages.php
index c791b26d06..ef6e713348 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/SyncMessages.php
@@ -5,10 +5,13 @@
 namespace App\Community\Commands;
 
 use App\Community\Models\Message;
-use App\Community\Models\UserMessage;
-use App\Community\Models\UserMessageChain;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
 use App\Site\Models\User;
 use Illuminate\Console\Command;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
 
 class SyncMessages extends Command
 {
@@ -22,7 +25,7 @@ public function __construct()
 
     public function handle(): void
     {
-        $count = Message::whereNull('migrated_id')->count();
+        $count = Message::where('thread_id', 0)->count();
 
         $progressBar = $this->output->createProgressBar($count);
         $progressBar->start();
@@ -30,7 +33,7 @@ public function handle(): void
         // have to do this in batches to prevent exhausting memory
         // due to requesting payloads (message content)
         for ($i = 0; $i < $count; $i += 100) {
-            $messages = Message::whereNull('migrated_id')->orderBy('ID')->limit(100)->get();
+            $messages = Message::where('thread_id', 0)->orderBy('ID')->limit(100)->get();
             /** @var Message $message */
             foreach ($messages as $message) {
                 $this->migrateMessage($message);
@@ -40,63 +43,94 @@ public function handle(): void
 
         $progressBar->finish();
         $this->line(PHP_EOL);
+
+        $count = Message::where('thread_id', 0)->count();
+        if ($count == 0) {
+            // all messages sync'd. add the foreign key so deletes will cascade
+            $sm = Schema::getConnection()->getDoctrineSchemaManager();
+            $foreignKeysFound = $sm->listTableForeignKeys('messages');
+
+            $found = false;
+            foreach ($foreignKeysFound as $foreignKey) {
+                if ($foreignKey->getName() == 'messages_thread_id_foreign') {
+                    $found = true;
+                    break;
+                }
+            }
+
+            if (!$found) {
+                Schema::table('messages', function (Blueprint $table) {
+                    $table->foreign('thread_id')->references('ID')->on('message_threads')->onDelete('cascade');
+                });
+            }
+        }
+
+        // automatically mark bug report notifications as deleted by the sender if
+        // the recipient hasn't replied to them.
+        DB::statement("UPDATE message_thread_participants mtp
+                       INNER JOIN message_threads mt ON mt.id=mtp.thread_id
+                       INNER JOIN messages m ON m.thread_id=mtp.thread_id AND m.author_id=mtp.user_id
+                       SET mtp.deleted_at=NOW()
+                       WHERE mt.num_messages=1 AND mt.title LIKE 'Bug Report (%'");
     }
 
     private function migrateMessage(Message $message)
     {
-        $userFrom = User::where('User', $message->UserFrom)->first();
-        $userTo = User::where('User', $message->UserTo)->first();
-        if (!$userFrom || !$userTo) {
-            // sender or recipient was deleted. ignore message
-            $message->migrated_id = 0;
-            $message->save();
+        // recipient can be entered by user. trim whitespace before trying to match
+        $message->UserTo = trim($message->UserTo);
+        $userTo = User::withTrashed()->where('User', $message->UserTo)->first();
+        if (!$userTo) {
+            $message->delete();
+
             return;
         }
 
+        $thread = null;
         if (strtolower(substr($message->Title, 0, 4)) == 're: ') {
-            $parent = Message::where('Title', '=', substr($message->Title, 4))
+            $threadId = Message::where('title', '=', substr($message->Title, 4))
                 ->where('UserFrom', '=', $message->UserTo)
                 ->where('UserTo', '=', $message->UserFrom)
-                ->where('ID', '<', $message->ID)
-                ->first();
-        } else {
-            $parent = null;
+                ->where('id', '<', $message->id)
+                ->value('thread_id');
+            if ($threadId > 0) {
+                $thread = MessageThread::firstWhere('id', $threadId);
+            }
         }
 
-        if ($parent === null) {
-            $userMessageChain = new UserMessageChain([
+        if ($thread === null) {
+            $thread = new MessageThread([
                 'title' => $message->Title,
-                'sender_id' => $userFrom->ID,
-                'recipient_id' => $userTo->ID,
             ]);
-        } else {
-            $migratedParent = UserMessage::where('id', $parent->migrated_id)->firstOrFail();
-            $userMessageChain = UserMessageChain::where('id', $migratedParent->chain_id)->firstOrFail();
-        }
+            $thread->save();
+
+            $participantTo = new MessageThreadParticipant([
+                'user_id' => $userTo->ID,
+                'thread_id' => $thread->id,
+            ]);
+            $participantTo->save();
 
-        $userMessageChain->num_messages++;
-        if ($userMessageChain->recipient_id == $userTo->ID) {
-            $userMessageChain->sender_last_post_at = $message->TimeSent;
-            if ($message->Unread) {
-                $userMessageChain->recipient_num_unread++;
+            if ($message->author_id != $userTo->ID) {
+                $participantFrom = new MessageThreadParticipant([
+                    'user_id' => $message->author_id,
+                    'thread_id' => $thread->id,
+                ]);
+                $participantFrom->save();
             }
         } else {
-            $userMessageChain->recipient_last_post_at = $message->TimeSent;
-            if ($message->Unread) {
-                $userMessageChain->sender_num_unread++;
-            }
+            $threadParticipants = MessageThreadParticipant::where('thread_id', $thread->id);
+            $participantTo = $threadParticipants->where('user_id', $userTo->ID)->first();
+        }
+
+        if ($message->Unread) {
+            $participantTo->num_unread++;
+            $participantTo->save();
         }
-        $userMessageChain->save();
 
-        $userMessage = new UserMessage([
-            'chain_id' => $userMessageChain->id,
-            'author_id' => $userFrom->ID,
-            'body' => $message->Payload,
-            'created_at' => $message->TimeSent,
-        ]);
-        $userMessage->save();
+        $thread->num_messages++;
+        $thread->last_message_id = $message->id;
+        $thread->save();
 
-        $message->migrated_id = $userMessage->id;
+        $message->thread_id = $thread->id;
         $message->save();
     }
 }
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
new file mode 100644
index 0000000000..180a7181b1
--- /dev/null
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -0,0 +1,253 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Controllers;
+
+use App\Community\Enums\UserRelationship;
+use App\Community\Events\MessageCreated;
+use App\Community\Models\Message;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
+use App\Community\Models\UserRelation;
+use App\Http\Controller;
+use App\Site\Models\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
+
+class MessageThreadsController extends Controller
+{
+    public function pageList(Request $request): View
+    {
+        $user = $request->user();
+
+        $messageThreads = MessageThread::join('message_thread_participants', 'message_thread_participants.thread_id', '=', 'message_threads.id')
+            ->where('message_thread_participants.user_id', $user->ID)
+            ->whereNull('message_thread_participants.deleted_at');
+        $totalMessages = $messageThreads->count();
+
+        $pageSize = 20;
+        $currentPage = (int) $request->input('page.number') ?? 1;
+        if ($currentPage < 1) {
+            $currentPage = 1;
+        }
+        $totalPages = (int) (($totalMessages + 19) / 20);
+
+        $messageThreads = $messageThreads
+            ->join('messages', 'messages.id', '=', 'message_threads.last_message_id')
+            ->orderBy('messages.created_at', 'DESC')
+            ->offset(($currentPage - 1) * $pageSize)
+            ->limit($pageSize)
+            ->select(['message_threads.*',
+                DB::raw('messages.author_id AS last_author_id'),
+                DB::raw('messages.created_at AS last_message_at'),
+            ])
+            ->get();
+
+        foreach ($messageThreads as &$messageThread) {
+            $messageThread['other_participants'] = User::withTrashed()
+                ->join('message_thread_participants', 'message_thread_participants.user_id', '=', 'UserAccounts.ID')
+                ->where('message_thread_participants.thread_id', '=', $messageThread->id)
+                ->where('message_thread_participants.user_id', '!=', $user->ID)
+                ->pluck('UserAccounts.User')
+                ->toArray();
+            $messageThread['num_unread'] = MessageThreadParticipant::where('user_id', $user->ID)
+                ->where('thread_id', $messageThread->id)
+                ->value('num_unread');
+        }
+
+        return view('community.components.message.list-page', [
+            'messages' => $messageThreads,
+            'totalPages' => $totalPages,
+            'currentPage' => $currentPage,
+            'unreadCount' => $request->user()->UnreadMessageCount,
+            'totalMessages' => $totalMessages,
+        ]);
+    }
+
+    public function pageView(Request $request): View
+    {
+        $threadId = $request->route('thread_id');
+
+        $thread = MessageThread::firstWhere('id', $threadId);
+        if (!$thread) {
+            abort(404);
+        }
+
+        $user = $request->user();
+        $participant = MessageThreadParticipant::where('thread_id', $threadId)
+            ->where('user_id', $user->ID)
+            ->first();
+        if (!$participant) {
+            abort(404);
+        }
+
+        $pageSize = 20;
+        $currentPage = (int) $request->input('page.number') ?? 1;
+        if ($currentPage < 1) {
+            $currentPage = 1;
+        }
+        $totalPages = (int) (($thread->num_messages + 19) / 20);
+
+        if ($currentPage == $totalPages) {
+            // if viewing last page, mark all messages in the chain as read
+            MessageThreadsController::markParticipantRead($participant, $user);
+        }
+
+        $messages = Message::where('thread_id', $threadId)
+            ->orderBy('created_at')
+            ->offset(($currentPage - 1) * $pageSize)
+            ->limit($pageSize)
+            ->get();
+
+        $participants = MessageThreadParticipant::withTrashed()
+            ->where('thread_id', $thread->id)
+            ->join('UserAccounts', 'UserAccounts.ID', '=', 'message_thread_participants.user_id');
+
+        $canReply = with(clone $participants)
+            ->where('user_id', '!=', $user->ID)
+            ->whereNull('UserAccounts.Deleted')
+            ->exists();
+
+        $participants = $participants->get(['UserAccounts.ID', 'UserAccounts.User'])
+            ->mapWithKeys(function ($participant, $key) {
+                return [$participant->ID => $participant->User];
+            })
+            ->toArray();
+
+        return view('community.components.message.view-thread-page', [
+            'thread' => $thread,
+            'messages' => $messages,
+            'participants' => $participants,
+            'totalPages' => $totalPages,
+            'currentPage' => $currentPage,
+            'canReply' => $canReply,
+        ]);
+    }
+
+    public function pageCreate(Request $request): View
+    {
+        $toUser = $request->input('to') ?? '';
+        $subject = $request->input('subject') ?? '';
+        $message = $request->input('message') ?? '';
+
+        return view('community.components.message.new-thread-page', [
+            'toUser' => $toUser,
+            'subject' => $subject,
+            'message' => $message,
+        ]);
+    }
+
+    public static function newThread(User $userFrom, User $userTo, string $title, string $body, bool $isProxied = false): MessageThread
+    {
+        $thread = new MessageThread([
+            'title' => $title,
+        ]);
+        $thread->save();
+
+        $participantFrom = new MessageThreadParticipant([
+            'user_id' => $userFrom->ID,
+            'thread_id' => $thread->id,
+        ]);
+
+        if ($isProxied) {
+            $participantFrom->deleted_at = Carbon::now();
+        }
+
+        $participantFrom->save();
+
+        if ($userTo->ID != $userFrom->ID) {
+            $participantTo = new MessageThreadParticipant([
+                'user_id' => $userTo->ID,
+                'thread_id' => $thread->id,
+            ]);
+
+            // if the recipient has blocked the sender, immediately mark the thread as deleted for the recipient
+            $relationship = UserRelation::getRelationship($userTo->User, $userFrom->User);
+            if ($relationship == UserRelationship::Blocked) {
+                $participantTo->deleted_at = Carbon::now();
+            }
+
+            $participantTo->save();
+        }
+
+        MessageThreadsController::addToThread($thread, $userFrom, $body);
+
+        return $thread;
+    }
+
+    public static function addToThread(MessageThread $thread, User $userFrom, string $body): void
+    {
+        $message = new Message([
+            'thread_id' => $thread->id,
+            'author_id' => $userFrom->ID,
+            'body' => $body,
+            'created_at' => Carbon::now(),
+        ]);
+        $message->save();
+
+        $thread->num_messages++;
+        $thread->last_message_id = $message->id;
+        $thread->save();
+
+        MessageCreated::dispatch($message);
+    }
+
+    public static function updateUnreadMessageCount(User $user): void
+    {
+        $totalUnread = MessageThreadParticipant::where('user_id', $user->id)
+            ->whereNull('deleted_at')
+            ->sum('num_unread');
+
+        $user->UnreadMessageCount = $totalUnread;
+        $user->save();
+    }
+
+    public static function markRead(MessageThread $thread, User $user): void
+    {
+        $participant = MessageThreadParticipant::where('user_id', $user->id)
+            ->where('thread_id', $thread->id)
+            ->whereNull('deleted_at')
+            ->first();
+
+        if ($participant) {
+            MessageThreadsController::markParticipantRead($participant, $user);
+        }
+    }
+
+    private static function markParticipantRead(MessageThreadParticipant $participant, User $user): void
+    {
+        if ($participant->num_unread) {
+            $participant->num_unread = 0;
+            $participant->save();
+
+            MessageThreadsController::updateUnreadMessageCount($user);
+        }
+    }
+
+    public static function deleteThread(MessageThread $thread, User $user): void
+    {
+        $participant = MessageThreadParticipant::where('thread_id', $thread->id)
+            ->where('user_id', $user->id)
+            ->first();
+
+        if ($participant) {
+            $participant->num_unread = 0;
+            $participant->deleted_at = Carbon::now();
+            $participant->save();
+
+            MessageThreadsController::updateUnreadMessageCount($user);
+
+            $hasOtherActiveParticipants = MessageThreadParticipant::where('thread_id', $thread->id)
+                ->where('user_id', '!=', $user->id)
+                ->whereNull('deleted_at')
+                ->exists();
+            if (!$hasOtherActiveParticipants) {
+                // this will also cascade delete the message_participants and messages
+                $thread->delete();
+            }
+        }
+    }
+}
diff --git a/app/Community/Controllers/UserMessageChainController.php b/app/Community/Controllers/UserMessageChainController.php
deleted file mode 100644
index 9cb10ea7e7..0000000000
--- a/app/Community/Controllers/UserMessageChainController.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Community\Controllers;
-
-use App\Community\Enums\TicketState;
-use App\Community\Enums\UserRelationship;
-use App\Community\Models\Ticket;
-use App\Community\Models\UserMessage;
-use App\Community\Models\UserMessageChain;
-use App\Community\Models\UserRelation;
-use App\Http\Controller;
-use App\Platform\Models\Game;
-use App\Platform\Models\PlayerGame;
-use App\Platform\Models\System;
-use App\Site\Enums\UserPreference;
-use App\Site\Models\User;
-use Illuminate\Contracts\View\View;
-use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\DB;
-
-class UserMessageChainController extends Controller
-{
-    public function __invoke(Request $request): View
-    {
-        $chainId = $request->route('chain');
-
-        $messageChain = UserMessageChain::firstWhere('id', $chainId);
-        if (!$messageChain) {
-            abort(404);
-        }
-
-        $user = $request->user();
-        if ($messageChain->sender_id != $user->id && $messageChain->recipient_id != $user->id) {
-            abort(404);
-        }
-
-        $pageSize = 20;
-        $currentPage = (int) $request->input('page.number') ?? 1;
-        if ($currentPage < 1) {
-            $currentPage = 1;
-        }
-        $totalPages = (int) (($messageChain->num_messages + 19) / 20);
-
-        if ($currentPage == $totalPages) {
-            // if viewing last page, mark all messages in the chain as read
-            UserMessageChainController::markRead($messageChain, $user);
-        }
-
-        $messages = UserMessage::where('chain_id', $chainId)
-            ->offset(($currentPage - 1) * $pageSize)
-            ->limit($pageSize)
-            ->get();
-
-        return view('community.components.message.view-chain-page', [
-            'messageChain' => $messageChain,
-            'messages' => $messages,
-            'totalPages' => $totalPages,
-            'currentPage' => $currentPage,
-        ]);
-    }
-
-    public function pageCreate(Request $request): View
-    {
-        $toUser = $request->input('to') ?? '';
-        $subject = $request->input('subject') ?? '';
-        $message = $request->input('message') ?? '';
-
-        return view('community.components.message.new-chain-page', [
-            'toUser' => $toUser,
-            'subject' => $subject,
-            'message' => $message,
-        ]);
-    }
-
-    public static function newChain(User $userFrom, User $userTo, string $title, string $body): UserMessageChain
-    {
-        $userMessageChain = new UserMessageChain([
-            'title' => $title,
-            'sender_id' => $userFrom->ID,
-            'recipient_id' => $userTo->ID,
-        ]);
-
-        UserMessageChainController::addToChain($userMessageChain, $userFrom, $body);
-        return $userMessageChain;
-    }
-
-    public static function addToChain(UserMessageChain $userMessageChain, User $userFrom, string $body): void
-    {
-        $now = Carbon::now();
-
-        $userMessageChain->num_messages++;
-        if ($userMessageChain->recipient_id == $userFrom->ID) {
-            $userMessageChain->recipient_last_post_at = $now;
-
-            $relationship = UserRelation::getRelationship($userMessageChain->sender->User, $userFrom->User);
-            if ($relationship == UserRelationship::Blocked) {
-                $userMessageChain->sender_num_unread = 0;
-                $userMessageChain->sender_deleted_at = $now;
-            } else {
-                $userMessageChain->sender_num_unread++;
-                $userMessageChain->sender_deleted_at = null;
-            }
-
-            $userTo = User::firstWhere('id', $userMessageChain->sender_id);
-        } else {
-            $userMessageChain->sender_last_post_at = $now;
-
-            $relationship = UserRelation::getRelationship($userMessageChain->recipient->User, $userFrom->User);
-            if ($relationship == UserRelationship::Blocked) {
-                $userMessageChain->recipient_num_unread = 0;
-                $userMessageChain->recipient_deleted_at = $now;
-            } else {
-                $userMessageChain->recipient_num_unread++;
-                $userMessageChain->recipient_deleted_at = null;
-            }
-
-            $userTo = User::firstWhere('id', $userMessageChain->recipient_id);
-        }
-        $userMessageChain->save();
-        
-        $userMessage = new UserMessage([
-            'chain_id' => $userMessageChain->id,
-            'author_id' => $userFrom->ID,
-            'body' => $body,
-        ]);
-        $userMessage->save();
-        
-        UserMessageChainController::updateUnreadMessageCount($userTo);
-
-        // send email?
-        if (BitSet($userTo->websitePrefs, UserPreference::EmailOn_PrivateMessage) &&
-                $relationship != UserRelationship::Blocked) {
-            sendPrivateMessageEmail($userTo->User, $userTo->EmailAddress, $userMessageChain->title, $body, $userFrom->User);
-        }
-    }
-
-    private static function updateUnreadMessageCount(User $user): void
-    {
-        $unreadReplies = UserMessageChain::where('sender_id', $user->id)
-            ->whereNull('sender_deleted_at')
-            ->sum('sender_num_unread');
-
-        $unreadMessages = UserMessageChain::where('recipient_id', $user->id)
-            ->whereNull('recipient_deleted_at')
-            ->sum('recipient_num_unread');
-
-        $user->UnreadMessageCount = $unreadMessages + $unreadReplies;
-        $user->save();
-    }
-
-    public static function markRead(UserMessageChain $userMessageChain, User $user): void
-    {
-        if ($userMessageChain->recipient_id == $user->ID) {
-            if ($userMessageChain->recipient_num_unread) {
-                $userMessageChain->recipient_num_unread = 0;
-                $userMessageChain->save();
-
-                UserMessageChainController::updateUnreadMessageCount($user);
-            }
-        } else {
-            if ($userMessageChain->sender_num_unread) {
-                $userMessageChain->sender_num_unread = 0;
-                $userMessageChain->save();
-
-                UserMessageChainController::updateUnreadMessageCount($user);
-            }
-        }
-    }
-
-    public static function deleteChain(UserMessageChain $userMessageChain, User $user): void
-    {
-        $now = Carbon::now();
-
-        if ($userMessageChain->recipient_id == $user->ID) {
-            $userMessageChain->recipient_num_unread = 0;
-            $userMessageChain->recipient_deleted_at = $now;
-        } else {
-            $userMessageChain->sender_num_unread = 0;
-            $userMessageChain->sender_deleted_at = $now;
-        }
-      
-        if ($userMessageChain->recipient_deleted_at != null && $userMessageChain->sender_deleted_at != null) {
-            // this will also cascade delete the user_messages
-            $userMessageChain->delete();
-        } else {
-            $userMessageChain->save();
-        }
-
-        UserMessageChainController::updateUnreadMessageCount($user);
-    }
-}
diff --git a/app/Community/Controllers/UserMessagesController.php b/app/Community/Controllers/UserMessagesController.php
deleted file mode 100644
index 4075c0cfb5..0000000000
--- a/app/Community/Controllers/UserMessagesController.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Community\Controllers;
-
-use App\Community\Enums\TicketState;
-use App\Community\Models\Ticket;
-use App\Community\Models\UserMessage;
-use App\Community\Models\UserMessageChain;
-use App\Http\Controller;
-use App\Platform\Models\Game;
-use App\Platform\Models\PlayerGame;
-use App\Platform\Models\System;
-use App\Site\Models\User;
-use Illuminate\Contracts\View\View;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class UserMessagesController extends Controller
-{
-    public function __invoke(Request $request): View
-    {
-        $user = $request->user();
-
-        $respondedMessages = UserMessageChain::where('sender_id', $user->id)
-            ->whereNull('sender_deleted_at')
-            ->whereNotNull('recipient_last_post_at');
-
-        $receivedMessages = UserMessageChain::where('recipient_id', $user->id)
-            ->whereNull('recipient_deleted_at');
-
-        $messages = $respondedMessages->union($receivedMessages);
-        return $this->buildList($messages, $request, 'inbox');
-    }
-
-    private function buildList(Builder $messages, Request $request, string $mode): View
-    {
-        $totalMessages = $messages->count();
-
-        $pageSize = 20;
-        $currentPage = (int) $request->input('page.number') ?? 1;
-        if ($currentPage < 1) {
-            $currentPage = 1;
-        }
-        $totalPages = (int) (($totalMessages + 19) / 20);
-
-        $messages = $messages
-            ->orderBy(DB::raw(greatestStatement(['COALESCE(recipient_last_post_at,0)', 'sender_last_post_at'])), 'DESC')
-            ->offset(($currentPage - 1) * $pageSize)
-            ->limit($pageSize)
-            ->get();
-
-        return view('community.components.message.list-page', [
-            'messages' => $messages,
-            'totalPages' => $totalPages,
-            'currentPage' => $currentPage,
-            'unreadCount' => $request->user()->UnreadMessageCount,
-            'totalMessages' => $totalMessages,
-            'mode' => $mode,
-        ]);
-    }
-
-    public function pageOutbox(Request $request): View
-    {
-        $user = $request->user();
-
-        $respondedMessages = UserMessageChain::where('recipient_id', $user->id)
-            ->whereNull('recipient_deleted_at')
-            ->whereRaw('recipient_last_post_at > sender_last_post_at');
-
-        $sentMessages = UserMessageChain::where('sender_id', $user->id)
-            ->whereNull('sender_deleted_at')
-            ->where(function ($query){
-                $query->whereNull('recipient_last_post_at')
-                ->orWhereRaw('sender_last_post_at > recipient_last_post_at');
-            });
-
-        $messages = $respondedMessages->union($sentMessages);
-        return $this->buildList($messages, $request, 'outbox');
-    }
-}
diff --git a/app/Community/EventServiceProvider.php b/app/Community/EventServiceProvider.php
index 9dfaa9626c..7460012df0 100755
--- a/app/Community/EventServiceProvider.php
+++ b/app/Community/EventServiceProvider.php
@@ -4,6 +4,8 @@
 
 namespace App\Community;
 
+use App\Community\Events\MessageCreated;
+use App\Community\Listeners\NotifyMessageParticipants;
 use App\Community\Listeners\WriteUserActivity;
 use App\Platform\Events\AchievementSetBeaten;
 use App\Platform\Events\AchievementSetCompleted;
@@ -26,6 +28,14 @@ class EventServiceProvider extends ServiceProvider
             WriteUserActivity::class,
         ],
 
+        /*
+         * Community Events
+         */
+
+        MessageCreated::class => [
+            NotifyMessageParticipants::class,
+        ],
+
         /*
          * Platform Events - Account Listeners
          */
diff --git a/app/Community/Events/MessageCreated.php b/app/Community/Events/MessageCreated.php
new file mode 100644
index 0000000000..d4f60226e3
--- /dev/null
+++ b/app/Community/Events/MessageCreated.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Events;
+
+use App\Community\Models\Message;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class MessageCreated
+{
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
+
+    public function __construct(
+        public Message $message
+    ) {
+    }
+
+    public function broadcastOn(): PrivateChannel
+    {
+        return new PrivateChannel('channel-name');
+    }
+}
diff --git a/app/Community/Listeners/NotifyMessageParticipants.php b/app/Community/Listeners/NotifyMessageParticipants.php
new file mode 100644
index 0000000000..b5dde867f9
--- /dev/null
+++ b/app/Community/Listeners/NotifyMessageParticipants.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Listeners;
+
+use App\Community\Controllers\MessageThreadsController;
+use App\Community\Enums\UserRelationship;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
+use App\Community\Models\UserRelation;
+use App\Site\Enums\UserPreference;
+use App\Site\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class NotifyMessageParticipants
+{
+    public function handle(object $event): void
+    {
+        $message = $event->message;
+
+        $userFrom = User::firstWhere('ID', $message->author_id);
+        if (!$userFrom) {
+            return;
+        }
+
+        $thread = MessageThread::firstWhere('id', $message->thread_id);
+        if (!$thread) {
+            return;
+        }
+        $validParticipants = 0;
+        $participants = MessageThreadParticipant::withTrashed()->where('thread_id', $message->thread_id)->get();
+        foreach ($participants as $participant) {
+            if ($participant->user_id == $message->author_id) {
+                // don't notify the sender
+                continue;
+            }
+
+            $userTo = User::firstWhere('ID', $participant->user_id);
+            if (!$userTo) {
+                // ignore deleted users
+                continue;
+            }
+
+            $relationship = UserRelation::getRelationship($userTo->User, $userFrom->User);
+            if ($relationship == UserRelationship::Blocked) {
+                // ignore users who have blocked the sender
+                continue;
+            }
+
+            $validParticipants++;
+
+            // use direct update to avoid race condition
+            DB::statement("UPDATE message_thread_participants
+                           SET num_unread = num_unread + 1, deleted_at = NULL
+                           WHERE id = {$participant->id}");
+
+            MessageThreadsController::updateUnreadMessageCount($userTo);
+
+            // send email?
+            if (BitSet($userTo->websitePrefs, UserPreference::EmailOn_PrivateMessage)) {
+                sendPrivateMessageEmail($userTo->User, $userTo->EmailAddress, $thread->title, $message->body, $userFrom->User);
+            }
+        }
+    }
+}
diff --git a/app/Community/Models/Message.php b/app/Community/Models/Message.php
index 3193721748..bdd47943d0 100644
--- a/app/Community/Models/Message.php
+++ b/app/Community/Models/Message.php
@@ -6,34 +6,27 @@
 
 use App\Site\Models\User;
 use App\Support\Database\Eloquent\BaseModel;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Laravel\Scout\Searchable;
 
 class Message extends BaseModel
 {
-    use SoftDeletes;
     use Searchable;
 
-    // TODO rename Message table to messages
-    // TODO rename ID column to id
-    // TODO drop UserTo, migrate to recipient_id
-    // TODO drop UserFrom, migrate to sender_id
-    // TODO rename Title column to title
-    // TODO rename Payload column to body
-    // TODO rename TimeSent column to sent_at
-    // TODO drop Unread, migrate to read_at
-    // TODO drop Type
-    protected $table = 'Messages';
+    protected $table = 'messages';
 
-    protected $primaryKey = 'ID';
-
-    public const CREATED_AT = 'TimeSent';
+    public const CREATED_AT = 'created_at';
     public const UPDATED_AT = null;
 
+    protected $fillable = [
+        'thread_id',
+        'author_id',
+        'body',
+        'created_at',
+    ];
+
     protected $casts = [
-        'read_at' => 'datetime',
+        'created_at' => 'datetime',
     ];
 
     // == search
@@ -60,29 +53,12 @@ public function shouldBeSearchable(): bool
     // == relations
 
     /**
-     * @return BelongsTo<User, Message>
+     * @return BelongsTo<User, UserMessage>
      */
-    public function sender(): BelongsTo
+    public function author(): BelongsTo
     {
-        return $this->belongsTo(User::class, 'sender_id');
-    }
-
-    /**
-     * @return BelongsTo<User, Message>
-     */
-    public function recipient(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'recipient_id');
+        return $this->belongsTo(User::class, 'author_id');
     }
 
     // == scopes
-
-    /**
-     * @param Builder<Message> $query
-     * @return Builder<Message>
-     */
-    public function scopeUnread(Builder $query): Builder
-    {
-        return $query->whereNull('read_at');
-    }
 }
diff --git a/app/Community/Models/MessageThread.php b/app/Community/Models/MessageThread.php
new file mode 100644
index 0000000000..43e2a4e624
--- /dev/null
+++ b/app/Community/Models/MessageThread.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Models;
+
+use App\Support\Database\Eloquent\BaseModel;
+
+class MessageThread extends BaseModel
+{
+    protected $table = 'message_threads';
+
+    public const CREATED_AT = null;
+    public const UPDATED_AT = null;
+
+    protected $fillable = [
+        'title',
+    ];
+
+    // == accessors
+
+    // == mutators
+
+    // == relations
+
+    // == scopes
+}
diff --git a/app/Community/Models/MessageThreadParticipant.php b/app/Community/Models/MessageThreadParticipant.php
new file mode 100644
index 0000000000..377511108d
--- /dev/null
+++ b/app/Community/Models/MessageThreadParticipant.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Models;
+
+use App\Support\Database\Eloquent\BaseModel;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class MessageThreadParticipant extends BaseModel
+{
+    use SoftDeletes;
+
+    protected $table = 'message_thread_participants';
+
+    public const CREATED_AT = null;
+    public const UPDATED_AT = null;
+
+    protected $fillable = [
+        'user_id',
+        'thread_id',
+    ];
+
+    // == accessors
+
+    // == mutators
+
+    // == relations
+
+    // == scopes
+}
diff --git a/app/Community/Models/UserMessage.php b/app/Community/Models/UserMessage.php
deleted file mode 100644
index 53abf813fc..0000000000
--- a/app/Community/Models/UserMessage.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Community\Models;
-
-use App\Site\Models\User;
-use App\Support\Database\Eloquent\BaseModel;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Laravel\Scout\Searchable;
-
-class UserMessage extends BaseModel
-{
-    protected $table = 'user_messages';
-
-    public const CREATED_AT = 'created_at';
-    public const UPDATED_AT = null;
-
-    protected $fillable = [
-        'chain_id',
-        'author_id',
-        'body',
-        'created_at',
-    ];
-
-    protected $casts = [
-        'created_at' => 'datetime',
-    ];
-
-    // == accessors
-
-    // == mutators
-
-    // == relations
-
-    /**
-     * @return BelongsTo<User, UserMessage>
-     */
-    public function author(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'author_id');
-    }
-
-    // == scopes
-}
diff --git a/app/Community/Models/UserMessageChain.php b/app/Community/Models/UserMessageChain.php
deleted file mode 100644
index d9ca95932f..0000000000
--- a/app/Community/Models/UserMessageChain.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Community\Models;
-
-use App\Site\Models\User;
-use App\Support\Database\Eloquent\BaseModel;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Laravel\Scout\Searchable;
-
-class UserMessageChain extends BaseModel
-{
-    protected $table = 'user_message_chains';
-
-    public const CREATED_AT = null;
-    public const UPDATED_AT = null;
-
-    protected $fillable = [
-        'title',
-        'sender_id',
-        'recipient_id',
-    ];
-    
-    protected $casts = [
-        'sender_deleted_at' => 'datetime',
-        'recipient_deleted_at' => 'datetime',
-        'sender_last_post_at' => 'datetime',
-        'recipient_last_post_at' => 'datetime',
-    ];
-
-    // == accessors
-
-    // == mutators
-
-    // == relations
-
-    /**
-     * @return BelongsTo<User, UserMessageChain>
-     */
-    public function sender(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'sender_id');
-    }
-
-    /**
-     * @return BelongsTo<User, UserMessageChain>
-     */
-    public function recipient(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'recipient_id');
-    }
-
-    // == scopes
-}
diff --git a/app/Community/Models/UserRelation.php b/app/Community/Models/UserRelation.php
index 9a3b31c693..84ca29522d 100644
--- a/app/Community/Models/UserRelation.php
+++ b/app/Community/Models/UserRelation.php
@@ -33,6 +33,7 @@ public static function getRelationship(string $user, string $relatedUser): int
         $relation = UserRelation::where('User', $user)
             ->where('Friend', $relatedUser)
             ->first();
+
         return $relation ? $relation->Friendship : UserRelationship::NotFollowing;
     }
 
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index bcd3f27c26..0ada8a5c8e 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -5,8 +5,7 @@
 namespace App\Community;
 
 use App\Community\Controllers\ContactController;
-use App\Community\Controllers\UserMessageChainController;
-use App\Community\Controllers\UserMessagesController;
+use App\Community\Controllers\MessageThreadsController;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Route;
 
@@ -231,12 +230,11 @@ protected function mapWebRoutes(): void
                 //     // Route::get('history', [PlayerHistoryController::class, 'index'])->name('history.index');
 
                 /*
-                 * inbox
+                 * messages
                  */
-                Route::get('message/new', [UserMessageChainController::class, 'pageCreate'])->name('message.new');
-                Route::get('message/{chain}', UserMessageChainController::class)->name('message.view-chain');
-                Route::get('messages', UserMessagesController::class)->name('message.inbox');
-                Route::get('messages/outbox', [UserMessagesController::class, 'pageOutbox'])->name('message.outbox');
+                Route::get('message/new', [MessageThreadsController::class, 'pageCreate'])->name('message.new');
+                Route::get('message/{thread_id}', [MessageThreadsController::class, 'pageView'])->name('message.view');
+                Route::get('messages', [MessageThreadsController::class, 'pageList'])->name('message.list');
 
                 //     /*
                 //      * tickets
diff --git a/app/Helpers/database/ticket.php b/app/Helpers/database/ticket.php
index 6614b6bff8..67114cac6b 100644
--- a/app/Helpers/database/ticket.php
+++ b/app/Helpers/database/ticket.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Community\Controllers\UserMessageChainController;
+use App\Community\Controllers\MessageThreadsController;
 use App\Community\Enums\ArticleType;
 use App\Community\Enums\SubscriptionSubjectType;
 use App\Community\Enums\TicketFilters;
@@ -150,9 +150,8 @@ function _createTicket(User $user, int $achID, int $reportType, ?int $hardcore,
     $author = User::firstWhere('User', $achAuthor);
     if ($author) {
         $bugReportMessage = "Hi, $achAuthor!\r\n[user=$username] would like to report a bug with an achievement you've created:\r\n$bugReportDetails";
-        $chain = UserMessageChainController::newChain($user, $author, "Bug Report ($gameTitle)", $bugReportMessage);
-        UserMessageChainController::deleteChain($chain, $user); // don't put the message in the user's outbox unless the recipient replies
-        $chain->save();
+        MessageThreadsController::newThread($user, $author, "Bug Report ($gameTitle)",
+            $bugReportMessage, isProxied: true); // don't put the message in the user's message list unless the recipient replies
     }
 
     // notify subscribers other than the achievement's author
diff --git a/app/Helpers/database/user-auth.php b/app/Helpers/database/user-auth.php
index 37d4dc07d2..7176d6ff73 100644
--- a/app/Helpers/database/user-auth.php
+++ b/app/Helpers/database/user-auth.php
@@ -85,7 +85,7 @@ function authenticateForConnect(?string $username, ?string $pass = null, ?string
         'Token' => $user->appToken,
         'Score' => $user->RAPoints,
         'SoftcoreScore' => $user->RASoftcorePoints,
-        'Messages' => $user->UnreadMessageCount,
+        'Messages' => $user->UnreadMessageCount ?? 0,
         'Permissions' => $permissions,
         'AccountType' => Permissions::toString($permissions),
     ];
diff --git a/app/Helpers/util/mail.php b/app/Helpers/util/mail.php
index 7df03f40db..0a994f0c1b 100644
--- a/app/Helpers/util/mail.php
+++ b/app/Helpers/util/mail.php
@@ -363,7 +363,7 @@ function SendPrivateMessageEmail(
 
     // Also used for Generic text:
     $emailTitle = "New Private Message from $fromUser";
-    $link = "<a href='" . route('message.inbox') . "'>here</a>";
+    $link = "<a href='" . route('message.list') . "'>here</a>";
 
     $msg = "Hello $user!<br>" .
         "You have received a new private message from $fromUser.<br><br>" .
diff --git a/app/Site/Components/NotificationIcon.php b/app/Site/Components/NotificationIcon.php
index 42f8be04a3..e97a7dde22 100644
--- a/app/Site/Components/NotificationIcon.php
+++ b/app/Site/Components/NotificationIcon.php
@@ -24,7 +24,7 @@ public function render(): View
 
         if ($user->unread_messages_count) {
             $notifications->push([
-                'link' => route('message.inbox'),
+                'link' => route('message.list'),
                 'title' => $user->unread_messages_count . ' ' . __res('message', (int) $user->unread_messages_count),
             ]);
         }
diff --git a/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php b/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
deleted file mode 100644
index 4f59d23729..0000000000
--- a/database/migrations/platform/2023_11_22_000000_create_user_message_chains_table.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class() extends Migration {
-    public function up(): void
-    {
-        Schema::create('user_message_chains', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('title');
-            $table->unsignedBigInteger('sender_id')->nullable();
-            $table->unsignedBigInteger('recipient_id')->nullable();
-            $table->integer('num_messages')->default(0);
-            $table->integer('sender_num_unread')->default(0);
-            $table->integer('recipient_num_unread')->default(0);
-            $table->timestampTz('sender_last_post_at')->nullable();
-            $table->timestampTz('recipient_last_post_at')->nullable();
-            $table->timestampTz('sender_deleted_at')->nullable();
-            $table->timestampTz('recipient_deleted_at')->nullable();
-
-            $table->index('sender_id');
-            $table->index('recipient_id');
-
-            $table->foreign('sender_id')->references('ID')->on('UserAccounts')->onDelete('set null');
-            $table->foreign('recipient_id')->references('ID')->on('UserAccounts')->onDelete('set null');
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::dropIfExists('user_message_chains');
-    }
-};
diff --git a/database/migrations/platform/2023_11_22_000001_create_user_messages_table.php b/database/migrations/platform/2023_11_22_000001_create_user_messages_table.php
deleted file mode 100644
index f834440a68..0000000000
--- a/database/migrations/platform/2023_11_22_000001_create_user_messages_table.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class() extends Migration {
-    public function up(): void
-    {
-        Schema::create('user_messages', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->unsignedBigInteger('chain_id');
-            $table->unsignedBigInteger('author_id');
-            $table->text('body');
-            $table->timestampTz('created_at')->useCurrent();
-
-            $table->index('chain_id');
-
-            $table->foreign('chain_id')->references('ID')->on('user_message_chains')->onDelete('cascade');
-            $table->foreign('author_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
-        });
-
-        Schema::table('Messages', function (Blueprint $table) {
-            $table->unsignedBigInteger('migrated_id')->nullable();
-        });
-    }
-
-    public function down(): void
-    {
-        Schema::table('Messages', function (Blueprint $table) {
-            $table->dropColumn('migrated_id');
-        });
-
-        Schema::dropIfExists('user_messages');
-    }
-};
diff --git a/database/migrations/platform/2023_11_25_000000_create_message_threads_table.php b/database/migrations/platform/2023_11_25_000000_create_message_threads_table.php
new file mode 100644
index 0000000000..fa3b255121
--- /dev/null
+++ b/database/migrations/platform/2023_11_25_000000_create_message_threads_table.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::create('message_threads', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('title');
+            $table->integer('num_messages')->default(0);
+            $table->unsignedBigInteger('last_message_id')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('message_threads');
+    }
+};
diff --git a/database/migrations/platform/2023_11_25_000001_create_message_thread_participants.php b/database/migrations/platform/2023_11_25_000001_create_message_thread_participants.php
new file mode 100644
index 0000000000..56c2d26b3b
--- /dev/null
+++ b/database/migrations/platform/2023_11_25_000001_create_message_thread_participants.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::create('message_thread_participants', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('thread_id');
+            $table->unsignedBigInteger('user_id');
+            $table->integer('num_unread')->default(0);
+            $table->timestampTz('deleted_at')->nullable();
+
+            $table->foreign('user_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
+            $table->foreign('thread_id')->references('ID')->on('message_threads')->onDelete('cascade');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('message_thread_participants');
+    }
+};
diff --git a/database/migrations/platform/2023_11_25_000002_update_messages_table.php b/database/migrations/platform/2023_11_25_000002_update_messages_table.php
new file mode 100644
index 0000000000..626203f674
--- /dev/null
+++ b/database/migrations/platform/2023_11_25_000002_update_messages_table.php
@@ -0,0 +1,117 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Community\Models\Message;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        if (DB::connection()->getDriverName() === 'sqlite') {
+            // just recreate the table for the unit tests
+            Schema::dropIfExists('Messages');
+
+            Schema::create('messages', function (Blueprint $table) {
+                $table->bigIncrements('id');
+                $table->unsignedBigInteger('thread_id');
+                $table->unsignedBigInteger('author_id');
+                $table->text('body')->nullable();
+                $table->timestampTz('created_at')->nullable();
+
+                $table->foreign('author_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
+                $table->foreign('thread_id')->references('ID')->on('message_threads')->onDelete('cascade');
+            });
+
+            return;
+        }
+
+        Schema::table('Messages', function (Blueprint $table) {
+            $table->dropForeign('messages_recipient_id_foreign');
+            $table->dropForeign('messages_sender_id_foreign');
+
+            $table->dropColumn(['recipient_id',
+                                'sender_id',
+                                'read_at',
+                                'Type',
+                                'recipient_deleted_at',
+                                'sender_deleted_at',
+                                'deleted_at']);
+
+            $table->unsignedBigInteger('thread_id')->after('ID');
+            $table->unsignedBigInteger('author_id')->after('thread_id');
+
+            $table->renameColumn('Payload', 'body');
+            $table->renameColumn('TimeSent', 'created_at');
+            $table->renameColumn('ID', 'id');
+        });
+
+        // populate author_id so we can add a foreign key
+        DB::statement("UPDATE Messages m SET m.author_id = (SELECT u.ID FROM UserAccounts u WHERE u.User = m.UserFrom)");
+
+        // delete records associated to non-existant users
+        DB::statement("DELETE FROM Messages WHERE author_id=0");
+
+        // add the foreign key
+        Schema::table('Messages', function (Blueprint $table) {
+            $table->foreign('author_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
+        });
+
+        Schema::rename('Messages', 'messages_');
+        Schema::rename('messages_', 'messages');
+
+        // cannot add the thread_id foreign key if there are any un-sync'd
+        // records. the `ra:sync:messages` command will add it when it's done.
+        $unsyncedCount = Message::where('thread_id', 0)->count();
+        if ($unsyncedCount == 0) {
+            Schema::table('messages', function (Blueprint $table) {
+                $table->foreign('thread_id')->references('ID')->on('message_threads')->onDelete('cascade');
+            });
+        }
+    }
+
+    public function down(): void
+    {
+        Schema::rename('messages', 'messages_');
+        Schema::rename('messages_', 'Messages');
+
+        Schema::table('Messages', function (Blueprint $table) {
+            $sm = Schema::getConnection()->getDoctrineSchemaManager();
+            $foreignKeysFound = $sm->listTableForeignKeys('Messages');
+
+            foreach ($foreignKeysFound as $foreignKey) {
+                if ($foreignKey->getName() == 'messages_thread_id_foreign'
+                    || $foreignKey->getName() == 'messages_author_id_foreign') {
+                    $table->dropForeign($foreignKey->getName());
+                }
+            }
+
+            $table->dropColumn('thread_id');
+            $table->dropColumn('author_id');
+
+            $table->renameColumn('body', 'Payload');
+            $table->renameColumn('created_at', 'TimeSent');
+
+            $table->renameColumn('id', 'ID');
+
+            $table->unsignedBigInteger('recipient_id')->nullable()->after('ID');
+            $table->unsignedBigInteger('sender_id')->nullable()->after('recipient_id');
+
+            $table->timestampTz('read_at')->nullable()->before('Unread');
+
+            $table->unsignedInteger('Type')->nullable()->after('Unread');
+
+            $table->timestamp('recipient_deleted_at')->nullable();
+            $table->timestamp('sender_deleted_at')->nullable();
+
+            $table->softDeletesTz();
+
+            $table->index('read_at');
+
+            $table->foreign('recipient_id', 'messages_recipient_id_foreign')->references('ID')->on('UserAccounts')->onDelete('set null');
+            $table->foreign('sender_id', 'messages_sender_id_foreign')->references('ID')->on('UserAccounts')->onDelete('set null');
+        });
+    }
+};
diff --git a/public/managehashes.php b/public/managehashes.php
index 6483ab0004..a79be99df7 100644
--- a/public/managehashes.php
+++ b/public/managehashes.php
@@ -113,7 +113,7 @@ function UnlinkHash(user, gameID, hash, elem) {
     }
     echo "</div>";
 
-    echo "<br><div class='text-danger'><b>Warning:</b> PLEASE be careful with this tool. If in doubt, <a href='" . route('message.new') . "?to=RAdmin&subject=Attempt+to+Unlink+" . urlencode($gameTitle) ."&message=%5Bgame=$gameID%5D'>leave a message for admins</a> and they'll help sort it.</div>";
+    echo "<br><div class='text-danger'><b>Warning:</b> PLEASE be careful with this tool. If in doubt, <a href='" . route('message.new') . "?to=RAdmin&subject=Attempt+to+Unlink+" . urlencode($gameTitle) . "&message=%5Bgame=$gameID%5D'>leave a message for admins</a> and they'll help sort it.</div>";
 
     echo "<br/><div id='hashCount'>Currently this game has <b>$numLinks</b> unique hashes registered for it:</div>";
 
diff --git a/public/request/message/create.php b/public/request/message/create.php
index a5fc11b390..e78104d0dc 100644
--- a/public/request/message/create.php
+++ b/public/request/message/create.php
@@ -1,12 +1,11 @@
 <?php
 
-use App\Community\Controllers\UserMessageChainController;
-use App\Community\Models\UserMessage;
-use App\Community\Models\UserMessageChain;
+use App\Community\Controllers\MessageThreadsController;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
 use App\Site\Enums\Permissions;
 use App\Site\Models\User;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Validator;
 
 if (!authenticateFromCookie($user, $permissions, $userDetail) || $permissions < Permissions::Registered) {
@@ -17,24 +16,26 @@
 $user = request()->user();
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'chain' => 'nullable|integer',
+    'thread_id' => 'nullable|integer',
     'body' => 'required|string|max:60000',
-    'title' => 'required_without:chain|string|max:255',
-    'recipient' => 'required_without:chain|exists:UserAccounts,User',
+    'title' => 'required_without:thread_id|string|max:255',
+    'recipient' => 'required_without:thread_id|exists:UserAccounts,User',
 ]);
 
-if (array_key_exists('chain', $input) && $input['chain'] != null) {
-    $userMessageChain = UserMessageChain::firstWhere('id', $input['chain']);
-    if (!$userMessageChain) {
+if (array_key_exists('thread_id', $input) && $input['thread_id'] != null) {
+    $thread = MessageThread::firstWhere('id', $input['thread_id']);
+    if (!$thread) {
         return back()->withErrors(__('legacy.error.error'));
     }
-    if ($userMessageChain->recipient_id != $user->ID && $userMessageChain->sender_id != $user->ID) {
+    $participant = MessageThreadParticipant::where('thread_id', $input['thread_id'])
+        ->where('user_id', $user->ID);
+    if (!$participant->exists()) {
         return back()->withErrors(__('legacy.error.error'));
     }
-    UserMessageChainController::addToChain($userMessageChain, $user, $input['body']);
-    return redirect(route("message.view-chain", $userMessageChain->id));
+    MessageThreadsController::addToThread($thread, $user, $input['body']);
+} else {
+    $recipient = User::firstWhere('User', $input['recipient']);
+    $thread = MessageThreadsController::newThread($user, $recipient, $input['title'], $input['body']);
 }
 
-$recipient = User::firstWhere('User', $input['recipient']);
-$userMessageChain = UserMessageChainController::newChain($user, $recipient, $input['title'], $input['body']);
-return redirect(route("message.outbox"))->with('success', __('legacy.success.message_send'));
+return redirect(route("message.view", $thread->id))->with('success', __('legacy.success.message_send'));
diff --git a/public/request/message/delete.php b/public/request/message/delete.php
index cf3a262da9..892905847d 100644
--- a/public/request/message/delete.php
+++ b/public/request/message/delete.php
@@ -1,7 +1,8 @@
 <?php
 
-use App\Community\Controllers\UserMessageChainController;
-use App\Community\Models\UserMessageChain;
+use App\Community\Controllers\MessageThreadsController;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 
@@ -10,20 +11,25 @@
 }
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'chain' => 'required|integer|exists:user_message_chains,id',
+    'thread_id' => 'required|integer|exists:message_threads,id',
 ]);
 
+$thread = MessageThread::firstWhere('id', $input['thread_id']);
+if (!$thread) {
+    return back()->withErrors(__('legacy.error.error'));
+}
+
 /** @var User $user */
 $user = request()->user();
 
-$userMessageChain = UserMessageChain::firstWhere('id', $input['chain']);
-if (!$userMessageChain) {
-    return back()->withErrors(__('legacy.error.error'));
-}
-if ($userMessageChain->recipient_id != $user->ID && $userMessageChain->sender_id != $user->ID) {
+$participating = MessageThreadParticipant::where('thread_id', $input['thread_id'])
+    ->where('user_id', $user->ID)
+    ->exists();
+
+if (!$participating) {
     return back()->withErrors(__('legacy.error.error'));
 }
 
-UserMessageChainController::deleteChain($userMessageChain, $user);
+MessageThreadsController::deleteThread($thread, $user);
 
-response()->json(['message' => __('legacy.success.ok')]);
+return redirect(route("message.list"))->with('success', __('legacy.success.message_delete'));
diff --git a/resources/views/community/components/message/breadcrumbs.blade.php b/resources/views/community/components/message/breadcrumbs.blade.php
deleted file mode 100644
index e259aa5ea1..0000000000
--- a/resources/views/community/components/message/breadcrumbs.blade.php
+++ /dev/null
@@ -1,10 +0,0 @@
-@props([
-    'targetUsername' => '',
-    'currentPage' => '',
-])
-
-<div class='navpath'>
-    <a href='{{ route('message.inbox') }}'>Messages</a>
-    &raquo;
-    <span class="font-bold">{{ $currentPage }}</span>
-</div>
diff --git a/resources/views/community/components/message/icon.blade.php b/resources/views/community/components/message/icon.blade.php
index 84ff210c0f..79b8e6f3f1 100644
--- a/resources/views/community/components/message/icon.blade.php
+++ b/resources/views/community/components/message/icon.blade.php
@@ -1,5 +1,5 @@
 <div class="navitem {{ $class ?? '' }}">
-    <a class="nav-link" href="{{ route('message.inbox') }}" title="{{ __res('message') }}" data-toggle="tooltip">
+    <a class="nav-link" href="{{ route('message.list') }}" title="{{ __res('message') }}" data-toggle="tooltip">
         <x-fas-envelope />
         @if($count ?? 0)
             <div class="text-danger absolute translate-x-3 -translate-y-1 text-[8px]">
diff --git a/resources/views/community/components/message/list-page.blade.php b/resources/views/community/components/message/list-page.blade.php
index 674099772f..8fbdf2ecc6 100644
--- a/resources/views/community/components/message/list-page.blade.php
+++ b/resources/views/community/components/message/list-page.blade.php
@@ -4,7 +4,6 @@
     'totalPages' => 1,
     'unreadCount' => 0,
     'totalMessages' => 0,
-    'mode' => 'inbox',
 ])
 
 <?php
@@ -13,9 +12,6 @@
 use App\Site\Models\User;
 use Illuminate\Support\Carbon;
 
-$pageTitle = ($mode == 'outbox') ? 'Outbox' : 'Inbox';
-$toFromLabel = ($mode == 'outbox') ? 'To' : 'From';
-
 $user = request()->user();
 $isShowAbsoluteDatesPreferenceSet = BitSet($user->websitePrefs, UserPreference::Forum_ShowAbsoluteDates);
 $monthAgo = Carbon::now()->subMonth(1);
@@ -26,7 +22,7 @@
 function deleteMessage(id) {
     if (confirm('Are you sure you want to delete this message?')) {
         $.post('/request/message/delete.php', {
-            chain: id,
+            thread_id: id,
             user: "{{ $user->User }}"
         })
     }
@@ -34,34 +30,23 @@ function deleteMessage(id) {
 </script>
 
 <x-app-layout
-    pageTitle="{{ $pageTitle }}"
+    pageTitle="Messages"
     pageDescription="Messages involving {{ $user->User }}"
 >
-    <x-message.breadcrumbs currentPage="{{ $pageTitle }}" />
+    <x-user.breadcrumbs targetUsername="{{ $user->User }}" currentPage="Messages" />
 
     <div class="mt-3 w-full flex gap-x-3">
         {!! userAvatar($user->User, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
-        <h1 class="mt-[10px] w-full">{{ $user->User }}'s {{ $pageTitle }}</h1>
+        <h1 class="mt-[10px] w-full">{{ $user->User }}'s Messages</h1>
     </div>
 
     <div class='ml-2'>
-        @if ($mode == 'outbox')
-            You have {{ $totalMessages }} sent messages.
-        @else
-            You have {{ $unreadCount }} unread of {{ $totalMessages }} total messages.
-        @endif
+        You have {{ $unreadCount }} unread messages in {{ $totalMessages }} message threads.
     </div>
 
     <div class="w-full flex mt-2">
         <div class="mr-6">
-            @if ($mode == 'outbox')
-                <a href='{{ route('message.inbox') }}'><button class='btn'>Inbox</button></a>
-            @else
-                <a href='{{ route('message.outbox') }}'><button class='btn'>Outbox</button></a>
-            @endif
-        </div>
-        <div class="mr-6">
-            <a href='{{ route('message.new') }}'><button class='btn'>New Message</button></a>
+            <a href="{{ route('message.new') }}"><button class='btn'>New Message</button></a>
         </div>
         <div class="w-full flex justify-end">
             <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
@@ -71,58 +56,36 @@ function deleteMessage(id) {
     <div><table class='table-highlight mb-4'><tbody>
 
     <tr>
-        <th style='width:20%'>{{ $toFromLabel }}</th>
+        <th style='width:20%'>With</th>
         <th style='width:55%'>Title</th>
         <th style='width:10%' class='text-right'>Messages</th>
         <th style='width:15%' class='text-right'>Last Message</th>
     </tr>
     @foreach ($messages as $message)
-        <?php 
-            $mostRecentUpdate = Carbon::parse($message->sender_last_post_at);
-            if ($message->recipient_last_post_at) {
-                $mostRecentReply = Carbon::parse($message->recipient_last_post_at);
-                if ($mostRecentReply > $mostRecentUpdate) {
-                    $mostRecentUpdate = $mostRecentReply;
-                }
-            }
+        <?php
+            $mostRecentUpdate = Carbon::parse($message->last_message_at);
             $humanDate = $mostRecentUpdate->format('F j Y, g:ia');
 
-            $otherUser = ($user->id == $message->recipient_id) ?
-                User::withTrashed()->firstWhere('ID', $message->sender_id) :
-                User::withTrashed()->firstWhere('ID', $message->recipient_id);
-
-            $num_unread = 0;
-            if ($message->recipient_id == $user->id && $message->recipient_num_unread > 0) {
-                $num_unread = $message->recipient_num_unread;
-            } elseif ($message->sender_id == $user->id && $message->sender_num_unread > 0) {
-                $num_unread = $message->sender_num_unread;
-            }
+            $num_unread = $message->num_unread;
         ?>
         <tr>
             <td>
                 @if ($num_unread > 0)
                     <b>
                 @endif
-                {!! userAvatar($otherUser, iconSize: 24) !!}
+                @foreach ($message->other_participants as $participant)
+                    {!! userAvatar($participant, iconSize: 24) !!}
+                @endforeach
                 @if ($num_unread > 0)
                     </b>
                 @endif
             </td>
 
             <td>
-                <a href='{{ route('message.view-chain', $message->id) }}'>
+                <a href="{{ route('message.view', $message->id) }}">
                     @if ($num_unread > 0)
                         <b>
                     @endif
-                    @if ($mode == 'outbox')
-                        @if ($message->recipient_id == $user->id)
-                            RE:
-                        @endif
-                    @else
-                        @if ($message->sender_id == $user->id)
-                            RE:
-                        @endif
-                    @endif
                     {{ $message->title }}
                     @if ($num_unread > 0)
                         </b>
diff --git a/resources/views/community/components/message/new-chain-page.blade.php b/resources/views/community/components/message/new-thread-page.blade.php
similarity index 89%
rename from resources/views/community/components/message/new-chain-page.blade.php
rename to resources/views/community/components/message/new-thread-page.blade.php
index 79ccd61162..e51f3ba3de 100644
--- a/resources/views/community/components/message/new-chain-page.blade.php
+++ b/resources/views/community/components/message/new-thread-page.blade.php
@@ -8,7 +8,10 @@
     pageTitle="New Message"
     pageDescription="Create a new message"
 >
-    <x-message.breadcrumbs currentPage="New Message" />
+    <x-user.breadcrumbs targetUsername="{{ request()->user()->User }}"
+            parentPage="Messages"
+            parentPageUrl="{{ route('message.list') }}"
+            currentPage="New Message" />
 
     <div class="w-full flex gap-x-3">
         <h1 class="mt-[10px] w-full">New Message</h1>
diff --git a/resources/views/community/components/message/view-chain-page.blade.php b/resources/views/community/components/message/view-thread-page.blade.php
similarity index 51%
rename from resources/views/community/components/message/view-chain-page.blade.php
rename to resources/views/community/components/message/view-thread-page.blade.php
index 4c0a16a770..be426c6854 100644
--- a/resources/views/community/components/message/view-chain-page.blade.php
+++ b/resources/views/community/components/message/view-thread-page.blade.php
@@ -1,8 +1,10 @@
 @props([
-    'messageChain' => null,
+    'thread' => null,
     'messages' => [],
+    'participants' => [],
     'currentPage' => 1,
     'totalPages' => 1,
+    'canReply' => true,
 ])
 
 <?php
@@ -12,41 +14,53 @@
 use App\Support\Shortcode\Shortcode;
 use Illuminate\Support\Carbon;
 
-$userTo = User::withTrashed()->firstWhere('ID', $messageChain->recipient_id);
-$userFrom = User::withTrashed()->firstWhere('ID', $messageChain->sender_id);
-
+$user = request()->user();
 $isShowAbsoluteDatesPreferenceSet = BitSet(request()->user()->websitePrefs, UserPreference::Forum_ShowAbsoluteDates);
 $monthAgo = Carbon::now()->subMonth(1);
 
-?>
-
-<script>
-function deleteMessage() {
-    if (confirm('Are you sure you want to delete this message?')) {
-        $.post('/request/message/delete.php', {
-            chain: {{ $messageChain->id }},
-            user: "{{ request()->user()->User }}"
-        })
-            .done(function () {
-                window.location.href = "{{ route('message.inbox') }}";
-            })
+$participantModels = [];
+if (empty($participants)) {
+    foreach ($messages as $message) {
+        if (!array_key_exists($message->author_id, $participants)) {
+            $participantModel = User::withTrashed()->firstWhere('id', $message->author_id);
+            if ($participantModel) {
+                $participantModels[$message->author_id] = $participantModel;
+                $participants[$participantModel->ID] = $participantModel->User;
+            }
+        }
+    }
+} else {
+    foreach ($participants as $id => $participant) {
+        $participantModel = User::withTrashed()->firstWhere('id', $id);
+        if ($participantModel) {
+            $participantModels[$id] = $participantModel;
+        }
     }
 }
-</script>
+$pageDescription = "Conversation between " . implode(' and ', $participants);
+
+?>
 
 <x-app-layout
-    pageTitle="{{ $messageChain->title }}"
-    pageDescription="Conversation between {{ $userFrom->User }} and {{ $userTo->User }}"
+    pageTitle="{{ $thread->title }}"
+    pageDescription="{{ $pageDescription }}"
 >
-    <x-message.breadcrumbs currentPage="{!! $messageChain->title !!}" />
+    <x-user.breadcrumbs targetUsername="{{ $user->User }}"
+        parentPage="Messages"
+        parentPageUrl="{{ route('message.list') }}"
+        currentPage="{!! $thread->title !!}" />
 
     <div class="mt-3 w-full flex gap-x-3">
-        <h1 class="mt-[10px] w-full">{!! $messageChain->title !!}</h1>
+        <h1 class="mt-[10px] w-full">{!! $thread->title !!}</h1>
     </div>
-    
+
     <div class="w-full flex my-2">
         <div class="mr-6">
-            <button class='btn btn-danger' onclick='deleteMessage()'>Delete</button>
+            <form action='/request/message/delete.php' method='post'>
+            {{ csrf_field() }}
+            <input type="hidden" name="thread_id" value="{{ $thread->id }}" />
+            <button class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this message?')">Delete</button>
+            </form>
         </div>
         <div class="w-full flex justify-end">
             <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
@@ -55,10 +69,10 @@ function deleteMessage() {
 
     <div class="flex flex-col gap-y-1">
         @foreach ($messages as $message)
-            <div class="embedded">
+            <div class="embedded mb-2">
                 <div class="flex justify-between items-center">
                     <div>
-                    {!! userAvatar($message->author_id == $userTo->ID ? $userTo : $userFrom, iconSize: 16) !!}
+                    {!! userAvatar($participants[$message->author_id], iconSize: 24) !!}
                     <?php $humanDate = $message->created_at->format('F j Y, g:ia'); ?>
                     @if ($isShowAbsoluteDatesPreferenceSet)
                         <span class='smalldate'>{{ $humanDate }}</span>
@@ -69,18 +83,19 @@ function deleteMessage() {
                     @endif
                     </div>
                 </div>
+                <hr class="w-full border-embed-highlight my-2" />
 
                 <p class="comment text-overflow-wrap">{!! Shortcode::render($message->body) !!}</p>
             </div>
         @endforeach
     </div>
 
-    @if ($userFrom->trashed() || $userTo->trashed())
-        <div class="mt-4"><i>Cannot reply to deleted user.</i></div>
+    @if (!$canReply)
+        <div class="mt-2"><i>Cannot reply to deleted user.</i></div>
     @else
         <form action='/request/message/create.php' method='post' x-data='{ isValid: true }'>
             {{ csrf_field() }}
-            <input type='hidden' name='chain' value='{{ $messageChain->id }}' />
+            <input type='hidden' name='thread_id' value='{{ $thread->id }}' />
 
             <x-input.shortcode-textarea
                 name='body'
diff --git a/resources/views/community/components/user/breadcrumbs.blade.php b/resources/views/community/components/user/breadcrumbs.blade.php
index fe2429f147..29167cf648 100644
--- a/resources/views/community/components/user/breadcrumbs.blade.php
+++ b/resources/views/community/components/user/breadcrumbs.blade.php
@@ -1,5 +1,7 @@
 @props([
     'targetUsername' => '',
+    'parentPage' => '',
+    'parentPageUrl' => '',
     'currentPage' => '',
 ])
 
@@ -11,6 +13,10 @@
     @else
         <a href="{{ route('user.show', $targetUsername) }}">{{ $targetUsername }}</a>
         &raquo;
+        @if (!empty($parentPage))
+            <a href="{!! $parentPageUrl !!}">{{ $parentPage }}</a>
+            &raquo;
+        @endif
         <span class="font-bold">{{ $currentPage }}</span>
     @endif
 </div>
diff --git a/resources/views/components/menu/account.blade.php b/resources/views/components/menu/account.blade.php
index b43852eaa9..268e4e6a8b 100644
--- a/resources/views/components/menu/account.blade.php
+++ b/resources/views/components/menu/account.blade.php
@@ -85,7 +85,7 @@
         <x-dropdown-item :link="url('history.php')">History</x-dropdown-item>
         {{--<x-dropdown-item :link="route('follower.index')">{{ __res('follower') }}</x-dropdown-item>--}}
         <x-dropdown-item :link="url('friends.php')">Following</x-dropdown-item>
-        <x-dropdown-item :link="route('message.inbox')">{{ __('Inbox') }}</x-dropdown-item>
+        <x-dropdown-item :link="route('message.list')">{{ __('Messages') }}</x-dropdown-item>
         <div class="dropdown-divider"></div>
         <x-dropdown-item :link="url('reorderSiteAwards.php')">Reorder Site Awards</x-dropdown-item>
         {{--<x-dropdown-item :link="route('settings')">{{ __res('setting') }}</x-dropdown-item>--}}
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index e5cb432493..1f20b75a0c 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -4,23 +4,14 @@
 
 namespace Tests\Feature\Community;
 
-use App\Community\Controllers\UserMessageChainController;
-use App\Community\Enums\AwardType;
+use App\Community\Controllers\MessageThreadsController;
 use App\Community\Enums\UserRelationship;
-use App\Community\Models\UserMessage;
-use App\Community\Models\UserMessageChain;
+use App\Community\Models\Message;
 use App\Community\Models\UserRelation;
-use App\Platform\Enums\UnlockMode;
-use App\Platform\Models\Achievement;
-use App\Platform\Models\Game;
-use App\Platform\Models\PlayerBadge;
-use App\Platform\Models\System;
-use App\Site\Enums\Permissions;
 use App\Site\Enums\UserPreference;
 use App\Site\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Log;
 use Tests\Feature\Site\Concerns\TestsMail;
 use Tests\TestCase;
 
@@ -41,35 +32,48 @@ public function testCreateMessageChain(): void
 
         // user1 sends message to user2
         $this->captureEmails();
-        $chain = UserMessageChainController::newChain($user1, $user2, 'This is a message', 'This is the message body.');
-        $this->assertDatabaseHas('user_message_chains', [
+        $thread = MessageThreadsController::newThread($user1, $user2, 'This is a message', 'This is the message body.');
+        $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
             'num_messages' => 1,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 1,
-            'sender_last_post_at' => $now->toDateTimeString(),
-            'recipient_last_post_at' => null,
-            'sender_deleted_at' => null,
-            'recipient_deleted_at' => null,
-        ]);
-        $this->assertDatabaseHas('user_messages', [
+            'last_message_id' => 1,
+        ]);
+        $this->assertDatabaseHas('messages', [
             'id' => 1,
-            'chain_id' => 1,
+            'thread_id' => 1,
             'author_id' => $user1->ID,
             'body' => 'This is the message body.',
             'created_at' => $now->toDateTimeString(),
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 1,
+            'deleted_at' => null,
+        ]);
 
+        $user1->refresh();
+        $this->assertEquals(0, $user1->UnreadMessageCount);
         $user2->refresh();
         $this->assertEquals(1, $user2->UnreadMessageCount);
 
         $this->assertEmailSent($user2, "New Private Message from {$user1->User}");
 
         // user2 responds
-        UserMessageChainController::markRead($chain, $user2);
+        MessageThreadsController::markRead($thread, $user2);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
         $user2->refresh();
         $this->assertEquals(0, $user2->UnreadMessageCount);
 
@@ -77,27 +81,32 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now2);
 
         $this->captureEmails();
-        UserMessageChainController::addToChain($chain, $user2, 'This is a response.');
-        $this->assertDatabaseHas('user_message_chains', [
+        MessageThreadsController::addToThread($thread, $user2, 'This is a response.');
+        $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
             'num_messages' => 2,
-            'sender_num_unread' => 1,
-            'recipient_num_unread' => 0,
-            'sender_last_post_at' => $now->toDateTimeString(),
-            'recipient_last_post_at' => $now2->toDateTimeString(),
-            'sender_deleted_at' => null,
-            'recipient_deleted_at' => null,
-        ]);
-        $this->assertDatabaseHas('user_messages', [
+            'last_message_id' => 2,
+        ]);
+        $this->assertDatabaseHas('messages', [
             'id' => 2,
-            'chain_id' => 1,
+            'thread_id' => 1,
             'author_id' => $user2->ID,
             'body' => 'This is a response.',
             'created_at' => $now2->toDateTimeString(),
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 1,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
 
         $user1->refresh();
         $this->assertEquals(1, $user1->UnreadMessageCount);
@@ -109,27 +118,32 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now3);
 
         $this->captureEmails();
-        UserMessageChainController::addToChain($chain, $user2, 'This is another response.');
-        $this->assertDatabaseHas('user_message_chains', [
+        MessageThreadsController::addToThread($thread, $user2, 'This is another response.');
+        $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
             'num_messages' => 3,
-            'sender_num_unread' => 2,
-            'recipient_num_unread' => 0,
-            'sender_last_post_at' => $now->toDateTimeString(),
-            'recipient_last_post_at' => $now3->toDateTimeString(),
-            'sender_deleted_at' => null,
-            'recipient_deleted_at' => null,
-        ]);
-        $this->assertDatabaseHas('user_messages', [
+            'last_message_id' => 3,
+        ]);
+        $this->assertDatabaseHas('messages', [
             'id' => 3,
-            'chain_id' => 1,
+            'thread_id' => 1,
             'author_id' => $user2->ID,
             'body' => 'This is another response.',
             'created_at' => $now3,
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 2,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
 
         $user1->refresh();
         $this->assertEquals(2, $user1->UnreadMessageCount);
@@ -137,7 +151,7 @@ public function testCreateMessageChain(): void
         $this->assertEmailNotSent($user1);
 
         // user1 responds
-        UserMessageChainController::markRead($chain, $user1);
+        MessageThreadsController::markRead($thread, $user1);
         $user1->refresh();
         $this->assertEquals(0, $user1->UnreadMessageCount);
 
@@ -145,27 +159,32 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now4);
 
         $this->captureEmails();
-        UserMessageChainController::addToChain($chain, $user1, 'This is a third response.');
-        $this->assertDatabaseHas('user_message_chains', [
+        MessageThreadsController::addToThread($thread, $user1, 'This is a third response.');
+        $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
             'num_messages' => 4,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 1,
-            'sender_last_post_at' => $now4->toDateTimeString(),
-            'recipient_last_post_at' => $now3->toDateTimeString(),
-            'sender_deleted_at' => null,
-            'recipient_deleted_at' => null,
-        ]);
-        $this->assertDatabaseHas('user_messages', [
+            'last_message_id' => 4,
+        ]);
+        $this->assertDatabaseHas('messages', [
             'id' => 4,
-            'chain_id' => 1,
+            'thread_id' => 1,
             'author_id' => $user1->ID,
             'body' => 'This is a third response.',
             'created_at' => $now4->toDateTimeString(),
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 1,
+            'deleted_at' => null,
+        ]);
 
         $user2->refresh();
         $this->assertEquals(1, $user2->UnreadMessageCount);
@@ -177,19 +196,24 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now5);
 
         $this->captureEmails();
-        UserMessageChainController::deleteChain($chain, $user1);
-        $this->assertDatabaseHas('user_message_chains', [
+        MessageThreadsController::deleteThread($thread, $user1);
+        $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
             'num_messages' => 4,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 1,
-            'sender_last_post_at' => $now4->toDateTimeString(),
-            'recipient_last_post_at' => $now3->toDateTimeString(),
-            'sender_deleted_at' => $now5->toDateTimeString(),
-            'recipient_deleted_at' => null,
+            'last_message_id' => 4,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => $now5->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 1,
+            'deleted_at' => null,
         ]);
 
         $user2->refresh();
@@ -203,12 +227,14 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now6);
 
         $this->captureEmails();
-        UserMessageChainController::deleteChain($chain, $user2);
-        $this->assertDatabaseMissing('user_message_chains', ['id' => 1]);
-        $this->assertDatabaseMissing('user_messages', ['id' => 1]);
-        $this->assertDatabaseMissing('user_messages', ['id' => 2]);
-        $this->assertDatabaseMissing('user_messages', ['id' => 3]);
-        $this->assertDatabaseMissing('user_messages', ['id' => 4]);
+        MessageThreadsController::deleteThread($thread, $user2);
+        $this->assertDatabaseMissing('message_threads', ['id' => 1]);
+        $this->assertDatabaseMissing('messages', ['id' => 1]);
+        $this->assertDatabaseMissing('messages', ['id' => 2]);
+        $this->assertDatabaseMissing('messages', ['id' => 3]);
+        $this->assertDatabaseMissing('messages', ['id' => 4]);
+        $this->assertDatabaseMissing('message_thread_participants', ['id' => 1]);
+        $this->assertDatabaseMissing('message_thread_participants', ['id' => 2]);
 
         $user2->refresh();
         $this->assertEquals(0, $user2->UnreadMessageCount);
@@ -223,9 +249,9 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now);
 
         /** @var User $user1 */
-        $user1 = User::factory()->create();
+        $user1 = User::factory()->create(['websitePrefs' => (1 << UserPreference::EmailOn_PrivateMessage)]);
         /** @var User $user2 */
-        $user2 = User::factory()->create();
+        $user2 = User::factory()->create(['websitePrefs' => (1 << UserPreference::EmailOn_PrivateMessage)]);
 
         // user1 has user2 blocked
         $relation = new UserRelation([
@@ -236,147 +262,182 @@ public function testBlockedUser(): void
         $relation->save();
 
         // message from user2 is automatically marked as deleted by user1
-        $chain = UserMessageChainController::newChain($user2, $user1, 'This is a message', 'This is the message body.');
-        $this->assertDatabaseHas('user_message_chains', [
+        $this->captureEmails();
+        $thread = MessageThreadsController::newThread($user2, $user1, 'This is a message', 'This is the message body.');
+        $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
-            'sender_id' => $user2->ID,
-            'recipient_id' => $user1->ID,
             'num_messages' => 1,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 0,
-            'sender_last_post_at' => $now->toDateTimeString(),
-            'recipient_last_post_at' => null,
-            'sender_deleted_at' => null,
-            'recipient_deleted_at' => $now->toDateTimeString(),
-        ]);
-        $this->assertDatabaseHas('user_messages', [
+            'last_message_id' => 1,
+        ]);
+        $this->assertDatabaseHas('messages', [
             'id' => 1,
-            'chain_id' => 1,
+            'thread_id' => $thread->id,
             'author_id' => $user2->ID,
             'body' => 'This is the message body.',
             'created_at' => $now->toDateTimeString(),
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => $now->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user2->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
 
         $user1->refresh();
         $this->assertEquals(0, $user1->UnreadMessageCount);
+        $this->assertEmailNotSent($user1);
 
         // additional message from user2 is also marked as deleted by user1
         $now2 = $now->clone()->addMinutes(5);
         Carbon::setTestNow($now2);
 
-        UserMessageChainController::addToChain($chain, $user2, 'This is a response.');
+        $this->captureEmails();
+        MessageThreadsController::addToThread($thread, $user2, 'This is a response.');
 
-        $this->assertDatabaseHas('user_message_chains',[
+        $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
-            'sender_id' => $user2->ID,
-            'recipient_id' => $user1->ID,
             'num_messages' => 2,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 0,
-            'sender_last_post_at' => $now2->toDateTimeString(),
-            'recipient_last_post_at' => null,
-            'sender_deleted_at' => null,
-            'recipient_deleted_at' => $now2->toDateTimeString(),
-        ]);
-        $this->assertDatabaseHas('user_messages',  [
+            'last_message_id' => 2,
+        ]);
+        $this->assertDatabaseHas('messages', [
             'id' => 2,
-            'chain_id' => 1,
+            'thread_id' => $thread->id,
             'author_id' => $user2->ID,
             'body' => 'This is a response.',
             'created_at' => $now2->toDateTimeString(),
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => $now->toDateTimeString(), /* deleted timestamp not updated */
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user2->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
 
         $user1->refresh();
         $this->assertEquals(0, $user1->UnreadMessageCount);
+        $this->assertEmailNotSent($user1);
 
         // message from user1 is delivered to user2
         Carbon::setTestNow($now);
 
-        $chain = UserMessageChainController::newChain($user1, $user2, 'This is a message', 'This is the message body.');
-        $this->assertDatabaseHas('user_message_chains',[
+        $this->captureEmails();
+        $thread = MessageThreadsController::newThread($user1, $user2, 'This is a message', 'This is the message body.');
+        $this->assertDatabaseHas('message_threads', [
             'id' => 2,
             'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
             'num_messages' => 1,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 1,
-            'sender_last_post_at' => $now->toDateTimeString(),
-            'recipient_last_post_at' => null,
-            'sender_deleted_at' => null,
-            'recipient_deleted_at' => null,
-        ]);
-        $message = UserMessage::firstWhere('id', 1);
-        $this->assertDatabaseHas('user_messages',  [
+            'last_message_id' => 3,
+        ]);
+        $message = Message::firstWhere('id', 1);
+        $this->assertDatabaseHas('messages', [
             'id' => 3,
-            'chain_id' => 2,
+            'thread_id' => $thread->id,
             'author_id' => $user1->ID,
             'body' => 'This is the message body.',
             'created_at' => $now->toDateTimeString(),
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user2->ID,
+            'num_unread' => 1,
+            'deleted_at' => null,
+        ]);
 
         $user2->refresh();
         $this->assertEquals(1, $user2->UnreadMessageCount);
+        $this->assertEmailSent($user2, "New Private Message from {$user1->User}");
 
         // additional message from user1 is also delivered
         Carbon::setTestNow($now2);
 
-        UserMessageChainController::addToChain($chain, $user1, 'This is a response.');
+        $this->captureEmails();
+        MessageThreadsController::addToThread($thread, $user1, 'This is a response.');
 
-        $this->assertDatabaseHas('user_message_chains',[
+        $this->assertDatabaseHas('message_threads', [
             'id' => 2,
             'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
             'num_messages' => 2,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 2,
-            'sender_last_post_at' => $now2->toDateTimeString(),
-            'recipient_last_post_at' => null,
-            'sender_deleted_at' => null,
-            'recipient_deleted_at' => null,
-        ]);
-        $this->assertDatabaseHas('user_messages',  [
+            'last_message_id' => 4,
+        ]);
+        $this->assertDatabaseHas('messages', [
             'id' => 4,
-            'chain_id' => 2,
+            'thread_id' => $thread->id,
             'author_id' => $user1->ID,
             'body' => 'This is a response.',
             'created_at' => $now2->toDateTimeString(),
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user2->ID,
+            'num_unread' => 2,
+            'deleted_at' => null,
+        ]);
 
         $user2->refresh();
         $this->assertEquals(2, $user2->UnreadMessageCount);
+        $this->assertEmailSent($user2, "New Private Message from {$user1->User}");
 
-        // response from user2 is automatically deleted
+        // response from user2 is ignored (no unread counter or email, but not deleted)
         $now3 = $now2->clone()->addMinutes(5);
         Carbon::setTestNow($now3);
 
-        UserMessageChainController::addToChain($chain, $user2, 'This is another response.');
+        $this->captureEmails();
+        MessageThreadsController::addToThread($thread, $user2, 'This is another response.');
 
-        $this->assertDatabaseHas('user_message_chains',[
+        $this->assertDatabaseHas('message_threads', [
             'id' => 2,
             'title' => 'This is a message',
-            'sender_id' => $user1->ID,
-            'recipient_id' => $user2->ID,
             'num_messages' => 3,
-            'sender_num_unread' => 0,
-            'recipient_num_unread' => 2,
-            'sender_last_post_at' => $now2->toDateTimeString(),
-            'recipient_last_post_at' => $now3->toDateTimeString(),
-            'sender_deleted_at' => $now3->toDateTimeString(),
-            'recipient_deleted_at' => null,
-        ]);
-        $this->assertDatabaseHas('user_messages',  [
+            'last_message_id' => 5,
+        ]);
+        $this->assertDatabaseHas('messages', [
             'id' => 5,
-            'chain_id' => 2,
+            'thread_id' => $thread->id,
             'author_id' => $user2->ID,
             'body' => 'This is another response.',
             'created_at' => $now3->toDateTimeString(),
         ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => $thread->id,
+            'user_id' => $user2->ID,
+            'num_unread' => 2,
+            'deleted_at' => null,
+        ]);
 
         $user1->refresh();
         $this->assertEquals(0, $user1->UnreadMessageCount);
+        $this->assertEmailNotSent($user1);
     }
 }
diff --git a/tests/Feature/Site/Concerns/TestsMail.php b/tests/Feature/Site/Concerns/TestsMail.php
index 602f80e738..3b29d4415f 100644
--- a/tests/Feature/Site/Concerns/TestsMail.php
+++ b/tests/Feature/Site/Concerns/TestsMail.php
@@ -16,7 +16,7 @@ protected function captureEmails()
         $emails = Cache::store('array')->put('test:emails', []);
     }
 
-    protected function assertEmailSent(User $user, string $subject, string $body = null)
+    protected function assertEmailSent(User $user, string $subject, ?string $body = null)
     {
         $emails = Cache::store('array')->get('test:emails') ?? [];
         $matchUser = null;
@@ -53,7 +53,7 @@ protected function assertEmailSent(User $user, string $subject, string $body = n
         }
     }
 
-    protected function assertEmailNotSent(User $user, string $subject = null, string $body = null)
+    protected function assertEmailNotSent(User $user, ?string $subject = null, ?string $body = null)
     {
         $emails = Cache::store('array')->get('test:emails') ?? [];
         $matchUser = null;

From 3713e15f3adbee80ab350e1c1061e7c38a91e683 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Sun, 26 Nov 2023 20:33:14 -0700
Subject: [PATCH 18/47] phpstan

---
 app/Community/Commands/SyncMessages.php       |  2 +-
 .../Concerns/ActsAsCommunityMember.php        | 17 -------
 .../Controllers/MessageController.php         | 50 -------------------
 .../Controllers/MessageThreadsController.php  |  6 +--
 app/Community/Models/Message.php              |  2 +-
 app/Helpers/render/user.php                   | 30 +++++------
 ...023_11_25_000002_update_messages_table.php |  3 +-
 public/request/message/delete.php             |  1 +
 tests/Feature/Site/Concerns/TestsMail.php     |  6 +--
 9 files changed, 23 insertions(+), 94 deletions(-)
 delete mode 100644 app/Community/Controllers/MessageController.php

diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/SyncMessages.php
index ef6e713348..ba9fd17b7f 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/SyncMessages.php
@@ -74,7 +74,7 @@ public function handle(): void
                        WHERE mt.num_messages=1 AND mt.title LIKE 'Bug Report (%'");
     }
 
-    private function migrateMessage(Message $message)
+    private function migrateMessage(Message $message): void
     {
         // recipient can be entered by user. trim whitespace before trying to match
         $message->UserTo = trim($message->UserTo);
diff --git a/app/Community/Concerns/ActsAsCommunityMember.php b/app/Community/Concerns/ActsAsCommunityMember.php
index f279e19e29..27d3932506 100644
--- a/app/Community/Concerns/ActsAsCommunityMember.php
+++ b/app/Community/Concerns/ActsAsCommunityMember.php
@@ -4,7 +4,6 @@
 
 namespace App\Community\Concerns;
 
-use App\Community\Models\Message;
 use App\Community\Models\UserActivity;
 use App\Community\Models\UserComment;
 use App\Community\Models\UserGameListEntry;
@@ -73,22 +72,6 @@ public function comments(): MorphMany
         return $this->morphMany(UserComment::class, 'commentable')->with('user');
     }
 
-    /**
-     * @return HasMany<Message>
-     */
-    public function messages(): HasMany
-    {
-        return $this->hasMany(Message::class, 'recipient_id');
-    }
-
-    /**
-     * @return HasMany<Message>
-     */
-    public function unreadMessages(): HasMany
-    {
-        return $this->messages()->unread();
-    }
-
     public function getUnreadMessagesCountAttribute(): int
     {
         return (int) ($this->attributes['UnreadMessageCount'] ?? 0);
diff --git a/app/Community/Controllers/MessageController.php b/app/Community/Controllers/MessageController.php
deleted file mode 100644
index 853b6d5ac4..0000000000
--- a/app/Community/Controllers/MessageController.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Community\Controllers;
-
-use App\Community\Models\Message;
-use App\Http\Controller;
-use Illuminate\Contracts\View\View;
-use Illuminate\Http\Request;
-
-class MessageController extends Controller
-{
-    public function index(Request $request): View
-    {
-        $messages = Message::where('recipient_id', $request->user()->id)
-            ->orWhere('sender_id', $request->user()->id)
-            ->with(['sender', 'recipient'])
-            ->orderByDesc('sent_at')
-            ->paginate();
-
-        return view('message.index')
-            ->with('messages', $messages);
-    }
-
-    public function create(): View
-    {
-        return view('message.create');
-    }
-
-    public function store(Request $request): void
-    {
-    }
-
-    public function show(Message $message): void
-    {
-    }
-
-    public function edit(Message $message): void
-    {
-    }
-
-    public function update(Request $request, Message $message): void
-    {
-    }
-
-    public function destroy(Message $message): void
-    {
-    }
-}
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index 180a7181b1..4f60ca1ae7 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -29,7 +29,7 @@ public function pageList(Request $request): View
         $totalMessages = $messageThreads->count();
 
         $pageSize = 20;
-        $currentPage = (int) $request->input('page.number') ?? 1;
+        $currentPage = (int) ($request->input('page.number') ?? 1);
         if ($currentPage < 1) {
             $currentPage = 1;
         }
@@ -85,7 +85,7 @@ public function pageView(Request $request): View
         }
 
         $pageSize = 20;
-        $currentPage = (int) $request->input('page.number') ?? 1;
+        $currentPage = (int) ($request->input('page.number') ?? 1);
         if ($currentPage < 1) {
             $currentPage = 1;
         }
@@ -106,7 +106,7 @@ public function pageView(Request $request): View
             ->where('thread_id', $thread->id)
             ->join('UserAccounts', 'UserAccounts.ID', '=', 'message_thread_participants.user_id');
 
-        $canReply = with(clone $participants)
+        $canReply = (clone $participants)
             ->where('user_id', '!=', $user->ID)
             ->whereNull('UserAccounts.Deleted')
             ->exists();
diff --git a/app/Community/Models/Message.php b/app/Community/Models/Message.php
index bdd47943d0..43f5a3975a 100644
--- a/app/Community/Models/Message.php
+++ b/app/Community/Models/Message.php
@@ -53,7 +53,7 @@ public function shouldBeSearchable(): bool
     // == relations
 
     /**
-     * @return BelongsTo<User, UserMessage>
+     * @return BelongsTo<User, Message>
      */
     public function author(): BelongsTo
     {
diff --git a/app/Helpers/render/user.php b/app/Helpers/render/user.php
index 3b20ae4b5c..fed937498a 100644
--- a/app/Helpers/render/user.php
+++ b/app/Helpers/render/user.php
@@ -24,10 +24,6 @@ function userAvatar(
 
     if (is_string($user)) {
         $username = $user;
-        if (empty($username)) {
-            return '';
-        }
-
         $user = Cache::store('array')->remember(
             CacheKey::buildUserCardDataCacheKey($username),
             Carbon::now()->addMonths(3),
@@ -37,23 +33,23 @@ function () use ($username): ?array {
                 return $foundUser ? $foundUser->toArray() : null;
             }
         );
-    }
 
-    if (!$user) {
-        $userSanitized = $username;
-        sanitize_outputs($userSanitized);
+        if (!$user) {
+            $userSanitized = $username;
+            sanitize_outputs($userSanitized);
 
-        $iconLabel = '';
-        if ($icon !== false && ($icon || !$label)) {
-            $iconLabel = "<img loading='lazy' width='$iconSize' height='$iconSize' src='" . media_asset('/UserPic/_User.png') . "' title='$userSanitized' alt='$userSanitized' class='$iconClass'>";
-        }
+            $iconLabel = '';
+            if ($icon !== false && ($icon || !$label)) {
+                $iconLabel = "<img loading='lazy' width='$iconSize' height='$iconSize' src='" . media_asset('/UserPic/_User.png') . "' title='$userSanitized' alt='$userSanitized' class='$iconClass'>";
+            }
 
-        $usernameLabel = '';
-        if ($label !== false && ($label || !$icon)) {
-            $usernameLabel = "<del>$userSanitized</del>";
-        }
+            $usernameLabel = '';
+            if ($label !== false && ($label || !$icon)) {
+                $usernameLabel = "<del>$userSanitized</del>";
+            }
 
-        return "<span class='inline whitespace-nowrap'><span class='inline-block'>" . $iconLabel . $usernameLabel . "</span></span>";
+            return "<span class='inline whitespace-nowrap'><span class='inline-block'>" . $iconLabel . $usernameLabel . "</span></span>";
+        }
     }
 
     $username = $user['User'] ?? null;
diff --git a/database/migrations/platform/2023_11_25_000002_update_messages_table.php b/database/migrations/platform/2023_11_25_000002_update_messages_table.php
index 626203f674..368af0628f 100644
--- a/database/migrations/platform/2023_11_25_000002_update_messages_table.php
+++ b/database/migrations/platform/2023_11_25_000002_update_messages_table.php
@@ -99,9 +99,8 @@ public function down(): void
             $table->unsignedBigInteger('recipient_id')->nullable()->after('ID');
             $table->unsignedBigInteger('sender_id')->nullable()->after('recipient_id');
 
-            $table->timestampTz('read_at')->nullable()->before('Unread');
-
             $table->unsignedInteger('Type')->nullable()->after('Unread');
+            $table->timestampTz('read_at')->nullable()->after('Type');
 
             $table->timestamp('recipient_deleted_at')->nullable();
             $table->timestamp('sender_deleted_at')->nullable();
diff --git a/public/request/message/delete.php b/public/request/message/delete.php
index 892905847d..bc6c6e3f91 100644
--- a/public/request/message/delete.php
+++ b/public/request/message/delete.php
@@ -3,6 +3,7 @@
 use App\Community\Controllers\MessageThreadsController;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
+use App\Site\Models\User;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 
diff --git a/tests/Feature/Site/Concerns/TestsMail.php b/tests/Feature/Site/Concerns/TestsMail.php
index 3b29d4415f..628241caff 100644
--- a/tests/Feature/Site/Concerns/TestsMail.php
+++ b/tests/Feature/Site/Concerns/TestsMail.php
@@ -9,14 +9,14 @@
 
 trait TestsMail
 {
-    protected function captureEmails()
+    protected function captureEmails(): void
     {
         // store an empty array in the immediate cache to be populated by mail_utf8().
         // also, clears out the array between tests.
         $emails = Cache::store('array')->put('test:emails', []);
     }
 
-    protected function assertEmailSent(User $user, string $subject, ?string $body = null)
+    protected function assertEmailSent(User $user, string $subject, ?string $body = null): void
     {
         $emails = Cache::store('array')->get('test:emails') ?? [];
         $matchUser = null;
@@ -53,7 +53,7 @@ protected function assertEmailSent(User $user, string $subject, ?string $body =
         }
     }
 
-    protected function assertEmailNotSent(User $user, ?string $subject = null, ?string $body = null)
+    protected function assertEmailNotSent(User $user, ?string $subject = null, ?string $body = null): void
     {
         $emails = Cache::store('array')->get('test:emails') ?? [];
         $matchUser = null;

From fdb7dd173445830dc5a2ff7b7c403e9b00a61043 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Sun, 26 Nov 2023 20:53:09 -0700
Subject: [PATCH 19/47] rename table

---
 app/Site/Actions/ClearAccountDataAction.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Site/Actions/ClearAccountDataAction.php b/app/Site/Actions/ClearAccountDataAction.php
index fb45892f74..c51fbf8a46 100644
--- a/app/Site/Actions/ClearAccountDataAction.php
+++ b/app/Site/Actions/ClearAccountDataAction.php
@@ -39,8 +39,7 @@ public function execute(User $user): void
         // TODO $user->subscriptions()->delete();
         DB::statement('DELETE FROM Subscription WHERE UserID = :userId', ['userId' => $user->ID]);
 
-        DB::statement('UPDATE user_message_chains SET sender_deleted_at=NOW() WHERE sender_id = :userId', ['userId' => $user->ID]);
-        DB::statement('UPDATE user_message_chains SET recipient_deleted_at=NOW() WHERE recipient_id = :userId', ['userId' => $user->ID]);
+        DB::statement('UPDATE message_thread_participants SET deleted_at=NOW() WHERE user_id = :userId', ['userId' => $user->ID]);
 
         DB::statement("UPDATE UserAccounts u SET
             u.Password = null,

From 4e06d44759fa75e57e66e5909735264893aef42e Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Mon, 27 Nov 2023 19:47:05 -0700
Subject: [PATCH 20/47] address feedback

---
 .../components/message/list-page.blade.php    | 23 ++++---------------
 .../message/new-thread-page.blade.php         | 16 ++++---------
 .../message/view-thread-page.blade.php        | 12 +++++-----
 .../input/shortcode-textarea.blade.php        |  9 ++++----
 4 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/resources/views/community/components/message/list-page.blade.php b/resources/views/community/components/message/list-page.blade.php
index 8fbdf2ecc6..854b69267d 100644
--- a/resources/views/community/components/message/list-page.blade.php
+++ b/resources/views/community/components/message/list-page.blade.php
@@ -41,7 +41,8 @@ function deleteMessage(id) {
     </div>
 
     <div class='ml-2'>
-        You have {{ $unreadCount }} unread messages in {{ $totalMessages }} message threads.
+        You have {{ $unreadCount }} unread @choice('message|messages', $unreadCount)
+        in {{ $totalMessages }} @choice('message thread|message threads', $totalMessages).
     </div>
 
     <div class="w-full flex mt-2">
@@ -69,27 +70,15 @@ function deleteMessage(id) {
             $num_unread = $message->num_unread;
         ?>
         <tr>
-            <td>
-                @if ($num_unread > 0)
-                    <b>
-                @endif
+            <td @if ($num_unread > 0) class="font-bold" @endif>
                 @foreach ($message->other_participants as $participant)
                     {!! userAvatar($participant, iconSize: 24) !!}
                 @endforeach
-                @if ($num_unread > 0)
-                    </b>
-                @endif
             </td>
 
-            <td>
+            <td @if ($num_unread > 0) class="font-bold" @endif>
                 <a href="{{ route('message.view', $message->id) }}">
-                    @if ($num_unread > 0)
-                        <b>
-                    @endif
                     {{ $message->title }}
-                    @if ($num_unread > 0)
-                        </b>
-                    @endif
                 </a>
             </td>
 
@@ -104,9 +93,7 @@ function deleteMessage(id) {
             </td>
 
             <td class='text-right'>
-                @if ($isShowAbsoluteDatesPreferenceSet)
-                    <span class='smalldate'>{{ $humanDate }}</span>
-                @elseif ($mostRecentUpdate < $monthAgo)
+                @if ($isShowAbsoluteDatesPreferenceSet || $mostRecentUpdate < $monthAgo)
                     <span class='smalldate'>{{ $humanDate }}</span>
                 @else
                     <span class='smalldate cursor-help' title='{{ $humanDate }}'>{{ $mostRecentUpdate->diffForHumans() }}</span>
diff --git a/resources/views/community/components/message/new-thread-page.blade.php b/resources/views/community/components/message/new-thread-page.blade.php
index e51f3ba3de..5756ab6f63 100644
--- a/resources/views/community/components/message/new-thread-page.blade.php
+++ b/resources/views/community/components/message/new-thread-page.blade.php
@@ -23,14 +23,9 @@
             <tr>
                 <td><label for='recipient'>User:</label></td>
                 <td>
-                    <div class="w-full">
-                        <div style="float:right">
-                            <x-input.user-select-image for="recipient" :user="$toUser" size="48" />
-                        </div>
-                        <!-- TODO: why won't this field align properly? -->
-                        <div style='vertical-align:middle'>
-                            <x-input.user-select name="recipient" :user="$toUser" />
-                        </div>
+                    <div class="w-full flex justify-between items-center">
+                        <div><x-input.user-select name="recipient" :user="$toUser" /></div>
+                        <div><x-input.user-select-image for="recipient" :user="$toUser" size="48" /></div>
                     </div>
                 </td>
             </tr>
@@ -45,9 +40,8 @@
                 <td>
                     <x-input.shortcode-textarea
                         name='body'
-                        watermark='Enter your message here...'
-                        initialValue="{{ $message }}"
-                    />
+                        placeholder='Enter your message here...'
+                    >{{ $message }}</x-input.shortcode-textarea>
                 </td>
             </tr>
         </tbody></table></div>
diff --git a/resources/views/community/components/message/view-thread-page.blade.php b/resources/views/community/components/message/view-thread-page.blade.php
index be426c6854..a1aea00100 100644
--- a/resources/views/community/components/message/view-thread-page.blade.php
+++ b/resources/views/community/components/message/view-thread-page.blade.php
@@ -59,7 +59,7 @@
             <form action='/request/message/delete.php' method='post'>
             {{ csrf_field() }}
             <input type="hidden" name="thread_id" value="{{ $thread->id }}" />
-            <button class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this message?')">Delete</button>
+            <button class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this message thread?')">Delete</button>
             </form>
         </div>
         <div class="w-full flex justify-end">
@@ -74,9 +74,7 @@
                     <div>
                     {!! userAvatar($participants[$message->author_id], iconSize: 24) !!}
                     <?php $humanDate = $message->created_at->format('F j Y, g:ia'); ?>
-                    @if ($isShowAbsoluteDatesPreferenceSet)
-                        <span class='smalldate'>{{ $humanDate }}</span>
-                    @elseif ($message->created_at < $monthAgo)
+                    @if ($isShowAbsoluteDatesPreferenceSet || $message->created_at < $monthAgo)
                         <span class='smalldate'>{{ $humanDate }}</span>
                     @else
                         <span class='smalldate cursor-help' title='{{ $humanDate }}'>{{ $message->created_at->diffForHumans() }}</span>
@@ -90,8 +88,9 @@
         @endforeach
     </div>
 
+    <div class="mt-2">
     @if (!$canReply)
-        <div class="mt-2"><i>Cannot reply to deleted user.</i></div>
+        <i>Cannot reply to deleted user.</i>
     @else
         <form action='/request/message/create.php' method='post' x-data='{ isValid: true }'>
             {{ csrf_field() }}
@@ -99,10 +98,11 @@
 
             <x-input.shortcode-textarea
                 name='body'
-                watermark='Enter your message here...'
+                placholder='Enter your message here...'
             />
         </form>
     @endif
+    </div>
 
     <div class="w-full flex justify-end mt-2">
         <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
diff --git a/resources/views/components/input/shortcode-textarea.blade.php b/resources/views/components/input/shortcode-textarea.blade.php
index d67faa50c1..68a5ac89c2 100644
--- a/resources/views/components/input/shortcode-textarea.blade.php
+++ b/resources/views/components/input/shortcode-textarea.blade.php
@@ -1,9 +1,8 @@
 @props([
     'name' => 'body',
     'enabled' => true,
-    'watermark' => '',
+    'placeholder' => '',
     'maxLength' => 60000,
-    'initialValue' => '',
 ])
 
 <?php
@@ -15,7 +14,7 @@
 
 ?>
 
-<div class='mt-4'>
+<div>
     <div>
         {!! RenderShortcodeButtons(); !!}
     </div>
@@ -35,9 +34,9 @@ class="w-full mb-2"
         {!! $inputEnabled !!}
         maxlength="{{ $maxLength }}"
         name="{{ $name }}"
-        placeholder="{{ $watermark }}"
+        placeholder="{{ $placeholder }}"
         x-on:input="autoExpandTextInput($el); isValid = window.getStringByteCount($event.target.value) <= {{ $maxLength }};"
-    >{{ $initialValue }}</textarea>
+    >{{ $slot }}</textarea>
 
     <div class="flex justify-between mb-2">
         <span class="textarea-counter" data-textarea-id="commentTextarea">0 / 60000</span>

From e38f391cd3d8c48acdaf83868dc563a240d61b21 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 10:45:26 -0700
Subject: [PATCH 21/47] move author populating from migrate step to sync
 command

---
 app/Community/Commands/SyncMessages.php       | 37 +++++++++++++------
 ...023_11_25_000002_update_messages_table.php | 12 +-----
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/SyncMessages.php
index ba9fd17b7f..02cf07d5b6 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/SyncMessages.php
@@ -30,39 +30,51 @@ public function handle(): void
         $progressBar = $this->output->createProgressBar($count);
         $progressBar->start();
 
+        // populate author_id for all records
+        DB::statement("UPDATE messages m SET m.author_id = (SELECT u.ID FROM UserAccounts u WHERE u.User = m.UserFrom)");
+
+        // delete records associated to non-existant users
+        DB::statement("DELETE FROM messages WHERE author_id=0");
+
+        // process remaining unprocessed records (thread_id=0)
         // have to do this in batches to prevent exhausting memory
         // due to requesting payloads (message content)
-        for ($i = 0; $i < $count; $i += 100) {
-            $messages = Message::where('thread_id', 0)->orderBy('ID')->limit(100)->get();
+        Message::where('thread_id', 0)->orderBy('ID')->chunk(100, function($messages) use($progressBar) {
             /** @var Message $message */
             foreach ($messages as $message) {
                 $this->migrateMessage($message);
                 $progressBar->advance();
             }
-        }
-
-        $progressBar->finish();
-        $this->line(PHP_EOL);
+        });
 
         $count = Message::where('thread_id', 0)->count();
         if ($count == 0) {
-            // all messages sync'd. add the foreign key so deletes will cascade
+            // all messages sync'd. add the foreign keys so deletes will cascade
             $sm = Schema::getConnection()->getDoctrineSchemaManager();
             $foreignKeysFound = $sm->listTableForeignKeys('messages');
 
-            $found = false;
+            $foundThreadForeignKey = false;
+            $foundAuthorForeignKey = false;
             foreach ($foreignKeysFound as $foreignKey) {
                 if ($foreignKey->getName() == 'messages_thread_id_foreign') {
-                    $found = true;
-                    break;
+                    $foundThreadForeignKey = true;
+                }
+                elseif ($foreignKey->getName() == 'messages_author_id_foreign') {
+                    $foundAuthorForeignKey = true;
                 }
             }
 
-            if (!$found) {
+            if (!$foundThreadForeignKey) {
                 Schema::table('messages', function (Blueprint $table) {
                     $table->foreign('thread_id')->references('ID')->on('message_threads')->onDelete('cascade');
                 });
             }
+
+            if (!$foundAuthorForeignKey) {
+                Schema::table('messages', function (Blueprint $table) {
+                    $table->foreign('author_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
+                });
+            }
         }
 
         // automatically mark bug report notifications as deleted by the sender if
@@ -72,6 +84,9 @@ public function handle(): void
                        INNER JOIN messages m ON m.thread_id=mtp.thread_id AND m.author_id=mtp.user_id
                        SET mtp.deleted_at=NOW()
                        WHERE mt.num_messages=1 AND mt.title LIKE 'Bug Report (%'");
+
+        $progressBar->finish();
+        $this->line(PHP_EOL);
     }
 
     private function migrateMessage(Message $message): void
diff --git a/database/migrations/platform/2023_11_25_000002_update_messages_table.php b/database/migrations/platform/2023_11_25_000002_update_messages_table.php
index 368af0628f..bac71d02ad 100644
--- a/database/migrations/platform/2023_11_25_000002_update_messages_table.php
+++ b/database/migrations/platform/2023_11_25_000002_update_messages_table.php
@@ -48,17 +48,6 @@ public function up(): void
             $table->renameColumn('ID', 'id');
         });
 
-        // populate author_id so we can add a foreign key
-        DB::statement("UPDATE Messages m SET m.author_id = (SELECT u.ID FROM UserAccounts u WHERE u.User = m.UserFrom)");
-
-        // delete records associated to non-existant users
-        DB::statement("DELETE FROM Messages WHERE author_id=0");
-
-        // add the foreign key
-        Schema::table('Messages', function (Blueprint $table) {
-            $table->foreign('author_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
-        });
-
         Schema::rename('Messages', 'messages_');
         Schema::rename('messages_', 'messages');
 
@@ -68,6 +57,7 @@ public function up(): void
         if ($unsyncedCount == 0) {
             Schema::table('messages', function (Blueprint $table) {
                 $table->foreign('thread_id')->references('ID')->on('message_threads')->onDelete('cascade');
+                $table->foreign('author_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
             });
         }
     }

From c932cba3cdedb556c6db6e8523fe5aa004edccd1 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 10:48:01 -0700
Subject: [PATCH 22/47] rename NotifyMessageParticipants ->
 NotifyMessageThreadParticipants

---
 app/Community/EventServiceProvider.php                        | 4 ++--
 ...geParticipants.php => NotifyMessageThreadParticipants.php} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename app/Community/Listeners/{NotifyMessageParticipants.php => NotifyMessageThreadParticipants.php} (98%)

diff --git a/app/Community/EventServiceProvider.php b/app/Community/EventServiceProvider.php
index 7460012df0..314aedbe11 100755
--- a/app/Community/EventServiceProvider.php
+++ b/app/Community/EventServiceProvider.php
@@ -5,7 +5,7 @@
 namespace App\Community;
 
 use App\Community\Events\MessageCreated;
-use App\Community\Listeners\NotifyMessageParticipants;
+use App\Community\Listeners\NotifyMessageThreadParticipants;
 use App\Community\Listeners\WriteUserActivity;
 use App\Platform\Events\AchievementSetBeaten;
 use App\Platform\Events\AchievementSetCompleted;
@@ -33,7 +33,7 @@ class EventServiceProvider extends ServiceProvider
          */
 
         MessageCreated::class => [
-            NotifyMessageParticipants::class,
+            NotifyMessageThreadParticipants::class,
         ],
 
         /*
diff --git a/app/Community/Listeners/NotifyMessageParticipants.php b/app/Community/Listeners/NotifyMessageThreadParticipants.php
similarity index 98%
rename from app/Community/Listeners/NotifyMessageParticipants.php
rename to app/Community/Listeners/NotifyMessageThreadParticipants.php
index b5dde867f9..bdac7796d5 100644
--- a/app/Community/Listeners/NotifyMessageParticipants.php
+++ b/app/Community/Listeners/NotifyMessageThreadParticipants.php
@@ -13,7 +13,7 @@
 use App\Site\Models\User;
 use Illuminate\Support\Facades\DB;
 
-class NotifyMessageParticipants
+class NotifyMessageThreadParticipants
 {
     public function handle(object $event): void
     {

From bf668916936ebbdf6b1dd18d9a76ad699cc6e15f Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 10:52:53 -0700
Subject: [PATCH 23/47] elimininate redunant naming in models

---
 app/Community/Models/Message.php                  | 13 +++----------
 app/Community/Models/MessageThread.php            |  2 --
 app/Community/Models/MessageThreadParticipant.php |  2 --
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/Community/Models/Message.php b/app/Community/Models/Message.php
index 43f5a3975a..ceadcf1aba 100644
--- a/app/Community/Models/Message.php
+++ b/app/Community/Models/Message.php
@@ -13,9 +13,6 @@ class Message extends BaseModel
 {
     use Searchable;
 
-    protected $table = 'messages';
-
-    public const CREATED_AT = 'created_at';
     public const UPDATED_AT = null;
 
     protected $fillable = [
@@ -25,18 +22,14 @@ class Message extends BaseModel
         'created_at',
     ];
 
-    protected $casts = [
-        'created_at' => 'datetime',
-    ];
-
     // == search
 
     public function toSearchableArray(): array
     {
         return $this->only([
-            'ID',
-            'Title',
-            'Payload',
+            'id',
+            'title',
+            'body',
         ]);
     }
 
diff --git a/app/Community/Models/MessageThread.php b/app/Community/Models/MessageThread.php
index 43e2a4e624..6ceebfd0ef 100644
--- a/app/Community/Models/MessageThread.php
+++ b/app/Community/Models/MessageThread.php
@@ -8,8 +8,6 @@
 
 class MessageThread extends BaseModel
 {
-    protected $table = 'message_threads';
-
     public const CREATED_AT = null;
     public const UPDATED_AT = null;
 
diff --git a/app/Community/Models/MessageThreadParticipant.php b/app/Community/Models/MessageThreadParticipant.php
index 377511108d..6cb8318e2c 100644
--- a/app/Community/Models/MessageThreadParticipant.php
+++ b/app/Community/Models/MessageThreadParticipant.php
@@ -11,8 +11,6 @@ class MessageThreadParticipant extends BaseModel
 {
     use SoftDeletes;
 
-    protected $table = 'message_thread_participants';
-
     public const CREATED_AT = null;
     public const UPDATED_AT = null;
 

From f19f1d7a15e3da868781ad9e4e62f6d64754ae1d Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 11:28:09 -0700
Subject: [PATCH 24/47] add created/updated timestamps to threads and
 participants

---
 app/Community/Commands/SyncMessages.php                | 10 +++++++++-
 app/Community/Models/MessageThread.php                 |  5 ++---
 app/Community/Models/MessageThreadParticipant.php      |  5 ++---
 .../2023_11_25_000000_create_message_threads_table.php |  1 +
 ...11_25_000001_create_message_thread_participants.php |  3 ++-
 .../2023_11_25_000002_update_messages_table.php        |  2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/SyncMessages.php
index 02cf07d5b6..9518e86b1a 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/SyncMessages.php
@@ -82,7 +82,7 @@ public function handle(): void
         DB::statement("UPDATE message_thread_participants mtp
                        INNER JOIN message_threads mt ON mt.id=mtp.thread_id
                        INNER JOIN messages m ON m.thread_id=mtp.thread_id AND m.author_id=mtp.user_id
-                       SET mtp.deleted_at=NOW()
+                       SET mtp.deleted_at=mtp.updated_at
                        WHERE mt.num_messages=1 AND mt.title LIKE 'Bug Report (%'");
 
         $progressBar->finish();
@@ -115,12 +115,16 @@ private function migrateMessage(Message $message): void
         if ($thread === null) {
             $thread = new MessageThread([
                 'title' => $message->Title,
+                'created_at' => $message->created_at,
+                'updated_at' => $message->created_at,
             ]);
             $thread->save();
 
             $participantTo = new MessageThreadParticipant([
                 'user_id' => $userTo->ID,
                 'thread_id' => $thread->id,
+                'created_at' => $message->created_at,
+                'updated_at' => $message->created_at,
             ]);
             $participantTo->save();
 
@@ -128,6 +132,8 @@ private function migrateMessage(Message $message): void
                 $participantFrom = new MessageThreadParticipant([
                     'user_id' => $message->author_id,
                     'thread_id' => $thread->id,
+                    'created_at' => $message->created_at,
+                    'updated_at' => $message->created_at,
                 ]);
                 $participantFrom->save();
             }
@@ -143,6 +149,8 @@ private function migrateMessage(Message $message): void
 
         $thread->num_messages++;
         $thread->last_message_id = $message->id;
+        $thread->updated_at = $message->created_at;
+        $thread->timestamps = false;
         $thread->save();
 
         $message->thread_id = $thread->id;
diff --git a/app/Community/Models/MessageThread.php b/app/Community/Models/MessageThread.php
index 6ceebfd0ef..23035eb23e 100644
--- a/app/Community/Models/MessageThread.php
+++ b/app/Community/Models/MessageThread.php
@@ -8,11 +8,10 @@
 
 class MessageThread extends BaseModel
 {
-    public const CREATED_AT = null;
-    public const UPDATED_AT = null;
-
     protected $fillable = [
         'title',
+        'created_at',
+        'updated_at',
     ];
 
     // == accessors
diff --git a/app/Community/Models/MessageThreadParticipant.php b/app/Community/Models/MessageThreadParticipant.php
index 6cb8318e2c..eb1c00dbe5 100644
--- a/app/Community/Models/MessageThreadParticipant.php
+++ b/app/Community/Models/MessageThreadParticipant.php
@@ -11,12 +11,11 @@ class MessageThreadParticipant extends BaseModel
 {
     use SoftDeletes;
 
-    public const CREATED_AT = null;
-    public const UPDATED_AT = null;
-
     protected $fillable = [
         'user_id',
         'thread_id',
+        'created_at',
+        'updated_at',
     ];
 
     // == accessors
diff --git a/database/migrations/platform/2023_11_25_000000_create_message_threads_table.php b/database/migrations/platform/2023_11_25_000000_create_message_threads_table.php
index fa3b255121..0dabc6d35e 100644
--- a/database/migrations/platform/2023_11_25_000000_create_message_threads_table.php
+++ b/database/migrations/platform/2023_11_25_000000_create_message_threads_table.php
@@ -14,6 +14,7 @@ public function up(): void
             $table->string('title');
             $table->integer('num_messages')->default(0);
             $table->unsignedBigInteger('last_message_id')->nullable();
+            $table->timestampsTz();
         });
     }
 
diff --git a/database/migrations/platform/2023_11_25_000001_create_message_thread_participants.php b/database/migrations/platform/2023_11_25_000001_create_message_thread_participants.php
index 56c2d26b3b..58481071f5 100644
--- a/database/migrations/platform/2023_11_25_000001_create_message_thread_participants.php
+++ b/database/migrations/platform/2023_11_25_000001_create_message_thread_participants.php
@@ -14,7 +14,8 @@ public function up(): void
             $table->unsignedBigInteger('thread_id');
             $table->unsignedBigInteger('user_id');
             $table->integer('num_unread')->default(0);
-            $table->timestampTz('deleted_at')->nullable();
+            $table->timestampsTz();
+            $table->softDeletesTz();
 
             $table->foreign('user_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
             $table->foreign('thread_id')->references('ID')->on('message_threads')->onDelete('cascade');
diff --git a/database/migrations/platform/2023_11_25_000002_update_messages_table.php b/database/migrations/platform/2023_11_25_000002_update_messages_table.php
index bac71d02ad..837a700e18 100644
--- a/database/migrations/platform/2023_11_25_000002_update_messages_table.php
+++ b/database/migrations/platform/2023_11_25_000002_update_messages_table.php
@@ -19,7 +19,7 @@ public function up(): void
                 $table->unsignedBigInteger('thread_id');
                 $table->unsignedBigInteger('author_id');
                 $table->text('body')->nullable();
-                $table->timestampTz('created_at')->nullable();
+                $table->timestampsTz('created_at');
 
                 $table->foreign('author_id')->references('ID')->on('UserAccounts')->onDelete('cascade');
                 $table->foreign('thread_id')->references('ID')->on('message_threads')->onDelete('cascade');

From a7f31c5e5d13f979559a6724aca569873641696d Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 15:11:44 -0700
Subject: [PATCH 25/47] add isBlocking helper function to ActsAsCommunityMember

---
 app/Community/Concerns/ActsAsCommunityMember.php     | 12 ++++++++++++
 .../Controllers/MessageThreadsController.php         |  5 +----
 .../Listeners/NotifyMessageThreadParticipants.php    |  5 +----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Community/Concerns/ActsAsCommunityMember.php b/app/Community/Concerns/ActsAsCommunityMember.php
index 27d3932506..984b9ad96f 100644
--- a/app/Community/Concerns/ActsAsCommunityMember.php
+++ b/app/Community/Concerns/ActsAsCommunityMember.php
@@ -4,9 +4,11 @@
 
 namespace App\Community\Concerns;
 
+use App\Community\Enums\UserRelationship;
 use App\Community\Models\UserActivity;
 use App\Community\Models\UserComment;
 use App\Community\Models\UserGameListEntry;
+use App\Community\Models\UserRelation;
 use App\Site\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -64,6 +66,16 @@ public function followers(): BelongsToMany
         return $this->belongsToMany(User::class, 'Friends', 'related_user_id', 'user_id');
     }
 
+    public function isFollowing(string $username): bool
+    {
+        return UserRelation::getRelationship($this->User, $username) === UserRelationship::Following;
+    }
+
+    public function isBlocking(string $username): bool
+    {
+        return UserRelation::getRelationship($this->User, $username) === UserRelationship::Blocked;
+    }
+
     /**
      * @return MorphMany<UserComment>
      */
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index 4f60ca1ae7..9d4c198897 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -4,12 +4,10 @@
 
 namespace App\Community\Controllers;
 
-use App\Community\Enums\UserRelationship;
 use App\Community\Events\MessageCreated;
 use App\Community\Models\Message;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
-use App\Community\Models\UserRelation;
 use App\Http\Controller;
 use App\Site\Models\User;
 use Illuminate\Contracts\View\View;
@@ -165,8 +163,7 @@ public static function newThread(User $userFrom, User $userTo, string $title, st
             ]);
 
             // if the recipient has blocked the sender, immediately mark the thread as deleted for the recipient
-            $relationship = UserRelation::getRelationship($userTo->User, $userFrom->User);
-            if ($relationship == UserRelationship::Blocked) {
+            if ($userTo->isBlocking($userFrom->User)) {
                 $participantTo->deleted_at = Carbon::now();
             }
 
diff --git a/app/Community/Listeners/NotifyMessageThreadParticipants.php b/app/Community/Listeners/NotifyMessageThreadParticipants.php
index bdac7796d5..ecdd4311c1 100644
--- a/app/Community/Listeners/NotifyMessageThreadParticipants.php
+++ b/app/Community/Listeners/NotifyMessageThreadParticipants.php
@@ -5,10 +5,8 @@
 namespace App\Community\Listeners;
 
 use App\Community\Controllers\MessageThreadsController;
-use App\Community\Enums\UserRelationship;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
-use App\Community\Models\UserRelation;
 use App\Site\Enums\UserPreference;
 use App\Site\Models\User;
 use Illuminate\Support\Facades\DB;
@@ -42,8 +40,7 @@ public function handle(object $event): void
                 continue;
             }
 
-            $relationship = UserRelation::getRelationship($userTo->User, $userFrom->User);
-            if ($relationship == UserRelationship::Blocked) {
+            if ($userTo->isBlocking($userFrom->User)) {
                 // ignore users who have blocked the sender
                 continue;
             }

From 5e7514084291e83196346b429b29ddced2bdcb3f Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 15:50:20 -0700
Subject: [PATCH 26/47] migrate deleteThread to action

---
 .../Actions/DeleteMessageThreadAction.php     | 38 +++++++++++++++++++
 .../UpdateUnreadMessageCountAction.php        | 21 ++++++++++
 .../Controllers/MessageThreadsController.php  | 24 ------------
 public/request/message/delete.php             |  3 +-
 tests/Feature/Community/MessagesTest.php      |  5 ++-
 5 files changed, 64 insertions(+), 27 deletions(-)
 create mode 100644 app/Community/Actions/DeleteMessageThreadAction.php
 create mode 100644 app/Community/Actions/UpdateUnreadMessageCountAction.php

diff --git a/app/Community/Actions/DeleteMessageThreadAction.php b/app/Community/Actions/DeleteMessageThreadAction.php
new file mode 100644
index 0000000000..abfc436db4
--- /dev/null
+++ b/app/Community/Actions/DeleteMessageThreadAction.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Actions;
+
+use App\Community\Actions\UpdateUnreadMessageCountAction;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
+use App\Site\Models\User;
+use Illuminate\Support\Carbon;
+
+class DeleteMessageThreadAction
+{
+    public function execute(MessageThread $thread, User $user): void
+    {
+        $participant = MessageThreadParticipant::where('thread_id', $thread->id)
+            ->where('user_id', $user->id)
+            ->first();
+
+        if ($participant) {
+            $participant->num_unread = 0;
+            $participant->deleted_at = Carbon::now();
+            $participant->save();
+
+            (new UpdateUnreadMessageCountAction)->execute($user);
+
+            $hasOtherActiveParticipants = MessageThreadParticipant::where('thread_id', $thread->id)
+                ->where('user_id', '!=', $user->id)
+                ->whereNull('deleted_at')
+                ->exists();
+            if (!$hasOtherActiveParticipants) {
+                // this will also cascade delete the message_participants and messages
+                $thread->delete();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/Community/Actions/UpdateUnreadMessageCountAction.php b/app/Community/Actions/UpdateUnreadMessageCountAction.php
new file mode 100644
index 0000000000..462c753332
--- /dev/null
+++ b/app/Community/Actions/UpdateUnreadMessageCountAction.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Actions;
+
+use App\Community\Models\MessageThreadParticipant;
+use App\Site\Models\User;
+
+class UpdateUnreadMessageCountAction
+{
+    public function execute(User $user): void
+    {
+        $totalUnread = MessageThreadParticipant::where('user_id', $user->id)
+            ->whereNull('deleted_at')
+            ->sum('num_unread');
+
+        $user->UnreadMessageCount = $totalUnread;
+        $user->save();
+    }
+}
\ No newline at end of file
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index 9d4c198897..99b84fb202 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -223,28 +223,4 @@ private static function markParticipantRead(MessageThreadParticipant $participan
             MessageThreadsController::updateUnreadMessageCount($user);
         }
     }
-
-    public static function deleteThread(MessageThread $thread, User $user): void
-    {
-        $participant = MessageThreadParticipant::where('thread_id', $thread->id)
-            ->where('user_id', $user->id)
-            ->first();
-
-        if ($participant) {
-            $participant->num_unread = 0;
-            $participant->deleted_at = Carbon::now();
-            $participant->save();
-
-            MessageThreadsController::updateUnreadMessageCount($user);
-
-            $hasOtherActiveParticipants = MessageThreadParticipant::where('thread_id', $thread->id)
-                ->where('user_id', '!=', $user->id)
-                ->whereNull('deleted_at')
-                ->exists();
-            if (!$hasOtherActiveParticipants) {
-                // this will also cascade delete the message_participants and messages
-                $thread->delete();
-            }
-        }
-    }
 }
diff --git a/public/request/message/delete.php b/public/request/message/delete.php
index bc6c6e3f91..195aa03028 100644
--- a/public/request/message/delete.php
+++ b/public/request/message/delete.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Community\Actions\DeleteMessageThreadAction;
 use App\Community\Controllers\MessageThreadsController;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
@@ -31,6 +32,6 @@
     return back()->withErrors(__('legacy.error.error'));
 }
 
-MessageThreadsController::deleteThread($thread, $user);
+(new DeleteMessageThreadAction)->execute($thread, $user);
 
 return redirect(route("message.list"))->with('success', __('legacy.success.message_delete'));
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 1f20b75a0c..21f962af13 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Feature\Community;
 
+use App\Community\Actions\DeleteMessageThreadAction;
 use App\Community\Controllers\MessageThreadsController;
 use App\Community\Enums\UserRelationship;
 use App\Community\Models\Message;
@@ -196,7 +197,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now5);
 
         $this->captureEmails();
-        MessageThreadsController::deleteThread($thread, $user1);
+        (new DeleteMessageThreadAction)->execute($thread, $user1);
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -227,7 +228,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now6);
 
         $this->captureEmails();
-        MessageThreadsController::deleteThread($thread, $user2);
+        (new DeleteMessageThreadAction)->execute($thread, $user2);
         $this->assertDatabaseMissing('message_threads', ['id' => 1]);
         $this->assertDatabaseMissing('messages', ['id' => 1]);
         $this->assertDatabaseMissing('messages', ['id' => 2]);

From f4581004d1a557fd958ee43576c3bb9505216ca2 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 16:03:08 -0700
Subject: [PATCH 27/47] migrate markRead to action

---
 .../Actions/ReadMessageThreadAction.php       | 36 +++++++++++++++++++
 .../Controllers/MessageThreadsController.php  | 35 ++----------------
 .../NotifyMessageThreadParticipants.php       |  6 +++-
 tests/Feature/Community/MessagesTest.php      |  5 +--
 4 files changed, 46 insertions(+), 36 deletions(-)
 create mode 100644 app/Community/Actions/ReadMessageThreadAction.php

diff --git a/app/Community/Actions/ReadMessageThreadAction.php b/app/Community/Actions/ReadMessageThreadAction.php
new file mode 100644
index 0000000000..b53dd522f0
--- /dev/null
+++ b/app/Community/Actions/ReadMessageThreadAction.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Actions;
+
+use App\Community\Actions\UpdateUnreadMessageCountAction;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
+use App\Site\Models\User;
+use Illuminate\Support\Carbon;
+
+class ReadMessageThreadAction
+{
+    public function execute(MessageThread $thread, User $user): void
+    {
+        $participant = MessageThreadParticipant::where('user_id', $user->id)
+            ->where('thread_id', $thread->id)
+            ->whereNull('deleted_at')
+            ->first();
+
+        if ($participant) {
+            ReadMessageThreadAction::markParticipantRead($participant, $user);
+        }
+    }
+
+    public static function markParticipantRead(MessageThreadParticipant $participant, User $user): void
+    {
+        if ($participant->num_unread) {
+            $participant->num_unread = 0;
+            $participant->save();
+
+            (new UpdateUnreadMessageCountAction)->execute($user);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index 99b84fb202..c970ab887a 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -4,6 +4,7 @@
 
 namespace App\Community\Controllers;
 
+use App\Community\Actions\ReadMessageThreadAction;
 use App\Community\Events\MessageCreated;
 use App\Community\Models\Message;
 use App\Community\Models\MessageThread;
@@ -91,7 +92,7 @@ public function pageView(Request $request): View
 
         if ($currentPage == $totalPages) {
             // if viewing last page, mark all messages in the chain as read
-            MessageThreadsController::markParticipantRead($participant, $user);
+            ReadMessageThreadAction::markParticipantRead($participant, $user);
         }
 
         $messages = Message::where('thread_id', $threadId)
@@ -191,36 +192,4 @@ public static function addToThread(MessageThread $thread, User $userFrom, string
 
         MessageCreated::dispatch($message);
     }
-
-    public static function updateUnreadMessageCount(User $user): void
-    {
-        $totalUnread = MessageThreadParticipant::where('user_id', $user->id)
-            ->whereNull('deleted_at')
-            ->sum('num_unread');
-
-        $user->UnreadMessageCount = $totalUnread;
-        $user->save();
-    }
-
-    public static function markRead(MessageThread $thread, User $user): void
-    {
-        $participant = MessageThreadParticipant::where('user_id', $user->id)
-            ->where('thread_id', $thread->id)
-            ->whereNull('deleted_at')
-            ->first();
-
-        if ($participant) {
-            MessageThreadsController::markParticipantRead($participant, $user);
-        }
-    }
-
-    private static function markParticipantRead(MessageThreadParticipant $participant, User $user): void
-    {
-        if ($participant->num_unread) {
-            $participant->num_unread = 0;
-            $participant->save();
-
-            MessageThreadsController::updateUnreadMessageCount($user);
-        }
-    }
 }
diff --git a/app/Community/Listeners/NotifyMessageThreadParticipants.php b/app/Community/Listeners/NotifyMessageThreadParticipants.php
index ecdd4311c1..451d22a2f9 100644
--- a/app/Community/Listeners/NotifyMessageThreadParticipants.php
+++ b/app/Community/Listeners/NotifyMessageThreadParticipants.php
@@ -4,6 +4,7 @@
 
 namespace App\Community\Listeners;
 
+use App\Community\Actions\UpdateUnreadMessageCountAction;
 use App\Community\Controllers\MessageThreadsController;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
@@ -26,6 +27,9 @@ public function handle(object $event): void
         if (!$thread) {
             return;
         }
+
+        $updateUnreadMessageCountAction = new UpdateUnreadMessageCountAction();
+
         $validParticipants = 0;
         $participants = MessageThreadParticipant::withTrashed()->where('thread_id', $message->thread_id)->get();
         foreach ($participants as $participant) {
@@ -52,7 +56,7 @@ public function handle(object $event): void
                            SET num_unread = num_unread + 1, deleted_at = NULL
                            WHERE id = {$participant->id}");
 
-            MessageThreadsController::updateUnreadMessageCount($userTo);
+            $updateUnreadMessageCountAction->execute($userTo);
 
             // send email?
             if (BitSet($userTo->websitePrefs, UserPreference::EmailOn_PrivateMessage)) {
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 21f962af13..e96a05fab9 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -5,6 +5,7 @@
 namespace Tests\Feature\Community;
 
 use App\Community\Actions\DeleteMessageThreadAction;
+use App\Community\Actions\ReadMessageThreadAction;
 use App\Community\Controllers\MessageThreadsController;
 use App\Community\Enums\UserRelationship;
 use App\Community\Models\Message;
@@ -68,7 +69,7 @@ public function testCreateMessageChain(): void
         $this->assertEmailSent($user2, "New Private Message from {$user1->User}");
 
         // user2 responds
-        MessageThreadsController::markRead($thread, $user2);
+        (new ReadMessageThreadAction)->execute($thread, $user2);
         $this->assertDatabaseHas('message_thread_participants', [
             'thread_id' => 1,
             'user_id' => $user2->ID,
@@ -152,7 +153,7 @@ public function testCreateMessageChain(): void
         $this->assertEmailNotSent($user1);
 
         // user1 responds
-        MessageThreadsController::markRead($thread, $user1);
+        (new ReadMessageThreadAction)->execute($thread, $user1);
         $user1->refresh();
         $this->assertEquals(0, $user1->UnreadMessageCount);
 

From bd6dbb324496946711094b0c793ae04cb9b952c7 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 16:11:12 -0700
Subject: [PATCH 28/47] move addToThread to Action

---
 .../Actions/AddToMessageThreadAction.php      | 31 +++++++++++++++++++
 .../Controllers/MessageThreadsController.php  | 20 ++----------
 public/request/message/create.php             |  3 +-
 tests/Feature/Community/MessagesTest.php      | 13 ++++----
 4 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 app/Community/Actions/AddToMessageThreadAction.php

diff --git a/app/Community/Actions/AddToMessageThreadAction.php b/app/Community/Actions/AddToMessageThreadAction.php
new file mode 100644
index 0000000000..1782769b89
--- /dev/null
+++ b/app/Community/Actions/AddToMessageThreadAction.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Actions;
+
+use App\Community\Events\MessageCreated;
+use App\Community\Models\Message;
+use App\Community\Models\MessageThread;
+use App\Site\Models\User;
+use Illuminate\Support\Carbon;
+
+class AddToMessageThreadAction
+{
+    public function execute(MessageThread $thread, User $userFrom, string $body): void
+    {
+        $message = new Message([
+            'thread_id' => $thread->id,
+            'author_id' => $userFrom->ID,
+            'body' => $body,
+            'created_at' => Carbon::now(),
+        ]);
+        $message->save();
+
+        $thread->num_messages++;
+        $thread->last_message_id = $message->id;
+        $thread->save();
+
+        MessageCreated::dispatch($message);
+    }
+}
\ No newline at end of file
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index c970ab887a..b793ba840e 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -4,6 +4,7 @@
 
 namespace App\Community\Controllers;
 
+use App\Community\Actions\AddToMessageThreadAction;
 use App\Community\Actions\ReadMessageThreadAction;
 use App\Community\Events\MessageCreated;
 use App\Community\Models\Message;
@@ -171,25 +172,8 @@ public static function newThread(User $userFrom, User $userTo, string $title, st
             $participantTo->save();
         }
 
-        MessageThreadsController::addToThread($thread, $userFrom, $body);
+        (new AddToMessageThreadAction)->execute($thread, $userFrom, $body);
 
         return $thread;
     }
-
-    public static function addToThread(MessageThread $thread, User $userFrom, string $body): void
-    {
-        $message = new Message([
-            'thread_id' => $thread->id,
-            'author_id' => $userFrom->ID,
-            'body' => $body,
-            'created_at' => Carbon::now(),
-        ]);
-        $message->save();
-
-        $thread->num_messages++;
-        $thread->last_message_id = $message->id;
-        $thread->save();
-
-        MessageCreated::dispatch($message);
-    }
 }
diff --git a/public/request/message/create.php b/public/request/message/create.php
index e78104d0dc..41ebf4d972 100644
--- a/public/request/message/create.php
+++ b/public/request/message/create.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Community\Actions\AddToMessageThreadAction;
 use App\Community\Controllers\MessageThreadsController;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
@@ -32,7 +33,7 @@
     if (!$participant->exists()) {
         return back()->withErrors(__('legacy.error.error'));
     }
-    MessageThreadsController::addToThread($thread, $user, $input['body']);
+    (new AddToMessageThreadAction)->execute($thread, $user, $input['body']);
 } else {
     $recipient = User::firstWhere('User', $input['recipient']);
     $thread = MessageThreadsController::newThread($user, $recipient, $input['title'], $input['body']);
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index e96a05fab9..ded8ac4a72 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Feature\Community;
 
+use App\Community\Actions\AddToMessageThreadAction;
 use App\Community\Actions\DeleteMessageThreadAction;
 use App\Community\Actions\ReadMessageThreadAction;
 use App\Community\Controllers\MessageThreadsController;
@@ -83,7 +84,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now2);
 
         $this->captureEmails();
-        MessageThreadsController::addToThread($thread, $user2, 'This is a response.');
+        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is a response.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -120,7 +121,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now3);
 
         $this->captureEmails();
-        MessageThreadsController::addToThread($thread, $user2, 'This is another response.');
+        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is another response.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -161,7 +162,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now4);
 
         $this->captureEmails();
-        MessageThreadsController::addToThread($thread, $user1, 'This is a third response.');
+        (new AddToMessageThreadAction)->execute($thread, $user1, 'This is a third response.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -301,7 +302,7 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now2);
 
         $this->captureEmails();
-        MessageThreadsController::addToThread($thread, $user2, 'This is a response.');
+        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is a response.');
 
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
@@ -373,7 +374,7 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now2);
 
         $this->captureEmails();
-        MessageThreadsController::addToThread($thread, $user1, 'This is a response.');
+        (new AddToMessageThreadAction)->execute($thread, $user1, 'This is a response.');
 
         $this->assertDatabaseHas('message_threads', [
             'id' => 2,
@@ -410,7 +411,7 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now3);
 
         $this->captureEmails();
-        MessageThreadsController::addToThread($thread, $user2, 'This is another response.');
+        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is another response.');
 
         $this->assertDatabaseHas('message_threads', [
             'id' => 2,

From 97d4578ed0129cee8f5a179be3abc7e09cdce973 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 16:15:45 -0700
Subject: [PATCH 29/47] migrate newThread to action

---
 .../Actions/CreateMessageThreadAction.php     | 52 +++++++++++++++++++
 .../Controllers/MessageThreadsController.php  | 37 -------------
 app/Helpers/database/ticket.php               |  3 +-
 public/request/message/create.php             |  3 +-
 tests/Feature/Community/MessagesTest.php      |  7 +--
 5 files changed, 60 insertions(+), 42 deletions(-)
 create mode 100644 app/Community/Actions/CreateMessageThreadAction.php

diff --git a/app/Community/Actions/CreateMessageThreadAction.php b/app/Community/Actions/CreateMessageThreadAction.php
new file mode 100644
index 0000000000..5d9942a9a3
--- /dev/null
+++ b/app/Community/Actions/CreateMessageThreadAction.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Actions;
+
+use App\Community\Events\MessageCreated;
+use App\Community\Models\Message;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
+use App\Site\Models\User;
+use Illuminate\Support\Carbon;
+
+class CreateMessageThreadAction
+{
+    public function execute(User $userFrom, User $userTo, string $title, string $body, bool $isProxied = false): MessageThread
+    {
+        $thread = new MessageThread([
+            'title' => $title,
+        ]);
+        $thread->save();
+
+        $participantFrom = new MessageThreadParticipant([
+            'user_id' => $userFrom->ID,
+            'thread_id' => $thread->id,
+        ]);
+
+        if ($isProxied) {
+            $participantFrom->deleted_at = Carbon::now();
+        }
+
+        $participantFrom->save();
+
+        if ($userTo->ID != $userFrom->ID) {
+            $participantTo = new MessageThreadParticipant([
+                'user_id' => $userTo->ID,
+                'thread_id' => $thread->id,
+            ]);
+
+            // if the recipient has blocked the sender, immediately mark the thread as deleted for the recipient
+            if ($userTo->isBlocking($userFrom->User)) {
+                $participantTo->deleted_at = Carbon::now();
+            }
+
+            $participantTo->save();
+        }
+
+        (new AddToMessageThreadAction)->execute($thread, $userFrom, $body);
+
+        return $thread;
+    }
+}
\ No newline at end of file
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index b793ba840e..aafed2eb5f 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -139,41 +139,4 @@ public function pageCreate(Request $request): View
             'message' => $message,
         ]);
     }
-
-    public static function newThread(User $userFrom, User $userTo, string $title, string $body, bool $isProxied = false): MessageThread
-    {
-        $thread = new MessageThread([
-            'title' => $title,
-        ]);
-        $thread->save();
-
-        $participantFrom = new MessageThreadParticipant([
-            'user_id' => $userFrom->ID,
-            'thread_id' => $thread->id,
-        ]);
-
-        if ($isProxied) {
-            $participantFrom->deleted_at = Carbon::now();
-        }
-
-        $participantFrom->save();
-
-        if ($userTo->ID != $userFrom->ID) {
-            $participantTo = new MessageThreadParticipant([
-                'user_id' => $userTo->ID,
-                'thread_id' => $thread->id,
-            ]);
-
-            // if the recipient has blocked the sender, immediately mark the thread as deleted for the recipient
-            if ($userTo->isBlocking($userFrom->User)) {
-                $participantTo->deleted_at = Carbon::now();
-            }
-
-            $participantTo->save();
-        }
-
-        (new AddToMessageThreadAction)->execute($thread, $userFrom, $body);
-
-        return $thread;
-    }
 }
diff --git a/app/Helpers/database/ticket.php b/app/Helpers/database/ticket.php
index 67114cac6b..08e7b28c83 100644
--- a/app/Helpers/database/ticket.php
+++ b/app/Helpers/database/ticket.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Community\Actions\CreateMessageThreadAction;
 use App\Community\Controllers\MessageThreadsController;
 use App\Community\Enums\ArticleType;
 use App\Community\Enums\SubscriptionSubjectType;
@@ -150,7 +151,7 @@ function _createTicket(User $user, int $achID, int $reportType, ?int $hardcore,
     $author = User::firstWhere('User', $achAuthor);
     if ($author) {
         $bugReportMessage = "Hi, $achAuthor!\r\n[user=$username] would like to report a bug with an achievement you've created:\r\n$bugReportDetails";
-        MessageThreadsController::newThread($user, $author, "Bug Report ($gameTitle)",
+        (new CreateMessageThreadAction)->execute($user, $author, "Bug Report ($gameTitle)",
             $bugReportMessage, isProxied: true); // don't put the message in the user's message list unless the recipient replies
     }
 
diff --git a/public/request/message/create.php b/public/request/message/create.php
index 41ebf4d972..de33d24fc4 100644
--- a/public/request/message/create.php
+++ b/public/request/message/create.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Community\Actions\AddToMessageThreadAction;
+use App\Community\Actions\CreateMessageThreadAction;
 use App\Community\Controllers\MessageThreadsController;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
@@ -36,7 +37,7 @@
     (new AddToMessageThreadAction)->execute($thread, $user, $input['body']);
 } else {
     $recipient = User::firstWhere('User', $input['recipient']);
-    $thread = MessageThreadsController::newThread($user, $recipient, $input['title'], $input['body']);
+    $thread = (new CreateMessageThreadAction)->execute($user, $recipient, $input['title'], $input['body']);
 }
 
 return redirect(route("message.view", $thread->id))->with('success', __('legacy.success.message_send'));
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index ded8ac4a72..9acc931a88 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -5,6 +5,7 @@
 namespace Tests\Feature\Community;
 
 use App\Community\Actions\AddToMessageThreadAction;
+use App\Community\Actions\CreateMessageThreadAction;
 use App\Community\Actions\DeleteMessageThreadAction;
 use App\Community\Actions\ReadMessageThreadAction;
 use App\Community\Controllers\MessageThreadsController;
@@ -35,7 +36,7 @@ public function testCreateMessageChain(): void
 
         // user1 sends message to user2
         $this->captureEmails();
-        $thread = MessageThreadsController::newThread($user1, $user2, 'This is a message', 'This is the message body.');
+        $thread = (new CreateMessageThreadAction)->execute($user1, $user2, 'This is a message', 'This is the message body.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -266,7 +267,7 @@ public function testBlockedUser(): void
 
         // message from user2 is automatically marked as deleted by user1
         $this->captureEmails();
-        $thread = MessageThreadsController::newThread($user2, $user1, 'This is a message', 'This is the message body.');
+        $thread = (new CreateMessageThreadAction)->execute($user2, $user1, 'This is a message', 'This is the message body.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -338,7 +339,7 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now);
 
         $this->captureEmails();
-        $thread = MessageThreadsController::newThread($user1, $user2, 'This is a message', 'This is the message body.');
+        $thread = (new CreateMessageThreadAction)->execute($user1, $user2, 'This is a message', 'This is the message body.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 2,
             'title' => 'This is a message',

From c2c15fc951e2dc0d6c2bc25be91ab9c68ee1f8a3 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 16:31:46 -0700
Subject: [PATCH 30/47] use implicit soft-delete for participant thread
 deletion

---
 app/Community/Actions/DeleteMessageThreadAction.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Community/Actions/DeleteMessageThreadAction.php b/app/Community/Actions/DeleteMessageThreadAction.php
index abfc436db4..167547c506 100644
--- a/app/Community/Actions/DeleteMessageThreadAction.php
+++ b/app/Community/Actions/DeleteMessageThreadAction.php
@@ -19,9 +19,13 @@ public function execute(MessageThread $thread, User $user): void
             ->first();
 
         if ($participant) {
-            $participant->num_unread = 0;
-            $participant->deleted_at = Carbon::now();
-            $participant->save();
+            // make sure num_unread is 0 before we soft-delete the record.
+            if ($participant->num_unread) {
+                $participant->num_unread = 0;
+                $participant->save();
+            }
+
+            $participant->delete();
 
             (new UpdateUnreadMessageCountAction)->execute($user);
 

From 4c359e21c2bd68c2672540fba4232f8ea2c2081c Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 20:16:28 -0700
Subject: [PATCH 31/47] use default laravel routes

---
 app/Community/AuthServiceProvider.php         |  6 +--
 app/Community/Commands/SyncMessages.php       |  7 +--
 .../Controllers/MessageThreadsController.php  | 14 +++---
 app/Community/Policies/MessagePolicy.php      | 44 -----------------
 .../Policies/MessageThreadPolicy.php          | 49 +++++++++++++++++++
 app/Community/RouteServiceProvider.php        |  6 +--
 app/Helpers/util/mail.php                     |  2 +-
 app/Site/Components/NotificationIcon.php      |  2 +-
 public/friends.php                            |  2 +-
 public/managehashes.php                       |  2 +-
 public/request/message/create.php             |  2 +-
 public/request/message/delete.php             |  2 +-
 public/ticketmanager.php                      |  2 +-
 public/userInfo.php                           |  2 +-
 .../components/message/icon.blade.php         |  2 +-
 .../components/message/list-page.blade.php    |  4 +-
 .../message/new-thread-page.blade.php         |  2 +-
 .../message/view-thread-page.blade.php        |  2 +-
 resources/views/community/contact.blade.php   | 16 +++---
 .../views/components/menu/account.blade.php   |  2 +-
 20 files changed, 87 insertions(+), 83 deletions(-)
 delete mode 100644 app/Community/Policies/MessagePolicy.php
 create mode 100644 app/Community/Policies/MessageThreadPolicy.php

diff --git a/app/Community/AuthServiceProvider.php b/app/Community/AuthServiceProvider.php
index 4cb6e695cb..9b3f9c6c24 100755
--- a/app/Community/AuthServiceProvider.php
+++ b/app/Community/AuthServiceProvider.php
@@ -12,7 +12,7 @@
 use App\Community\Models\ForumTopic;
 use App\Community\Models\ForumTopicComment;
 use App\Community\Models\GameComment;
-use App\Community\Models\Message;
+use App\Community\Models\MessageThread;
 use App\Community\Models\News;
 use App\Community\Models\NewsComment;
 use App\Community\Models\TriggerTicket;
@@ -26,7 +26,7 @@
 use App\Community\Policies\ForumTopicCommentPolicy;
 use App\Community\Policies\ForumTopicPolicy;
 use App\Community\Policies\GameCommentPolicy;
-use App\Community\Policies\MessagePolicy;
+use App\Community\Policies\MessageThreadPolicy;
 use App\Community\Policies\NewsCommentPolicy;
 use App\Community\Policies\NewsPolicy;
 use App\Community\Policies\TriggerTicketPolicy;
@@ -45,7 +45,7 @@ class AuthServiceProvider extends ServiceProvider
         ForumTopicComment::class => ForumTopicCommentPolicy::class,
         ForumTopic::class => ForumTopicPolicy::class,
         GameComment::class => GameCommentPolicy::class,
-        Message::class => MessagePolicy::class,
+        MessageThread::class => MessageThreadPolicy::class,
         News::class => NewsPolicy::class,
         NewsComment::class => NewsCommentPolicy::class,
         TriggerTicket::class => TriggerTicketPolicy::class,
diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/SyncMessages.php
index 9518e86b1a..770ddbe727 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/SyncMessages.php
@@ -39,13 +39,14 @@ public function handle(): void
         // process remaining unprocessed records (thread_id=0)
         // have to do this in batches to prevent exhausting memory
         // due to requesting payloads (message content)
-        Message::where('thread_id', 0)->orderBy('ID')->chunk(100, function($messages) use($progressBar) {
+        for ($i = 0; $i < $count; $i += 100) {
+            $messages = Message::where('thread_id', 0)->orderBy('ID')->limit(100)->get();
             /** @var Message $message */
             foreach ($messages as $message) {
                 $this->migrateMessage($message);
                 $progressBar->advance();
             }
-        });
+        }
 
         $count = Message::where('thread_id', 0)->count();
         if ($count == 0) {
@@ -138,7 +139,7 @@ private function migrateMessage(Message $message): void
                 $participantFrom->save();
             }
         } else {
-            $threadParticipants = MessageThreadParticipant::where('thread_id', $thread->id);
+            $threadParticipants = MessageThreadParticipant::withTrashed()->where('thread_id', $thread->id);
             $participantTo = $threadParticipants->where('user_id', $userTo->ID)->first();
         }
 
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index aafed2eb5f..abaaec2b4b 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -19,7 +19,7 @@
 
 class MessageThreadsController extends Controller
 {
-    public function pageList(Request $request): View
+    public function index(Request $request): View
     {
         $user = $request->user();
 
@@ -67,17 +67,15 @@ public function pageList(Request $request): View
         ]);
     }
 
-    public function pageView(Request $request): View
+    public function show(Request $request, int $threadId): View
     {
-        $threadId = $request->route('thread_id');
-
         $thread = MessageThread::firstWhere('id', $threadId);
         if (!$thread) {
             abort(404);
         }
-
+        
         $user = $request->user();
-        $participant = MessageThreadParticipant::where('thread_id', $threadId)
+        $participant = MessageThreadParticipant::where('thread_id', $thread->id)
             ->where('user_id', $user->ID)
             ->first();
         if (!$participant) {
@@ -96,7 +94,7 @@ public function pageView(Request $request): View
             ReadMessageThreadAction::markParticipantRead($participant, $user);
         }
 
-        $messages = Message::where('thread_id', $threadId)
+        $messages = Message::where('thread_id', $thread->id)
             ->orderBy('created_at')
             ->offset(($currentPage - 1) * $pageSize)
             ->limit($pageSize)
@@ -127,7 +125,7 @@ public function pageView(Request $request): View
         ]);
     }
 
-    public function pageCreate(Request $request): View
+    public function create(Request $request): View
     {
         $toUser = $request->input('to') ?? '';
         $subject = $request->input('subject') ?? '';
diff --git a/app/Community/Policies/MessagePolicy.php b/app/Community/Policies/MessagePolicy.php
deleted file mode 100644
index 29079c74cb..0000000000
--- a/app/Community/Policies/MessagePolicy.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Community\Policies;
-
-use App\Community\Models\Message;
-use App\Site\Models\User;
-use Illuminate\Auth\Access\HandlesAuthorization;
-
-class MessagePolicy
-{
-    use HandlesAuthorization;
-
-    public function view(User $user, Message $message): bool
-    {
-        return false;
-    }
-
-    public function create(User $user): bool
-    {
-        return false;
-    }
-
-    public function update(User $user, Message $message): bool
-    {
-        return false;
-    }
-
-    public function delete(User $user, Message $message): bool
-    {
-        return false;
-    }
-
-    public function restore(User $user, Message $message): bool
-    {
-        return false;
-    }
-
-    public function forceDelete(User $user, Message $message): bool
-    {
-        return false;
-    }
-}
diff --git a/app/Community/Policies/MessageThreadPolicy.php b/app/Community/Policies/MessageThreadPolicy.php
new file mode 100644
index 0000000000..6af5fa2dcf
--- /dev/null
+++ b/app/Community/Policies/MessageThreadPolicy.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Policies;
+
+use App\Community\Models\MessageThread;
+use App\Site\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class MessageThreadPolicy
+{
+    use HandlesAuthorization;
+
+    public function manage(User $user): bool
+    {
+        return true;
+    }
+
+    public function view(User $user, MessageThread $message): bool
+    {
+        return true;
+    }
+
+    public function create(User $user): bool
+    {
+        return true;
+    }
+
+    public function update(User $user, MessageThread $message): bool
+    {
+        return false;
+    }
+
+    public function delete(User $user, MessageThread $message): bool
+    {
+        return true;
+    }
+
+    public function restore(User $user, MessageThread $message): bool
+    {
+        return false;
+    }
+
+    public function forceDelete(User $user, MessageThread $message): bool
+    {
+        return false;
+    }
+}
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index 0ada8a5c8e..94f9a22a7a 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -232,9 +232,9 @@ protected function mapWebRoutes(): void
                 /*
                  * messages
                  */
-                Route::get('message/new', [MessageThreadsController::class, 'pageCreate'])->name('message.new');
-                Route::get('message/{thread_id}', [MessageThreadsController::class, 'pageView'])->name('message.view');
-                Route::get('messages', [MessageThreadsController::class, 'pageList'])->name('message.list');
+                Route::resource('messages', MessageThreadsController::class, [
+                    'only' => ['index', 'show', 'create'],
+                ]);
 
                 //     /*
                 //      * tickets
diff --git a/app/Helpers/util/mail.php b/app/Helpers/util/mail.php
index 0a994f0c1b..cc5d710935 100644
--- a/app/Helpers/util/mail.php
+++ b/app/Helpers/util/mail.php
@@ -363,7 +363,7 @@ function SendPrivateMessageEmail(
 
     // Also used for Generic text:
     $emailTitle = "New Private Message from $fromUser";
-    $link = "<a href='" . route('message.list') . "'>here</a>";
+    $link = "<a href='" . route('messages.index') . "'>here</a>";
 
     $msg = "Hello $user!<br>" .
         "You have received a new private message from $fromUser.<br><br>" .
diff --git a/app/Site/Components/NotificationIcon.php b/app/Site/Components/NotificationIcon.php
index e97a7dde22..b56d328905 100644
--- a/app/Site/Components/NotificationIcon.php
+++ b/app/Site/Components/NotificationIcon.php
@@ -24,7 +24,7 @@ public function render(): View
 
         if ($user->unread_messages_count) {
             $notifications->push([
-                'link' => route('message.list'),
+                'link' => route('messages.index'),
                 'title' => $user->unread_messages_count . ' ' . __res('message', (int) $user->unread_messages_count),
             ]);
         }
diff --git a/public/friends.php b/public/friends.php
index 707d8ba31d..0218bbb73a 100644
--- a/public/friends.php
+++ b/public/friends.php
@@ -124,7 +124,7 @@ function RenderUserList(string $header, array $users, int $friendshipType, array
             echo "<td style='vertical-align:middle;'>";
             echo "<div class='flex justify-end gap-2'>";
 
-            echo "<a class='btn btn-link' href='" . route('message.new') . "?to=$followingUser'>Message</a>";
+            echo "<a class='btn btn-link' href='" . route('messages.create') . "?to=$followingUser'>Message</a>";
 
             echo "<form class='inline-block' action='/request/user/update-relationship.php' method='post'>";
             echo csrf_field();
diff --git a/public/managehashes.php b/public/managehashes.php
index a79be99df7..3e1ae7ac67 100644
--- a/public/managehashes.php
+++ b/public/managehashes.php
@@ -113,7 +113,7 @@ function UnlinkHash(user, gameID, hash, elem) {
     }
     echo "</div>";
 
-    echo "<br><div class='text-danger'><b>Warning:</b> PLEASE be careful with this tool. If in doubt, <a href='" . route('message.new') . "?to=RAdmin&subject=Attempt+to+Unlink+" . urlencode($gameTitle) . "&message=%5Bgame=$gameID%5D'>leave a message for admins</a> and they'll help sort it.</div>";
+    echo "<br><div class='text-danger'><b>Warning:</b> PLEASE be careful with this tool. If in doubt, <a href='" . route('messages.create') . "?to=RAdmin&subject=Attempt+to+Unlink+" . urlencode($gameTitle) . "&message=%5Bgame=$gameID%5D'>leave a message for admins</a> and they'll help sort it.</div>";
 
     echo "<br/><div id='hashCount'>Currently this game has <b>$numLinks</b> unique hashes registered for it:</div>";
 
diff --git a/public/request/message/create.php b/public/request/message/create.php
index de33d24fc4..238b956c7a 100644
--- a/public/request/message/create.php
+++ b/public/request/message/create.php
@@ -40,4 +40,4 @@
     $thread = (new CreateMessageThreadAction)->execute($user, $recipient, $input['title'], $input['body']);
 }
 
-return redirect(route("message.view", $thread->id))->with('success', __('legacy.success.message_send'));
+return redirect(route("messages.show", $thread->id))->with('success', __('legacy.success.message_send'));
diff --git a/public/request/message/delete.php b/public/request/message/delete.php
index 195aa03028..5d9a2f7c80 100644
--- a/public/request/message/delete.php
+++ b/public/request/message/delete.php
@@ -34,4 +34,4 @@
 
 (new DeleteMessageThreadAction)->execute($thread, $user);
 
-return redirect(route("message.list"))->with('success', __('legacy.success.message_delete'));
+return redirect(route("messages.index"))->with('success', __('legacy.success.message_delete'));
diff --git a/public/ticketmanager.php b/public/ticketmanager.php
index ed0da96aee..f83c1a35ba 100644
--- a/public/ticketmanager.php
+++ b/public/ticketmanager.php
@@ -729,7 +729,7 @@
                 $msgPayload = "Hi [user=$reportedBy], I'm contacting you about [ticket=$ticketID]";
                 $msgPayload = rawurlencode($msgPayload);
                 $msgTitle = rawurlencode("Bug Report ($gameTitle)");
-                echo "<a href='" . route('message.new') . "?to=$reportedBy&subject=$msgTitle&message=$msgPayload'>Contact the reporter - $reportedBy</a>";
+                echo "<a href='" . route('messages.create') . "?to=$reportedBy&subject=$msgTitle&message=$msgPayload'>Contact the reporter - $reportedBy</a>";
                 echo "</div>";
                 echo "</td>";
                 echo "</tr>";
diff --git a/public/userInfo.php b/public/userInfo.php
index 97dbeeb04f..f2bab9869a 100644
--- a/public/userInfo.php
+++ b/public/userInfo.php
@@ -248,7 +248,7 @@ function resize() {
             echo "<button class='btn btn-link'>Unblock</button>";
             echo "</form>";
         }
-        echo "<a class='btn btn-link' href='" . route('message.new') . "?to=$userPage'>Message</a>";
+        echo "<a class='btn btn-link' href='" . route('messages.create') . "?to=$userPage'>Message</a>";
         echo "</div>";
 
         if ($areTheyFollowingMe) {
diff --git a/resources/views/community/components/message/icon.blade.php b/resources/views/community/components/message/icon.blade.php
index 79b8e6f3f1..78905ec780 100644
--- a/resources/views/community/components/message/icon.blade.php
+++ b/resources/views/community/components/message/icon.blade.php
@@ -1,5 +1,5 @@
 <div class="navitem {{ $class ?? '' }}">
-    <a class="nav-link" href="{{ route('message.list') }}" title="{{ __res('message') }}" data-toggle="tooltip">
+    <a class="nav-link" href="{{ route('messages.index') }}" title="{{ __res('message') }}" data-toggle="tooltip">
         <x-fas-envelope />
         @if($count ?? 0)
             <div class="text-danger absolute translate-x-3 -translate-y-1 text-[8px]">
diff --git a/resources/views/community/components/message/list-page.blade.php b/resources/views/community/components/message/list-page.blade.php
index 854b69267d..170cfdacc3 100644
--- a/resources/views/community/components/message/list-page.blade.php
+++ b/resources/views/community/components/message/list-page.blade.php
@@ -47,7 +47,7 @@ function deleteMessage(id) {
 
     <div class="w-full flex mt-2">
         <div class="mr-6">
-            <a href="{{ route('message.new') }}"><button class='btn'>New Message</button></a>
+            <a href="{{ route('messages.create') }}"><button class='btn'>New Message</button></a>
         </div>
         <div class="w-full flex justify-end">
             <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
@@ -77,7 +77,7 @@ function deleteMessage(id) {
             </td>
 
             <td @if ($num_unread > 0) class="font-bold" @endif>
-                <a href="{{ route('message.view', $message->id) }}">
+                <a href="{{ route('messages.show', $message->id) }}">
                     {{ $message->title }}
                 </a>
             </td>
diff --git a/resources/views/community/components/message/new-thread-page.blade.php b/resources/views/community/components/message/new-thread-page.blade.php
index 5756ab6f63..d50567cf9d 100644
--- a/resources/views/community/components/message/new-thread-page.blade.php
+++ b/resources/views/community/components/message/new-thread-page.blade.php
@@ -10,7 +10,7 @@
 >
     <x-user.breadcrumbs targetUsername="{{ request()->user()->User }}"
             parentPage="Messages"
-            parentPageUrl="{{ route('message.list') }}"
+            parentPageUrl="{{ route('messages.index') }}"
             currentPage="New Message" />
 
     <div class="w-full flex gap-x-3">
diff --git a/resources/views/community/components/message/view-thread-page.blade.php b/resources/views/community/components/message/view-thread-page.blade.php
index a1aea00100..20e2c5e5e9 100644
--- a/resources/views/community/components/message/view-thread-page.blade.php
+++ b/resources/views/community/components/message/view-thread-page.blade.php
@@ -47,7 +47,7 @@
 >
     <x-user.breadcrumbs targetUsername="{{ $user->User }}"
         parentPage="Messages"
-        parentPageUrl="{{ route('message.list') }}"
+        parentPageUrl="{{ route('messages.index') }}"
         currentPage="{!! $thread->title !!}" />
 
     <div class="mt-3 w-full flex gap-x-3">
diff --git a/resources/views/community/contact.blade.php b/resources/views/community/contact.blade.php
index 0b5039d699..dd037b59f8 100644
--- a/resources/views/community/contact.blade.php
+++ b/resources/views/community/contact.blade.php
@@ -5,7 +5,7 @@
                 <h2>Admins and Moderators</h2>
 
                 <p class="mb-0">
-                    <a href='{{ route("message.new") }}?to=RAdmin'>Send a message to RAdmin</a> for:
+                    <a href='{{ route("messages.create") }}?to=RAdmin'>Send a message to RAdmin</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -20,7 +20,7 @@
                 <h2>Developer Compliance</h2>
 
                 <p class="mb-0">
-                    <a href='{{ route("message.new") }}?to=DevCompliance'>Send a message to DevCompliance</a> for:
+                    <a href='{{ route("messages.create") }}?to=DevCompliance'>Send a message to DevCompliance</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -34,7 +34,7 @@
                 <h2>Quality Assurance</h2>
 
                 <p class="mb-0">
-                    <a href='{{ route("message.new") }}?to=QATeam'>Send a message to QATeam</a> for:
+                    <a href='{{ route("messages.create") }}?to=QATeam'>Send a message to QATeam</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -51,7 +51,7 @@
                 <h2>DevQuest</h2>
 
                 <p class="mb-3">
-                    <a href='{{ route("message.new") }}?to=DevQuest'>Send a message to DevQuest</a> for
+                    <a href='{{ route("messages.create") }}?to=DevQuest'>Send a message to DevQuest</a> for
                     submissions, questions, ideas, or reporting issues related to
                     <a href='/game/5686'>DevQuest</a>.
                 </p>
@@ -63,7 +63,7 @@
                 <h2>Cheating Reports</h2>
 
                 <p class="mb-3">
-                    <a href="{{ route("message.new") }}?to=RACheats">Send a message to RACheats</a>
+                    <a href="{{ route("messages.create") }}?to=RACheats">Send a message to RACheats</a>
                     if you believe someone is in violation of our
                     <a href="https://docs.retroachievements.org/Global-Leaderboard-and-Achievement-Hunting-Rules/#not-allowed">Global Leaderboard and Achievement Hunting Rules</a>.
                 </p>
@@ -81,7 +81,7 @@
                 <h2>RANews</h2>
 
                 <p class="mb-0">
-                    <a href='{{ route("message.new") }}?to=RANews'>Send a message to RANews</a> for:
+                    <a href='{{ route("messages.create") }}?to=RANews'>Send a message to RANews</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -96,13 +96,13 @@
                 <h2>RAEvents</h2>
 
                 <p class="mb-3">
-                    <a href='{{ route("message.new") }}?to=RAEvents'>Send a message to RAEvents</a> for
+                    <a href='{{ route("messages.create") }}?to=RAEvents'>Send a message to RAEvents</a> for
                     submissions, questions, ideas, or reporting issues related to
                     <a href='/game/3105'>community events</a>.
                 </p>
 
                 <p class="mb-3">
-                    <a href='{{ route("message.new") }}?to=TheUnwanted'>Send a message to TheUnwanted</a> for
+                    <a href='{{ route("messages.create") }}?to=TheUnwanted'>Send a message to TheUnwanted</a> for
                     submissions, questions, ideas, or reporting issues specifically related to
                     <a href='/game/4271'>The Unwanted</a>.
                 </p>
diff --git a/resources/views/components/menu/account.blade.php b/resources/views/components/menu/account.blade.php
index 268e4e6a8b..1bf8f74872 100644
--- a/resources/views/components/menu/account.blade.php
+++ b/resources/views/components/menu/account.blade.php
@@ -85,7 +85,7 @@
         <x-dropdown-item :link="url('history.php')">History</x-dropdown-item>
         {{--<x-dropdown-item :link="route('follower.index')">{{ __res('follower') }}</x-dropdown-item>--}}
         <x-dropdown-item :link="url('friends.php')">Following</x-dropdown-item>
-        <x-dropdown-item :link="route('message.list')">{{ __('Messages') }}</x-dropdown-item>
+        <x-dropdown-item :link="route('messages.index')">{{ __('Messages') }}</x-dropdown-item>
         <div class="dropdown-divider"></div>
         <x-dropdown-item :link="url('reorderSiteAwards.php')">Reorder Site Awards</x-dropdown-item>
         {{--<x-dropdown-item :link="route('settings')">{{ __res('setting') }}</x-dropdown-item>--}}

From cc1403d19e75fc270c8dc4c8e813343d85a8f973 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 20:30:02 -0700
Subject: [PATCH 32/47] move create.php -> controller.store

---
 .../Controllers/MessageThreadsController.php  | 45 +++++++++++++++++--
 .../Policies/MessageThreadPolicy.php          |  5 ---
 app/Community/RouteServiceProvider.php        |  2 +-
 public/request/message/create.php             | 43 ------------------
 ...thread-page.blade.php => create.blade.php} |  2 +-
 .../{list-page.blade.php => index.blade.php}  |  0
 ...w-thread-page.blade.php => show.blade.php} |  2 +-
 7 files changed, 45 insertions(+), 54 deletions(-)
 delete mode 100644 public/request/message/create.php
 rename resources/views/community/components/message/{new-thread-page.blade.php => create.blade.php} (94%)
 rename resources/views/community/components/message/{list-page.blade.php => index.blade.php} (100%)
 rename resources/views/community/components/message/{view-thread-page.blade.php => show.blade.php} (97%)

diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index abaaec2b4b..9b0ccbbe74 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -5,17 +5,22 @@
 namespace App\Community\Controllers;
 
 use App\Community\Actions\AddToMessageThreadAction;
+use App\Community\Actions\CreateMessageThreadAction;
 use App\Community\Actions\ReadMessageThreadAction;
 use App\Community\Events\MessageCreated;
 use App\Community\Models\Message;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
 use App\Http\Controller;
+use App\Site\Enums\Permissions;
 use App\Site\Models\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
 
 class MessageThreadsController extends Controller
 {
@@ -58,7 +63,7 @@ public function index(Request $request): View
                 ->value('num_unread');
         }
 
-        return view('community.components.message.list-page', [
+        return view('community.components.message.index', [
             'messages' => $messageThreads,
             'totalPages' => $totalPages,
             'currentPage' => $currentPage,
@@ -115,7 +120,7 @@ public function show(Request $request, int $threadId): View
             })
             ->toArray();
 
-        return view('community.components.message.view-thread-page', [
+        return view('community.components.message.show', [
             'thread' => $thread,
             'messages' => $messages,
             'participants' => $participants,
@@ -131,10 +136,44 @@ public function create(Request $request): View
         $subject = $request->input('subject') ?? '';
         $message = $request->input('message') ?? '';
 
-        return view('community.components.message.new-thread-page', [
+        return view('community.components.message.create', [
             'toUser' => $toUser,
             'subject' => $subject,
             'message' => $message,
         ]);
     }
+
+    public function store(Request $request): RedirectResponse
+    {
+        /** @var User $user */
+        $user = request()->user();
+
+        $input = Validator::validate(Arr::wrap(request()->post()), [
+            'thread_id' => 'nullable|integer',
+            'body' => 'required|string|max:60000',
+            'title' => 'required_without:thread_id|string|max:255',
+            'recipient' => 'required_without:thread_id|exists:UserAccounts,User',
+        ]);
+
+        if (array_key_exists('thread_id', $input) && $input['thread_id'] != null) {
+            $thread = MessageThread::firstWhere('id', $input['thread_id']);
+            if (!$thread) {
+                return back()->withErrors(__('legacy.error.error'));
+            }
+
+            $participant = MessageThreadParticipant::withTrashed()
+                ->where('thread_id', $input['thread_id'])
+                ->where('user_id', $user->ID);
+            if (!$participant->exists()) {
+                return back()->withErrors(__('legacy.error.error'));
+            }
+
+            (new AddToMessageThreadAction)->execute($thread, $user, $input['body']);
+        } else {
+            $recipient = User::firstWhere('User', $input['recipient']);
+            $thread = (new CreateMessageThreadAction)->execute($user, $recipient, $input['title'], $input['body']);
+        }
+
+        return redirect(route("messages.show", $thread->id))->with('success', __('legacy.success.message_send'));
+    }
 }
diff --git a/app/Community/Policies/MessageThreadPolicy.php b/app/Community/Policies/MessageThreadPolicy.php
index 6af5fa2dcf..2dcbe1e10e 100644
--- a/app/Community/Policies/MessageThreadPolicy.php
+++ b/app/Community/Policies/MessageThreadPolicy.php
@@ -12,11 +12,6 @@ class MessageThreadPolicy
 {
     use HandlesAuthorization;
 
-    public function manage(User $user): bool
-    {
-        return true;
-    }
-
     public function view(User $user, MessageThread $message): bool
     {
         return true;
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index 94f9a22a7a..2733f4b82a 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -233,7 +233,7 @@ protected function mapWebRoutes(): void
                  * messages
                  */
                 Route::resource('messages', MessageThreadsController::class, [
-                    'only' => ['index', 'show', 'create'],
+                    'only' => ['index', 'show', 'create', 'store'],
                 ]);
 
                 //     /*
diff --git a/public/request/message/create.php b/public/request/message/create.php
deleted file mode 100644
index 238b956c7a..0000000000
--- a/public/request/message/create.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-use App\Community\Actions\AddToMessageThreadAction;
-use App\Community\Actions\CreateMessageThreadAction;
-use App\Community\Controllers\MessageThreadsController;
-use App\Community\Models\MessageThread;
-use App\Community\Models\MessageThreadParticipant;
-use App\Site\Enums\Permissions;
-use App\Site\Models\User;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Validator;
-
-if (!authenticateFromCookie($user, $permissions, $userDetail) || $permissions < Permissions::Registered) {
-    return back()->withErrors(__('legacy.error.permissions'));
-}
-
-/** @var User $user */
-$user = request()->user();
-
-$input = Validator::validate(Arr::wrap(request()->post()), [
-    'thread_id' => 'nullable|integer',
-    'body' => 'required|string|max:60000',
-    'title' => 'required_without:thread_id|string|max:255',
-    'recipient' => 'required_without:thread_id|exists:UserAccounts,User',
-]);
-
-if (array_key_exists('thread_id', $input) && $input['thread_id'] != null) {
-    $thread = MessageThread::firstWhere('id', $input['thread_id']);
-    if (!$thread) {
-        return back()->withErrors(__('legacy.error.error'));
-    }
-    $participant = MessageThreadParticipant::where('thread_id', $input['thread_id'])
-        ->where('user_id', $user->ID);
-    if (!$participant->exists()) {
-        return back()->withErrors(__('legacy.error.error'));
-    }
-    (new AddToMessageThreadAction)->execute($thread, $user, $input['body']);
-} else {
-    $recipient = User::firstWhere('User', $input['recipient']);
-    $thread = (new CreateMessageThreadAction)->execute($user, $recipient, $input['title'], $input['body']);
-}
-
-return redirect(route("messages.show", $thread->id))->with('success', __('legacy.success.message_send'));
diff --git a/resources/views/community/components/message/new-thread-page.blade.php b/resources/views/community/components/message/create.blade.php
similarity index 94%
rename from resources/views/community/components/message/new-thread-page.blade.php
rename to resources/views/community/components/message/create.blade.php
index d50567cf9d..b562787cce 100644
--- a/resources/views/community/components/message/new-thread-page.blade.php
+++ b/resources/views/community/components/message/create.blade.php
@@ -17,7 +17,7 @@
         <h1 class="mt-[10px] w-full">New Message</h1>
     </div>
 
-    <form action='/request/message/create.php' method='post' x-data='{ isValid: true }'>
+    <form action="{{ route('messages.store') }}" method='post' x-data='{ isValid: true }'>
         {{ csrf_field() }}
         <div><table class='mb-4'><tbody>
             <tr>
diff --git a/resources/views/community/components/message/list-page.blade.php b/resources/views/community/components/message/index.blade.php
similarity index 100%
rename from resources/views/community/components/message/list-page.blade.php
rename to resources/views/community/components/message/index.blade.php
diff --git a/resources/views/community/components/message/view-thread-page.blade.php b/resources/views/community/components/message/show.blade.php
similarity index 97%
rename from resources/views/community/components/message/view-thread-page.blade.php
rename to resources/views/community/components/message/show.blade.php
index 20e2c5e5e9..37ceb05b8a 100644
--- a/resources/views/community/components/message/view-thread-page.blade.php
+++ b/resources/views/community/components/message/show.blade.php
@@ -92,7 +92,7 @@
     @if (!$canReply)
         <i>Cannot reply to deleted user.</i>
     @else
-        <form action='/request/message/create.php' method='post' x-data='{ isValid: true }'>
+        <form action="{{ route('messages.store') }}" method='post' x-data='{ isValid: true }'>
             {{ csrf_field() }}
             <input type='hidden' name='thread_id' value='{{ $thread->id }}' />
 

From 8f9f087e19dd0f4badf274304362ea1425d0c9a2 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 20:39:09 -0700
Subject: [PATCH 33/47] move delete.php -> controller.destroy

---
 .../Controllers/MessageThreadsController.php  | 24 ++++++++++++
 app/Community/RouteServiceProvider.php        |  4 +-
 public/request/message/delete.php             | 37 -------------------
 .../components/message/index.blade.php        |  2 +-
 .../components/message/show.blade.php         |  4 +-
 5 files changed, 28 insertions(+), 43 deletions(-)
 delete mode 100644 public/request/message/delete.php

diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index 9b0ccbbe74..cdb801f4ed 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -6,6 +6,7 @@
 
 use App\Community\Actions\AddToMessageThreadAction;
 use App\Community\Actions\CreateMessageThreadAction;
+use App\Community\Actions\DeleteMessageThreadAction;
 use App\Community\Actions\ReadMessageThreadAction;
 use App\Community\Events\MessageCreated;
 use App\Community\Models\Message;
@@ -176,4 +177,27 @@ public function store(Request $request): RedirectResponse
 
         return redirect(route("messages.show", $thread->id))->with('success', __('legacy.success.message_send'));
     }
+
+    public function destroy(Request $request, int $threadId): RedirectResponse
+    {
+        $thread = MessageThread::firstWhere('id', $threadId);
+        if (!$thread) {
+            return back()->withErrors(__('legacy.error.error'));
+        }
+        
+        /** @var User $user */
+        $user = request()->user();
+        
+        $participating = MessageThreadParticipant::where('thread_id', $threadId)
+            ->where('user_id', $user->ID)
+            ->exists();
+        
+        if (!$participating) {
+            return back()->withErrors(__('legacy.error.error'));
+        }
+        
+        (new DeleteMessageThreadAction)->execute($thread, $user);
+        
+        return redirect(route("messages.index"))->with('success', __('legacy.success.message_delete'));
+    }
 }
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index 2733f4b82a..e607575344 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -232,9 +232,7 @@ protected function mapWebRoutes(): void
                 /*
                  * messages
                  */
-                Route::resource('messages', MessageThreadsController::class, [
-                    'only' => ['index', 'show', 'create', 'store'],
-                ]);
+                Route::resource('messages', MessageThreadsController::class)->except(['edit', 'update']);
 
                 //     /*
                 //      * tickets
diff --git a/public/request/message/delete.php b/public/request/message/delete.php
deleted file mode 100644
index 5d9a2f7c80..0000000000
--- a/public/request/message/delete.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use App\Community\Actions\DeleteMessageThreadAction;
-use App\Community\Controllers\MessageThreadsController;
-use App\Community\Models\MessageThread;
-use App\Community\Models\MessageThreadParticipant;
-use App\Site\Models\User;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Validator;
-
-if (!authenticateFromCookie($user, $permissions, $userDetails)) {
-    return back()->withErrors(__('legacy.error.permissions'));
-}
-
-$input = Validator::validate(Arr::wrap(request()->post()), [
-    'thread_id' => 'required|integer|exists:message_threads,id',
-]);
-
-$thread = MessageThread::firstWhere('id', $input['thread_id']);
-if (!$thread) {
-    return back()->withErrors(__('legacy.error.error'));
-}
-
-/** @var User $user */
-$user = request()->user();
-
-$participating = MessageThreadParticipant::where('thread_id', $input['thread_id'])
-    ->where('user_id', $user->ID)
-    ->exists();
-
-if (!$participating) {
-    return back()->withErrors(__('legacy.error.error'));
-}
-
-(new DeleteMessageThreadAction)->execute($thread, $user);
-
-return redirect(route("messages.index"))->with('success', __('legacy.success.message_delete'));
diff --git a/resources/views/community/components/message/index.blade.php b/resources/views/community/components/message/index.blade.php
index 170cfdacc3..52471f2f65 100644
--- a/resources/views/community/components/message/index.blade.php
+++ b/resources/views/community/components/message/index.blade.php
@@ -21,7 +21,7 @@
 <script>
 function deleteMessage(id) {
     if (confirm('Are you sure you want to delete this message?')) {
-        $.post('/request/message/delete.php', {
+        $.post("{{ route('messages.store') }}", {
             thread_id: id,
             user: "{{ $user->User }}"
         })
diff --git a/resources/views/community/components/message/show.blade.php b/resources/views/community/components/message/show.blade.php
index 37ceb05b8a..f9f7773a44 100644
--- a/resources/views/community/components/message/show.blade.php
+++ b/resources/views/community/components/message/show.blade.php
@@ -56,9 +56,9 @@
 
     <div class="w-full flex my-2">
         <div class="mr-6">
-            <form action='/request/message/delete.php' method='post'>
+            <form action="{{ route('messages.destroy', $thread->id) }}" method='post'>
+            {{ method_field('DELETE') }}
             {{ csrf_field() }}
-            <input type="hidden" name="thread_id" value="{{ $thread->id }}" />
             <button class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this message thread?')">Delete</button>
             </form>
         </div>

From 54e60e503e30dfe688842dc19cae2dca2a1df3ef Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 20:42:34 -0700
Subject: [PATCH 34/47] use __res for resource lookup

---
 resources/views/components/menu/account.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/menu/account.blade.php b/resources/views/components/menu/account.blade.php
index 1bf8f74872..a169aedd09 100644
--- a/resources/views/components/menu/account.blade.php
+++ b/resources/views/components/menu/account.blade.php
@@ -85,7 +85,7 @@
         <x-dropdown-item :link="url('history.php')">History</x-dropdown-item>
         {{--<x-dropdown-item :link="route('follower.index')">{{ __res('follower') }}</x-dropdown-item>--}}
         <x-dropdown-item :link="url('friends.php')">Following</x-dropdown-item>
-        <x-dropdown-item :link="route('messages.index')">{{ __('Messages') }}</x-dropdown-item>
+        <x-dropdown-item :link="route('messages.index')">{{ __res('message') }}</x-dropdown-item>
         <div class="dropdown-divider"></div>
         <x-dropdown-item :link="url('reorderSiteAwards.php')">Reorder Site Awards</x-dropdown-item>
         {{--<x-dropdown-item :link="route('settings')">{{ __res('setting') }}</x-dropdown-item>--}}

From 8ff401a16243da8f81a43a34c36afee1cb8833f0 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 21:08:59 -0700
Subject: [PATCH 35/47] use action to delete thread participation on user
 deletion

---
 .../Concerns/ActsAsCommunityMember.php        |   9 ++
 .../Models/MessageThreadParticipant.php       |   9 ++
 app/Site/Actions/ClearAccountDataAction.php   |  67 ++++++-----
 tests/Feature/Community/MessagesTest.php      | 109 ++++++++++++++++++
 4 files changed, 164 insertions(+), 30 deletions(-)

diff --git a/app/Community/Concerns/ActsAsCommunityMember.php b/app/Community/Concerns/ActsAsCommunityMember.php
index 984b9ad96f..09f6dbdc79 100644
--- a/app/Community/Concerns/ActsAsCommunityMember.php
+++ b/app/Community/Concerns/ActsAsCommunityMember.php
@@ -5,6 +5,7 @@
 namespace App\Community\Concerns;
 
 use App\Community\Enums\UserRelationship;
+use App\Community\Models\MessageThreadParticipant;
 use App\Community\Models\UserActivity;
 use App\Community\Models\UserComment;
 use App\Community\Models\UserGameListEntry;
@@ -84,6 +85,14 @@ public function comments(): MorphMany
         return $this->morphMany(UserComment::class, 'commentable')->with('user');
     }
 
+    /**
+     * @return HasMany<MessageThreadParticipant>
+     */
+    public function messageThreadParticipations(): HasMany
+    {
+        return $this->hasMany(MessageThreadParticipant::class);
+    }
+
     public function getUnreadMessagesCountAttribute(): int
     {
         return (int) ($this->attributes['UnreadMessageCount'] ?? 0);
diff --git a/app/Community/Models/MessageThreadParticipant.php b/app/Community/Models/MessageThreadParticipant.php
index eb1c00dbe5..59a4eb9497 100644
--- a/app/Community/Models/MessageThreadParticipant.php
+++ b/app/Community/Models/MessageThreadParticipant.php
@@ -6,6 +6,7 @@
 
 use App\Support\Database\Eloquent\BaseModel;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class MessageThreadParticipant extends BaseModel
 {
@@ -24,5 +25,13 @@ class MessageThreadParticipant extends BaseModel
 
     // == relations
 
+    /**
+     * @return BelongsTo<MessageThread, MessageThreadParticipant>
+     */
+    public function thread(): BelongsTo
+    {
+        return $this->belongsTo(MessageThread::class, 'thread_id');
+    }
+
     // == scopes
 }
diff --git a/app/Site/Actions/ClearAccountDataAction.php b/app/Site/Actions/ClearAccountDataAction.php
index c51fbf8a46..a4e856f35c 100644
--- a/app/Site/Actions/ClearAccountDataAction.php
+++ b/app/Site/Actions/ClearAccountDataAction.php
@@ -4,10 +4,12 @@
 
 namespace App\Site\Actions;
 
+use App\Community\Actions\DeleteMessageThreadAction;
 use App\Site\Enums\Permissions;
 use App\Site\Events\UserDeleted;
 use App\Site\Models\User;
 use DB;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Log;
 
 class ClearAccountDataAction
@@ -15,13 +17,13 @@ class ClearAccountDataAction
     public function execute(User $user): void
     {
         // disable account access while we destroy it (prevents creating new records during delete)
-        DB::statement("UPDATE UserAccounts u SET
-            u.Password = null,
-            u.SaltedPass = '',
-            u.cookie = null,
-            u.appToken = null,
-            u.APIKey = null
-            WHERE u.ID = :userId", ['userId' => $user->ID]
+        DB::statement("UPDATE UserAccounts SET
+            Password = null,
+            SaltedPass = '',
+            cookie = null,
+            appToken = null,
+            APIKey = null
+            WHERE ID = :userId", ['userId' => $user->ID]
         );
 
         // TODO $user->activities()->delete();
@@ -39,35 +41,40 @@ public function execute(User $user): void
         // TODO $user->subscriptions()->delete();
         DB::statement('DELETE FROM Subscription WHERE UserID = :userId', ['userId' => $user->ID]);
 
-        DB::statement('UPDATE message_thread_participants SET deleted_at=NOW() WHERE user_id = :userId', ['userId' => $user->ID]);
+        // use action to delete each participation so threads with no remaing active participants get cleaned up
+        $deleteMessageThreadAction = new DeleteMessageThreadAction();
+        foreach ($user->messageThreadParticipations()->get() as $participation) {
+            $deleteMessageThreadAction->execute($participation->thread, $user);
+        }
 
-        DB::statement("UPDATE UserAccounts u SET
-            u.Password = null,
-            u.SaltedPass = '',
-            u.EmailAddress = '',
-            u.Permissions = :permissions,
-            u.fbUser = 0,
-            u.fbPrefs = null,
-            u.cookie = null,
-            u.appToken = null,
-            u.appTokenExpiry = null,
-            u.websitePrefs = 0,
-            u.LastLogin = null,
-            u.LastActivityID = 0,
-            u.Motto = '',
-            u.Untracked = 1,
-            u.APIKey = null,
-            u.UserWallActive = 0,
-            u.LastGameID = 0,
-            u.RichPresenceMsg = null,
-            u.RichPresenceMsgDate = null,
-            u.PasswordResetToken = null,
-            u.Deleted = NOW()
+        DB::statement("UPDATE UserAccounts SET
+            Password = null,
+            SaltedPass = '',
+            EmailAddress = '',
+            Permissions = :permissions,
+            fbUser = 0,
+            fbPrefs = null,
+            cookie = null,
+            appToken = null,
+            appTokenExpiry = null,
+            websitePrefs = 0,
+            LastLogin = null,
+            LastActivityID = 0,
+            Motto = '',
+            Untracked = 1,
+            APIKey = null,
+            UserWallActive = 0,
+            LastGameID = 0,
+            RichPresenceMsg = null,
+            RichPresenceMsgDate = null,
+            PasswordResetToken = null,
+            Deleted = :now
             WHERE ID = :userId",
             [
                 // Cap permissions to 0 - negative values may stay
                 'permissions' => min($user->Permissions, Permissions::Unregistered),
                 'userId' => $user->ID,
+                'now' => Carbon::now(),
             ]
         );
 
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 9acc931a88..68795b433a 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -12,6 +12,7 @@
 use App\Community\Enums\UserRelationship;
 use App\Community\Models\Message;
 use App\Community\Models\UserRelation;
+use App\Site\Actions\ClearAccountDataAction;
 use App\Site\Enums\UserPreference;
 use App\Site\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -444,4 +445,112 @@ public function testBlockedUser(): void
         $this->assertEquals(0, $user1->UnreadMessageCount);
         $this->assertEmailNotSent($user1);
     }
+
+    public function testDeleteUserDeletesThread(): void
+    {
+        $now = Carbon::now()->floorSecond();
+        Carbon::setTestNow($now);
+
+        /** @var User $user1 */
+        $user1 = User::factory()->create(['websitePrefs' => (1 << UserPreference::EmailOn_PrivateMessage)]);
+        /** @var User $user2 */
+        $user2 = User::factory()->create(['websitePrefs' => (1 << UserPreference::EmailOn_PrivateMessage)]);
+
+        // user1 sends message to user2
+        $thread = (new CreateMessageThreadAction)->execute($user1, $user2, 'This is a message', 'This is the message body.');
+        $this->assertDatabaseHas('message_threads', [
+            'id' => 1,
+            'title' => 'This is a message',
+            'num_messages' => 1,
+            'last_message_id' => 1,
+        ]);
+        $this->assertDatabaseHas('messages', [
+            'id' => 1,
+            'thread_id' => 1,
+            'author_id' => $user1->ID,
+            'body' => 'This is the message body.',
+            'created_at' => $now->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 1,
+            'deleted_at' => null,
+        ]);
+
+        // user2 responds
+        (new ReadMessageThreadAction)->execute($thread, $user2);
+        $now2 = $now->clone()->addMinutes(5);
+        Carbon::setTestNow($now2);
+
+        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is a response.');
+        $this->assertDatabaseHas('message_threads', [
+            'id' => 1,
+            'title' => 'This is a message',
+            'num_messages' => 2,
+            'last_message_id' => 2,
+        ]);
+        $this->assertDatabaseHas('messages', [
+            'id' => 2,
+            'thread_id' => 1,
+            'author_id' => $user2->ID,
+            'body' => 'This is a response.',
+            'created_at' => $now2->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 1,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+
+        // user2 is deleted
+        $now3 = $now2->clone()->addMinutes(5);
+        Carbon::setTestNow($now3);
+        (new ClearAccountDataAction)->execute($user2);
+        $this->assertDatabaseHas('message_threads', [
+            'id' => 1,
+            'title' => 'This is a message',
+            'num_messages' => 2,
+            'last_message_id' => 2,
+        ]);
+        $this->assertDatabaseHas('messages', [
+            'id' => 2,
+            'thread_id' => 1,
+            'author_id' => $user2->ID,
+            'body' => 'This is a response.',
+            'created_at' => $now2->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 1,
+            'deleted_at' => null,
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user2->ID,
+            'num_unread' => 0,
+            'deleted_at' => $now3,
+        ]);
+
+        // user1 is deleted
+        (new ClearAccountDataAction)->execute($user1);
+        $this->assertDatabaseMissing('message_threads', ['id' => 1]);
+        $this->assertDatabaseMissing('messages', ['id' => 1]);
+        $this->assertDatabaseMissing('messages', ['id' => 2]);
+        $this->assertDatabaseMissing('message_thread_participants', ['id' => 1]);
+        $this->assertDatabaseMissing('message_thread_participants', ['id' => 2]);    }
 }

From c7a6ac6b9d2a7d8406731d7bc3e4f292087a73be Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Tue, 28 Nov 2023 21:09:42 -0700
Subject: [PATCH 36/47] composer fix

---
 .../Actions/AddToMessageThreadAction.php      |  2 +-
 .../Actions/CreateMessageThreadAction.php     |  6 +--
 .../Actions/DeleteMessageThreadAction.php     |  6 +--
 .../Actions/ReadMessageThreadAction.php       |  6 +--
 .../UpdateUnreadMessageCountAction.php        |  2 +-
 app/Community/Commands/SyncMessages.php       |  3 +-
 .../Controllers/MessageThreadsController.php  | 23 +++++------
 .../NotifyMessageThreadParticipants.php       |  1 -
 .../Models/MessageThreadParticipant.php       |  2 +-
 app/Helpers/database/ticket.php               |  3 +-
 tests/Feature/Community/MessagesTest.php      | 40 +++++++++----------
 11 files changed, 41 insertions(+), 53 deletions(-)

diff --git a/app/Community/Actions/AddToMessageThreadAction.php b/app/Community/Actions/AddToMessageThreadAction.php
index 1782769b89..605d30aee6 100644
--- a/app/Community/Actions/AddToMessageThreadAction.php
+++ b/app/Community/Actions/AddToMessageThreadAction.php
@@ -28,4 +28,4 @@ public function execute(MessageThread $thread, User $userFrom, string $body): vo
 
         MessageCreated::dispatch($message);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Community/Actions/CreateMessageThreadAction.php b/app/Community/Actions/CreateMessageThreadAction.php
index 5d9942a9a3..59add97278 100644
--- a/app/Community/Actions/CreateMessageThreadAction.php
+++ b/app/Community/Actions/CreateMessageThreadAction.php
@@ -4,8 +4,6 @@
 
 namespace App\Community\Actions;
 
-use App\Community\Events\MessageCreated;
-use App\Community\Models\Message;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
 use App\Site\Models\User;
@@ -45,8 +43,8 @@ public function execute(User $userFrom, User $userTo, string $title, string $bod
             $participantTo->save();
         }
 
-        (new AddToMessageThreadAction)->execute($thread, $userFrom, $body);
+        (new AddToMessageThreadAction())->execute($thread, $userFrom, $body);
 
         return $thread;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Community/Actions/DeleteMessageThreadAction.php b/app/Community/Actions/DeleteMessageThreadAction.php
index 167547c506..1c1fc24740 100644
--- a/app/Community/Actions/DeleteMessageThreadAction.php
+++ b/app/Community/Actions/DeleteMessageThreadAction.php
@@ -4,11 +4,9 @@
 
 namespace App\Community\Actions;
 
-use App\Community\Actions\UpdateUnreadMessageCountAction;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
 use App\Site\Models\User;
-use Illuminate\Support\Carbon;
 
 class DeleteMessageThreadAction
 {
@@ -27,7 +25,7 @@ public function execute(MessageThread $thread, User $user): void
 
             $participant->delete();
 
-            (new UpdateUnreadMessageCountAction)->execute($user);
+            (new UpdateUnreadMessageCountAction())->execute($user);
 
             $hasOtherActiveParticipants = MessageThreadParticipant::where('thread_id', $thread->id)
                 ->where('user_id', '!=', $user->id)
@@ -39,4 +37,4 @@ public function execute(MessageThread $thread, User $user): void
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Community/Actions/ReadMessageThreadAction.php b/app/Community/Actions/ReadMessageThreadAction.php
index b53dd522f0..feaacbf7a2 100644
--- a/app/Community/Actions/ReadMessageThreadAction.php
+++ b/app/Community/Actions/ReadMessageThreadAction.php
@@ -4,11 +4,9 @@
 
 namespace App\Community\Actions;
 
-use App\Community\Actions\UpdateUnreadMessageCountAction;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
 use App\Site\Models\User;
-use Illuminate\Support\Carbon;
 
 class ReadMessageThreadAction
 {
@@ -30,7 +28,7 @@ public static function markParticipantRead(MessageThreadParticipant $participant
             $participant->num_unread = 0;
             $participant->save();
 
-            (new UpdateUnreadMessageCountAction)->execute($user);
+            (new UpdateUnreadMessageCountAction())->execute($user);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Community/Actions/UpdateUnreadMessageCountAction.php b/app/Community/Actions/UpdateUnreadMessageCountAction.php
index 462c753332..bdf7e35fa4 100644
--- a/app/Community/Actions/UpdateUnreadMessageCountAction.php
+++ b/app/Community/Actions/UpdateUnreadMessageCountAction.php
@@ -18,4 +18,4 @@ public function execute(User $user): void
         $user->UnreadMessageCount = $totalUnread;
         $user->save();
     }
-}
\ No newline at end of file
+}
diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/SyncMessages.php
index 770ddbe727..3665498628 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/SyncMessages.php
@@ -59,8 +59,7 @@ public function handle(): void
             foreach ($foreignKeysFound as $foreignKey) {
                 if ($foreignKey->getName() == 'messages_thread_id_foreign') {
                     $foundThreadForeignKey = true;
-                }
-                elseif ($foreignKey->getName() == 'messages_author_id_foreign') {
+                } elseif ($foreignKey->getName() == 'messages_author_id_foreign') {
                     $foundAuthorForeignKey = true;
                 }
             }
diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadsController.php
index cdb801f4ed..14f0d30832 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadsController.php
@@ -8,18 +8,15 @@
 use App\Community\Actions\CreateMessageThreadAction;
 use App\Community\Actions\DeleteMessageThreadAction;
 use App\Community\Actions\ReadMessageThreadAction;
-use App\Community\Events\MessageCreated;
 use App\Community\Models\Message;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
 use App\Http\Controller;
-use App\Site\Enums\Permissions;
 use App\Site\Models\User;
 use Illuminate\Contracts\View\View;
-use Illuminate\Http\Request;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 
@@ -79,7 +76,7 @@ public function show(Request $request, int $threadId): View
         if (!$thread) {
             abort(404);
         }
-        
+
         $user = $request->user();
         $participant = MessageThreadParticipant::where('thread_id', $thread->id)
             ->where('user_id', $user->ID)
@@ -169,10 +166,10 @@ public function store(Request $request): RedirectResponse
                 return back()->withErrors(__('legacy.error.error'));
             }
 
-            (new AddToMessageThreadAction)->execute($thread, $user, $input['body']);
+            (new AddToMessageThreadAction())->execute($thread, $user, $input['body']);
         } else {
             $recipient = User::firstWhere('User', $input['recipient']);
-            $thread = (new CreateMessageThreadAction)->execute($user, $recipient, $input['title'], $input['body']);
+            $thread = (new CreateMessageThreadAction())->execute($user, $recipient, $input['title'], $input['body']);
         }
 
         return redirect(route("messages.show", $thread->id))->with('success', __('legacy.success.message_send'));
@@ -184,20 +181,20 @@ public function destroy(Request $request, int $threadId): RedirectResponse
         if (!$thread) {
             return back()->withErrors(__('legacy.error.error'));
         }
-        
+
         /** @var User $user */
         $user = request()->user();
-        
+
         $participating = MessageThreadParticipant::where('thread_id', $threadId)
             ->where('user_id', $user->ID)
             ->exists();
-        
+
         if (!$participating) {
             return back()->withErrors(__('legacy.error.error'));
         }
-        
-        (new DeleteMessageThreadAction)->execute($thread, $user);
-        
+
+        (new DeleteMessageThreadAction())->execute($thread, $user);
+
         return redirect(route("messages.index"))->with('success', __('legacy.success.message_delete'));
     }
 }
diff --git a/app/Community/Listeners/NotifyMessageThreadParticipants.php b/app/Community/Listeners/NotifyMessageThreadParticipants.php
index 451d22a2f9..b1c527e76b 100644
--- a/app/Community/Listeners/NotifyMessageThreadParticipants.php
+++ b/app/Community/Listeners/NotifyMessageThreadParticipants.php
@@ -5,7 +5,6 @@
 namespace App\Community\Listeners;
 
 use App\Community\Actions\UpdateUnreadMessageCountAction;
-use App\Community\Controllers\MessageThreadsController;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
 use App\Site\Enums\UserPreference;
diff --git a/app/Community/Models/MessageThreadParticipant.php b/app/Community/Models/MessageThreadParticipant.php
index 59a4eb9497..26a871908f 100644
--- a/app/Community/Models/MessageThreadParticipant.php
+++ b/app/Community/Models/MessageThreadParticipant.php
@@ -5,8 +5,8 @@
 namespace App\Community\Models;
 
 use App\Support\Database\Eloquent\BaseModel;
-use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class MessageThreadParticipant extends BaseModel
 {
diff --git a/app/Helpers/database/ticket.php b/app/Helpers/database/ticket.php
index 08e7b28c83..3552e0522f 100644
--- a/app/Helpers/database/ticket.php
+++ b/app/Helpers/database/ticket.php
@@ -1,7 +1,6 @@
 <?php
 
 use App\Community\Actions\CreateMessageThreadAction;
-use App\Community\Controllers\MessageThreadsController;
 use App\Community\Enums\ArticleType;
 use App\Community\Enums\SubscriptionSubjectType;
 use App\Community\Enums\TicketFilters;
@@ -151,7 +150,7 @@ function _createTicket(User $user, int $achID, int $reportType, ?int $hardcore,
     $author = User::firstWhere('User', $achAuthor);
     if ($author) {
         $bugReportMessage = "Hi, $achAuthor!\r\n[user=$username] would like to report a bug with an achievement you've created:\r\n$bugReportDetails";
-        (new CreateMessageThreadAction)->execute($user, $author, "Bug Report ($gameTitle)",
+        (new CreateMessageThreadAction())->execute($user, $author, "Bug Report ($gameTitle)",
             $bugReportMessage, isProxied: true); // don't put the message in the user's message list unless the recipient replies
     }
 
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 68795b433a..135d8447d3 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -8,7 +8,6 @@
 use App\Community\Actions\CreateMessageThreadAction;
 use App\Community\Actions\DeleteMessageThreadAction;
 use App\Community\Actions\ReadMessageThreadAction;
-use App\Community\Controllers\MessageThreadsController;
 use App\Community\Enums\UserRelationship;
 use App\Community\Models\Message;
 use App\Community\Models\UserRelation;
@@ -37,7 +36,7 @@ public function testCreateMessageChain(): void
 
         // user1 sends message to user2
         $this->captureEmails();
-        $thread = (new CreateMessageThreadAction)->execute($user1, $user2, 'This is a message', 'This is the message body.');
+        $thread = (new CreateMessageThreadAction())->execute($user1, $user2, 'This is a message', 'This is the message body.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -72,7 +71,7 @@ public function testCreateMessageChain(): void
         $this->assertEmailSent($user2, "New Private Message from {$user1->User}");
 
         // user2 responds
-        (new ReadMessageThreadAction)->execute($thread, $user2);
+        (new ReadMessageThreadAction())->execute($thread, $user2);
         $this->assertDatabaseHas('message_thread_participants', [
             'thread_id' => 1,
             'user_id' => $user2->ID,
@@ -86,7 +85,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now2);
 
         $this->captureEmails();
-        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is a response.');
+        (new AddToMessageThreadAction())->execute($thread, $user2, 'This is a response.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -123,7 +122,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now3);
 
         $this->captureEmails();
-        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is another response.');
+        (new AddToMessageThreadAction())->execute($thread, $user2, 'This is another response.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -156,7 +155,7 @@ public function testCreateMessageChain(): void
         $this->assertEmailNotSent($user1);
 
         // user1 responds
-        (new ReadMessageThreadAction)->execute($thread, $user1);
+        (new ReadMessageThreadAction())->execute($thread, $user1);
         $user1->refresh();
         $this->assertEquals(0, $user1->UnreadMessageCount);
 
@@ -164,7 +163,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now4);
 
         $this->captureEmails();
-        (new AddToMessageThreadAction)->execute($thread, $user1, 'This is a third response.');
+        (new AddToMessageThreadAction())->execute($thread, $user1, 'This is a third response.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -201,7 +200,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now5);
 
         $this->captureEmails();
-        (new DeleteMessageThreadAction)->execute($thread, $user1);
+        (new DeleteMessageThreadAction())->execute($thread, $user1);
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -232,7 +231,7 @@ public function testCreateMessageChain(): void
         Carbon::setTestNow($now6);
 
         $this->captureEmails();
-        (new DeleteMessageThreadAction)->execute($thread, $user2);
+        (new DeleteMessageThreadAction())->execute($thread, $user2);
         $this->assertDatabaseMissing('message_threads', ['id' => 1]);
         $this->assertDatabaseMissing('messages', ['id' => 1]);
         $this->assertDatabaseMissing('messages', ['id' => 2]);
@@ -268,7 +267,7 @@ public function testBlockedUser(): void
 
         // message from user2 is automatically marked as deleted by user1
         $this->captureEmails();
-        $thread = (new CreateMessageThreadAction)->execute($user2, $user1, 'This is a message', 'This is the message body.');
+        $thread = (new CreateMessageThreadAction())->execute($user2, $user1, 'This is a message', 'This is the message body.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -304,7 +303,7 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now2);
 
         $this->captureEmails();
-        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is a response.');
+        (new AddToMessageThreadAction())->execute($thread, $user2, 'This is a response.');
 
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
@@ -340,7 +339,7 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now);
 
         $this->captureEmails();
-        $thread = (new CreateMessageThreadAction)->execute($user1, $user2, 'This is a message', 'This is the message body.');
+        $thread = (new CreateMessageThreadAction())->execute($user1, $user2, 'This is a message', 'This is the message body.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 2,
             'title' => 'This is a message',
@@ -376,7 +375,7 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now2);
 
         $this->captureEmails();
-        (new AddToMessageThreadAction)->execute($thread, $user1, 'This is a response.');
+        (new AddToMessageThreadAction())->execute($thread, $user1, 'This is a response.');
 
         $this->assertDatabaseHas('message_threads', [
             'id' => 2,
@@ -413,7 +412,7 @@ public function testBlockedUser(): void
         Carbon::setTestNow($now3);
 
         $this->captureEmails();
-        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is another response.');
+        (new AddToMessageThreadAction())->execute($thread, $user2, 'This is another response.');
 
         $this->assertDatabaseHas('message_threads', [
             'id' => 2,
@@ -457,7 +456,7 @@ public function testDeleteUserDeletesThread(): void
         $user2 = User::factory()->create(['websitePrefs' => (1 << UserPreference::EmailOn_PrivateMessage)]);
 
         // user1 sends message to user2
-        $thread = (new CreateMessageThreadAction)->execute($user1, $user2, 'This is a message', 'This is the message body.');
+        $thread = (new CreateMessageThreadAction())->execute($user1, $user2, 'This is a message', 'This is the message body.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -485,11 +484,11 @@ public function testDeleteUserDeletesThread(): void
         ]);
 
         // user2 responds
-        (new ReadMessageThreadAction)->execute($thread, $user2);
+        (new ReadMessageThreadAction())->execute($thread, $user2);
         $now2 = $now->clone()->addMinutes(5);
         Carbon::setTestNow($now2);
 
-        (new AddToMessageThreadAction)->execute($thread, $user2, 'This is a response.');
+        (new AddToMessageThreadAction())->execute($thread, $user2, 'This is a response.');
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -519,7 +518,7 @@ public function testDeleteUserDeletesThread(): void
         // user2 is deleted
         $now3 = $now2->clone()->addMinutes(5);
         Carbon::setTestNow($now3);
-        (new ClearAccountDataAction)->execute($user2);
+        (new ClearAccountDataAction())->execute($user2);
         $this->assertDatabaseHas('message_threads', [
             'id' => 1,
             'title' => 'This is a message',
@@ -547,10 +546,11 @@ public function testDeleteUserDeletesThread(): void
         ]);
 
         // user1 is deleted
-        (new ClearAccountDataAction)->execute($user1);
+        (new ClearAccountDataAction())->execute($user1);
         $this->assertDatabaseMissing('message_threads', ['id' => 1]);
         $this->assertDatabaseMissing('messages', ['id' => 1]);
         $this->assertDatabaseMissing('messages', ['id' => 2]);
         $this->assertDatabaseMissing('message_thread_participants', ['id' => 1]);
-        $this->assertDatabaseMissing('message_thread_participants', ['id' => 2]);    }
+        $this->assertDatabaseMissing('message_thread_participants', ['id' => 2]);
+    }
 }

From 683892759dfddfcb982e633c6a5d5db30cae24d0 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 11:28:56 -0700
Subject: [PATCH 37/47] rename SyncMessages -> MigrateMessages; use chunkById

---
 app/Community/AppServiceProvider.php                   |  4 ++--
 .../Commands/{SyncMessages.php => MigrateMessages.php} | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename app/Community/Commands/{SyncMessages.php => MigrateMessages.php} (95%)

diff --git a/app/Community/AppServiceProvider.php b/app/Community/AppServiceProvider.php
index cff69666ff..3933517831 100644
--- a/app/Community/AppServiceProvider.php
+++ b/app/Community/AppServiceProvider.php
@@ -4,11 +4,11 @@
 
 namespace App\Community;
 
+use App\Community\Commands\MigrateMessages;
 use App\Community\Commands\SyncComments;
 use App\Community\Commands\SyncForumCategories;
 use App\Community\Commands\SyncForums;
 use App\Community\Commands\SyncForumTopics;
-use App\Community\Commands\SyncMessages;
 use App\Community\Commands\SyncNews;
 use App\Community\Commands\SyncRatings;
 use App\Community\Commands\SyncTickets;
@@ -54,11 +54,11 @@ public function boot(): void
     {
         if ($this->app->runningInConsole()) {
             $this->commands([
+                MigrateMessages::class,
                 SyncComments::class,
                 SyncForumCategories::class,
                 SyncForums::class,
                 SyncForumTopics::class,
-                SyncMessages::class,
                 SyncNews::class,
                 SyncRatings::class,
                 SyncTickets::class,
diff --git a/app/Community/Commands/SyncMessages.php b/app/Community/Commands/MigrateMessages.php
similarity index 95%
rename from app/Community/Commands/SyncMessages.php
rename to app/Community/Commands/MigrateMessages.php
index 3665498628..0a3fd35ec4 100644
--- a/app/Community/Commands/SyncMessages.php
+++ b/app/Community/Commands/MigrateMessages.php
@@ -13,9 +13,9 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-class SyncMessages extends Command
+class MigrateMessages extends Command
 {
-    protected $signature = 'ra:sync:messages';
+    protected $signature = 'ra:platform:messages:migrate-to-threads';
     protected $description = 'Sync messages';
 
     public function __construct()
@@ -39,14 +39,12 @@ public function handle(): void
         // process remaining unprocessed records (thread_id=0)
         // have to do this in batches to prevent exhausting memory
         // due to requesting payloads (message content)
-        for ($i = 0; $i < $count; $i += 100) {
-            $messages = Message::where('thread_id', 0)->orderBy('ID')->limit(100)->get();
-            /** @var Message $message */
+        Message::where('thread_id', 0)->chunkById(100, function($messages) use ($progressBar) {
             foreach ($messages as $message) {
                 $this->migrateMessage($message);
                 $progressBar->advance();
             }
-        }
+        });
 
         $count = Message::where('thread_id', 0)->count();
         if ($count == 0) {

From 8fc03fc2238a4a5b5c2b790c740f9b39e40ed93f Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 11:31:44 -0700
Subject: [PATCH 38/47] restore redirect for createmessage.php

---
 config/missing-page-redirector.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/missing-page-redirector.php b/config/missing-page-redirector.php
index b5097abe57..0097abb302 100644
--- a/config/missing-page-redirector.php
+++ b/config/missing-page-redirector.php
@@ -90,6 +90,7 @@
          */
         '/controlpanel.php' => '/settings',
         '/friends.php' => '/friends',
+        '/createmessage.php' => '/messages/create?to={t}&subject={s}&message={p}',
         '/inbox.php' => '/messages',
         '/gamecompare.php' => '/user/{f}/game/{ID}/compare',
         '/manageuserpic.php' => '/settings',

From 3c89ad7038be3b7774e473d730ceade0a69a13e1 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 11:48:03 -0700
Subject: [PATCH 39/47] rename MessageThreadsController ->
 MessageThreadController

---
 ...ssageThreadsController.php => MessageThreadController.php} | 2 +-
 app/Community/RouteServiceProvider.php                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename app/Community/Controllers/{MessageThreadsController.php => MessageThreadController.php} (99%)

diff --git a/app/Community/Controllers/MessageThreadsController.php b/app/Community/Controllers/MessageThreadController.php
similarity index 99%
rename from app/Community/Controllers/MessageThreadsController.php
rename to app/Community/Controllers/MessageThreadController.php
index 14f0d30832..652909030c 100644
--- a/app/Community/Controllers/MessageThreadsController.php
+++ b/app/Community/Controllers/MessageThreadController.php
@@ -20,7 +20,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 
-class MessageThreadsController extends Controller
+class MessageThreadController extends Controller
 {
     public function index(Request $request): View
     {
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index e607575344..7e433800bc 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -5,7 +5,7 @@
 namespace App\Community;
 
 use App\Community\Controllers\ContactController;
-use App\Community\Controllers\MessageThreadsController;
+use App\Community\Controllers\MessageThreadController;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Route;
 
@@ -232,7 +232,7 @@ protected function mapWebRoutes(): void
                 /*
                  * messages
                  */
-                Route::resource('messages', MessageThreadsController::class)->except(['edit', 'update']);
+                Route::resource('messages', MessageThreadController::class)->except(['edit', 'update']);
 
                 //     /*
                 //      * tickets

From cbdc88922b407efcfb9997fb0f255887c859e556 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 11:53:12 -0700
Subject: [PATCH 40/47] restore MessagePolicy

---
 app/Community/AuthServiceProvider.php    |  3 ++
 app/Community/Policies/MessagePolicy.php | 44 ++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 app/Community/Policies/MessagePolicy.php

diff --git a/app/Community/AuthServiceProvider.php b/app/Community/AuthServiceProvider.php
index 9b3f9c6c24..e7e7ffbf5e 100755
--- a/app/Community/AuthServiceProvider.php
+++ b/app/Community/AuthServiceProvider.php
@@ -12,6 +12,7 @@
 use App\Community\Models\ForumTopic;
 use App\Community\Models\ForumTopicComment;
 use App\Community\Models\GameComment;
+use App\Community\Models\Message;
 use App\Community\Models\MessageThread;
 use App\Community\Models\News;
 use App\Community\Models\NewsComment;
@@ -26,6 +27,7 @@
 use App\Community\Policies\ForumTopicCommentPolicy;
 use App\Community\Policies\ForumTopicPolicy;
 use App\Community\Policies\GameCommentPolicy;
+use App\Community\Policies\MessagePolicy;
 use App\Community\Policies\MessageThreadPolicy;
 use App\Community\Policies\NewsCommentPolicy;
 use App\Community\Policies\NewsPolicy;
@@ -45,6 +47,7 @@ class AuthServiceProvider extends ServiceProvider
         ForumTopicComment::class => ForumTopicCommentPolicy::class,
         ForumTopic::class => ForumTopicPolicy::class,
         GameComment::class => GameCommentPolicy::class,
+        Message::class => MessagePolicy::class,
         MessageThread::class => MessageThreadPolicy::class,
         News::class => NewsPolicy::class,
         NewsComment::class => NewsCommentPolicy::class,
diff --git a/app/Community/Policies/MessagePolicy.php b/app/Community/Policies/MessagePolicy.php
new file mode 100644
index 0000000000..ca566005a2
--- /dev/null
+++ b/app/Community/Policies/MessagePolicy.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Policies;
+
+use App\Community\Models\Message;
+use App\Site\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class MessagePolicy
+{
+    use HandlesAuthorization;
+
+    public function view(User $user, Message $message): bool
+    {
+        return true;
+    }
+
+    public function create(User $user): bool
+    {
+        return true;
+    }
+
+    public function update(User $user, Message $message): bool
+    {
+        return false;
+    }
+
+    public function delete(User $user, Message $message): bool
+    {
+        return false;
+    }
+
+    public function restore(User $user, Message $message): bool
+    {
+        return false;
+    }
+
+    public function forceDelete(User $user, Message $message): bool
+    {
+        return false;
+    }
+}

From fecde6011f73e96a678184e39757b774efc79151 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 12:12:00 -0700
Subject: [PATCH 41/47] update variable names

---
 app/Community/Policies/MessageThreadPolicy.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Community/Policies/MessageThreadPolicy.php b/app/Community/Policies/MessageThreadPolicy.php
index 2dcbe1e10e..c8bac1cbb8 100644
--- a/app/Community/Policies/MessageThreadPolicy.php
+++ b/app/Community/Policies/MessageThreadPolicy.php
@@ -12,7 +12,7 @@ class MessageThreadPolicy
 {
     use HandlesAuthorization;
 
-    public function view(User $user, MessageThread $message): bool
+    public function view(User $user, MessageThread $messageThread): bool
     {
         return true;
     }
@@ -22,22 +22,22 @@ public function create(User $user): bool
         return true;
     }
 
-    public function update(User $user, MessageThread $message): bool
+    public function update(User $user, MessageThread $messageThread): bool
     {
         return false;
     }
 
-    public function delete(User $user, MessageThread $message): bool
+    public function delete(User $user, MessageThread $messageThread): bool
     {
         return true;
     }
 
-    public function restore(User $user, MessageThread $message): bool
+    public function restore(User $user, MessageThread $messageThread): bool
     {
         return false;
     }
 
-    public function forceDelete(User $user, MessageThread $message): bool
+    public function forceDelete(User $user, MessageThread $messageThread): bool
     {
         return false;
     }

From 39b0b912a8773530e91f5a8b24436a3581c8255e Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 12:12:16 -0700
Subject: [PATCH 42/47] composer fix

---
 app/Community/Commands/MigrateMessages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Community/Commands/MigrateMessages.php b/app/Community/Commands/MigrateMessages.php
index 0a3fd35ec4..dee6b1fa9e 100644
--- a/app/Community/Commands/MigrateMessages.php
+++ b/app/Community/Commands/MigrateMessages.php
@@ -39,7 +39,7 @@ public function handle(): void
         // process remaining unprocessed records (thread_id=0)
         // have to do this in batches to prevent exhausting memory
         // due to requesting payloads (message content)
-        Message::where('thread_id', 0)->chunkById(100, function($messages) use ($progressBar) {
+        Message::where('thread_id', 0)->chunkById(100, function ($messages) use ($progressBar) {
             foreach ($messages as $message) {
                 $this->migrateMessage($message);
                 $progressBar->advance();

From 0ded67da544c773198710e022e9361663b0cdb66 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 14:52:03 -0700
Subject: [PATCH 43/47] update routes

---
 .../Controllers/MessageController.php         | 71 +++++++++++++++++++
 .../Controllers/MessageThreadController.php   | 53 +-------------
 app/Community/RouteServiceProvider.php        | 10 ++-
 app/Helpers/util/mail.php                     |  2 +-
 app/Site/Components/NotificationIcon.php      |  2 +-
 config/missing-page-redirector.php            |  2 +-
 public/friends.php                            |  2 +-
 public/managehashes.php                       |  2 +-
 public/ticketmanager.php                      |  2 +-
 public/userInfo.php                           |  2 +-
 .../components/message/icon.blade.php         |  2 +-
 resources/views/community/contact.blade.php   | 16 ++---
 .../index.blade.php                           |  6 +-
 .../message => message-thread}/show.blade.php |  6 +-
 .../{components => }/message/create.blade.php |  4 +-
 .../views/components/menu/account.blade.php   |  2 +-
 16 files changed, 108 insertions(+), 76 deletions(-)
 create mode 100644 app/Community/Controllers/MessageController.php
 rename resources/views/community/{components/message => message-thread}/index.blade.php (93%)
 rename resources/views/community/{components/message => message-thread}/show.blade.php (93%)
 rename resources/views/community/{components => }/message/create.blade.php (91%)

diff --git a/app/Community/Controllers/MessageController.php b/app/Community/Controllers/MessageController.php
new file mode 100644
index 0000000000..985216ce9e
--- /dev/null
+++ b/app/Community/Controllers/MessageController.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Controllers;
+
+use App\Community\Actions\AddToMessageThreadAction;
+use App\Community\Actions\CreateMessageThreadAction;
+use App\Community\Actions\DeleteMessageThreadAction;
+use App\Community\Actions\ReadMessageThreadAction;
+use App\Community\Models\Message;
+use App\Community\Models\MessageThread;
+use App\Community\Models\MessageThreadParticipant;
+use App\Http\Controller;
+use App\Site\Models\User;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+
+class MessageController extends Controller
+{
+    public function create(Request $request): View
+    {
+        $toUser = $request->input('to') ?? '';
+        $subject = $request->input('subject') ?? '';
+        $message = $request->input('message') ?? '';
+
+        return view('community.message.create', [
+            'toUser' => $toUser,
+            'subject' => $subject,
+            'message' => $message,
+        ]);
+    }
+
+    public function store(Request $request): RedirectResponse
+    {
+        /** @var User $user */
+        $user = request()->user();
+
+        $input = Validator::validate(Arr::wrap(request()->post()), [
+            'thread_id' => 'nullable|integer',
+            'body' => 'required|string|max:60000',
+            'title' => 'required_without:thread_id|string|max:255',
+            'recipient' => 'required_without:thread_id|exists:UserAccounts,User',
+        ]);
+
+        if (array_key_exists('thread_id', $input) && $input['thread_id'] != null) {
+            $thread = MessageThread::firstWhere('id', $input['thread_id']);
+            if (!$thread) {
+                return back()->withErrors(__('legacy.error.error'));
+            }
+
+            $participant = MessageThreadParticipant::withTrashed()
+                ->where('thread_id', $input['thread_id'])
+                ->where('user_id', $user->ID);
+            if (!$participant->exists()) {
+                return back()->withErrors(__('legacy.error.error'));
+            }
+
+            (new AddToMessageThreadAction())->execute($thread, $user, $input['body']);
+        } else {
+            $recipient = User::firstWhere('User', $input['recipient']);
+            $thread = (new CreateMessageThreadAction())->execute($user, $recipient, $input['title'], $input['body']);
+        }
+
+        return redirect(route("message-thread.show", $thread->id))->with('success', __('legacy.success.message_send'));
+    }
+}
diff --git a/app/Community/Controllers/MessageThreadController.php b/app/Community/Controllers/MessageThreadController.php
index 652909030c..96ce64bad9 100644
--- a/app/Community/Controllers/MessageThreadController.php
+++ b/app/Community/Controllers/MessageThreadController.php
@@ -61,7 +61,7 @@ public function index(Request $request): View
                 ->value('num_unread');
         }
 
-        return view('community.components.message.index', [
+        return view('community.message-thread.index', [
             'messages' => $messageThreads,
             'totalPages' => $totalPages,
             'currentPage' => $currentPage,
@@ -118,7 +118,7 @@ public function show(Request $request, int $threadId): View
             })
             ->toArray();
 
-        return view('community.components.message.show', [
+        return view('community.message-thread.show', [
             'thread' => $thread,
             'messages' => $messages,
             'participants' => $participants,
@@ -128,53 +128,6 @@ public function show(Request $request, int $threadId): View
         ]);
     }
 
-    public function create(Request $request): View
-    {
-        $toUser = $request->input('to') ?? '';
-        $subject = $request->input('subject') ?? '';
-        $message = $request->input('message') ?? '';
-
-        return view('community.components.message.create', [
-            'toUser' => $toUser,
-            'subject' => $subject,
-            'message' => $message,
-        ]);
-    }
-
-    public function store(Request $request): RedirectResponse
-    {
-        /** @var User $user */
-        $user = request()->user();
-
-        $input = Validator::validate(Arr::wrap(request()->post()), [
-            'thread_id' => 'nullable|integer',
-            'body' => 'required|string|max:60000',
-            'title' => 'required_without:thread_id|string|max:255',
-            'recipient' => 'required_without:thread_id|exists:UserAccounts,User',
-        ]);
-
-        if (array_key_exists('thread_id', $input) && $input['thread_id'] != null) {
-            $thread = MessageThread::firstWhere('id', $input['thread_id']);
-            if (!$thread) {
-                return back()->withErrors(__('legacy.error.error'));
-            }
-
-            $participant = MessageThreadParticipant::withTrashed()
-                ->where('thread_id', $input['thread_id'])
-                ->where('user_id', $user->ID);
-            if (!$participant->exists()) {
-                return back()->withErrors(__('legacy.error.error'));
-            }
-
-            (new AddToMessageThreadAction())->execute($thread, $user, $input['body']);
-        } else {
-            $recipient = User::firstWhere('User', $input['recipient']);
-            $thread = (new CreateMessageThreadAction())->execute($user, $recipient, $input['title'], $input['body']);
-        }
-
-        return redirect(route("messages.show", $thread->id))->with('success', __('legacy.success.message_send'));
-    }
-
     public function destroy(Request $request, int $threadId): RedirectResponse
     {
         $thread = MessageThread::firstWhere('id', $threadId);
@@ -195,6 +148,6 @@ public function destroy(Request $request, int $threadId): RedirectResponse
 
         (new DeleteMessageThreadAction())->execute($thread, $user);
 
-        return redirect(route("messages.index"))->with('success', __('legacy.success.message_delete'));
+        return redirect(route('message-thread.index'))->with('success', __('legacy.success.message_delete'));
     }
 }
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index 7e433800bc..ec3b38795e 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -5,6 +5,7 @@
 namespace App\Community;
 
 use App\Community\Controllers\ContactController;
+use App\Community\Controllers\MessageController;
 use App\Community\Controllers\MessageThreadController;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Route;
@@ -232,7 +233,14 @@ protected function mapWebRoutes(): void
                 /*
                  * messages
                  */
-                Route::resource('messages', MessageThreadController::class)->except(['edit', 'update']);
+                Route::group([
+                    'middleware' => ['auth'], // TODO add 'verified' middleware
+                ], function () {
+                    Route::resource('message', MessageController::class)->only(['create', 'store']);
+
+                    Route::get('messages', [MessageThreadController::class, 'index'])->name('message-thread.index');
+                    Route::resource('message-thread', MessageThreadController::class)->only(['show', 'destroy']);
+                });
 
                 //     /*
                 //      * tickets
diff --git a/app/Helpers/util/mail.php b/app/Helpers/util/mail.php
index cc5d710935..df1e284a89 100644
--- a/app/Helpers/util/mail.php
+++ b/app/Helpers/util/mail.php
@@ -363,7 +363,7 @@ function SendPrivateMessageEmail(
 
     // Also used for Generic text:
     $emailTitle = "New Private Message from $fromUser";
-    $link = "<a href='" . route('messages.index') . "'>here</a>";
+    $link = "<a href='" . route('message-thread.index') . "'>here</a>";
 
     $msg = "Hello $user!<br>" .
         "You have received a new private message from $fromUser.<br><br>" .
diff --git a/app/Site/Components/NotificationIcon.php b/app/Site/Components/NotificationIcon.php
index b56d328905..5682cf2d48 100644
--- a/app/Site/Components/NotificationIcon.php
+++ b/app/Site/Components/NotificationIcon.php
@@ -24,7 +24,7 @@ public function render(): View
 
         if ($user->unread_messages_count) {
             $notifications->push([
-                'link' => route('messages.index'),
+                'link' => route('message-thread.index'),
                 'title' => $user->unread_messages_count . ' ' . __res('message', (int) $user->unread_messages_count),
             ]);
         }
diff --git a/config/missing-page-redirector.php b/config/missing-page-redirector.php
index 0097abb302..601faf74de 100644
--- a/config/missing-page-redirector.php
+++ b/config/missing-page-redirector.php
@@ -90,7 +90,7 @@
          */
         '/controlpanel.php' => '/settings',
         '/friends.php' => '/friends',
-        '/createmessage.php' => '/messages/create?to={t}&subject={s}&message={p}',
+        '/createmessage.php' => '/message/create?to={t}&subject={s}&message={p}',
         '/inbox.php' => '/messages',
         '/gamecompare.php' => '/user/{f}/game/{ID}/compare',
         '/manageuserpic.php' => '/settings',
diff --git a/public/friends.php b/public/friends.php
index 0218bbb73a..49adfd3d5c 100644
--- a/public/friends.php
+++ b/public/friends.php
@@ -124,7 +124,7 @@ function RenderUserList(string $header, array $users, int $friendshipType, array
             echo "<td style='vertical-align:middle;'>";
             echo "<div class='flex justify-end gap-2'>";
 
-            echo "<a class='btn btn-link' href='" . route('messages.create') . "?to=$followingUser'>Message</a>";
+            echo "<a class='btn btn-link' href='" . route('message.create') . "?to=$followingUser'>Message</a>";
 
             echo "<form class='inline-block' action='/request/user/update-relationship.php' method='post'>";
             echo csrf_field();
diff --git a/public/managehashes.php b/public/managehashes.php
index 3e1ae7ac67..bd11cf4fab 100644
--- a/public/managehashes.php
+++ b/public/managehashes.php
@@ -113,7 +113,7 @@ function UnlinkHash(user, gameID, hash, elem) {
     }
     echo "</div>";
 
-    echo "<br><div class='text-danger'><b>Warning:</b> PLEASE be careful with this tool. If in doubt, <a href='" . route('messages.create') . "?to=RAdmin&subject=Attempt+to+Unlink+" . urlencode($gameTitle) . "&message=%5Bgame=$gameID%5D'>leave a message for admins</a> and they'll help sort it.</div>";
+    echo "<br><div class='text-danger'><b>Warning:</b> PLEASE be careful with this tool. If in doubt, <a href='" . route('message.create') . "?to=RAdmin&subject=Attempt+to+Unlink+" . urlencode($gameTitle) . "&message=%5Bgame=$gameID%5D'>leave a message for admins</a> and they'll help sort it.</div>";
 
     echo "<br/><div id='hashCount'>Currently this game has <b>$numLinks</b> unique hashes registered for it:</div>";
 
diff --git a/public/ticketmanager.php b/public/ticketmanager.php
index f83c1a35ba..5bd28415f8 100644
--- a/public/ticketmanager.php
+++ b/public/ticketmanager.php
@@ -729,7 +729,7 @@
                 $msgPayload = "Hi [user=$reportedBy], I'm contacting you about [ticket=$ticketID]";
                 $msgPayload = rawurlencode($msgPayload);
                 $msgTitle = rawurlencode("Bug Report ($gameTitle)");
-                echo "<a href='" . route('messages.create') . "?to=$reportedBy&subject=$msgTitle&message=$msgPayload'>Contact the reporter - $reportedBy</a>";
+                echo "<a href='" . route('message.create') . "?to=$reportedBy&subject=$msgTitle&message=$msgPayload'>Contact the reporter - $reportedBy</a>";
                 echo "</div>";
                 echo "</td>";
                 echo "</tr>";
diff --git a/public/userInfo.php b/public/userInfo.php
index f2bab9869a..df77eca265 100644
--- a/public/userInfo.php
+++ b/public/userInfo.php
@@ -248,7 +248,7 @@ function resize() {
             echo "<button class='btn btn-link'>Unblock</button>";
             echo "</form>";
         }
-        echo "<a class='btn btn-link' href='" . route('messages.create') . "?to=$userPage'>Message</a>";
+        echo "<a class='btn btn-link' href='" . route('message.create') . "?to=$userPage'>Message</a>";
         echo "</div>";
 
         if ($areTheyFollowingMe) {
diff --git a/resources/views/community/components/message/icon.blade.php b/resources/views/community/components/message/icon.blade.php
index 78905ec780..ff8fff9289 100644
--- a/resources/views/community/components/message/icon.blade.php
+++ b/resources/views/community/components/message/icon.blade.php
@@ -1,5 +1,5 @@
 <div class="navitem {{ $class ?? '' }}">
-    <a class="nav-link" href="{{ route('messages.index') }}" title="{{ __res('message') }}" data-toggle="tooltip">
+    <a class="nav-link" href="{{ route('message-thread.index') }}" title="{{ __res('message') }}" data-toggle="tooltip">
         <x-fas-envelope />
         @if($count ?? 0)
             <div class="text-danger absolute translate-x-3 -translate-y-1 text-[8px]">
diff --git a/resources/views/community/contact.blade.php b/resources/views/community/contact.blade.php
index dd037b59f8..e51baf3774 100644
--- a/resources/views/community/contact.blade.php
+++ b/resources/views/community/contact.blade.php
@@ -5,7 +5,7 @@
                 <h2>Admins and Moderators</h2>
 
                 <p class="mb-0">
-                    <a href='{{ route("messages.create") }}?to=RAdmin'>Send a message to RAdmin</a> for:
+                    <a href='{{ route("message.create") }}?to=RAdmin'>Send a message to RAdmin</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -20,7 +20,7 @@
                 <h2>Developer Compliance</h2>
 
                 <p class="mb-0">
-                    <a href='{{ route("messages.create") }}?to=DevCompliance'>Send a message to DevCompliance</a> for:
+                    <a href='{{ route("message.create") }}?to=DevCompliance'>Send a message to DevCompliance</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -34,7 +34,7 @@
                 <h2>Quality Assurance</h2>
 
                 <p class="mb-0">
-                    <a href='{{ route("messages.create") }}?to=QATeam'>Send a message to QATeam</a> for:
+                    <a href='{{ route("message.create") }}?to=QATeam'>Send a message to QATeam</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -51,7 +51,7 @@
                 <h2>DevQuest</h2>
 
                 <p class="mb-3">
-                    <a href='{{ route("messages.create") }}?to=DevQuest'>Send a message to DevQuest</a> for
+                    <a href='{{ route("message.create") }}?to=DevQuest'>Send a message to DevQuest</a> for
                     submissions, questions, ideas, or reporting issues related to
                     <a href='/game/5686'>DevQuest</a>.
                 </p>
@@ -63,7 +63,7 @@
                 <h2>Cheating Reports</h2>
 
                 <p class="mb-3">
-                    <a href="{{ route("messages.create") }}?to=RACheats">Send a message to RACheats</a>
+                    <a href='{{ route("message.create") }}?to=RACheats'>Send a message to RACheats</a>
                     if you believe someone is in violation of our
                     <a href="https://docs.retroachievements.org/Global-Leaderboard-and-Achievement-Hunting-Rules/#not-allowed">Global Leaderboard and Achievement Hunting Rules</a>.
                 </p>
@@ -81,7 +81,7 @@
                 <h2>RANews</h2>
 
                 <p class="mb-0">
-                    <a href='{{ route("messages.create") }}?to=RANews'>Send a message to RANews</a> for:
+                    <a href='{{ route("message.create") }}?to=RANews'>Send a message to RANews</a> for:
                 </p>
 
                 <ul class="mb-3 list-disc list-inside">
@@ -96,13 +96,13 @@
                 <h2>RAEvents</h2>
 
                 <p class="mb-3">
-                    <a href='{{ route("messages.create") }}?to=RAEvents'>Send a message to RAEvents</a> for
+                    <a href='{{ route("message.create") }}?to=RAEvents'>Send a message to RAEvents</a> for
                     submissions, questions, ideas, or reporting issues related to
                     <a href='/game/3105'>community events</a>.
                 </p>
 
                 <p class="mb-3">
-                    <a href='{{ route("messages.create") }}?to=TheUnwanted'>Send a message to TheUnwanted</a> for
+                    <a href='{{ route("message.create") }}?to=TheUnwanted'>Send a message to TheUnwanted</a> for
                     submissions, questions, ideas, or reporting issues specifically related to
                     <a href='/game/4271'>The Unwanted</a>.
                 </p>
diff --git a/resources/views/community/components/message/index.blade.php b/resources/views/community/message-thread/index.blade.php
similarity index 93%
rename from resources/views/community/components/message/index.blade.php
rename to resources/views/community/message-thread/index.blade.php
index 52471f2f65..0910fcc709 100644
--- a/resources/views/community/components/message/index.blade.php
+++ b/resources/views/community/message-thread/index.blade.php
@@ -21,7 +21,7 @@
 <script>
 function deleteMessage(id) {
     if (confirm('Are you sure you want to delete this message?')) {
-        $.post("{{ route('messages.store') }}", {
+        $.post("{{ route('message.store') }}", {
             thread_id: id,
             user: "{{ $user->User }}"
         })
@@ -47,7 +47,7 @@ function deleteMessage(id) {
 
     <div class="w-full flex mt-2">
         <div class="mr-6">
-            <a href="{{ route('messages.create') }}"><button class='btn'>New Message</button></a>
+            <a href="{{ route('message.create') }}"><button class='btn'>New Message</button></a>
         </div>
         <div class="w-full flex justify-end">
             <x-paginator :totalPages="$totalPages" :currentPage="$currentPage" />
@@ -77,7 +77,7 @@ function deleteMessage(id) {
             </td>
 
             <td @if ($num_unread > 0) class="font-bold" @endif>
-                <a href="{{ route('messages.show', $message->id) }}">
+                <a href="{{ route('message-thread.show', $message->id) }}">
                     {{ $message->title }}
                 </a>
             </td>
diff --git a/resources/views/community/components/message/show.blade.php b/resources/views/community/message-thread/show.blade.php
similarity index 93%
rename from resources/views/community/components/message/show.blade.php
rename to resources/views/community/message-thread/show.blade.php
index f9f7773a44..331026266f 100644
--- a/resources/views/community/components/message/show.blade.php
+++ b/resources/views/community/message-thread/show.blade.php
@@ -47,7 +47,7 @@
 >
     <x-user.breadcrumbs targetUsername="{{ $user->User }}"
         parentPage="Messages"
-        parentPageUrl="{{ route('messages.index') }}"
+        parentPageUrl="{{ route('message-thread.index') }}"
         currentPage="{!! $thread->title !!}" />
 
     <div class="mt-3 w-full flex gap-x-3">
@@ -56,7 +56,7 @@
 
     <div class="w-full flex my-2">
         <div class="mr-6">
-            <form action="{{ route('messages.destroy', $thread->id) }}" method='post'>
+            <form action="{{ route('message-thread.destroy', $thread->id) }}" method='post'>
             {{ method_field('DELETE') }}
             {{ csrf_field() }}
             <button class="btn btn-danger" onclick="return confirm('Are you sure you want to delete this message thread?')">Delete</button>
@@ -92,7 +92,7 @@
     @if (!$canReply)
         <i>Cannot reply to deleted user.</i>
     @else
-        <form action="{{ route('messages.store') }}" method='post' x-data='{ isValid: true }'>
+        <form action="{{ route('message.store') }}" method='post' x-data='{ isValid: true }'>
             {{ csrf_field() }}
             <input type='hidden' name='thread_id' value='{{ $thread->id }}' />
 
diff --git a/resources/views/community/components/message/create.blade.php b/resources/views/community/message/create.blade.php
similarity index 91%
rename from resources/views/community/components/message/create.blade.php
rename to resources/views/community/message/create.blade.php
index b562787cce..63ce9bf17a 100644
--- a/resources/views/community/components/message/create.blade.php
+++ b/resources/views/community/message/create.blade.php
@@ -10,14 +10,14 @@
 >
     <x-user.breadcrumbs targetUsername="{{ request()->user()->User }}"
             parentPage="Messages"
-            parentPageUrl="{{ route('messages.index') }}"
+            parentPageUrl="{{ route('message-thread.index') }}"
             currentPage="New Message" />
 
     <div class="w-full flex gap-x-3">
         <h1 class="mt-[10px] w-full">New Message</h1>
     </div>
 
-    <form action="{{ route('messages.store') }}" method='post' x-data='{ isValid: true }'>
+    <form action="{{ route('message.store') }}" method='post' x-data='{ isValid: true }'>
         {{ csrf_field() }}
         <div><table class='mb-4'><tbody>
             <tr>
diff --git a/resources/views/components/menu/account.blade.php b/resources/views/components/menu/account.blade.php
index a169aedd09..1d4f17189d 100644
--- a/resources/views/components/menu/account.blade.php
+++ b/resources/views/components/menu/account.blade.php
@@ -85,7 +85,7 @@
         <x-dropdown-item :link="url('history.php')">History</x-dropdown-item>
         {{--<x-dropdown-item :link="route('follower.index')">{{ __res('follower') }}</x-dropdown-item>--}}
         <x-dropdown-item :link="url('friends.php')">Following</x-dropdown-item>
-        <x-dropdown-item :link="route('messages.index')">{{ __res('message') }}</x-dropdown-item>
+        <x-dropdown-item :link="route('message-thread.index')">{{ __res('message') }}</x-dropdown-item>
         <div class="dropdown-divider"></div>
         <x-dropdown-item :link="url('reorderSiteAwards.php')">Reorder Site Awards</x-dropdown-item>
         {{--<x-dropdown-item :link="route('settings')">{{ __res('setting') }}</x-dropdown-item>--}}

From f18518615b53d600fe041ddc4d0725d2bfb93df5 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 15:02:46 -0700
Subject: [PATCH 44/47] handle message to self

---
 .../Controllers/MessageThreadController.php   |  2 +-
 .../community/message-thread/index.blade.php  | 10 ++-
 tests/Feature/Community/MessagesTest.php      | 63 +++++++++++++++++++
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/app/Community/Controllers/MessageThreadController.php b/app/Community/Controllers/MessageThreadController.php
index 96ce64bad9..415ca7c4e4 100644
--- a/app/Community/Controllers/MessageThreadController.php
+++ b/app/Community/Controllers/MessageThreadController.php
@@ -107,7 +107,7 @@ public function show(Request $request, int $threadId): View
             ->where('thread_id', $thread->id)
             ->join('UserAccounts', 'UserAccounts.ID', '=', 'message_thread_participants.user_id');
 
-        $canReply = (clone $participants)
+        $canReply = ($participants->count() === 1) || (clone $participants)
             ->where('user_id', '!=', $user->ID)
             ->whereNull('UserAccounts.Deleted')
             ->exists();
diff --git a/resources/views/community/message-thread/index.blade.php b/resources/views/community/message-thread/index.blade.php
index 0910fcc709..06af46c26d 100644
--- a/resources/views/community/message-thread/index.blade.php
+++ b/resources/views/community/message-thread/index.blade.php
@@ -71,9 +71,13 @@ function deleteMessage(id) {
         ?>
         <tr>
             <td @if ($num_unread > 0) class="font-bold" @endif>
-                @foreach ($message->other_participants as $participant)
-                    {!! userAvatar($participant, iconSize: 24) !!}
-                @endforeach
+                @if (empty($message->other_participants))
+                    {!! userAvatar($user, iconSize: 24) !!}
+                @else
+                    @foreach ($message->other_participants as $participant)
+                        {!! userAvatar($participant, iconSize: 24) !!}
+                    @endforeach
+                @endif
             </td>
 
             <td @if ($num_unread > 0) class="font-bold" @endif>
diff --git a/tests/Feature/Community/MessagesTest.php b/tests/Feature/Community/MessagesTest.php
index 135d8447d3..7ea727be65 100644
--- a/tests/Feature/Community/MessagesTest.php
+++ b/tests/Feature/Community/MessagesTest.php
@@ -553,4 +553,67 @@ public function testDeleteUserDeletesThread(): void
         $this->assertDatabaseMissing('message_thread_participants', ['id' => 1]);
         $this->assertDatabaseMissing('message_thread_participants', ['id' => 2]);
     }
+
+    public function testMessageToSelf(): void
+    {
+        $now = Carbon::now()->floorSecond();
+        Carbon::setTestNow($now);
+
+        /** @var User $user1 */
+        $user1 = User::factory()->create(['websitePrefs' => (1 << UserPreference::EmailOn_PrivateMessage)]);
+
+        // user1 sends message to user1
+        $thread = (new CreateMessageThreadAction())->execute($user1, $user1, 'This is a message', 'This is the message body.');
+        $this->assertDatabaseHas('message_threads', [
+            'id' => 1,
+            'title' => 'This is a message',
+            'num_messages' => 1,
+            'last_message_id' => 1,
+        ]);
+        $this->assertDatabaseHas('messages', [
+            'id' => 1,
+            'thread_id' => 1,
+            'author_id' => $user1->ID,
+            'body' => 'This is the message body.',
+            'created_at' => $now->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+
+        // user1 responds
+        $now2 = $now->clone()->addMinutes(5);
+        Carbon::setTestNow($now2);
+
+        (new AddToMessageThreadAction())->execute($thread, $user1, 'This is a response.');
+        $this->assertDatabaseHas('message_threads', [
+            'id' => 1,
+            'title' => 'This is a message',
+            'num_messages' => 2,
+            'last_message_id' => 2,
+        ]);
+        $this->assertDatabaseHas('messages', [
+            'id' => 2,
+            'thread_id' => 1,
+            'author_id' => $user1->ID,
+            'body' => 'This is a response.',
+            'created_at' => $now2->toDateTimeString(),
+        ]);
+        $this->assertDatabaseHas('message_thread_participants', [
+            'thread_id' => 1,
+            'user_id' => $user1->ID,
+            'num_unread' => 0,
+            'deleted_at' => null,
+        ]);
+
+        // user1 deletes message
+        (new DeleteMessageThreadAction())->execute($thread, $user1);
+        $this->assertDatabaseMissing('message_threads', ['id' => 1]);
+        $this->assertDatabaseMissing('messages', ['id' => 1]);
+        $this->assertDatabaseMissing('messages', ['id' => 2]);
+        $this->assertDatabaseMissing('message_thread_participants', ['id' => 1]);
+    }
 }

From 8faae59634ab14bed1af481c47f764c40415e3f1 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Fri, 1 Dec 2023 15:03:48 -0700
Subject: [PATCH 45/47] composer fix

---
 app/Community/Controllers/MessageController.php       | 4 ----
 app/Community/Controllers/MessageThreadController.php | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/app/Community/Controllers/MessageController.php b/app/Community/Controllers/MessageController.php
index 985216ce9e..c899a86dba 100644
--- a/app/Community/Controllers/MessageController.php
+++ b/app/Community/Controllers/MessageController.php
@@ -6,9 +6,6 @@
 
 use App\Community\Actions\AddToMessageThreadAction;
 use App\Community\Actions\CreateMessageThreadAction;
-use App\Community\Actions\DeleteMessageThreadAction;
-use App\Community\Actions\ReadMessageThreadAction;
-use App\Community\Models\Message;
 use App\Community\Models\MessageThread;
 use App\Community\Models\MessageThreadParticipant;
 use App\Http\Controller;
@@ -17,7 +14,6 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 
 class MessageController extends Controller
diff --git a/app/Community/Controllers/MessageThreadController.php b/app/Community/Controllers/MessageThreadController.php
index 415ca7c4e4..feaa50a45b 100644
--- a/app/Community/Controllers/MessageThreadController.php
+++ b/app/Community/Controllers/MessageThreadController.php
@@ -4,8 +4,6 @@
 
 namespace App\Community\Controllers;
 
-use App\Community\Actions\AddToMessageThreadAction;
-use App\Community\Actions\CreateMessageThreadAction;
 use App\Community\Actions\DeleteMessageThreadAction;
 use App\Community\Actions\ReadMessageThreadAction;
 use App\Community\Models\Message;
@@ -16,9 +14,7 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Validator;
 
 class MessageThreadController extends Controller
 {

From 8d3ac882ff14a4b5e4559015f2e694f8108c7274 Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Sat, 2 Dec 2023 08:11:10 -0700
Subject: [PATCH 46/47] allow framework to locate model

---
 .../Controllers/MessageThreadController.php   | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/Community/Controllers/MessageThreadController.php b/app/Community/Controllers/MessageThreadController.php
index feaa50a45b..8cd64307b0 100644
--- a/app/Community/Controllers/MessageThreadController.php
+++ b/app/Community/Controllers/MessageThreadController.php
@@ -66,15 +66,10 @@ public function index(Request $request): View
         ]);
     }
 
-    public function show(Request $request, int $threadId): View
+    public function show(Request $request, MessageThread $messageThread): View
     {
-        $thread = MessageThread::firstWhere('id', $threadId);
-        if (!$thread) {
-            abort(404);
-        }
-
         $user = $request->user();
-        $participant = MessageThreadParticipant::where('thread_id', $thread->id)
+        $participant = MessageThreadParticipant::where('thread_id', $messageThread->id)
             ->where('user_id', $user->ID)
             ->first();
         if (!$participant) {
@@ -86,21 +81,21 @@ public function show(Request $request, int $threadId): View
         if ($currentPage < 1) {
             $currentPage = 1;
         }
-        $totalPages = (int) (($thread->num_messages + 19) / 20);
+        $totalPages = (int) (($messageThread->num_messages + 19) / 20);
 
         if ($currentPage == $totalPages) {
             // if viewing last page, mark all messages in the chain as read
             ReadMessageThreadAction::markParticipantRead($participant, $user);
         }
 
-        $messages = Message::where('thread_id', $thread->id)
+        $messages = Message::where('thread_id', $messageThread->id)
             ->orderBy('created_at')
             ->offset(($currentPage - 1) * $pageSize)
             ->limit($pageSize)
             ->get();
 
         $participants = MessageThreadParticipant::withTrashed()
-            ->where('thread_id', $thread->id)
+            ->where('thread_id', $messageThread->id)
             ->join('UserAccounts', 'UserAccounts.ID', '=', 'message_thread_participants.user_id');
 
         $canReply = ($participants->count() === 1) || (clone $participants)
@@ -115,7 +110,7 @@ public function show(Request $request, int $threadId): View
             ->toArray();
 
         return view('community.message-thread.show', [
-            'thread' => $thread,
+            'thread' => $messageThread,
             'messages' => $messages,
             'participants' => $participants,
             'totalPages' => $totalPages,
@@ -124,17 +119,12 @@ public function show(Request $request, int $threadId): View
         ]);
     }
 
-    public function destroy(Request $request, int $threadId): RedirectResponse
+    public function destroy(Request $request, MessageThread $messageThread): RedirectResponse
     {
-        $thread = MessageThread::firstWhere('id', $threadId);
-        if (!$thread) {
-            return back()->withErrors(__('legacy.error.error'));
-        }
-
         /** @var User $user */
         $user = request()->user();
 
-        $participating = MessageThreadParticipant::where('thread_id', $threadId)
+        $participating = MessageThreadParticipant::where('thread_id', $messageThread->id)
             ->where('user_id', $user->ID)
             ->exists();
 
@@ -142,7 +132,7 @@ public function destroy(Request $request, int $threadId): RedirectResponse
             return back()->withErrors(__('legacy.error.error'));
         }
 
-        (new DeleteMessageThreadAction())->execute($thread, $user);
+        (new DeleteMessageThreadAction())->execute($messageThread, $user);
 
         return redirect(route('message-thread.index'))->with('success', __('legacy.success.message_delete'));
     }

From 80d4a63d646e3d9cdfb17266f7a1528d4ab0d7aa Mon Sep 17 00:00:00 2001
From: Jamiras <jamirasmt@gmail.com>
Date: Sun, 3 Dec 2023 10:14:27 -0700
Subject: [PATCH 47/47] remove breadcrumb and user info from title

---
 resources/views/community/message-thread/index.blade.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/resources/views/community/message-thread/index.blade.php b/resources/views/community/message-thread/index.blade.php
index 06af46c26d..2247f240b7 100644
--- a/resources/views/community/message-thread/index.blade.php
+++ b/resources/views/community/message-thread/index.blade.php
@@ -33,12 +33,7 @@ function deleteMessage(id) {
     pageTitle="Messages"
     pageDescription="Messages involving {{ $user->User }}"
 >
-    <x-user.breadcrumbs targetUsername="{{ $user->User }}" currentPage="Messages" />
-
-    <div class="mt-3 w-full flex gap-x-3">
-        {!! userAvatar($user->User, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
-        <h1 class="mt-[10px] w-full">{{ $user->User }}'s Messages</h1>
-    </div>
+    <h1 class="w-full">Messages</h1>
 
     <div class='ml-2'>
         You have {{ $unreadCount }} unread @choice('message|messages', $unreadCount)