amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

save filters for following feed

Browse Source
This commit is contained in:
Hazel K 2024-10-09 15:45:16 -04:00 committed by Hazelnoot
parent 463b9ac59d
commit 499e8895c5
2 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
packages/frontend/src/pages/following-feed.vue
View File

@ -63,20 +63,42 @@ import { checkWordMute } from '@/scripts/check-word-mute.js';
import SkUserRecentNotes from '@/components/SkUserRecentNotes.vue'; import SkUserRecentNotes from '@/components/SkUserRecentNotes.vue';
import { useScrollPositionManager } from '@/nirax.js'; import { useScrollPositionManager } from '@/nirax.js';
import { getScrollContainer } from '@/scripts/scroll.js'; import { getScrollContainer } from '@/scripts/scroll.js';
import { defaultStore } from '@/store.js';
import { deepMerge } from '@/scripts/merge.js';
const props = withDefaults(defineProps<{ const withNonPublic = computed({
initialTab?: FollowingFeedTab, get: () => defaultStore.reactiveState.followingFeed.value.withNonPublic,
}>(), { set: value => saveFollowingFilter('withNonPublic', value),
initialTab: followingTab,
}); });
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(); const router = useRouter();
// Vue complains, but we *want* to lose reactivity here. const currentTab = computed({
// Otherwise, the user would be unable to change the tab. get: () => onlyMutuals.value ? mutualsTab : followingTab,
// eslint-disable-next-line vue/no-setup-props-reactivity-loss set: value => onlyMutuals.value = (value === mutualsTab),
const currentTab: Ref<FollowingFeedTab> = ref(props.initialTab); });
const mutualsOnly: Ref<boolean> = computed(() => currentTab.value === mutualsTab);
const userRecentNotes = shallowRef<InstanceType<typeof SkUserRecentNotes>>(); const userRecentNotes = shallowRef<InstanceType<typeof SkUserRecentNotes>>();
const userScroll = shallowRef<HTMLElement>(); const userScroll = shallowRef<HTMLElement>();
const noteScroll = shallowRef<HTMLElement>(); const noteScroll = shallowRef<HTMLElement>();
@ -161,7 +183,7 @@ const latestNotesPagination: Paging<'notes/following'> = {
endpoint: 'notes/following' as const, endpoint: 'notes/following' as const,
limit: 20, limit: 20,
params: computed(() => ({ params: computed(() => ({
mutualsOnly: mutualsOnly.value, mutualsOnly: onlyMutuals.value,
filesOnly: onlyFiles.value, filesOnly: onlyFiles.value,
includeNonPublic: withNonPublic.value, includeNonPublic: withNonPublic.value,
includeReplies: withReplies.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[] = [ const headerActions: PageHeaderItem[] = [
{ {
icon: 'ti ti-refresh', icon: 'ti ti-refresh',

10
packages/frontend/src/store.ts
View File

@ -239,6 +239,16 @@ export const defaultStore = markRaw(new Storage('base', {
where: 'deviceAccount', where: 'deviceAccount',
default: [] as Misskey.entities.UserList[], default: [] as Misskey.entities.UserList[],
}, },
followingFeed: {
where: 'account',
default: {
withNonPublic: false,
withQuotes: false,
withReplies: false,
onlyFiles: false,
onlyMutuals: false,
},
},
overridedDeviceKind: { overridedDeviceKind: {
where: 'device', where: 'device',