From de214538171c8d74fa964a70d7d02cde00087e80 Mon Sep 17 00:00:00 2001 From: Jay Sizzla Date: Sun, 5 Jan 2025 17:16:18 +0000 Subject: [PATCH] (Add) Store torrent moderation message to DB and views --- app/Helpers/TorrentHelper.php | 5 +- .../Controllers/API/TorrentController.php | 11 ++- .../Staff/ModerationController.php | 29 ++++-- app/Http/Controllers/TorrentController.php | 27 ++++-- app/Models/Torrent.php | 34 +++---- app/Models/TorrentModerationMessage.php | 63 ++++++++++++ database/factories/TorrentFactory.php | 2 - .../TorrentModerationMessageFactory.php | 42 ++++++++ ...eate_torrent_moderation_messages_table.php | 88 +++++++++++++++++ resources/sass/pages/_staff.scss | 91 +++++++++++++++++ .../views/Staff/moderation/index.blade.php | 34 +++++-- .../torrent/partials/moderations.blade.php | 47 +++++++++ .../views/torrent/partials/tools.blade.php | 15 ++- resources/views/torrent/show.blade.php | 4 + .../Staff/ModerationControllerTest.php | 97 +++++++++++++++++-- 15 files changed, 527 insertions(+), 62 deletions(-) create mode 100644 app/Models/TorrentModerationMessage.php create mode 100644 database/factories/TorrentModerationMessageFactory.php create mode 100644 database/migrations/2025_01_04_190942_create_torrent_moderation_messages_table.php create mode 100644 resources/views/torrent/partials/moderations.blade.php diff --git a/app/Helpers/TorrentHelper.php b/app/Helpers/TorrentHelper.php index cb67b7fa0b..f2033b3372 100644 --- a/app/Helpers/TorrentHelper.php +++ b/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() diff --git a/app/Http/Controllers/API/TorrentController.php b/app/Http/Controllers/API/TorrentController.php index 2618d1a205..9cc3468d2f 100644 --- a/app/Http/Controllers/API/TorrentController.php +++ b/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) { diff --git a/app/Http/Controllers/Staff/ModerationController.php b/app/Http/Controllers/Staff/ModerationController.php index c36a31585c..de64deb491 100644 --- a/app/Http/Controllers/Staff/ModerationController.php +++ b/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]); diff --git a/app/Http/Controllers/TorrentController.php b/app/Http/Controllers/TorrentController.php index d6118e4204..748fcebde3 100644 --- a/app/Http/Controllers/TorrentController.php +++ b/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(); diff --git a/app/Models/Torrent.php b/app/Models/Torrent.php index 0230b3dfab..bcb0905782 100644 --- a/app/Models/Torrent.php +++ b/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 + * @return \Illuminate\Database\Eloquent\Relations\HasMany */ - 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'); } /** diff --git a/app/Models/TorrentModerationMessage.php b/app/Models/TorrentModerationMessage.php new file mode 100644 index 0000000000..8132540352 --- /dev/null +++ b/app/Models/TorrentModerationMessage.php @@ -0,0 +1,63 @@ + + * @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 + */ + public function torrent(): \Illuminate\Database\Eloquent\Relations\BelongsTo + { + return $this->belongsTo(Torrent::class); + } + + /** + * Belongs To A Moderator. + * + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo + */ + public function moderator(): \Illuminate\Database\Eloquent\Relations\BelongsTo + { + return $this->belongsTo(User::class, 'moderated_by')->withDefault([ + 'username' => 'System', + 'id' => User::SYSTEM_USER_ID, + ]); + } +} diff --git a/database/factories/TorrentFactory.php b/database/factories/TorrentFactory.php index a880d4c16f..e71f45ce37 100644 --- a/database/factories/TorrentFactory.php +++ b/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(), diff --git a/database/factories/TorrentModerationMessageFactory.php b/database/factories/TorrentModerationMessageFactory.php new file mode 100644 index 0000000000..d4ae01b4d8 --- /dev/null +++ b/database/factories/TorrentModerationMessageFactory.php @@ -0,0 +1,42 @@ + + * @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 */ +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(), + ]; + } +} diff --git a/database/migrations/2025_01_04_190942_create_torrent_moderation_messages_table.php b/database/migrations/2025_01_04_190942_create_torrent_moderation_messages_table.php new file mode 100644 index 0000000000..780fd40135 --- /dev/null +++ b/database/migrations/2025_01_04_190942_create_torrent_moderation_messages_table.php @@ -0,0 +1,88 @@ + + * @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0 + */ + +use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Schema; + +return new class () extends Migration { + /** + * Run the migrations. + */ + public function up(): void + { + Schema::create('torrent_moderation_messages', function (Blueprint $table): void { + $table->increments('id'); + $table->unsignedInteger('moderated_by')->index(); + $table->unsignedInteger('torrent_id')->index(); + $table->smallInteger('status')->default(0); + $table->text('message')->nullable(); + $table->timestamps(); + }); + + // Migrate "moderated_by" to new table using chunking + DB::table('torrents')->where('moderated_by', '!=', null)->orderBy('id')->chunk(10000, function ($torrents): void { + $insertData = []; + + foreach ($torrents as $torrent) { + // Convert to array to prevent PHPStan errors + $torrentArray = (array) $torrent; + + $insertData[] = [ + 'moderated_by' => $torrentArray['moderated_by'], + 'torrent_id' => $torrentArray['id'], + 'status' => $torrentArray['status'], + 'message' => null, + 'created_at' => $torrentArray['moderated_at'], + 'updated_at' => $torrentArray['moderated_at'], + ]; + } + + // Only insert if there's data to insert + if (!empty($insertData)) { + DB::table('torrent_moderation_messages')->insert($insertData); + } + }); + + Schema::table('torrents', function (Blueprint $table): void { + $table->dropColumn('moderated_at'); + $table->dropColumn('moderated_by'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('torrents', function (Blueprint $table): void { + $table->unsignedInteger('moderated_by')->nullable()->index()->after('status'); + $table->dateTime('moderated_at')->nullable()->after('status'); + }); + + $torrentModerationMessages = DB::table('torrent_moderation_messages')->get(); + + foreach ($torrentModerationMessages as $message) { + DB::table('torrents')->where('id', $message->torrent_id)->update([ + 'moderated_by' => $message->moderated_by, + 'moderated_at' => $message->created_at, + ]); + } + + Schema::dropIfExists('torrent_moderation_messages'); + } +}; diff --git a/resources/sass/pages/_staff.scss b/resources/sass/pages/_staff.scss index d8869f84ff..f08ca4c3b4 100644 --- a/resources/sass/pages/_staff.scss +++ b/resources/sass/pages/_staff.scss @@ -58,3 +58,94 @@ flex: 1; } } + +/* Torrent Moderation */ +// Table Header +.moderation-queue-table thead tr { + display: grid; + grid-template-columns: repeat(7, 1fr); + /* Ensures rows can grow */ + grid-template-rows: auto auto; +} + +.moderation-queue-table thead tr th { + display: flex; + align-items: center; + justify-content: center; +} + +// Name +.moderation-queue-table thead tr th:nth-child(2) { + grid-column: 1 / span 7; + grid-row: 1; +} + +// Action +.moderation-queue-table thead tr th:nth-child(9) { + grid-column: 5 / span 7; + grid-row: 3; +} + +// Moderation Message +.moderation-queue-table thead tr th:nth-child(10) { + /* Span the last 4 columns */ + grid-column: 1 / span 4; + /* Stay in the first row */ + grid-row: 3; +} + +/* Define the rest of the header columns to be in the grid */ +.moderation-queue-table + thead + tr + th:not(:nth-child(2)):not(:nth-child(9)):not(:nth-child(10)) { + /* This can stay as the default */ + grid-column: span 1; + grid-row: 2; +} + +// Table Body +.moderation-queue-table tr { + display: grid; + grid-template-columns: repeat(7, 1fr); + /* Ensures rows can grow */ + grid-template-rows: auto auto; +} + +.moderation-queue-table td { + display: flex; + align-items: center; + justify-content: center; +} + +/* Keep 2nd column in the first row and span across 4 columns */ +.moderation-queue-table tr td:nth-child(2) { + /* Span the first 4 columns */ + grid-column: 1 / span 10; + /* Stay in the first row */ + grid-row: 1; +} + +// Action +.moderation-queue-table tr td:nth-child(9) { + /* Span the last 4 columns */ + grid-column: 5 / span 7; + /* Stay in the first row */ + grid-row: 3; +} + +// Moderation Message +.moderation-queue-table tr td:nth-child(10) { + /* Span the last 4 columns */ + grid-column: 1 / span 4; + /* Stay in the first row */ + grid-row: 3; +} + +/* Move all other columns to the second row */ +.moderation-queue-table + tr + td:not(:nth-child(2)):not(:nth-child(9)):not(:nth-child(10)) { + /* Move to the second row */ + grid-row: 2; +} diff --git a/resources/views/Staff/moderation/index.blade.php b/resources/views/Staff/moderation/index.blade.php index 55038a6c83..46b2ca43a4 100644 --- a/resources/views/Staff/moderation/index.blade.php +++ b/resources/views/Staff/moderation/index.blade.php @@ -105,7 +105,7 @@ class="{{ config('other.font-awesome') }} fa-thumbs-up"

{{ __('torrent.postponed-torrents') }}

- +
@@ -117,6 +117,7 @@ class="{{ config('other.font-awesome') }} fa-thumbs-up" + @@ -124,10 +125,10 @@ class="{{ config('other.font-awesome') }} fa-thumbs-up" + @empty @@ -203,7 +210,7 @@ class="{{ config('other.font-awesome') }} fa-pencil"

{{ __('torrent.rejected') }}

-
{{ __('staff.moderation-since') }}{{ __('torrent.uploader') }} {{ __('common.staff') }} {{ __('common.action') }}{{ __('torrent.moderation') }} {{ __('common.message') }}
@@ -148,7 +149,10 @@ class="{{ $torrent->category->icon }} category__icon" - + @@ -190,6 +194,9 @@ class="{{ config('other.font-awesome') }} fa-pencil" @include('Staff.moderation.partials._delete_dialog', ['torrent' => $torrent]) + {{ Str::limit($torrent->moderationMessages()->latest()->first()->message ?? 'N/A', 300) }} +
+
@@ -215,6 +222,7 @@ class="{{ config('other.font-awesome') }} fa-pencil" + @@ -222,10 +230,10 @@ class="{{ config('other.font-awesome') }} fa-pencil" + @empty diff --git a/resources/views/torrent/partials/moderations.blade.php b/resources/views/torrent/partials/moderations.blade.php new file mode 100644 index 0000000000..31cb0dc3e5 --- /dev/null +++ b/resources/views/torrent/partials/moderations.blade.php @@ -0,0 +1,47 @@ +
+

+ + {{ __('torrent.moderation') }} {{ __('pm.messages') }} +

+
+
{{ __('staff.moderation-since') }}{{ __('torrent.uploader') }} {{ __('common.staff') }} {{ __('common.action') }}{{ __('torrent.moderation') }} {{ __('common.message') }}
@@ -246,7 +254,10 @@ class="{{ $torrent->category->icon }} category__icon" - + @@ -289,6 +300,9 @@ class="{{ config('other.font-awesome') }} fa-pencil" @include('Staff.moderation.partials._delete_dialog', ['torrent' => $torrent]) + {{ Str::limit($torrent->moderationMessages()->latest()->first()->message ?? 'N/A', 300) }} +
+ + + + + + + + + + @forelse ($torrent->moderationMessages as $message) + + + + + + + @empty + No moderations found. + @endforelse + +
{{ __('common.moderated-by') }}{{ __('torrent.status') }}{{ __('pm.messages') }}{{ __('common.date') }}
+ @switch($message->status) + @case(\App\Models\Torrent::APPROVED) +

{{ __('torrent.approved') }}

+ + @break + @case(\App\Models\Torrent::POSTPONED) +

{{ __('torrent.postponed') }}

+ + @break + @case(\App\Models\Torrent::REJECTED) +

{{ __('torrent.rejected') }}

+ + @break + @default + N/A + @endswitch + 		{{ $message->message ?? 'N/A' }}{{ $message->created_at }}
+
+ diff --git a/resources/views/torrent/partials/tools.blade.php b/resources/views/torrent/partials/tools.blade.php index 182dd7ef25..143e6dbf95 100644 --- a/resources/views/torrent/partials/tools.blade.php +++ b/resources/views/torrent/partials/tools.blade.php @@ -540,17 +540,26 @@ class="form__button form__button--outlined" @switch($torrent->status) @case(\App\Models\Torrent::APPROVED) Approved By: - + @break @case(\App\Models\Torrent::POSTPONED) Postponed By: - + @break @case(\App\Models\Torrent::REJECTED) Rejected By: - + @break @default diff --git a/resources/views/torrent/show.blade.php b/resources/views/torrent/show.blade.php index 5af44b4b2d..a60c97315b 100644 --- a/resources/views/torrent/show.blade.php +++ b/resources/views/torrent/show.blade.php @@ -54,6 +54,10 @@ @include('torrent.partials.tools') @endif + @if ($torrent->status !== App\Models\Torrent::APPROVED && (auth()->user()->group->is_editor || auth()->user()->group->is_modo)) + @include('torrent.partials.moderations') + @endif + {{-- Audits, Reports, Downloads Block --}} @if (auth()->user()->group->is_modo) @include('torrent.partials.audits') diff --git a/tests/Feature/Http/Controllers/Staff/ModerationControllerTest.php b/tests/Feature/Http/Controllers/Staff/ModerationControllerTest.php index 2654f76437..660959a4d8 100644 --- a/tests/Feature/Http/Controllers/Staff/ModerationControllerTest.php +++ b/tests/Feature/Http/Controllers/Staff/ModerationControllerTest.php @@ -16,16 +16,26 @@ use App\Http\Controllers\Staff\ModerationController; use App\Http\Requests\Staff\UpdateModerationRequest; +use App\Models\Group; use App\Models\Torrent; use App\Models\User; +use Illuminate\Foundation\Testing\RefreshDatabase; + +uses(RefreshDatabase::class); test('index returns an ok response', function (): void { - $this->markTestIncomplete('This test case was generated by Shift. When you are ready, remove this line and complete this test case.'); + $torrents = Torrent::factory()->times(3)->create([ + 'status' => 0, + ]); - $torrents = Torrent::factory()->times(3)->create(); - $user = User::factory()->create(); + $group = Group::factory()->create([ + 'is_torrent_modo' => 1, + ]); + $staff = User::factory()->create([ + 'group_id' => $group->id, + ]); - $response = $this->actingAs($user)->get(route('staff.moderation.index')); + $response = $this->actingAs($staff)->get(route('staff.moderation.index')); $response->assertOk(); $response->assertViewIs('Staff.moderation.index'); @@ -33,8 +43,9 @@ $response->assertViewHas('pending'); $response->assertViewHas('postponed'); $response->assertViewHas('rejected'); - - // TODO: perform additional assertions + $response->assertSee($torrents[0]->name); + $response->assertSee($torrents[1]->name); + $response->assertSee($torrents[2]->name); }); test('update validates with a form request', function (): void { @@ -60,4 +71,76 @@ // TODO: perform additional assertions }); -// test cases... +test('postpone a torrent returns an ok response', function (): void { + $torrent = Torrent::factory()->create([ + 'status' => 0, + ]); + + $group = Group::factory()->create([ + 'is_torrent_modo' => 1, + ]); + $staff = User::factory()->create([ + 'group_id' => $group->id, + ]); + + $response = $this->actingAs($staff)->post(route('staff.moderation.update', ['id' => $torrent->id]), [ + 'old_status' => Torrent::PENDING, + 'status' => Torrent::POSTPONED, + 'message' => 'This is a postponement message.', + ]); + + $response->assertRedirect(route('staff.moderation.index')); + $response->assertSessionHas('success', 'Torrent Postponed'); + + $this->assertDatabaseHas('torrents', [ + 'id' => $torrent->id, + 'status' => Torrent::POSTPONED, + ]); + + $this->assertDatabaseHas('conversations', [ + 'subject' => 'Your upload, '.$torrent->name.', has been postponed by '.$staff->username, + ]); + + $this->assertDatabaseHas('torrent_moderation_messages', [ + 'torrent_id' => $torrent->id, + 'moderated_by' => $staff->id, + 'message' => 'This is a postponement message.', + ]); +}); + +test('reject a torrent returns an ok response', function (): void { + $torrent = Torrent::factory()->create([ + 'status' => 0, + ]); + + $group = Group::factory()->create([ + 'is_torrent_modo' => 1, + ]); + $staff = User::factory()->create([ + 'group_id' => $group->id, + ]); + + $response = $this->actingAs($staff)->post(route('staff.moderation.update', ['id' => $torrent->id]), [ + 'old_status' => Torrent::PENDING, + 'status' => Torrent::REJECTED, + 'message' => 'This is a rejection message.', + ]); + + $response->assertRedirect(route('staff.moderation.index')); + $response->assertSessionHas('success', 'Torrent Rejected'); + + $this->assertDatabaseHas('torrents', [ + 'id' => $torrent->id, + 'status' => Torrent::REJECTED, + ]); + + $this->assertDatabaseHas('conversations', [ + 'subject' => 'Your upload, '.$torrent->name.', has been rejected by '.$staff->username, + ]); + + $this->assertDatabaseHas('torrent_moderation_messages', [ + 'torrent_id' => $torrent->id, + 'moderated_by' => $staff->id, + 'message' => 'This is a rejection message.', + ]); +});