Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/origin/timelineheader' into develop

Browse source 
# Conflicts:
#	CHANGELOG.md
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/store.ts
This commit is contained in:
mattyatea 2024-06-22 00:25:52 +09:00
commit 58ce5a5f79
10 changed files with 324 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

21
packages/frontend/src/store.ts
View file

@ -9,8 +9,7 @@ import { miLocalStorage } from './local-storage.js';
import type { SoundType } from '@/scripts/sound.js';
import { Storage } from '@/pizzax.js';
import { hemisphere } from '@/scripts/intl-const.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { isLocalTimelineAvailable, isGlobalTimelineAvailable } from '@/scripts/get-timeline-available.js';
interface PostFormAction {
title: string,
handler: <T>(form: T, update: (key: unknown, value: unknown) => void) => void;
@ -53,7 +52,6 @@ export type SoundStore = {
volume: number;
}
import { instance } from '@/instance.js';
export const postFormActions: PostFormAction[] = [];
export const userActions: UserAction[] = [];
export const noteActions: NoteAction[] = [];
@ -238,6 +236,22 @@ export const defaultStore = markRaw(new Storage('base', {
'cacheclear',
],
},
timelineHeader: {
where: 'deviceAccount',
default: [
'home',
...(isLocalTimelineAvailable ? [
'local',
'social',
] : []),
...(isGlobalTimelineAvailable ? [
'global',
] : []),
'lists',
'antennas',
'channels',
] as TimelineHeaderItem[],
},
visibility: {
where: 'deviceAccount',
default: 'public' as (typeof Misskey.noteVisibilities)[number],
@ -804,6 +818,7 @@ interface Watcher {
*/
import lightTheme from '@/themes/l-light.json5';
import darkTheme from '@/themes/d-green-lime.json5';
import { TimelineHeaderItem } from '@/timeline-header.js';
export class ColdDeviceStorage {
public static default = {