fix: repeat server in acct
parent
2d5038d046
commit
f844648cbf
|
@ -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]
|
||||||
|
|
Loading…
Reference in New Issue