Merge pull request #4929 from HDInnovations/development

(Release) UNIT3D v9.1.6

Author: HDVinnie

.cspell/brands.txt

@@ -10,6 +10,7 @@ limewire
 mal
 mediainfo
 phpstorm
+rottentomatoes
 shareaza
 tmdb
 tvdb

app/Console/Commands/AutoRemoveTimedTorrentBuffs.php

@@ -71,9 +71,13 @@ final public function handle(): void
             Unit3dAnnounce::addTorrent($torrent);
         }
 
-        Torrent::query()->whereNotNull('bumped_at')->where('bumped_at', '<', now()->subWeek())->update([
-            'bumped_at' => DB::raw('created_at'),
-        ]);
+        Torrent::query()
+            ->whereNotNull('bumped_at')
+            ->where('bumped_at', '<', now()->subWeek())
+            ->whereColumn('bumped_at', '!=', 'created_at')
+            ->update([
+                'bumped_at' => DB::raw('created_at'),
+            ]);
 
         $this->comment('Automated Removal Of Expired Torrent Buffs Command Complete');
     }

app/DTO/TorrentSearchFiltersDTO.php

@@ -448,7 +448,10 @@ final public function toMeilisearchFilter(): array
             $filters[] = 'user.username = '.json_encode($this->uploader);
 
             if (!$group->is_modo) {
-                $filters[] = 'anon = false';
+                $filters[] = [
+                    'anon = false',
+                    'user.username = '.json_encode($this->user->username),
+                ];
             }
         }
 

app/Helpers/Bbcode.php

@@ -183,8 +183,8 @@ class Bbcode
         'code' => [
             'openBbcode'  => '/^\[code\]/i',
             'closeBbcode' => '[/code]',
-            'openHtml'    => '<pre>',
-            'closeHtml'   => '</pre>',
+            'openHtml'    => '<div class="bbcode-rendered__clipboard" x-data="clipboardButton"><pre><code>',
+            'closeHtml'   => '</code></pre><div class="bbcode-rendered__clipboard-container"><button class="bbcode-rendered__clipboard-button" x-bind="button"><i class="fa fa-clone"></i></button></div></div>',
             'block'       => true,
         ],
         'pre' => [

app/Helpers/Helpers.php

@@ -56,6 +56,16 @@ function href_request(App\Models\TorrentRequest $torrentRequest): string
     }
 }
 
+if (!\function_exists('href_rottentomatoes')) {
+    function href_rottentomatoes(string|null $title, string|null $date): string
+    {
+        $year = substr($date ?? '', 0, 4);
+        $query = "{$title}  ({$year}) site:rottentomatoes.com";
+
+        return "https://html.duckduckgo.com/html/?q=\\".rawurlencode($query);
+    }
+}
+
 if (!\function_exists('href_poll')) {
     function href_poll(App\Models\Poll $poll): string
     {

app/Helpers/TorrentTools.php

@@ -48,6 +48,7 @@ public static function normalizeTorrent(UploadedFile $torrentFile)
 
         $result['info']['source'] = config('torrent.source');
         $result['info']['private'] = 1;
+        $result['info']['entropy'] = bin2hex(random_bytes(64));
 
         if (config('torrent.created_by_append') && \array_key_exists('created by', $result)) {
             $result['created by'] = trim((string) $result['created by'], '. ').'. '.config('torrent.created_by', '');

app/Http/Controllers/API/ChatController.php

@@ -420,7 +420,7 @@ public function toggleBotAudible(Request $request): \Illuminate\Http\JsonRespons
     }
 
     /* USERS */
-    public function updateUserChatStatus(Request $request): \Illuminate\Http\JsonResponse
+    public function updateUserChatStatus(Request $request): \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
     {
         $user = $request->user();
         $user->load(['chatStatus', 'chatroom', 'group', 'echoes']);
@@ -432,7 +432,7 @@ public function updateUserChatStatus(Request $request): \Illuminate\Http\JsonRes
         $user->chatStatus()->associate($status);
         $user->save();
 
-        return response()->json($user);
+        return response('success');
     }
 
     public function updateUserRoom(Request $request): \Illuminate\Http\JsonResponse

app/Http/Controllers/API/QuickSearchController.php

@@ -27,7 +27,7 @@ class QuickSearchController extends Controller
 {
     public function index(Request $request): \Illuminate\Http\JsonResponse
     {
-        $query = $request->input('query');
+        $query = $request->input('query', '');
 
         $filters = [
             'deleted_at IS NULL',

app/Http/Controllers/API/TorrentController.php

@@ -671,7 +671,6 @@ function (Indexes $meilisearch, string $query, array $options) use ($request, $f
                             'media_info'       => $hit['mediainfo'],
                             'bd_info'          => $hit['bdinfo'],
                             'description'      => $hit['description'],
-                            'info_hash'        => $hit['info_hash'],
                             'size'             => $hit['size'],
                             'num_file'         => $hit['num_file'],
                             'files'            => $hit['files'],

app/Http/Controllers/API/TorrentRequestController.php

@@ -0,0 +1,70 @@
+<?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\Http\Controllers\API;
+
+use App\Http\Controllers\Controller;
+use App\Http\Resources\TorrentRequestResource;
+use App\Models\TorrentRequest;
+use Illuminate\Http\Request;
+
+class RequestController extends Controller
+{
+    /**
+     * Request search filter.
+     */
+    public function filter(Request $request): \Illuminate\Http\JsonResponse
+    {
+        $query = TorrentRequest::query()
+            ->with(['user', 'claim.user', 'filler'])
+            ->withSum('bounties', 'seedbonus')
+            ->when($request->filled('name'), fn ($query) => $query->where('name', 'LIKE', '%'.str_replace(' ', '%', $request->input('name')).'%'))
+            ->when($request->filled('category_id'), fn ($query) => $query->whereIntegerInRaw('category_id', (array) $request->input('category_id')))
+            ->when($request->filled('type_id'), fn ($query) => $query->whereIntegerInRaw('type_id', (array) $request->input('type_id')))
+            ->when($request->filled('resolution_id'), fn ($query) => $query->whereIntegerInRaw('resolution_id', (array) $request->input('resolution_id')))
+            ->when($request->filled('tmdb'), fn ($query) => $query->whereAny(['tmdb_movie_id', 'tmdb_tv_id'], '=', $request->integer('tmdb')))
+            ->when($request->filled('imdb'), fn ($query) => $query->where('imdb', '=', $request->integer('imdb')))
+            ->when($request->filled('tvdb'), fn ($query) => $query->where('tvdb', '=', $request->integer('tvdb')))
+            ->when($request->filled('mal'), fn ($query) => $query->where('mal', '=', $request->integer('mal')))
+            ->when($request->filled('filled'), fn ($query) => $request->boolean('filled')
+                ? $query->whereNotNull('filled_by')
+                : $query->whereNull('filled_by'))
+            ->when($request->filled('claimed'), fn ($query) => $request->boolean('claimed')
+                ? $query->whereNotNull('claim')
+                : $query->whereNull('claim'));
+
+        $perPage = min($request->integer('perPage', 25), 100);
+        $page = max($request->integer('page', 1), 1);
+        $requests = $query->paginate(
+            perPage: $perPage,
+            page: $page
+        );
+
+        return TorrentRequestResource::collection($requests)->response();
+    }
+
+    /**
+     * View a single request.
+     */
+    public function show(int $id): \Illuminate\Http\JsonResponse
+    {
+        $request = TorrentRequest::with(['user', 'claim.user', 'filler'])
+            ->withSum('bounties', 'seedbonus')
+            ->findOrFail($id);
+
+        return new TorrentRequestResource($request)->response();
+    }
+}