From 4ea4fadadafc7b99e60b9af72a0b4a80383c5b8a Mon Sep 17 00:00:00 2001 From: TAKAHASHI Shuuji Date: Mon, 19 May 2025 13:00:00 +0900 Subject: [PATCH] chore: fix status related type errors --- components/status/StatusEmojiReaction.vue | 4 ++-- composables/masto/status.ts | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/components/status/StatusEmojiReaction.vue b/components/status/StatusEmojiReaction.vue index 83862dc7..f9bbee7d 100644 --- a/components/status/StatusEmojiReaction.vue +++ b/components/status/StatusEmojiReaction.vue @@ -7,8 +7,8 @@ const props = defineProps<{ details?: boolean }>() -const { status }: { status: mastodon.v1.Status } = useStatusActions(props) -function isCustomEmoji(emoji: EmojiReaction) { +const { status } = useStatusActions(props) +function isCustomEmoji(emoji: mastodon.v1.EmojiReaction) { return !!emoji.staticUrl } diff --git a/composables/masto/status.ts b/composables/masto/status.ts index b0ce8f49..9f4903ce 100644 --- a/composables/masto/status.ts +++ b/composables/masto/status.ts @@ -1,12 +1,14 @@ +import type { mastodon } from 'masto' + type Action = 'reblogged' | 'favourited' | 'bookmarked' | 'pinned' | 'muted' type CountField = 'reblogsCount' | 'favouritesCount' export interface StatusActionsProps { - status: Status + status: mastodon.v1.Status } export function useStatusActions(props: StatusActionsProps) { - const status = ref({ ...props.status }) + const status = ref({ ...props.status }) const { client } = useMasto() watch( @@ -25,7 +27,7 @@ export function useStatusActions(props: StatusActionsProps) { muted: false, }) - async function toggleStatusAction(action: Action, fetchNewStatus: () => Promise, countField?: CountField) { + async function toggleStatusAction(action: Action, fetchNewStatus: () => Promise, countField?: CountField) { // check login if (!checkLogin()) return