(Add) Store moderation message in DB and display in views

app/Helpers/TorrentHelper.php

@@ -50,9 +50,10 @@ public static function approveHelper(int $id): void
         $torrent = Torrent::with('user')->withoutGlobalScope(ApprovedScope::class)->findOrFail($id);
         $torrent->created_at = Carbon::now();
         $torrent->bumped_at = Carbon::now();
+        // Update the status on this torrent.
+        // The moderation table status for this torrent is set to approved in this stage already.
+        // Both places are kept in order to have the torrent status quickly accesible for the announce.
         $torrent->status = Torrent::APPROVED;
-        $torrent->moderated_at = now();
-        $torrent->moderated_by = (int) auth()->id();
 
         if (!$torrent->free) {
             $autoFreeleechs = AutomaticTorrentFreeleech::query()

app/Http/Controllers/API/TorrentController.php

@@ -27,6 +27,7 @@
 use App\Models\Keyword;
 use App\Models\Movie;
 use App\Models\Torrent;
+use App\Models\TorrentModerationMessage;
 use App\Models\TorrentFile;
 use App\Models\Tv;
 use App\Models\User;
@@ -182,8 +183,14 @@ public function store(Request $request): \Illuminate\Http\JsonResponse
             $torrent->fl_until = Carbon::now()->addDays($request->integer('fl_until'));
         }
         $torrent->sticky = $user->group->is_modo || $user->group->is_internal ? ($request->input('sticky') ?? 0) : 0;
-        $torrent->moderated_at = Carbon::now();
-        $torrent->moderated_by = User::SYSTEM_USER_ID;
+
+        // Update the status on this torrent moderation message table.
+        // The status on the torrent itself will be updated with the TorrentHelper().
+        // Both places are kept in order to have the torrent status quickly accesible for the announce.
+        TorrentModerationMessage::create([
+            'moderated_by' => User::SYSTEM_USER_ID,
+            'torrent_id'   => $torrent->id,
+        ]);
 
         // Set freeleech and doubleup if featured
         if ($torrent->featured === true) {

app/Http/Controllers/Staff/ModerationController.php

@@ -23,6 +23,7 @@
 use App\Models\PrivateMessage;
 use App\Models\Scopes\ApprovedScope;
 use App\Models\Torrent;
+use App\Models\TorrentModerationMessage;
 use App\Repositories\ChatRepository;
 use App\Services\Unit3dAnnounce;
 
@@ -52,11 +53,11 @@ public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vie
                 ->where('status', '=', Torrent::PENDING)
                 ->get(),
             'postponed' => Torrent::withoutGlobalScope(ApprovedScope::class)
-                ->with(['user.group', 'moderated.group', 'category', 'type', 'resolution'])
+                ->with(['user.group', 'category', 'type', 'resolution'])
                 ->where('status', '=', Torrent::POSTPONED)
                 ->get(),
             'rejected' => Torrent::withoutGlobalScope(ApprovedScope::class)
-                ->with(['user.group', 'moderated.group', 'category', 'type', 'resolution'])
+                ->with(['user.group', 'category', 'type', 'resolution'])
                 ->where('status', '=', Torrent::REJECTED)
                 ->get(),
         ]);
@@ -108,14 +109,25 @@ public function update(UpdateModerationRequest $request, int $id): \Illuminate\H
 
                 TorrentHelper::approveHelper($id);
 
+                TorrentModerationMessage::create([
+                    'moderated_by' => $staff->id,
+                    'torrent_id'   => $torrent->id,
+                    'status'       => Torrent::APPROVED,
+                ]);
+
                 return to_route('staff.moderation.index')
                     ->withSuccess('Torrent Approved');
 
             case Torrent::REJECTED:
                 $torrent->update([
-                    'status'       => Torrent::REJECTED,
-                    'moderated_at' => now(),
+                    'status' => Torrent::REJECTED,
+                ]);
+
+                TorrentModerationMessage::create([
                     'moderated_by' => $staff->id,
+                    'torrent_id'   => $torrent->id,
+                    'status'       => Torrent::REJECTED,
+                    'message'      => $request->message,
                 ]);
 
                 $conversation = Conversation::create(['subject' => 'Your upload, '.$torrent->name.', has been rejected by '.$staff->username]);
@@ -137,9 +149,14 @@ public function update(UpdateModerationRequest $request, int $id): \Illuminate\H
 
             case Torrent::POSTPONED:
                 $torrent->update([
-                    'status'       => Torrent::POSTPONED,
-                    'moderated_at' => now(),
+                    'status' => Torrent::POSTPONED,
+                ]);
+
+                TorrentModerationMessage::create([
                     'moderated_by' => $staff->id,
+                    'torrent_id'   => $torrent->id,
+                    'status'       => Torrent::POSTPONED,
+                    'message'      => $request->message,
                 ]);
 
                 $conversation = Conversation::create(['subject' => 'Your upload, '.$torrent->name.', has been postponed by '.$staff->username]);

app/Http/Controllers/TorrentController.php

@@ -33,6 +33,7 @@
 use App\Models\Resolution;
 use App\Models\Scopes\ApprovedScope;
 use App\Models\Torrent;
+use App\Models\TorrentModerationMessage;
 use App\Models\TorrentFile;
 use App\Models\Tv;
 use App\Models\Type;
@@ -400,18 +401,24 @@ public function store(StoreTorrentRequest $request): \Illuminate\Http\RedirectRe
         file_put_contents(getcwd().'/files/torrents/'.$fileName, Bencode::bencode($decodedTorrent));
 
         $torrent = Torrent::create([
-            'mediainfo'    => TorrentTools::anonymizeMediainfo($request->filled('mediainfo') ? $request->string('mediainfo') : null),
-            'info_hash'    => Bencode::get_infohash($decodedTorrent),
-            'file_name'    => $fileName,
-            'num_file'     => $meta['count'],
-            'folder'       => Bencode::get_name($decodedTorrent),
-            'size'         => $meta['size'],
-            'nfo'          => $request->hasFile('nfo') ? TorrentTools::getNfo($request->file('nfo')) : '',
-            'user_id'      => $user->id,
-            'moderated_at' => now(),
-            'moderated_by' => User::SYSTEM_USER_ID,
+            'mediainfo' => TorrentTools::anonymizeMediainfo($request->filled('mediainfo') ? $request->string('mediainfo') : null),
+            'info_hash' => Bencode::get_infohash($decodedTorrent),
+            'file_name' => $fileName,
+            'num_file'  => $meta['count'],
+            'folder'    => Bencode::get_name($decodedTorrent),
+            'size'      => $meta['size'],
+            'nfo'       => $request->hasFile('nfo') ? TorrentTools::getNfo($request->file('nfo')) : '',
+            'user_id'   => $user->id,
         ] + $request->safe()->except(['torrent']));
 
+        // Update the status on this torrent moderation message table.
+        // The status on the torrent itself will be updated with the TorrentHelper().
+        // Both places are kept in order to have the torrent status quickly accesible for the announce.
+        TorrentModerationMessage::create([
+            'moderated_by' => User::SYSTEM_USER_ID,
+            'torrent_id'   => $torrent->id,
+        ]);
+
         // Populate the status/seeders/leechers/times_completed fields for the external tracker
         $torrent->refresh();
 

app/Models/Torrent.php

@@ -64,8 +64,6 @@
  * @property int                             $highspeed
  * @property bool                            $featured
  * @property int                             $status
- * @property \Illuminate\Support\Carbon|null $moderated_at
- * @property int|null                        $moderated_by
  * @property int                             $anon
  * @property bool                            $sticky
  * @property int                             $sd
@@ -99,21 +97,20 @@ class Torrent extends Model
     /**
      * Get the attributes that should be cast.
      *
-     * @return array{tmdb: 'int', igdb: 'int', bumped_at: 'datetime', fl_until: 'datetime', du_until: 'datetime', doubleup: 'bool', refundable: 'bool', featured: 'bool', moderated_at: 'datetime', sticky: 'bool'}
+     * @return array{tmdb: 'int', igdb: 'int', bumped_at: 'datetime', fl_until: 'datetime', du_until: 'datetime', doubleup: 'bool', refundable: 'bool', featured: 'bool', sticky: 'bool'}
      */
     protected function casts(): array
     {
         return [
-            'tmdb'         => 'int',
-            'igdb'         => 'int',
-            'bumped_at'    => 'datetime',
-            'fl_until'     => 'datetime',
-            'du_until'     => 'datetime',
-            'doubleup'     => 'bool',
-            'refundable'   => 'bool',
-            'featured'     => 'bool',
-            'moderated_at' => 'datetime',
-            'sticky'       => 'bool',
+            'tmdb'       => 'int',
+            'igdb'       => 'int',
+            'bumped_at'  => 'datetime',
+            'fl_until'   => 'datetime',
+            'du_until'   => 'datetime',
+            'doubleup'   => 'bool',
+            'refundable' => 'bool',
+            'featured'   => 'bool',
+            'sticky'     => 'bool',
         ];
     }
 
@@ -561,16 +558,13 @@ public function playlists(): \Illuminate\Database\Eloquent\Relations\BelongsToMa
     }
 
     /**
-     * Torrent Has Been Moderated By.
+     * Has Many Moderation Messages.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, $this>
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<TorrentModerationMessage, $this>
      */
-    public function moderated(): \Illuminate\Database\Eloquent\Relations\BelongsTo
+    public function moderationMessages(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
-        return $this->belongsTo(User::class, 'moderated_by')->withDefault([
-            'username' => 'System',
-            'id'       => User::SYSTEM_USER_ID,
-        ]);
+        return $this->hasMany(TorrentModerationMessage::class)->orderBy('created_at', 'desc');
     }
 
     /**

app/Models/TorrentModerationMessage.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * NOTICE OF LICENSE.
+ *
+ * UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
+ * The details is bundled with this project in the file LICENSE.txt.
+ *
+ * @project    UNIT3D Community Edition
+ *
+ * @author     HDVinnie <hdinnovations@protonmail.com>
+ * @license    https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
+ */
+
+namespace App\Models;
+
+use App\Traits\Auditable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * App\Models\TorrentModerationMessage.
+ *
+ * @property int                             $id
+ * @property int                             $moderated_by
+ * @property int                             $torrent_id
+ * @property int                             $status
+ * @property string|null                     $message
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ */
+class TorrentModerationMessage extends Model
+{
+    use Auditable;
+
+    /** @use HasFactory<\Database\Factories\TorrentModerationMessageFactory> */
+    use HasFactory;
+
+    protected $guarded = [];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<Torrent, $this>
+     */
+    public function torrent(): \Illuminate\Database\Eloquent\Relations\BelongsTo
+    {
+        return $this->belongsTo(Torrent::class);
+    }
+
+    /**
+     * Belongs To A Moderator.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<User, $this>
+     */
+    public function moderator(): \Illuminate\Database\Eloquent\Relations\BelongsTo
+    {
+        return $this->belongsTo(User::class, 'moderated_by')->withDefault([
+            'username' => 'System',
+            'id'       => User::SYSTEM_USER_ID,
+        ]);
+    }
+}

database/factories/TorrentFactory.php

@@ -66,8 +66,6 @@ public function definition(): array
             'highspeed'       => $this->faker->boolean(),
             'featured'        => false,
             'status'          => Torrent::APPROVED,
-            'moderated_at'    => now(),
-            'moderated_by'    => 1,
             'anon'            => $this->faker->boolean(),
             'sticky'          => $this->faker->boolean(),
             'sd'              => $this->faker->boolean(),

database/factories/TorrentModerationMessageFactory.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * NOTICE OF LICENSE.
+ *
+ * UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
+ * The details is bundled with this project in the file LICENSE.txt.
+ *
+ * @project    UNIT3D Community Edition
+ *
+ * @author     HDVinnie <hdinnovations@protonmail.com>
+ * @license    https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
+ */
+
+namespace Database\Factories;
+
+use App\Models\Torrent;
+use App\Models\TorrentModerationMessage;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/** @extends Factory<TorrentModerationMessage> */
+class TorrentModerationMessageFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     */
+    protected $model = TorrentModerationMessage::class;
+
+    /**
+     * Define the model's default state.
+     */
+    public function definition(): array
+    {
+        return [
+            'moderated_by' => 1,
+            'torrent_id'   => Torrent::factory(),
+            'message'      => $this->faker->sentence(),
+        ];
+    }
+}