From 499e8895c5a4f03c33e910c410a29276e9e05917 Mon Sep 17 00:00:00 2001 From: Hazel K Date: Wed, 9 Oct 2024 15:45:16 -0400 Subject: [PATCH] save filters for following feed --- .../frontend/src/pages/following-feed.vue | 47 +++++++++++++------ packages/frontend/src/store.ts | 10 ++++ 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/packages/frontend/src/pages/following-feed.vue b/packages/frontend/src/pages/following-feed.vue index f460086ff0..1b3f303dfe 100644 --- a/packages/frontend/src/pages/following-feed.vue +++ b/packages/frontend/src/pages/following-feed.vue @@ -63,20 +63,42 @@ import { checkWordMute } from '@/scripts/check-word-mute.js'; import SkUserRecentNotes from '@/components/SkUserRecentNotes.vue'; import { useScrollPositionManager } from '@/nirax.js'; import { getScrollContainer } from '@/scripts/scroll.js'; +import { defaultStore } from '@/store.js'; +import { deepMerge } from '@/scripts/merge.js'; -const props = withDefaults(defineProps<{ - initialTab?: FollowingFeedTab, -}>(), { - initialTab: followingTab, +const withNonPublic = computed({ + get: () => defaultStore.reactiveState.followingFeed.value.withNonPublic, + set: value => saveFollowingFilter('withNonPublic', value), }); +const withQuotes = computed({ + get: () => defaultStore.reactiveState.followingFeed.value.withQuotes, + set: value => saveFollowingFilter('withQuotes', value), +}); +const withReplies = computed({ + get: () => defaultStore.reactiveState.followingFeed.value.withReplies, + set: value => saveFollowingFilter('withReplies', value), +}); +const onlyFiles = computed({ + get: () => defaultStore.reactiveState.followingFeed.value.onlyFiles, + set: value => saveFollowingFilter('onlyFiles', value), +}); +const onlyMutuals = computed({ + get: () => defaultStore.reactiveState.followingFeed.value.onlyMutuals, + set: value => saveFollowingFilter('onlyMutuals', value), +}); + +// Based on timeline.saveTlFilter() +function saveFollowingFilter(key: keyof typeof defaultStore.state.followingFeed, value: boolean) { + const out = deepMerge({ [key]: value }, defaultStore.state.followingFeed); + defaultStore.set('followingFeed', out); +} const router = useRouter(); -// Vue complains, but we *want* to lose reactivity here. -// Otherwise, the user would be unable to change the tab. -// eslint-disable-next-line vue/no-setup-props-reactivity-loss -const currentTab: Ref = ref(props.initialTab); -const mutualsOnly: Ref = computed(() => currentTab.value === mutualsTab); +const currentTab = computed({ + get: () => onlyMutuals.value ? mutualsTab : followingTab, + set: value => onlyMutuals.value = (value === mutualsTab), +}); const userRecentNotes = shallowRef>(); const userScroll = shallowRef(); const noteScroll = shallowRef(); @@ -161,7 +183,7 @@ const latestNotesPagination: Paging<'notes/following'> = { endpoint: 'notes/following' as const, limit: 20, params: computed(() => ({ - mutualsOnly: mutualsOnly.value, + mutualsOnly: onlyMutuals.value, filesOnly: onlyFiles.value, includeNonPublic: withNonPublic.value, includeReplies: withReplies.value, @@ -169,11 +191,6 @@ const latestNotesPagination: Paging<'notes/following'> = { })), }; -const withNonPublic = ref(false); -const withQuotes = ref(false); -const withReplies = ref(false); -const onlyFiles = ref(false); - const headerActions: PageHeaderItem[] = [ { icon: 'ti ti-refresh', diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 8665cdaf76..5f78330147 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -239,6 +239,16 @@ export const defaultStore = markRaw(new Storage('base', { where: 'deviceAccount', default: [] as Misskey.entities.UserList[], }, + followingFeed: { + where: 'account', + default: { + withNonPublic: false, + withQuotes: false, + withReplies: false, + onlyFiles: false, + onlyMutuals: false, + }, + }, overridedDeviceKind: { where: 'device',