From 424dde9ea1cdbdc80174031d84f9ce481d2ec839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Marti=CC=81n?= Date: Fri, 5 Oct 2018 19:52:34 -0400 Subject: [PATCH 1/3] Do not hide tags from Following (subscriptions) Closes flarum/core#1232 --- extensions/tags/src/Listener/FilterDiscussionListByTags.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/tags/src/Listener/FilterDiscussionListByTags.php b/extensions/tags/src/Listener/FilterDiscussionListByTags.php index 5270b9fa6..b4b5cdf63 100755 --- a/extensions/tags/src/Listener/FilterDiscussionListByTags.php +++ b/extensions/tags/src/Listener/FilterDiscussionListByTags.php @@ -13,6 +13,7 @@ namespace Flarum\Tags\Listener; use Flarum\Discussion\Event\Searching; use Flarum\Event\ConfigureDiscussionGambits; +use Flarum\Subscriptions\Gambit\SubscriptionGambit; use Flarum\Tags\Gambit\TagGambit; use Flarum\Tags\Tag; use Illuminate\Contracts\Events\Dispatcher; @@ -44,7 +45,7 @@ class FilterDiscussionListByTags $query = $event->search->getQuery(); foreach ($event->search->getActiveGambits() as $gambit) { - if ($gambit instanceof TagGambit) { + if ($gambit instanceof TagGambit || $gambit instanceof SubscriptionGambit) { return; } } From f9d50ec67ddba805f790a8f441f50e0a21eedc22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Marti=CC=81n?= Date: Sat, 6 Oct 2018 08:36:39 -0400 Subject: [PATCH 2/3] Do not hide discussions if query contains gambits --- extensions/tags/src/Listener/FilterDiscussionListByTags.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/tags/src/Listener/FilterDiscussionListByTags.php b/extensions/tags/src/Listener/FilterDiscussionListByTags.php index b4b5cdf63..6f3ac172e 100755 --- a/extensions/tags/src/Listener/FilterDiscussionListByTags.php +++ b/extensions/tags/src/Listener/FilterDiscussionListByTags.php @@ -44,10 +44,8 @@ class FilterDiscussionListByTags { $query = $event->search->getQuery(); - foreach ($event->search->getActiveGambits() as $gambit) { - if ($gambit instanceof TagGambit || $gambit instanceof SubscriptionGambit) { - return; - } + if (count($event->search->getActiveGambits()) > 0) { + return; } $query->whereNotExists(function ($query) { From f9744b5f9805c251f507a897cd48857a21d89546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sevilla=20Marti=CC=81n?= Date: Sat, 6 Oct 2018 08:37:28 -0400 Subject: [PATCH 3/3] Remove unused import --- extensions/tags/src/Listener/FilterDiscussionListByTags.php | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/tags/src/Listener/FilterDiscussionListByTags.php b/extensions/tags/src/Listener/FilterDiscussionListByTags.php index 6f3ac172e..2e12da3fe 100755 --- a/extensions/tags/src/Listener/FilterDiscussionListByTags.php +++ b/extensions/tags/src/Listener/FilterDiscussionListByTags.php @@ -13,7 +13,6 @@ namespace Flarum\Tags\Listener; use Flarum\Discussion\Event\Searching; use Flarum\Event\ConfigureDiscussionGambits; -use Flarum\Subscriptions\Gambit\SubscriptionGambit; use Flarum\Tags\Gambit\TagGambit; use Flarum\Tags\Tag; use Illuminate\Contracts\Events\Dispatcher;