refactor: user-specific storage

This commit is contained in:
Anthony Fu 2022-12-13 14:22:27 +01:00
parent 75f49461de
commit 2bee673a14
3 changed files with 47 additions and 57 deletions

View file

@ -1,4 +1,3 @@
import type { Account } from 'masto'
import { STORAGE_KEY_FEATURE_FLAGS } from '~/constants' import { STORAGE_KEY_FEATURE_FLAGS } from '~/constants'
export interface FeatureFlags { export interface FeatureFlags {
@ -7,8 +6,6 @@ export interface FeatureFlags {
} }
export type FeatureFlagsMap = Record<string, FeatureFlags> export type FeatureFlagsMap = Record<string, FeatureFlags>
export const allFeatureFlags = useLocalStorage<FeatureFlagsMap>(STORAGE_KEY_FEATURE_FLAGS, {}, { deep: true })
export function getDefaultFeatureFlags(): FeatureFlags { export function getDefaultFeatureFlags(): FeatureFlags {
return { return {
experimentalVirtualScroll: false, experimentalVirtualScroll: false,
@ -16,17 +13,7 @@ export function getDefaultFeatureFlags(): FeatureFlags {
} }
} }
export const currentUserFeatureFlags = computed(() => { export const currentUserFeatureFlags = useUserLocalStorage(STORAGE_KEY_FEATURE_FLAGS, getDefaultFeatureFlags)
if (!currentUser.value?.account.id)
return {} as FeatureFlags
const id = `${currentUser.value.account.acct}@${currentUser.value.server}`
if (!allFeatureFlags.value[id])
allFeatureFlags.value[id] = getDefaultFeatureFlags()
return allFeatureFlags.value[id] as FeatureFlags
})
export function useFeatureFlags() { export function useFeatureFlags() {
const featureFlags = currentUserFeatureFlags.value const featureFlags = currentUserFeatureFlags.value
@ -42,18 +29,3 @@ export function toggleFeatureFlag(key: keyof FeatureFlags) {
else else
featureFlags[key] = true featureFlags[key] = true
} }
export function clearUserFeatureFlags(account?: Account) {
if (!account)
account = currentUser.value?.account
if (!account)
return
const id = `${account.acct}@${currentUser.value?.server}`
if (!allFeatureFlags.value[id])
return
delete allFeatureFlags.value[id]
}

View file

@ -12,16 +12,7 @@ export interface Draft {
} }
export type DraftMap = Record<string, Draft> export type DraftMap = Record<string, Draft>
const allDrafts = useLocalStorage<Record<string, DraftMap>>(STORAGE_KEY_DRAFTS, {}) export const currentUserDrafts = useUserLocalStorage<DraftMap>(STORAGE_KEY_DRAFTS, () => ({}))
export const currentUserDrafts = computed(() => {
if (!currentUser.value?.account.id)
return {}
const id = `${currentUser.value.account.acct}@${currentUser.value.server}`
if (!allDrafts.value[id])
allDrafts.value[id] = {}
return allDrafts.value[id]
})
export function getDefaultDraft(options: Partial<Draft['params'] & Omit<Draft, 'params'>> = {}): Draft { export function getDefaultDraft(options: Partial<Draft['params'] & Omit<Draft, 'params'>> = {}): Draft {
const { const {
@ -124,17 +115,3 @@ export function directMessageUser(account: Account) {
visibility: 'direct', visibility: 'direct',
}), true) }), true)
} }
export function clearUserDrafts(account?: Account) {
if (!account)
account = currentUser.value?.account
if (!account)
return
const id = `${account.acct}@${currentUser.value?.server}`
if (!allDrafts.value[id])
return
delete allDrafts.value[id]
}

View file

@ -1,6 +1,6 @@
import { login as loginMasto } from 'masto' import { login as loginMasto } from 'masto'
import type { AccountCredentials, Instance, WsEvents } from 'masto' import type { Account, AccountCredentials, Instance, WsEvents } from 'masto'
import { clearUserDrafts } from './statusDrafts' import type { Ref } from 'vue'
import type { UserLogin } from '~/types' import type { UserLogin } from '~/types'
import { DEFAULT_POST_CHARS_LIMIT, DEFAULT_SERVER, STORAGE_KEY_CURRENT_USER, STORAGE_KEY_SERVERS, STORAGE_KEY_USERS } from '~/constants' import { DEFAULT_POST_CHARS_LIMIT, DEFAULT_SERVER, STORAGE_KEY_CURRENT_USER, STORAGE_KEY_SERVERS, STORAGE_KEY_USERS } from '~/constants'
@ -91,9 +91,8 @@ export async function signout() {
if (index !== -1) { if (index !== -1) {
// Clear stale data // Clear stale data
clearUserLocalStorage()
delete servers.value[_currentUserId] delete servers.value[_currentUserId]
clearUserDrafts()
clearUserFeatureFlags()
currentUserId.value = '' currentUserId.value = ''
// Remove the current user from the users // Remove the current user from the users
@ -153,3 +152,45 @@ export function checkLogin() {
} }
return true return true
} }
const userLocalStorages = new Map<string, Ref<Record<string, any>>>()
/**
* Create reactive storage for the current user
*/
export function useUserLocalStorage<T extends object>(key: string, initial: () => T) {
if (!userLocalStorages.has(key))
userLocalStorages.set(key, useLocalStorage(key, {}, { deep: true }))
const all = userLocalStorages.get(key) as Ref<Record<string, T>>
const id = currentUser.value?.account.id
? `${currentUser.value.account.acct}@${currentUser.value.server}`
: '[anonymous]'
all.value[id] = Object.assign(initial(), all.value[id] || {})
return extendRef(
computed(() => all.value[id]),
{
remove: {
value: () => {
delete all.value[id]
},
},
})
}
/**
* Clear all storages for the given account
*/
export function clearUserLocalStorage(account?: Account) {
if (!account)
account = currentUser.value?.account
if (!account)
return
const id = `${account.acct}@${currentUser.value?.server}`
userLocalStorages.forEach((storage) => {
if (storage.value[id])
delete storage.value[id]
})
}