CloudToys/elk
1
0
Fork 0
Code

fix: repeat preprocessing notifications

Browse Source 
removed some logic of a8e0e06d84 before,
re-add it now
This commit is contained in:
三咲智子 2023-01-09 23:39:59 +08:00
parent 333cab0858
commit 8d77f9e9fb
No known key found for this signature in database
GPG Key ID: 69992F2250DFD93E
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/common/CommonPaginator.vue
View File

@ -17,7 +17,7 @@ const {
virtualScroller?: boolean
stream?: Promise<WsEvents>
eventType?: 'notification' | 'update'
preprocess?: (items: T[]) => U[]
preprocess?: (items: (U | T)[]) => U[]
}>()
defineSlots<{

24
components/notification/NotificationPaginator.vue
View File

@ -23,7 +23,7 @@ const groupId = (item: mastodon.v1.Notification): string => {
return JSON.stringify(id)
}
function preprocess(items: mastodon.v1.Notification[]): NotificationSlot[] {
function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
const results: NotificationSlot[] = []
let id = 0
@ -108,6 +108,28 @@ function preprocess(items: mastodon.v1.Notification[]): NotificationSlot[] {
return results
}
function preprocess(items: NotificationSlot[]): NotificationSlot[] {
const flattenedNotifications: mastodon.v1.Notification[] = []
for (const item of items) {
if (item.type === 'grouped-reblogs-and-favourites') {
const group = item
for (const like of group.likes) {
if (like.reblog)
flattenedNotifications.push(like.reblog)
if (like.favourite)
flattenedNotifications.push(like.favourite)
}
}
else if (item.type === 'grouped-follow') {
flattenedNotifications.push(...item.items)
}
else {
flattenedNotifications.push(item)
}
}
return groupItems(flattenedNotifications)
}
const { clearNotifications } = useNotifications()
const { formatNumber } = useHumanReadableNumber()
</script>

10
composables/paginator.ts
View File

@ -5,7 +5,7 @@ export function usePaginator<T, P, U = T>(
paginator: Paginator<T[], P>,
stream?: Promise<WsEvents>,
eventType: 'notification' | 'update' = 'update',
preprocess: (items: T[]) => U[] = items => items as unknown as U[],
preprocess: (items: (T | U)[]) => U[] = items => items as unknown as U[],
buffer = 10,
) {
const state = ref<PaginatorState>(isMastoInitialised.value ? 'idle' : 'loading')
@ -64,14 +64,14 @@ export function usePaginator<T, P, U = T>(
try {
const result = await paginator.next()
if (result.value?.length) {
const preprocessedItems = preprocess([...nextItems.value, ...result.value]) as any
if (!result.done && result.value.length) {
const preprocessedItems = preprocess([...nextItems.value, ...result.value] as (U | T)[])
const itemsToShowCount
= preprocessedItems.length < buffer
? preprocessedItems.length
: preprocessedItems.length - buffer
nextItems.value = preprocessedItems.slice(itemsToShowCount)
items.value.push(...preprocessedItems.slice(0, itemsToShowCount))
;(nextItems.value as U[]) = preprocessedItems.slice(itemsToShowCount)
;(items.value as U[]).push(...preprocessedItems.slice(0, itemsToShowCount))
state.value = 'idle'
}
else {