Merge pull request #4259 from Roardom/torrent-trump-search

(Fix) Add torrent trump filtering to meilisearch search
HDInnovations · Oct 21, 2024 · c1c8288 · c1c8288
2 parents af6dc92 + 3c7d94d
commit c1c8288
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/app/DTO/TorrentSearchFiltersDTO.php b/app/DTO/TorrentSearchFiltersDTO.php
@@ -330,6 +330,10 @@ final public function toMeilisearchFilter(): array
             $filters[] = 'internal = true';
         }
 
+        if ($this->trumpable) {
+            $filters[] = 'trumpable = true';
+        }
+
         if ($this->personalRelease) {
             $filters[] = 'personal_release = true';
         }

diff --git a/app/Models/Torrent.php b/app/Models/Torrent.php
@@ -304,6 +304,11 @@ protected function casts(): array
                     )
                 LIMIT 1
             ) AS rating,
+            EXISTS(
+                SELECT *
+                FROM torrent_trumps
+                WHERE torrents.id = torrent_trumps.torrent_id
+            ) AS trumpable,
             (
                 SELECT JSON_OBJECT(
                     'id', movies.id,
@@ -857,6 +862,7 @@ public function toSearchableArray(): array
             'region_id',
             'personal_release',
             'info_hash',
+            'trumpable',
             'rating',
             'json_user',
             'json_type',
@@ -929,6 +935,7 @@ public function toSearchableArray(): array
             'personal_release'   => (bool) $torrent->personal_release,
             'info_hash'          => bin2hex($torrent->info_hash),
             'rating'             => (float) $torrent->rating, /** @phpstan-ignore property.notFound (This property is selected in the query but doesn't exist on the model) */
+            'trumpable'          => (bool) $torrent->trumpable, /** @phpstan-ignore property.notFound (This property is selected in the query but doesn't exist on the model) */
             'user'               => json_decode($torrent->json_user ?? 'null'),
             'type'               => json_decode($torrent->json_type ?? 'null'),
             'category'           => json_decode($torrent->json_category ?? 'null'),

diff --git a/config/scout.php b/config/scout.php
@@ -178,6 +178,7 @@
                     'internal',
                     'deleted_at',
                     'personal_release',
+                    'trumpable',
                     'info_hash',
                     'history_seeders.user_id',
                     'history_leechers.user_id',