Backport #22, fixes #23 for Flarum beta 13

FriendsOfFlarum · Jan 2, 2021 · b25f6da · b25f6da
1 parent 83388f5
commit b25f6da
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/Listeners/HideDiscussionsInIgnoredTags.php b/src/Listeners/HideDiscussionsInIgnoredTags.php
@@ -27,17 +27,16 @@ public function handle(Searching $event)
         $db = $event->search->getQuery()->getConnection();
 
         $event->search->getQuery()
-            ->whereNotExists(function ($query) use ($db, $user) {
-                return $query->selectRaw('1')
+            ->whereNotIn('discussions.id', function ($query) use ($user) {
+                return $query->select('discussion_id')
                     ->from('discussion_tag')
-                    ->whereIn('tag_id', function ($query) use ($db, $user) {
+                    ->whereIn('tag_id', function ($query) use ($user) {
                         $query
-                            ->select($db->raw(1))
+                            ->select('tag_id')
                             ->from((new TagState())->getTable())
                             ->where('user_id', $user->id)
                             ->where('subscription', 'hide');
-                    })
-                    ->whereColumn('discussions.id', 'discussion_id');
+                    });
             });
     }
 }