From a08f56676dddc6fadd78d64568555433e4163f4b Mon Sep 17 00:00:00 2001
From: Ayo Ayco <ramon.aycojr@gmail.com>
Date: Mon, 23 Jan 2023 20:33:21 +0100
Subject: [PATCH] feat: totally hide strict filters (#948)

---
 .eslintignore                                 |  1 +
 .../conversation/ConversationPaginator.vue    |  8 +++-
 .../notification/NotificationPaginator.vue    |  8 +++-
 components/status/StatusCard.vue              | 13 -------
 components/status/StatusContent.vue           |  2 +-
 components/status/StatusSpoiler.vue           |  6 +--
 components/timeline/TimelineHome.vue          |  5 ++-
 components/timeline/TimelinePublic.vue        |  5 ++-
 composables/timeline.ts                       | 16 ++++++--
 locales/cs-CZ.json                            |  1 -
 locales/de-DE.json                            |  1 -
 locales/fr-FR.json                            |  1 -
 locales/nl-NL.json                            |  1 -
 locales/uk-UA.json                            |  1 -
 locales/zh-CN.json                            |  1 -
 locales/zh-TW.json                            |  1 -
 pages/[[server]]/@[account]/index/index.vue   |  6 ++-
 tests/reorder-timeline.test.ts                | 38 ++++++++++++++++++-
 18 files changed, 82 insertions(+), 33 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 28b79860..b2365300 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -8,3 +8,4 @@ Dockerfile
 public/
 https-dev-config/localhost.crt
 https-dev-config/localhost.key
+Dockerfile
diff --git a/components/conversation/ConversationPaginator.vue b/components/conversation/ConversationPaginator.vue
index 40a4c7c7..e41292c4 100644
--- a/components/conversation/ConversationPaginator.vue
+++ b/components/conversation/ConversationPaginator.vue
@@ -4,10 +4,16 @@ import type { Paginator, mastodon } from 'masto'
 const { paginator } = defineProps<{
   paginator: Paginator<mastodon.v1.Conversation[], mastodon.DefaultPaginationParams>
 }>()
+
+function preprocess(items: mastodon.v1.Conversation[]): mastodon.v1.Conversation[] {
+  return items.filter(items => !items.lastStatus?.filtered?.find(
+    filter => filter.filter.filterAction === 'hide' && filter.filter.context.includes('thread'),
+  ))
+}
 </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..db5e6015 100644
--- a/components/notification/NotificationPaginator.vue
+++ b/components/notification/NotificationPaginator.vue
@@ -112,6 +112,12 @@ function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
   return results
 }
 
+function removeFiltered(items: mastodon.v1.Notification[]): mastodon.v1.Notification[] {
+  return items.filter(item => !item.status?.filtered?.find(
+    filter => filter.filter.filterAction === 'hide' && filter.filter.context.includes('notifications'),
+  ))
+}
+
 function preprocess(items: NotificationSlot[]): NotificationSlot[] {
   const flattenedNotifications: mastodon.v1.Notification[] = []
   for (const item of items) {
@@ -131,7 +137,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 0f1b7c67..1f539949 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -67,13 +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 filterPhrase = $computed(() => filter?.title)
-const isFiltered = $computed(() => filterPhrase && (props.context ? filter?.context.includes(props.context) : false))
-
 const isSelfReply = $computed(() => status.inReplyToAccountId === status.account.id)
 const collapseRebloggedBy = $computed(() => rebloggedBy?.id === status.account.id)
 const isDM = $computed(() => status.visibility === 'direct')
@@ -84,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"
@@ -189,9 +181,4 @@ const showReplyTo = $computed(() => !replyToMain && !directReply)
       </div>
     </div>
   </div>
-  <div v-else-if="isFiltered" gap-2 p-4 :class="{ 'border-t border-base': newer }">
-    <p text-center text-secondary text-sm>
-      {{ filterPhrase && `${$t('status.filter_removed_phrase')}: ${filterPhrase}` }}
-    </p>
-  </div>
 </template>
diff --git a/components/status/StatusContent.vue b/components/status/StatusContent.vue
index ad2492d9..459f4cd7 100644
--- a/components/status/StatusContent.vue
+++ b/components/status/StatusContent.vue
@@ -27,7 +27,7 @@ const isFiltered = $computed(() => filterPhrase && (context && context !== 'deta
     }"
   >
     <StatusBody v-if="!isFiltered && status.sensitive && !status.spoilerText" :status="status" :newer="newer" :with-action="!isDetails" :class="isDetails ? 'text-xl' : ''" />
-    <StatusSpoiler :enabled="status.sensitive || isFiltered" :filter="isFiltered">
+    <StatusSpoiler :enabled="status.sensitive || isFiltered" :filter="isFiltered" :is-d-m="isDM">
       <template v-if="filterPhrase" #spoiler>
         <p>{{ `${$t('status.filter_hidden_phrase')}: ${filterPhrase}` }}</p>
       </template>
diff --git a/components/status/StatusSpoiler.vue b/components/status/StatusSpoiler.vue
index 10250a0f..9eced3bc 100644
--- a/components/status/StatusSpoiler.vue
+++ b/components/status/StatusSpoiler.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const props = defineProps<{ enabled?: boolean; filter?: boolean }>()
+const props = defineProps<{ enabled?: boolean; filter?: boolean; isDM?: boolean }>()
 
 const showContent = ref(!props.enabled)
 const toggleContent = useToggle(showContent)
@@ -14,8 +14,8 @@ watchEffect(() => {
     <div class="content-rich" p="x-4 b-2.5" text-center text-secondary w-full border="~ base" border-0 border-b-dotted border-b-3 mt-2>
       <slot name="spoiler" />
     </div>
-    <div flex="~ gap-1 center" w-full mt="-4.5">
-      <button btn-text px-2 py-1 bg-base flex="~ center gap-2" :class="showContent ? '' : 'filter-saturate-0 hover:filter-saturate-100'" @click="toggleContent()">
+    <div flex="~ gap-1 center" w-full :mb="isDM && !showContent ? '4' : ''" mt="-4.5">
+      <button btn-text px-2 py-1 :bg="isDM ? 'transparent' : 'base'" flex="~ center gap-2" :class="showContent ? '' : 'filter-saturate-0 hover:filter-saturate-100'" @click="toggleContent()">
         <div v-if="showContent" i-ri:eye-line />
         <div v-else i-ri:eye-close-line />
         {{ showContent ? $t('status.spoiler_show_less') : $t(filter ? 'status.filter_show_anyway' : 'status.spoiler_show_more') }}
diff --git a/components/timeline/TimelineHome.vue b/components/timeline/TimelineHome.vue
index e7016490..1367dae4 100644
--- a/components/timeline/TimelineHome.vue
+++ b/components/timeline/TimelineHome.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
+import type { mastodon } from 'masto'
+
 const paginator = useMastoClient().v1.timelines.listHome({ limit: 30 })
 const stream = $(useStreaming(client => client.v1.stream.streamUser()))
+const reorderAndFilter = (items: mastodon.v1.Status[]) => reorderedTimeline(items, 'home')
 </script>
 
 <template>
   <div>
     <PublishWidget draft-key="home" border="b base" />
-    <TimelinePaginator v-bind="{ paginator, stream }" :preprocess="reorderedTimeline" context="home" />
+    <TimelinePaginator v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="home" />
   </div>
 </template>
diff --git a/components/timeline/TimelinePublic.vue b/components/timeline/TimelinePublic.vue
index 7768ea2d..f9b00d6c 100644
--- a/components/timeline/TimelinePublic.vue
+++ b/components/timeline/TimelinePublic.vue
@@ -1,10 +1,13 @@
 <script setup lang="ts">
+import type { mastodon } from 'masto'
+
 const paginator = useMastoClient().v1.timelines.listPublic({ limit: 30 })
 const stream = useStreaming(client => client.v1.stream.streamPublicTimeline())
+const reorderAndFilter = (items: mastodon.v1.Status[]) => reorderedTimeline(items, 'public')
 </script>
 
 <template>
   <div>
-    <TimelinePaginator v-bind="{ paginator, stream }" context="public" />
+    <TimelinePaginator v-bind="{ paginator, stream }" :preprocess="reorderAndFilter" context="public" />
   </div>
 </template>
diff --git a/composables/timeline.ts b/composables/timeline.ts
index 0d0d9b4c..b827fa61 100644
--- a/composables/timeline.ts
+++ b/composables/timeline.ts
@@ -9,10 +9,20 @@ function areStatusesConsecutive(a: mastodon.v1.Status, b: mastodon.v1.Status) {
   return !!inReplyToId && (inReplyToId === a.reblog?.id || inReplyToId === a.id)
 }
 
-export function reorderedTimeline(items: mastodon.v1.Status[]) {
+function removeFilteredItems(items: mastodon.v1.Status[], context: mastodon.v1.FilterContext): mastodon.v1.Status[] {
+  const isStrict = (filter: mastodon.v1.FilterResult) => filter.filter.filterAction === 'hide' && filter.filter.context.includes(context)
+  const isFiltered = (item: mastodon.v1.Status) => !item.filtered?.find(isStrict)
+  const isReblogFiltered = (item: mastodon.v1.Status) => !item.reblog?.filtered?.find(isStrict)
+
+  return [...items].filter(isFiltered).filter(isReblogFiltered)
+}
+
+export function reorderedTimeline(items: mastodon.v1.Status[], context: mastodon.v1.FilterContext = 'public') {
   let steps = 0
-  const newItems = [...items]
-  for (let i = items.length - 1; i > 0; i--) {
+
+  const newItems = removeFilteredItems(items, context)
+
+  for (let i = newItems.length - 1; i > 0; i--) {
     for (let k = 1; k <= maxDistance && i - k >= 0; k++) {
       // Prevent infinite loops
       steps++
diff --git a/locales/cs-CZ.json b/locales/cs-CZ.json
index fcae19a0..9648f526 100644
--- a/locales/cs-CZ.json
+++ b/locales/cs-CZ.json
@@ -158,7 +158,6 @@
   "status": {
     "edited": "Upraveno {0}",
     "filter_hidden_phrase": "Vyfiltrováno",
-    "filter_removed_phrase": "Vyfiltrováno",
     "filter_show_anyway": "Ukázat i tak",
     "img_alt": {
       "desc": "Popis",
diff --git a/locales/de-DE.json b/locales/de-DE.json
index 64b5a589..569522f5 100644
--- a/locales/de-DE.json
+++ b/locales/de-DE.json
@@ -377,7 +377,6 @@
     "edited": "Zuletzt bearbeitet: {0}",
     "favourited_by": "Favorisiert von",
     "filter_hidden_phrase": "Versteckt durch",
-    "filter_removed_phrase": "Entfernt durch Filter",
     "filter_show_anyway": "Trotzdem zeigen",
     "img_alt": {
       "desc": "Beschreibung",
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
index 30ba74f1..09be1fa5 100644
--- a/locales/fr-FR.json
+++ b/locales/fr-FR.json
@@ -419,7 +419,6 @@
     "edited": "Edité {0}",
     "favourited_by": "Aimé par",
     "filter_hidden_phrase": "Filtré par",
-    "filter_removed_phrase": "Caché par le filtre",
     "filter_show_anyway": "Montrer coûte que coûte",
     "img_alt": {
       "desc": "Description",
diff --git a/locales/nl-NL.json b/locales/nl-NL.json
index cda26e49..3b100f81 100644
--- a/locales/nl-NL.json
+++ b/locales/nl-NL.json
@@ -295,7 +295,6 @@
   "status": {
     "edited": "Aangepast {0}",
     "filter_hidden_phrase": "Gefilterd door",
-    "filter_removed_phrase": "Verwijderd door filter",
     "filter_show_anyway": "Laat toch zien",
     "img_alt": {
       "desc": "Omschrijving",
diff --git a/locales/uk-UA.json b/locales/uk-UA.json
index 3613f998..b09b5b08 100644
--- a/locales/uk-UA.json
+++ b/locales/uk-UA.json
@@ -315,7 +315,6 @@
   "status": {
     "edited": "Редаговано {0}",
     "filter_hidden_phrase": "Відфільтровано",
-    "filter_removed_phrase": "Видалено фільтром",
     "filter_show_anyway": "Показати все одно",
     "img_alt": {
       "desc": "Опис зображення",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 9cce0cfa..5e7ece91 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -378,7 +378,6 @@
     "edited": "在 {0} 编辑了",
     "favourited_by": "被喜欢",
     "filter_hidden_phrase": "筛选依据",
-    "filter_removed_phrase": "从筛选中移除",
     "filter_show_anyway": "仍然展示",
     "img_alt": {
       "desc": "描述",
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index b308a2a3..648a982f 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -394,7 +394,6 @@
     "edited": "在 {0} 編輯了",
     "favourited_by": "被喜歡",
     "filter_hidden_phrase": "篩選依據",
-    "filter_removed_phrase": "從篩選中移除",
     "filter_show_anyway": "仍然顯示",
     "img_alt": {
       "desc": "描述",
diff --git a/pages/[[server]]/@[account]/index/index.vue b/pages/[[server]]/@[account]/index/index.vue
index 914751bc..60ec4b07 100644
--- a/pages/[[server]]/@[account]/index/index.vue
+++ b/pages/[[server]]/@[account]/index/index.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import type { mastodon } from 'masto'
+
 const params = useRoute().params
 const handle = $(computedEager(() => params.account as string))
 
@@ -8,6 +10,8 @@ const { t } = useI18n()
 
 const account = await fetchAccountByHandle(handle)
 
+const reorderAndFilter = (items: mastodon.v1.Status[]) => reorderedTimeline(items, 'account')
+
 const paginator = useMastoClient().v1.accounts.listStatuses(account.id, { limit: 30, excludeReplies: true })
 
 if (account) {
@@ -20,6 +24,6 @@ if (account) {
 <template>
   <div>
     <AccountTabs />
-    <TimelinePaginator :paginator="paginator" :preprocess="reorderedTimeline" context="account" :account="account" />
+    <TimelinePaginator :paginator="paginator" :preprocess="reorderAndFilter" context="account" :account="account" />
   </div>
 </template>
diff --git a/tests/reorder-timeline.test.ts b/tests/reorder-timeline.test.ts
index eaa5e76f..2fdda56b 100644
--- a/tests/reorder-timeline.test.ts
+++ b/tests/reorder-timeline.test.ts
@@ -1,7 +1,21 @@
 import type { mastodon } from 'masto'
 import { describe, expect, it } from 'vitest'
 
-function status(id: string): mastodon.v1.Status {
+function status(id: string, filtered?: mastodon.v1.FilterContext): mastodon.v1.Status {
+  if (filtered) {
+    return {
+      id,
+      filtered: [
+        {
+          filter: {
+            filterAction: 'hide',
+            context: [filtered],
+          },
+        } as mastodon.v1.FilterResult,
+      ],
+    } as mastodon.v1.Status
+  }
+
   return { id } as mastodon.v1.Status
 }
 function reply(id: string, s: mastodon.v1.Status) {
@@ -26,6 +40,11 @@ const r_b1 = reblog('r_b1', p_b1)
 const r_a2 = reblog('r_a2', p_a2)
 const r_b2 = reblog('r_b2', p_b2)
 
+const f1 = status('f1', 'public')
+const r_f1 = reply('r_f1', f1)
+const rb_f1 = reblog('rb_f1', f1)
+const n_f2 = status('f2', 'notifications')
+
 describe('timeline reordering', () => {
   it('reorder basic', () => {
     expect(reorderedTimeline([r_a2, r_a1])).toEqual([r_a1, r_a2])
@@ -48,4 +67,21 @@ describe('timeline reordering', () => {
 
     expect(reorderedTimeline([p_a3, r_a1, r_a2, r_b2, p_b3, r_b1])).toEqual([r_a1, r_a2, p_a3, r_b1, r_b2, p_b3])
   })
+
+  it('reorder with filtered item', () => {
+    // should not show filtered status with 'hide' filterAction
+    expect(reorderedTimeline([p_a3, f1, r_a1, r_a2, r_b2, p_b3, r_b1])).toEqual([r_a1, r_a2, p_a3, r_b1, r_b2, p_b3])
+
+    // should not filter status with 'hide' filterAction but does not match context
+    expect(reorderedTimeline([p_a3, n_f2, r_a1, r_a2, r_b2, p_b3, r_b1], 'public')).toEqual([r_a1, r_a2, p_a3, n_f2, r_b1, r_b2, p_b3])
+
+    // should filter status with 'hide' filterAction and matches context
+    expect(reorderedTimeline([p_a3, n_f2, r_a1, r_a2, r_b2, p_b3, r_b1], 'notifications')).toEqual([r_a1, r_a2, p_a3, r_b1, r_b2, p_b3])
+
+    // should show reply to a filtered status
+    expect(reorderedTimeline([p_a3, f1, r_a1, r_f1, r_a2, r_b2, p_b3, r_b1])).toEqual([r_a1, r_a2, p_a3, r_f1, r_b1, r_b2, p_b3])
+
+    // should not show reblogged status that is filtered with 'hide' filterAction
+    expect(reorderedTimeline([p_a3, f1, r_a1, rb_f1, r_a2, r_b2, p_b3, r_b1])).toEqual([r_a1, r_a2, p_a3, r_b1, r_b2, p_b3])
+  })
 })