zio/elk
2
0
Fork 0
Code Releases 2 Packages 1 Activity

feat: prevent mixing data on account switch (#384)

Browse source
This commit is contained in:
Joaquín Sánchez 2022-12-12 00:30:26 +01:00 • committed by GitHub
parent 8c82c91056
commit de160c219a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

36
composables/cache.ts
View file

@ -15,7 +15,8 @@ export function setCached(key: string, value: any, override = false) {
}
export function fetchStatus(id: string, force = false): Promise<Status> {
const key = `status:${id}`
const server = currentServer.value
const key = `${server}:status:${id}`
const cached = cache.get(key)
if (cached && !force)
return cached
@ -32,30 +33,37 @@ export function fetchAccountById(id?: string | null): Promise<Account | null> {
if (!id)
return Promise.resolve(null)
const key = `account:${id}`
const server = currentServer.value
const key = `${server}:account:${id}`
const cached = cache.get(key)
if (cached)
return cached
const uri = currentInstance.value?.uri
const promise = useMasto().accounts.fetch(id)
.then((account) => {
cacheAccount(account, true)
return account
.then((r) => {
if (!r.acct.includes('@') && uri)
r.acct = `${r.acct}@${uri}`
cacheAccount(r, server, true)
return r
})
cache.set(key, promise)
return promise
}
export async function fetchAccountByHandle(acct: string): Promise<Account> {
const key = `account:${acct}`
const server = currentServer.value
const key = `${server}:account:${acct}`
const cached = cache.get(key)
if (cached)
return cached
const uri = currentInstance.value?.uri
const account = useMasto().accounts.lookup({ acct })
.then((r) => {
if (!r.acct.includes('@') && currentInstance.value)
r.acct = `${r.acct}@${currentInstance.value.uri}`
if (!r.acct.includes('@') && uri)
r.acct = `${r.acct}@${uri}`
cacheAccount(r, true)
cacheAccount(r, server, true)
return r
})
cache.set(key, account)
@ -70,11 +78,11 @@ export function useAccountById(id?: string | null) {
return useAsyncState(() => fetchAccountById(id), null).state
}
export function cacheStatus(status: Status, override?: boolean) {
setCached(`status:${status.id}`, status, override)
export function cacheStatus(status: Status, server = currentServer.value, override?: boolean) {
setCached(`${server}:status:${status.id}`, status, override)
}
export function cacheAccount(account: Account, override?: boolean) {
setCached(`account:${account.id}`, account, override)
setCached(`account:${account.acct}`, account, override)
export function cacheAccount(account: Account, server = currentServer.value, override?: boolean) {
setCached(`${server}:account:${account.id}`, account, override)
setCached(`${server}:account:${account.acct}`, account, override)
}

12
composables/users.ts
View file

@ -31,12 +31,6 @@ export const currentInstance = computed<null | Instance>(() => currentUserId.val
export const characterLimit = computed(() => currentInstance.value?.configuration.statuses.maxCharacters ?? DEFAULT_POST_CHARS_LIMIT)
export async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: AccountCredentials }) {
if (user) {
const existing = users.value.find(u => u.server === user.server && u.token === user.token)
if (existing && currentUserId.value !== user.account?.id)
currentUserId.value = user.account?.id
}
const config = useRuntimeConfig()
const route = useRoute()
const router = useRouter()
@ -76,7 +70,7 @@ export async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: Ac
setMasto(masto)
if ('server' in route.params) {
if ('server' in route.params && user?.token) {
await router.push({
...route,
force: true,
@ -110,7 +104,7 @@ export async function signout() {
currentUserId.value = users.value[0]?.account?.id
if (!currentUserId.value)
await useRouter().push(`/${currentServer.value}/public`)
await useRouter().push('/')
await loginTo(currentUser.value)
}
@ -127,7 +121,7 @@ export const useNotifications = () => {
}
async function connect(): Promise<void> {
if (!id || notifications[id])
if (!id || notifications[id] || !currentUser.value?.token)
return
const masto = useMasto()