feat: re-apply timelines loading optimization (#524)

Co-authored-by: Daniel Roe <daniel@roe.dev>
zio/stable
patak 2022-12-26 06:39:18 +01:00 committed by GitHub
parent db7f82422e
commit baa2696d31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 155 additions and 99 deletions

View File

@ -6,12 +6,15 @@ provideGlobalCommands()
// We want to trigger rerendering the page when account changes
const key = computed(() => `${currentUser.value?.server ?? currentServer.value}:${currentUser.value?.account.id || ''}`)
const { params } = useRoute()
</script>
<template>
<NuxtLoadingIndicator color="repeating-linear-gradient(to right,var(--c-primary) 0%,var(--c-primary-active) 100%)" />
<NuxtLayout :key="key">
<NuxtPage v-if="isMastoInitialised" />
<!-- TODO: rework the /[account] routes to remove conditional loading -->
<NuxtPage v-if="(!params.account && $route.path !== '/signin/callback') || isMastoInitialised" />
</NuxtLayout>
<AriaAnnouncer />
</template>

View File

@ -5,6 +5,7 @@ const { options, command, replace, preventScrollTop = false } = $defineProps<{
options: {
to: RouteLocationRaw
display: string
disabled?: boolean
name?: string
icon?: string
}[]
@ -28,18 +29,25 @@ useCommands(() => command
<template>
<div flex w-full items-center lg:text-lg of-x-auto scrollbar-hide>
<NuxtLink
<template
v-for="(option, index) in options"
:key="option?.name || index"
:to="option.to"
:replace="replace"
relative flex flex-auto cursor-pointer sm:px6 px2 rounded transition-all
tabindex="1"
hover:bg-active transition-100
exact-active-class="children:(font-bold !border-primary !op100)"
@click="!preventScrollTop && $scrollToTop()"
>
<span ws-nowrap mxa sm:px2 sm:py3 py2 text-center border-b-3 op50 hover:op70 border-transparent>{{ option.display }}</span>
</NuxtLink>
<NuxtLink
v-if="!option.disabled"
:to="option.to"
:replace="replace"
relative flex flex-auto cursor-pointer sm:px6 px2 rounded transition-all
tabindex="1"
hover:bg-active transition-100
exact-active-class="children:(text-secondary !border-primary !op100)"
@click="!preventScrollTop && $scrollToTop()"
>
<span ws-nowrap mxa sm:px2 sm:py3 py2 text-center border-b-3 text-secondary-light hover:text-secondary border-transparent>{{ option.display }}</span>
</NuxtLink>
<div v-else flex flex-auto sm:px6 px2>
<span ws-nowrap mxa sm:px2 sm:py3 py2 text-center text-secondary-light op50>{{ option.display }}</span>
</div>
</template>
</div>
</template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().blocks.iterate()
</script>
<template>
<AccountPaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().bookmarks.iterate()
</script>
<template>
<TimelinePaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().conversations.iterate()
</script>
<template>
<ConversationPaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,21 @@
<script setup lang="ts">
const masto = useMasto()
const paginator = masto.domainBlocks.iterate()
const unblock = async (domain: string) => {
await masto.domainBlocks.unblock(domain)
}
</script>
<template>
<CommonPaginator :paginator="paginator">
<template #default="{ item }">
<CommonDropdownItem class="!cursor-auto">
{{ item }}
<template #actions>
<div i-ri:lock-unlock-line text-primary cursor-pointer @click="unblock(item)" />
</template>
</CommonDropdownItem>
</template>
</CommonPaginator>
</template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().favourites.iterate()
</script>
<template>
<TimelinePaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,12 @@
<script setup lang="ts">
const paginator = useMasto().timelines.iterateHome()
const stream = await useMasto().stream.streamUser()
onBeforeUnmount(() => stream.disconnect())
</script>
<template>
<div>
<PublishWidget draft-key="home" border="b base" />
<TimelinePaginator v-bind="{ paginator, stream }" context="home" />
</div>
</template>

View File

@ -0,0 +1,13 @@
<script setup lang="ts">
// Default limit is 20 notifications, and servers are normally caped to 30
const paginator = useMasto().notifications.iterate({ limit: 30, types: ['mention'] })
const { clearNotifications } = useNotifications()
onActivated(clearNotifications)
const stream = await useMasto().stream.streamUser()
</script>
<template>
<NotificationPaginator v-bind="{ paginator, stream }" />
</template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().mutes.iterate()
</script>
<template>
<AccountPaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,13 @@
<script setup lang="ts">
// Default limit is 20 notifications, and servers are normally caped to 30
const paginator = useMasto().notifications.iterate({ limit: 30 })
const { clearNotifications } = useNotifications()
onActivated(clearNotifications)
const stream = await useMasto().stream.streamUser()
</script>
<template>
<NotificationPaginator v-bind="{ paginator, stream }" />
</template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().accounts.iterateStatuses(currentUser.value!.account.id, { pinned: true })
</script>
<template>
<TimelinePaginator :paginator="paginator" />
</template>

View File

@ -17,15 +17,11 @@ const tabs = $computed(() => [
display: t('tab.news'),
},
// This section can only be accessed after logging in
...invoke(() => currentUser.value
? [
{
to: `/${currentServer.value}/explore/users`,
display: t('tab.for_you'),
},
]
: [],
),
{
to: `/${currentServer.value}/explore/users`,
display: t('tab.for_you'),
disabled: !isMastoInitialised.value || !currentUser.value,
},
] as const)
</script>
@ -41,6 +37,6 @@ const tabs = $computed(() => [
<template #header>
<CommonRouteTabs replace :options="tabs" />
</template>
<NuxtPage />
<NuxtPage v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -3,8 +3,6 @@ definePageMeta({
middleware: 'auth',
})
const paginator = useMasto().blocks.iterate()
useHeadFixed({
title: 'Blocked users',
})
@ -15,6 +13,7 @@ useHeadFixed({
<template #title>
<span text-lg font-bold>{{ $t('account.blocked_users') }}</span>
</template>
<AccountPaginator :paginator="paginator" />
<TimelineBlocks v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -3,8 +3,6 @@ definePageMeta({
middleware: 'auth',
})
const paginator = useMasto().bookmarks.iterate()
const { t } = useI18n()
useHeadFixed({
@ -21,8 +19,6 @@ useHeadFixed({
</NuxtLink>
</template>
<slot>
<TimelinePaginator :paginator="paginator" />
</slot>
<TimelineBookmarks v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -3,8 +3,6 @@ definePageMeta({
middleware: 'auth',
})
const paginator = useMasto().conversations.iterate()
const { t } = useI18n()
useHeadFixed({
@ -21,8 +19,6 @@ useHeadFixed({
</NuxtLink>
</template>
<slot>
<ConversationPaginator :paginator="paginator" />
</slot>
<TimelineConversations v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -1,18 +1,13 @@
<script setup lang="ts">
import TimelineDomainBlocks from '~~/components/timeline/TimelineDomainBlocks.vue'
definePageMeta({
middleware: 'auth',
})
const masto = useMasto()
const paginator = masto.domainBlocks.iterate()
useHeadFixed({
title: 'Blocked domains',
})
const unblock = async (domain: string) => {
await masto.domainBlocks.unblock(domain)
}
</script>
<template>
@ -21,15 +16,6 @@ const unblock = async (domain: string) => {
<span text-lg font-bold>{{ $t('account.blocked_domains') }}</span>
</template>
<CommonPaginator :paginator="paginator">
<template #default="{ item }">
<CommonDropdownItem class="!cursor-auto">
{{ item }}
<template #actions>
<div i-ri:lock-unlock-line text-primary cursor-pointer @click="unblock(item)" />
</template>
</CommonDropdownItem>
</template>
</CommonPaginator>
<TimelineDomainBlocks v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -3,7 +3,6 @@ definePageMeta({
middleware: 'auth',
})
const paginator = useMasto().favourites.iterate()
const { t } = useI18n()
useHeadFixed({
@ -19,8 +18,7 @@ useHeadFixed({
<span>{{ t('nav_side.favourites') }}</span>
</NuxtLink>
</template>
<slot>
<TimelinePaginator :paginator="paginator" />
</slot>
<TimelineFavourites v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -6,16 +6,6 @@ definePageMeta({
alias: ['/signin/callback'],
})
if (useRoute().path === '/signin/callback') {
// This only cleans up the URL; page content should stay the same
useRouter().push('/home')
}
const masto = useMasto()
const paginator = masto.timelines.iterateHome()
const stream = await masto.stream.streamUser()
onBeforeUnmount(() => stream.disconnect())
const { t } = useI18n()
useHeadFixed({
title: () => t('nav_side.home'),
@ -30,9 +20,7 @@ useHeadFixed({
<span>{{ $t('nav_side.home') }}</span>
</NuxtLink>
</template>
<slot>
<PublishWidget draft-key="home" border="b base" />
<TimelinePaginator v-bind="{ paginator, stream }" context="home" />
</slot>
<TimelineHome v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -2,9 +2,6 @@
definePageMeta({
middleware: 'auth',
})
const paginator = useMasto().mutes.iterate()
useHeadFixed({
title: 'Muted users',
})
@ -15,6 +12,7 @@ useHeadFixed({
<template #title>
<span text-lg font-bold>{{ $t('account.muted_users') }}</span>
</template>
<AccountPaginator :paginator="paginator" />
<TimelineMutes v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -53,6 +53,7 @@ onActivated(() => {
<template v-if="pwaEnabled">
<NotificationPreferences :show="showSettings" />
</template>
<NuxtPage />
</slot>
</MainContent>

View File

@ -1,20 +1,10 @@
<script setup lang="ts">
const { t } = useI18n()
const masto = useMasto()
// Default limit is 20 notifications, and servers are normally caped to 30
const paginator = masto.notifications.iterate({ limit: 30 })
const { clearNotifications } = useNotifications()
onActivated(clearNotifications)
const stream = await masto.stream.streamUser()
useHeadFixed({
title: () => `${t('tab.notifications_all')} | ${t('nav_side.notifications')}`,
})
</script>
<template>
<NotificationPaginator v-bind="{ paginator, stream }" />
<TimelineNotifications v-if="isMastoInitialised" />
</template>

View File

@ -1,20 +1,10 @@
<script setup lang="ts">
const { t } = useI18n()
const masto = useMasto()
// Default limit is 20 notifications, and servers are normally caped to 30
const paginator = masto.notifications.iterate({ limit: 30, types: ['mention'] })
const { clearNotifications } = useNotifications()
onActivated(clearNotifications)
const stream = await masto.stream.streamUser()
useHeadFixed({
title: () => `${t('tab.notifications_mention')} | ${t('nav_side.notifications')}`,
})
</script>
<template>
<NotificationPaginator v-bind="{ paginator, stream }" />
<TimelineNotifications v-if="isMastoInitialised" />
</template>

View File

@ -18,6 +18,6 @@ useHeadFixed({
<span>{{ t('account.pinned') }}</span>
</template>
<TimelinePaginator :paginator="paginator" />
<TimelinePinned v-if="isMastoInitialised" />
</MainContent>
</template>

View File

@ -2,7 +2,8 @@ export default defineNuxtPlugin(async (nuxtApp) => {
const masto = createMasto()
if (process.client) {
const { query } = useRoute()
const { query, path } = useRoute()
const router = useRouter()
const user = typeof query.server === 'string' && typeof query.token === 'string'
? {
server: query.server,
@ -13,8 +14,13 @@ export default defineNuxtPlugin(async (nuxtApp) => {
nuxtApp.hook('app:suspense:resolve', () => {
// TODO: improve upstream to make this synchronous (delayed auth)
if (!masto.loggedIn.value)
masto.loginTo(user)
if (!masto.loggedIn.value) {
masto.loginTo(user).then(() => {
// This only cleans up the URL; page content should stay the same
if (path === '/signin/callback')
router.push('/home')
})
}
})
}