From a889f8d1421f3645ae65ca26295d77c329385773 Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Tue, 11 Jun 2024 15:02:30 -1000 Subject: [PATCH] chore: :arrow_up: Update @lysand-org/client for new types --- bun.lockb | Bin 674124 -> 674044 bytes .../social-elements/notifications/notif.vue | 10 ++++++---- composables/Identities.ts | 2 +- composables/Note.ts | 2 +- composables/NoteContext.ts | 2 +- composables/NoteData.ts | 2 +- composables/Relationship.ts | 2 +- composables/Timeline.ts | 8 ++++---- package.json | 4 ++-- types/mastodon/account.ts | 2 ++ 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/bun.lockb b/bun.lockb index e8e527d2cc57bec29e690b0604420962f992ada1..76ed7618b29705124f4214620f0f68d90b2ff0d6 100755 GIT binary patch delta 6925 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 X%RUsadSXDg4$t0Chq>_`0+0V6#9AX1 delta 7037 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 SME@1xIiJ
- Accept - Reject + Accept + + Reject +
@@ -47,7 +49,7 @@ const acceptFollowRequest = async () => { const { data } = await client.value.acceptFollowRequest( props.notification.account.id, ); - relationship.value = data as Relationship; + relationship.value = data; isWorkingOnFollowRequest.value = false; }; @@ -57,7 +59,7 @@ const rejectFollowRequest = async () => { const { data } = await client.value.rejectFollowRequest( props.notification.account.id, ); - relationship.value = data as Relationship; + relationship.value = data; isWorkingOnFollowRequest.value = false; }; diff --git a/composables/Identities.ts b/composables/Identities.ts index b52a86f..7a09d7b 100644 --- a/composables/Identities.ts +++ b/composables/Identities.ts @@ -106,7 +106,7 @@ export const useCurrentIdentity = (): Ref => { ); if (identities.value.length > 0) { - currentId.value = identities.value[0].id; + currentId.value = identities.value[0]?.id; } else { currentId.value = null; } diff --git a/composables/Note.ts b/composables/Note.ts index 51c8bf7..5a45a62 100644 --- a/composables/Note.ts +++ b/composables/Note.ts @@ -14,7 +14,7 @@ export const useNote = ( ref(client) .value?.getStatus(noteId) .then((res) => { - output.value = res.data as Status; + output.value = res.data; }); return output; diff --git a/composables/NoteContext.ts b/composables/NoteContext.ts index 05eb941..f707c9c 100644 --- a/composables/NoteContext.ts +++ b/composables/NoteContext.ts @@ -16,7 +16,7 @@ export const useNoteContext = ( ref(client) .value?.getStatusContext(toValue(noteId) ?? "") .then((res) => { - output.value = res.data as Context; + output.value = res.data; }); }); diff --git a/composables/NoteData.ts b/composables/NoteData.ts index 96f7855..9c5500e 100644 --- a/composables/NoteData.ts +++ b/composables/NoteData.ts @@ -58,7 +58,7 @@ export const useNoteData = ( ); if (result?.data) { - useEvent("note:delete", result.data as Status); + useEvent("note:delete", result.data); } }; diff --git a/composables/Relationship.ts b/composables/Relationship.ts index 16b2b3d..fac23f8 100644 --- a/composables/Relationship.ts +++ b/composables/Relationship.ts @@ -18,7 +18,7 @@ export const useRelationship = ( toValue(client) ?.getRelationship(toValue(accountId) ?? "") .then((res) => { - relationship.value = res.data as Relationship; + relationship.value = res.data; }); }); diff --git a/composables/Timeline.ts b/composables/Timeline.ts index dee060e..ba087af 100644 --- a/composables/Timeline.ts +++ b/composables/Timeline.ts @@ -49,7 +49,7 @@ export const useTimeline = < ); if (newNotes.length > 0) { fetchedNotes.value = [...fetchedNotes.value, ...newNotes]; - nextMaxId = newNotes[newNotes.length - 1].id; + nextMaxId = newNotes[newNotes.length - 1]?.id; for (const note of newNotes) { fetchedNoteIds.add(note.id); } @@ -70,7 +70,7 @@ export const useTimeline = < ); if (newNotes.length > 0) { fetchedNotes.value = [...newNotes, ...fetchedNotes.value]; - prevMinId = newNotes[0].id; + prevMinId = newNotes[0]?.id; for (const note of newNotes) { fetchedNoteIds.add(note.id); } @@ -132,7 +132,7 @@ export const useIdTimeline = < ); if (newNotes.length > 0) { fetchedNotes.value = [...fetchedNotes.value, ...newNotes]; - nextMaxId = newNotes[newNotes.length - 1].id; + nextMaxId = newNotes[newNotes.length - 1]?.id; for (const note of newNotes) { fetchedNoteIds.add(note.id); } @@ -153,7 +153,7 @@ export const useIdTimeline = < ); if (newNotes.length > 0) { fetchedNotes.value = [...newNotes, ...fetchedNotes.value]; - prevMinId = newNotes[0].id; + prevMinId = newNotes[0]?.id; for (const note of newNotes) { fetchedNoteIds.add(note.id); } diff --git a/package.json b/package.json index 3886b27..5179852 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@ark-ui/vue": "^3.3.1", - "@lysand-org/client": "^0.1.6", + "@lysand-org/client": "^0.1.7", "@nuxt/fonts": "^0.7.0", "@tailwindcss/typography": "^0.5.13", "@vee-validate/nuxt": "^4.13.1", @@ -49,7 +49,7 @@ "nuxt-shiki": "^0.3.0", "overlayscrollbars": "^2.8.3", "overlayscrollbars-vue": "^0.5.9", - "shiki": "^1.6.3", + "shiki": "^1.6.4", "vue": "^3.4.27", "vue-router": "^4.3.3", "zod": "^3.23.8" diff --git a/types/mastodon/account.ts b/types/mastodon/account.ts index 9d796c8..6dfec5f 100644 --- a/types/mastodon/account.ts +++ b/types/mastodon/account.ts @@ -1,3 +1,4 @@ +import type { Role as LysandRole } from "~/composables/Identities"; import type { Emoji } from "./emoji"; import type { Field } from "./field"; import type { Role } from "./role"; @@ -30,5 +31,6 @@ export type Account = { bot: boolean | null; source?: Source; role?: Role; + roles: LysandRole[]; mute_expires_at?: string; };