Nikurasu/elk
1
0
Fork 0
forked from Mirrors/elk
Code Pull requests Releases 2 Packages Activity

fix: use user id in cache key (#1139)

Browse source
This commit is contained in:
Daniel Roe 2023-01-14 21:56:47 +00:00 committed by GitHub
parent 5f7feac96b
commit 9a8e645e16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
composables/cache.ts
View file

@ -19,7 +19,8 @@ function removeCached(key: string) {
export function fetchStatus(id: string, force = false): Promise<mastodon.v1.Status> { export function fetchStatus(id: string, force = false): Promise<mastodon.v1.Status> {
const server = currentServer.value const server = currentServer.value
const key = `${server}:status:${id}` const userId = currentUser.value?.account.id
const key = `${server}:${userId}:status:${id}`
const cached = cache.get(key) const cached = cache.get(key)
if (cached && !force) if (cached && !force)
return cached return cached
@ -37,7 +38,8 @@ export function fetchAccountById(id?: string | null): Promise<mastodon.v1.Accoun
return Promise.resolve(null) return Promise.resolve(null)
const server = currentServer.value const server = currentServer.value
const key = `${server}:account:${id}` const userId = currentUser.value?.account.id
const key = `${server}:${userId}:account:${id}`
const cached = cache.get(key) const cached = cache.get(key)
if (cached) if (cached)
return cached return cached
@ -56,7 +58,8 @@ export function fetchAccountById(id?: string | null): Promise<mastodon.v1.Accoun
export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Account> { export async function fetchAccountByHandle(acct: string): Promise<mastodon.v1.Account> {
const server = currentServer.value const server = currentServer.value
const key = `${server}:account:${acct}` const userId = currentUser.value?.account.id
const key = `${server}:${userId}:account:${acct}`
const cached = cache.get(key) const cached = cache.get(key)
if (cached) if (cached)
return cached return cached
@ -82,14 +85,17 @@ export function useAccountById(id?: string | null) {
} }
export function cacheStatus(status: mastodon.v1.Status, server = currentServer.value, override?: boolean) { export function cacheStatus(status: mastodon.v1.Status, server = currentServer.value, override?: boolean) {
setCached(`${server}:status:${status.id}`, status, override) const userId = currentUser.value?.account.id
setCached(`${server}:${userId}:status:${status.id}`, status, override)
} }
export function removeCachedStatus(id: string, server = currentServer.value) { export function removeCachedStatus(id: string, server = currentServer.value) {
removeCached(`${server}:status:${id}`) const userId = currentUser.value?.account.id
removeCached(`${server}:${userId}:status:${id}`)
} }
export function cacheAccount(account: mastodon.v1.Account, server = currentServer.value, override?: boolean) { export function cacheAccount(account: mastodon.v1.Account, server = currentServer.value, override?: boolean) {
setCached(`${server}:account:${account.id}`, account, override) const userId = currentUser.value?.account.id
setCached(`${server}:account:${account.acct}`, account, override) setCached(`${server}:${userId}:account:${account.id}`, account, override)
setCached(`${server}:${userId}:account:${account.acct}`, account, override)
} }