natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 🔒 Remove timeline source if not logged in and guest tl isn't enabled

This commit is contained in:
ThatOneCalculator 2022-08-09 16:12:20 -07:00
parent 0ef9dd3519
commit 4f0030ecc8
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/client/src/pages/timeline.vue
View File

@ -38,6 +38,7 @@ const XTutorial = defineAsyncComponent(() => import('./timeline.tutorial.vue'));
const isLocalTimelineAvailable = !instance.disableLocalTimeline || ($i != null && ($i.isModerator || $i.isAdmin)); const isLocalTimelineAvailable = !instance.disableLocalTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
const isRecommendedTimelineAvailable = !instance.disableRecommendedTimeline || ($i != null && ($i.isModerator || $i.isAdmin)); const isRecommendedTimelineAvailable = !instance.disableRecommendedTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
const isGlobalTimelineAvailable = !instance.disableGlobalTimeline || ($i != null && ($i.isModerator || $i.isAdmin)); const isGlobalTimelineAvailable = !instance.disableGlobalTimeline || ($i != null && ($i.isModerator || $i.isAdmin));
const enableGuestTimeline = instance.enableGuestTimeline;
const keymap = { const keymap = {
't': focus, 't': focus,
}; };
@ -47,7 +48,10 @@ const rootEl = $ref<HTMLElement>();
let queue = $ref(0); let queue = $ref(0);
let srcWhenNotSignin = $ref(isLocalTimelineAvailable ? 'local' : 'global'); let srcWhenNotSignin = $ref(isLocalTimelineAvailable ? 'local' : 'global');
const src = $computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin), set: (x) => saveSrc(x) }); let src = $computed({ get: () => ($i ? defaultStore.reactiveState.tl.value.src : srcWhenNotSignin), set: (x) => saveSrc(x) });
if (!enableGuestTimeline) {
src = $computed({});
}
watch ($$(src), () => queue = 0); watch ($$(src), () => queue = 0);

19
packages/client/src/router.ts
View File

@ -6,18 +6,15 @@ import MkError from '@/pages/_error_.vue';
import { api } from '@/os'; import { api } from '@/os';
import { ui } from '@/config'; import { ui } from '@/config';
const meta = api('meta', { function getGuestTimelineStatus() {
detail: false api('meta', {
}).then((meta) => { detail: false
console.log(meta); }).then((meta) => {
console.log(meta[0]); return meta.enableGuestTimeline;
console.log(meta[1]); });
console.log(meta[0][0]); }
// const guestTimeline = meta.enableGuestTimeline;
// console.log(guestTimeline);
});
const guestTimeline = true; const guestTimeline = getGuestTimelineStatus();
const page = (loader: AsyncComponentLoader<any>) => defineAsyncComponent({ const page = (loader: AsyncComponentLoader<any>) => defineAsyncComponent({
loader: loader, loader: loader,