teutat3s/elk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: reference conflicts

Browse source
This commit is contained in:
Anthony Fu 2022-12-13 14:49:22 +01:00
parent 2bee673a14
commit d546390f5c
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
composables/statusDrafts.ts
View file

@ -48,16 +48,16 @@ function mentionHTML(acct: string) {
} }
export function getReplyDraft(status: Status) { export function getReplyDraft(status: Status) {
const acountsToMention: string[] = [] const accountsToMention: string[] = []
const userId = currentUser.value?.account.id const userId = currentUser.value?.account.id
if (status.account.id !== userId) if (status.account.id !== userId)
acountsToMention.push(status.account.acct) accountsToMention.push(status.account.acct)
acountsToMention.push(...(status.mentions.filter(mention => mention.id !== userId).map(mention => mention.acct))) accountsToMention.push(...(status.mentions.filter(mention => mention.id !== userId).map(mention => mention.acct)))
return { return {
key: `reply-${status.id}`, key: `reply-${status.id}`,
draft: () => { draft: () => {
return getDefaultDraft({ return getDefaultDraft({
initialText: acountsToMention.map(acct => mentionHTML(acct)).join(' '), initialText: accountsToMention.map(acct => mentionHTML(acct)).join(' '),
inReplyToId: status!.id, inReplyToId: status!.id,
visibility: status.visibility, visibility: status.visibility,
}) })

35
composables/users.ts
View file

@ -20,6 +20,11 @@ export const currentUser = computed<UserLogin | undefined>(() => {
return users.value[0] return users.value[0]
}) })
export const currentUserHandle = computed(() => currentUser.value?.account.id
? `${currentUser.value.account.acct}@${currentUser.value.server}`
: '[anonymous]',
)
export const publicServer = ref(DEFAULT_SERVER) export const publicServer = ref(DEFAULT_SERVER)
const publicInstance = ref<Instance | null>(null) const publicInstance = ref<Instance | null>(null)
export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value) export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
@ -153,30 +158,24 @@ export function checkLogin() {
return true return true
} }
const userLocalStorages = new Map<string, Ref<Record<string, any>>>()
/** /**
* Create reactive storage for the current user * Create reactive storage for the current user
*/ */
export function useUserLocalStorage<T extends object>(key: string, initial: () => T) { export function useUserLocalStorage<T extends object>(key: string, initial: () => T) {
if (!userLocalStorages.has(key)) // @ts-expect-error bind value to the function
userLocalStorages.set(key, useLocalStorage(key, {}, { deep: true })) const storages = useUserLocalStorage._ = useUserLocalStorage._ || new Map<string, Ref<Record<string, any>>>()
const all = userLocalStorages.get(key) as Ref<Record<string, T>> if (!storages.has(key))
const id = currentUser.value?.account.id storages.set(key, useLocalStorage(key, {}, { deep: true }))
? `${currentUser.value.account.acct}@${currentUser.value.server}` const all = storages.get(key) as Ref<Record<string, T>>
: '[anonymous]'
all.value[id] = Object.assign(initial(), all.value[id] || {}) return computed(() => {
return extendRef( const id = currentUser.value?.account.id
computed(() => all.value[id]), ? `${currentUser.value.account.acct}@${currentUser.value.server}`
{ : '[anonymous]'
remove: { all.value[id] = Object.assign(initial(), all.value[id] || {})
value: () => { return all.value[id]
delete all.value[id] })
},
},
})
} }
/** /**