From f6af4c43f656d1990da00bc773c15ebbbc57e71d Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 1 Mar 2021 16:21:35 +0200
Subject: [PATCH 1/6] add quick filters for notifications2

---
 .../notifications/notification_filters.vue    | 121 ++++++++++++++++++
 src/components/notifications/notifications.js |   8 +-
 .../notifications/notifications.vue           |   1 +
 .../timeline/timeline_quick_settings.js       |   4 +-
 .../timeline/timeline_quick_settings.vue      |   8 +-
 src/modules/config.js                         |   2 +-
 6 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 src/components/notifications/notification_filters.vue

diff --git a/src/components/notifications/notification_filters.vue b/src/components/notifications/notification_filters.vue
new file mode 100644
index 0000000000..95b2513b38
--- /dev/null
+++ b/src/components/notifications/notification_filters.vue
@@ -0,0 +1,121 @@
+<template>
+  <Popover
+    trigger="click"
+    class="NotificationFilters"
+    placement="bottom"
+    :bound-to="{ x: 'container' }"
+  >
+    <div
+      slot="content"
+      class="dropdown-menu"
+    >
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('likes')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.likes }"
+        />{{ $t('settings.notification_visibility_likes') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('repeats')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.repeats }"
+        />{{ $t('settings.notification_visibility_repeats') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('follows')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.follows }"
+        />{{ $t('settings.notification_visibility_follows') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('mentions')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.mentions }"
+        />{{ $t('settings.notification_visibility_mentions') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('emojiReactions')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.emojiReactions }"
+        />{{ $t('settings.notification_visibility_emoji_reactions') }}
+      </button>
+      <button
+        class="button-default dropdown-item"
+        @click="toggleNotificationFilter('moves')"
+      >
+        <span
+          class="menu-checkbox"
+          :class="{ 'menu-checkbox-checked': filters.moves }"
+        />{{ $t('settings.notification_visibility_moves') }}
+      </button>
+    </div>
+    <div slot="trigger">
+      <FAIcon icon="filter" />
+    </div>
+  </Popover>
+</template>
+
+<script>
+import Popover from '../popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faFilter } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faFilter
+)
+
+export default {
+  components: { Popover },
+  computed: {
+    filters () {
+      return this.$store.getters.mergedConfig.notificationVisibility
+    }
+  },
+  methods: {
+    toggleNotificationFilter (type) {
+      this.$store.dispatch('setOption', {
+        name: 'notificationVisibility',
+        value: {
+          ...this.filters,
+          [type]: !this.filters[type]
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+
+.NotificationFilters {
+  align-self: stretch;
+
+  > button {
+    font-size: 1.2em;
+    padding-left: 0.7em;
+    padding-right: 0.2em;
+    line-height: 100%;
+    height: 100%;
+  }
+
+  .dropdown-item {
+    margin: 0;
+  }
+}
+
+</style>
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 492585631d..a9bf29313f 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -1,5 +1,6 @@
 import { mapGetters } from 'vuex'
 import Notification from '../notification/notification.vue'
+import NotificationFilters from './notification_filters.vue'
 import notificationsFetcher from '../../services/notifications_fetcher/notifications_fetcher.service.js'
 import {
   notificationsFromStore,
@@ -17,6 +18,10 @@ library.add(
 const DEFAULT_SEEN_TO_DISPLAY_COUNT = 30
 
 const Notifications = {
+  components: {
+    Notification,
+    NotificationFilters
+  },
   props: {
     // Disables display of panel header
     noHeading: Boolean,
@@ -70,9 +75,6 @@ const Notifications = {
     },
     ...mapGetters(['unreadChatCount'])
   },
-  components: {
-    Notification
-  },
   watch: {
     unseenCountTitle (count) {
       if (count > 0) {
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 725d1ad4ed..12097b856e 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -22,6 +22,7 @@
         >
           {{ $t('notifications.read') }}
         </button>
+        <NotificationFilters />
       </div>
       <div class="panel-body">
         <div
diff --git a/src/components/timeline/timeline_quick_settings.js b/src/components/timeline/timeline_quick_settings.js
index 9ec1a007f4..eae65a5587 100644
--- a/src/components/timeline/timeline_quick_settings.js
+++ b/src/components/timeline/timeline_quick_settings.js
@@ -1,5 +1,4 @@
 import Popover from '../popover/popover.vue'
-import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
@@ -12,8 +11,7 @@ library.add(
 
 const TimelineQuickSettings = {
   components: {
-    Popover,
-    BooleanSetting
+    Popover
   },
   methods: {
     setReplyVisibility (visibility) {
diff --git a/src/components/timeline/timeline_quick_settings.vue b/src/components/timeline/timeline_quick_settings.vue
index 4ad2842b30..94997c0d73 100644
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@@ -6,7 +6,7 @@
   >
     <div
       slot="content"
-      class="timeline-settings-menu dropdown-menu"
+      class="dropdown-menu"
     >
       <div v-if="loggedIn">
         <button
@@ -96,12 +96,6 @@
   .dropdown-item {
     margin: 0;
   }
-
-  .timeline-settings-menu {
-    display: flex;
-    min-width: 12em;
-    flex-direction: column;
-  }
 }
 
 </style>
diff --git a/src/modules/config.js b/src/modules/config.js
index eca58c12c3..f98e664961 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -44,7 +44,7 @@ export const defaultState = {
     likes: true,
     repeats: true,
     moves: true,
-    emojiReactions: false,
+    emojiReactions: true,
     followRequest: true,
     chatMention: true
   },

From 11a036d6d6c695eb8cff64d2c6cb85db23a0ed0e Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 1 Mar 2021 16:27:24 +0200
Subject: [PATCH 2/6] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2b48b9ec..d851456187 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added reason field for registration when approval is required
 - Added a quick settings to timeline header for easier access
 - Added option to mark posts as sensitive by default
+- Added quick filters for notifications
 
 ## [2.2.3] - 2021-01-18
 ### Added

From ae159f6ad8d23ce0e3d2d765bf694f1a614c6df4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Mon, 1 Mar 2021 16:30:10 +0200
Subject: [PATCH 3/6] ui never refers to them as likes

---
 src/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index bf77536361..a6e892d64c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -377,7 +377,7 @@
     "new_password": "New password",
     "notification_visibility": "Types of notifications to show",
     "notification_visibility_follows": "Follows",
-    "notification_visibility_likes": "Likes",
+    "notification_visibility_likes": "Favorites",
     "notification_visibility_mentions": "Mentions",
     "notification_visibility_repeats": "Repeats",
     "notification_visibility_moves": "User Migrates",

From 088683538d86d5230c333e9e01913a51ea1f95fe Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 9 Mar 2021 09:45:14 +0000
Subject: [PATCH 4/6] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3176181e1..1d2fab676b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Added a quick settings to timeline header for easier access
 - Added option to mark posts as sensitive by default
-- Added a quick settings to timeline header for easier access
 - Added option to mark posts as sensitive by default
 - Added quick filters for notifications
 

From 0475e1c61cba0862e8ed8976920dad895e8a5828 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 9 Mar 2021 09:45:28 +0000
Subject: [PATCH 5/6] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2fab676b..629e129017 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Added a quick settings to timeline header for easier access
 - Added option to mark posts as sensitive by default
-- Added option to mark posts as sensitive by default
 - Added quick filters for notifications
 
 ## [2.3.0] - 2021-03-01

From 8163c7b55bbc66a2455777025c29e7f9015497e0 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Mar 2021 08:35:29 +0200
Subject: [PATCH 6/6] v-slot

---
 .../notifications/notification_filters.vue    | 117 +++++++++---------
 1 file changed, 59 insertions(+), 58 deletions(-)

diff --git a/src/components/notifications/notification_filters.vue b/src/components/notifications/notification_filters.vue
index b348943004..e86a0fcc2f 100644
--- a/src/components/notifications/notification_filters.vue
+++ b/src/components/notifications/notification_filters.vue
@@ -5,65 +5,66 @@
     placement="bottom"
     :bound-to="{ x: 'container' }"
   >
-    <div
-      slot="content"
-      class="dropdown-menu"
+    <template
+      v-slot:content
     >
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('likes')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.likes }"
-        />{{ $t('settings.notification_visibility_likes') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('repeats')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.repeats }"
-        />{{ $t('settings.notification_visibility_repeats') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('follows')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.follows }"
-        />{{ $t('settings.notification_visibility_follows') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('mentions')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.mentions }"
-        />{{ $t('settings.notification_visibility_mentions') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('emojiReactions')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.emojiReactions }"
-        />{{ $t('settings.notification_visibility_emoji_reactions') }}
-      </button>
-      <button
-        class="button-default dropdown-item"
-        @click="toggleNotificationFilter('moves')"
-      >
-        <span
-          class="menu-checkbox"
-          :class="{ 'menu-checkbox-checked': filters.moves }"
-        />{{ $t('settings.notification_visibility_moves') }}
-      </button>
-    </div>
+      <div class="dropdown-menu">
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('likes')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.likes }"
+          />{{ $t('settings.notification_visibility_likes') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('repeats')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.repeats }"
+          />{{ $t('settings.notification_visibility_repeats') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('follows')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.follows }"
+          />{{ $t('settings.notification_visibility_follows') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('mentions')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.mentions }"
+          />{{ $t('settings.notification_visibility_mentions') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('emojiReactions')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.emojiReactions }"
+          />{{ $t('settings.notification_visibility_emoji_reactions') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('moves')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.moves }"
+          />{{ $t('settings.notification_visibility_moves') }}
+        </button>
+      </div>
+    </template>
     <template v-slot:trigger>
       <FAIcon icon="filter" />
     </template>