Remove option to show both followed tags & discussions

FriendsOfFlarum · Oct 30, 2020 · 72d06ba · 72d06ba
1 parent 4004627
commit 72d06ba
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/js/src/common/utils/followingPageOptions.js b/js/src/common/utils/followingPageOptions.js
@@ -2,7 +2,7 @@ let opts;
 
 export default (section) =>
     opts ||
-    (opts = ['none', 'tags', 'all'].reduce((o, key) => {
+    (opts = ['none', 'tags'].reduce((o, key) => {
         o[key] = app.translator.trans(`fof-follow-tags.${section}.following_${key}_label`);
 
         return o;

diff --git a/resources/locale/en.yml b/resources/locale/en.yml
@@ -11,7 +11,6 @@ fof-follow-tags:
 
       following:
         following_none_label: => fof-follow-tags.ref.filtering_options.none
-        following_all_label: => fof-follow-tags.ref.filtering_options.all
         following_tags_label: => fof-follow-tags.ref.filtering_options.tags
 
     badge:
@@ -53,7 +52,6 @@ fof-follow-tags:
 
       following_none_label: => fof-follow-tags.ref.filtering_options.none
       following_tags_label: => fof-follow-tags.ref.filtering_options.tags
-      following_all_label: => fof-follow-tags.ref.filtering_options.all
 
 
   email:
@@ -70,5 +68,4 @@ fof-follow-tags:
 
     filtering_options:
       none: Followed Discussions
-      all: Everything You Follow
       tags: Followed Tags
diff --git a/src/Gambit/FollowTagsGambit.php b/src/Gambit/FollowTagsGambit.php
@@ -32,11 +32,7 @@ protected function conditions(AbstractSearch $search, array $matches, $negate)
             return;
         }
 
-        $includeFollowing = Arr::first($search->getActiveGambits(), function ($gambit) {
-            return $gambit instanceof SubscriptionGambit;
-        });
-
-        $search->getQuery()->{$includeFollowing ? 'orWhereExists' : 'whereExists'}(function ($query) use ($actor) {
+        $search->getQuery()->whereExists(function ($query) use ($actor) {
             $tagIds = TagState::query()
                 ->where('user_id', $actor->id)
                 ->whereIn('subscription', ['lurk', 'follow'])