zio/elk
2
0
Fork 0
Code Releases 2 Packages 1 Activity

refactor: upgrade masto 5 (#867)

Browse source
This commit is contained in:
三咲智子 Kevin Deng 2023-01-08 14:21:09 +08:00 • committed by GitHub
parent 39034c5777
commit 5c8f75b9b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 438 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/notification/NotificationCard.vue
View file

@ -1,8 +1,8 @@
<script setup lang="ts">
import type { Notification } from 'masto'
import type { mastodon } from 'masto'
const { notification } = defineProps<{
notification: Notification
notification: mastodon.v1.Notification
}>()
</script>

15
components/notification/NotificationPaginator.vue
View file

@ -1,20 +1,19 @@
<script setup lang="ts">
// type used in <template>
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
import type { Notification, Paginator, WsEvents } from 'masto'
import { mastodon } from 'masto'
import type { Paginator, WsEvents } from 'masto'
// type used in <template>
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
import type { GroupedAccountLike, GroupedLikeNotifications, NotificationSlot } from '~/types'
const { paginator, stream } = defineProps<{
paginator: Paginator<any, Notification[]>
paginator: Paginator<mastodon.v1.Notification[], mastodon.v1.ListNotificationsParams>
stream?: Promise<WsEvents>
}>()
const groupCapacity = Number.MAX_VALUE // No limit
// Group by type (and status when applicable)
const groupId = (item: Notification): string => {
const groupId = (item: mastodon.v1.Notification): string => {
// If the update is related to an status, group notifications from the same account (boost + favorite the same status)
const id = item.status
? {
@ -27,12 +26,12 @@ const groupId = (item: Notification): string => {
return JSON.stringify(id)
}
function groupItems(items: Notification[]): NotificationSlot[] {
function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
const results: NotificationSlot[] = []
let id = 0
let currentGroupId = ''
let currentGroup: Notification[] = []
let currentGroup: mastodon.v1.Notification[] = []
const processGroup = () => {
if (currentGroup.length === 0)
return
@ -127,7 +126,7 @@ const { formatNumber } = useHumanReadableNumber()
/>
<NotificationCard
v-else
:notification="item as Notification"
:notification="item as mastodon.v1.Notification"
hover:bg-active
border="b base"
/>