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

fix: defer loading accounts/tags until masto is initialised

Browse source
This commit is contained in:
Daniel Roe 2022-12-26 15:14:48 +01:00
parent f28923f86f
commit 4e79246df3
No known key found for this signature in database
GPG key ID: 22D5008E4F5D9B55
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pages/[[server]]/@[account]/[status].vue
View file

@ -13,9 +13,10 @@ const main = ref<ComponentPublicInstance | null>(null)
let bottomSpace = $ref(0) let bottomSpace = $ref(0)
const publishWidget = ref() const publishWidget = ref()
const { data: status, pending, refresh: refreshStatus } = useAsyncData(`status:${id}`, async () => ( const { data: status, pending, refresh: refreshStatus } = useAsyncData(
window.history.state?.status as Status | undefined) `status:${id}`,
?? await fetchStatus(id), async () => (window.history.state?.status as Status | undefined) ?? await fetchStatus(id),
{ watch: [isMastoInitialised], immediate: isMastoInitialised.value },
) )
const masto = useMasto() const masto = useMasto()
const { data: context, pending: pendingContext, refresh: refreshContext } = useAsyncData(`context:${id}`, () => masto.statuses.fetchContext(id)) const { data: context, pending: pendingContext, refresh: refreshContext } = useAsyncData(`context:${id}`, () => masto.statuses.fetchContext(id))

5
pages/[[server]]/@[account]/index.vue
View file

@ -8,7 +8,7 @@ const accountName = $(computedEager(() => toShortHandle(params.account as string
const { t } = useI18n() const { t } = useI18n()
const { data: account, refresh } = $(await useAsyncData(() => fetchAccountByHandle(accountName).catch(() => null))) const { data: account, pending, refresh } = $(await useAsyncData(() => fetchAccountByHandle(accountName).catch(() => null), { watch: [isMastoInitialised], immediate: isMastoInitialised.value }))
const relationship = $computed(() => account ? useRelationship(account).value : undefined) const relationship = $computed(() => account ? useRelationship(account).value : undefined)
onReactivated(() => { onReactivated(() => {
@ -24,7 +24,8 @@ onReactivated(() => {
<span text-lg font-bold>{{ account ? getDisplayName(account) : t('nav_side.profile') }}</span> <span text-lg font-bold>{{ account ? getDisplayName(account) : t('nav_side.profile') }}</span>
</template> </template>
<template v-if="account"> <template v-if="pending" />
<template v-else-if="account">
<AccountMoved v-if="account.moved" :account="account" /> <AccountMoved v-if="account.moved" :account="account" />
<AccountHeader :account="account" command border="b base" :class="{ 'op-50 grayscale-50': !!account.moved }" /> <AccountHeader :account="account" command border="b base" :class="{ 'op-50 grayscale-50': !!account.moved }" />

2
pages/[[server]]/tags/[tag].vue
View file

@ -3,7 +3,7 @@ const params = useRoute().params
const tagName = $(computedEager(() => params.tag as string)) const tagName = $(computedEager(() => params.tag as string))
const masto = useMasto() const masto = useMasto()
const { data: tag, refresh } = $(await useAsyncData(() => masto.tags.fetch(tagName))) const { data: tag, refresh } = $(await useAsyncData(() => masto.tags.fetch(tagName), { watch: [isMastoInitialised], immediate: isMastoInitialised.value }))
const paginator = masto.timelines.iterateHashtag(tagName) const paginator = masto.timelines.iterateHashtag(tagName)
const stream = await masto.stream.streamTagTimeline(tagName) const stream = await masto.stream.streamTagTimeline(tagName)