mirrors/elk
1
0
Fork 0
mirror of https://github.com/elk-zone/elk.git synced 2024-11-28 13:28:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: repeat server in acct

Browse source
This commit is contained in:
三咲智子 2023-01-03 07:00:12 +08:00
parent 2d5038d046
commit f844648cbf
No known key found for this signature in database
GPG key ID: 69992F2250DFD93E
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
composables/users.ts
View file

@ -98,14 +98,14 @@ async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: AccountCr
: Promise.resolve(undefined), : Promise.resolve(undefined),
]) ])
if (!me.acct.includes('@'))
me.acct = `${me.acct}@${instance.uri}`
user.account = me user.account = me
user.pushSubscription = pushSubscription user.pushSubscription = pushSubscription
currentUserId.value = me.id currentUserId.value = me.id
instances.value[server] = instance instances.value[server] = instance
if (!user.account.acct.includes('@'))
user.account.acct = `${user.account.acct}@${instance.uri}`
if (!users.value.some(u => u.server === user.server && u.token === user.token)) if (!users.value.some(u => u.server === user.server && u.token === user.token))
users.value.push(user as UserLogin) users.value.push(user as UserLogin)
} }
@ -140,7 +140,11 @@ export function setAccountInfo(userId: string, account: AccountCredentials) {
export async function pullMyAccountInfo() { export async function pullMyAccountInfo() {
const account = await useMasto().accounts.verifyCredentials() const account = await useMasto().accounts.verifyCredentials()
if (!account.acct.includes('@'))
account.acct = `${account.acct}@${currentInstance.value!.uri}`
setAccountInfo(currentUserId.value, account) setAccountInfo(currentUserId.value, account)
cacheAccount(account, currentServer.value, true)
} }
export function getUsersIndexByUserId(userId: string) { export function getUsersIndexByUserId(userId: string) {
@ -283,7 +287,7 @@ export function useUserLocalStorage<T extends object>(key: string, initial: () =
return computed(() => { return computed(() => {
const id = currentUser.value?.account.id const id = currentUser.value?.account.id
? `${currentUser.value.account.acct}@${currentInstance.value?.uri || currentServer.value}` ? currentUser.value.account.acct
: '[anonymous]' : '[anonymous]'
all.value[id] = Object.assign(initial(), all.value[id] || {}) all.value[id] = Object.assign(initial(), all.value[id] || {})
return all.value[id] return all.value[id]