fix: handle account uris that differ from server url
parent
20d8aa7e75
commit
e75cc9edf2
|
@ -49,6 +49,9 @@ export async function fetchAccountByHandle(acct: string): Promise<Account> {
|
|||
return cached
|
||||
const account = useMasto().accounts.lookup({ acct })
|
||||
.then((r) => {
|
||||
if (!r.acct.includes('@') && currentInstance.value)
|
||||
r.acct = `${r.acct}@${currentInstance.value.uri}`
|
||||
|
||||
cacheAccount(r, true)
|
||||
return r
|
||||
})
|
||||
|
|
|
@ -58,6 +58,9 @@ export async function loginTo(user?: Omit<UserLogin, 'account'> & { account?: Ac
|
|||
currentUserId.value = me.id
|
||||
servers.value[me.id] = server
|
||||
|
||||
if (!user.account.acct.includes('@'))
|
||||
user.account.acct = `${user.account.acct}@${server.uri}`
|
||||
|
||||
if (!users.value.some(u => u.server === user.server && u.token === user.token))
|
||||
users.value.push(user as UserLogin)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue