From 28c011ac2ec6e02e3389d62b90938cca4514df10 Mon Sep 17 00:00:00 2001
From: Ayo <ramon.aycojr@gmail.com>
Date: Sat, 21 Jan 2023 22:53:02 +0100
Subject: [PATCH] feat: filter notifications and conversations

---
 components/conversation/ConversationPaginator.vue | 15 ++++++++++++++-
 components/notification/NotificationPaginator.vue | 15 ++++++++++++++-
 components/status/StatusCard.vue                  |  5 -----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/components/conversation/ConversationPaginator.vue b/components/conversation/ConversationPaginator.vue
index 40a4c7c7..72ed1840 100644
--- a/components/conversation/ConversationPaginator.vue
+++ b/components/conversation/ConversationPaginator.vue
@@ -4,10 +4,23 @@ import type { Paginator, mastodon } from 'masto'
 const { paginator } = defineProps<{
   paginator: Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
 }>()
+
+function preprocess(items: mastodon.v1.Conversation[]) {
+  const filteredIndices = items.map(
+    (items, index) => (
+      {
+        status: items.lastStatus,
+        index,
+      }))
+    .filter(item => !!item.status?.filtered?.find(filter => filter.filter.filterAction === 'hide' && filter.filter.context.includes('thread')))
+    .map(item => item.index)
+
+  return items.filter((_, index) => !filteredIndices.includes(index))
+}
 </script>
 
 <template>
-  <CommonPaginator :paginator="paginator">
+  <CommonPaginator :paginator="paginator" :preprocess="preprocess">
     <template #default="{ item }">
       <ConversationCard
         :conversation="item"
diff --git a/components/notification/NotificationPaginator.vue b/components/notification/NotificationPaginator.vue
index c6c3b531..dc9e96dc 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -112,6 +112,19 @@ function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
   return results
 }
 
+function removeFiltered(items: mastodon.v1.Notification[]): mastodon.v1.Notification[] {
+  const filteredIndices = items.map(
+    (items, index) => (
+      {
+        status: items.status,
+        index,
+      }))
+    .filter(item => !!item.status?.filtered?.find(filter => filter.filter.filterAction === 'hide' && filter.filter.context.includes('notifications')))
+    .map(item => item.index)
+
+  return items.filter((_, index) => !filteredIndices.includes(index))
+}
+
 function preprocess(items: NotificationSlot[]): NotificationSlot[] {
   const flattenedNotifications: mastodon.v1.Notification[] = []
   for (const item of items) {
@@ -131,7 +144,7 @@ function preprocess(items: NotificationSlot[]): NotificationSlot[] {
       flattenedNotifications.push(item)
     }
   }
-  return groupItems(flattenedNotifications)
+  return groupItems(removeFiltered(flattenedNotifications))
 }
 
 const { clearNotifications } = useNotifications()
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index 3af1e4c4..115e6511 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -67,10 +67,6 @@ const createdAt = useFormattedDateTime(status.createdAt)
 const timeAgoOptions = useTimeAgoOptions(true)
 const timeago = useTimeAgo(() => status.createdAt, timeAgoOptions)
 
-// Content Filter logic
-const filterResult = $computed(() => status.filtered?.length ? status.filtered[0] : null)
-const filter = $computed(() => filterResult?.filter)
-
 const isSelfReply = $computed(() => status.inReplyToAccountId === status.account.id)
 const collapseRebloggedBy = $computed(() => rebloggedBy?.id === status.account.id)
 const isDM = $computed(() => status.visibility === 'direct')
@@ -81,7 +77,6 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
 
 <template>
   <div
-    v-if="filter?.filterAction !== 'hide'"
     :id="`status-${status.id}`"
     ref="el"
     relative flex="~ col gap1" p="l-3 r-4 b-2"