Nikurasu/elk
1
0
Fork 0
forked from Mirrors/elk
Code Pull requests Releases 2 Packages 1 Activity

refactor: use single filter logic

Browse source
This commit is contained in:
Ayo 2023-01-21 23:41:46 +01:00
parent d3a567ddb8
commit 979c97306b
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/conversation/ConversationPaginator.vue
View file

@ -6,16 +6,9 @@ const { paginator } = defineProps<{
}>() }>()
function preprocess(items: mastodon.v1.Conversation[]) { function preprocess(items: mastodon.v1.Conversation[]) {
const filteredIndices = items.map( return items.filter(items => !items.lastStatus?.filtered?.find(
(items, index) => ( filter => filter.filter.filterAction === 'hide' && filter.filter.context.includes('thread'),
{ ))
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> </script>

13
components/notification/NotificationPaginator.vue
View file

@ -113,16 +113,9 @@ function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
} }
function removeFiltered(items: mastodon.v1.Notification[]): mastodon.v1.Notification[] { function removeFiltered(items: mastodon.v1.Notification[]): mastodon.v1.Notification[] {
const filteredIndices = items.map( return items.filter(item => !item.status?.filtered?.find(
(items, index) => ( filter => filter.filter.filterAction === 'hide' && filter.filter.context.includes('notifications'),
{ ))
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[] { function preprocess(items: NotificationSlot[]): NotificationSlot[] {