From cd803fd199a7540b3bbb40f6bc5bdc0351461174 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 9 Aug 2022 19:52:07 -0700 Subject: [PATCH] revert: :rewind: timeline for non-logged in users --- CALCKEY.md | 1 - packages/client/src/pages/timeline.vue | 34 ++++---------------------- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/CALCKEY.md b/CALCKEY.md index dacaf77ee..8126523c6 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -67,7 +67,6 @@ - [Star is generic like/favorite](https://github.com/JakeMBauer/Misskey-Extras/blob/master/patches/star-is-like.patch) - 👍 also triggers generic like/favorite - [Add additional background for acrylic popups if backdrop-filter is unsupported](https://github.com/misskey-dev/misskey/pull/8671) -- [Timeline page for non-login users](https://github.com/misskey-dev/misskey/pull/8927) - [Add parameters to MFM rotate](https://github.com/misskey-dev/misskey/pull/8549) - Many changes from [Foundkey](https://akkoma.dev/FoundKeyGang/Foundkey) - 0ece67b04c3f0365057624c1068808276ccab981: refactor pages/auth.form.vue to composition API diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index a727c849a..ba4e9b821 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -95,7 +95,6 @@ function saveSrc(newSrc: 'home' | 'local' | 'social' | 'global'): void { ...defaultStore.state.tl, src: newSrc, }); - logoutSrc = newSrc ; } async function timetravel(): Promise { @@ -121,12 +120,7 @@ const headerActions = $computed(() => [{ title: i18n.ts.antennas, iconOnly: true, handler: chooseAntenna, -}, /* { - icon: 'fas fa-satellite-dish', - title: i18n.ts.channel, - iconOnly: true, - handler: chooseChannel, -}, */ { +}, { icon: 'fas fa-calendar-alt', title: i18n.ts.jumpToSpecifiedDate, iconOnly: true, @@ -150,36 +144,18 @@ const headerTabs = $computed(() => [{ icon: 'fas fa-signs-post', iconOnly: true, }] : []), - ...(isLocalTimelineAvailable ? [{ +...(isLocalTimelineAvailable ? [{ key: 'social', title: i18n.ts._timelines.social, icon: 'fas fa-handshake-simple', iconOnly: true, - loginRequired: true, -}] : []), ...(isGlobalTimelineAvailable ? [{ +}] : []), +...(isGlobalTimelineAvailable ? [{ key: 'global', title: i18n.ts._timelines.global, icon: 'fas fa-globe', iconOnly: true, -}] : []), { - icon: 'fas fa-list-ul', - title: i18n.ts.lists, - iconOnly: true, - loginRequired: true, - onClick: chooseList, -}, { - icon: 'fas fa-satellite', - title: i18n.ts.antennas, - iconOnly: true, - loginRequired: true, - onClick: chooseAntenna, -}, { - icon: 'fas fa-satellite-dish', - title: i18n.ts.channel, - iconOnly: true, - loginRequired: true, - onClick: chooseChannel, -}]); +}] : [])]); definePageMetadata(computed(() => ({ title: i18n.ts.timeline,