zio/elk
2
0
Fork 0
Code Releases 2 Packages 1 Activity

fix: account server in GoToSocial

Browse source
This commit is contained in:
三咲智子 Kevin Deng 2023-01-15 17:44:36 +08:00
parent ba5b89d5b8
commit 5247b36b6d
No known key found for this signature in database
GPG key ID: 69992F2250DFD93E
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
composables/masto/account.ts
View file

@ -17,7 +17,7 @@ export function getServerName(account: mastodon.v1.Account) {
if (account.acct?.includes('@'))
return account.acct.split('@')[1]
// We should only lack the server name if we're on the same server as the account
return currentInstance.value?.uri || ''
return currentInstance.value ? getInstanceDomain(currentInstance.value) : ''
}
export function getFullHandle(account: mastodon.v1.Account) {
@ -38,7 +38,7 @@ export function toShortHandle(fullHandle: string) {
export function extractAccountHandle(account: mastodon.v1.Account) {
let handle = getFullHandle(account).slice(1)
const uri = currentInstance.value?.uri ?? currentServer.value
const uri = currentInstance.value ? getInstanceDomain(currentInstance.value) : currentServer.value
if (currentInstance.value && handle.endsWith(`@${uri}`))
handle = handle.slice(0, -uri.length - 1)

2
composables/masto/masto.ts
View file

@ -34,7 +34,7 @@ export function mastoLogin(masto: ElkMasto, user: Pick<UserLogin, 'server' | 'to
const server = user.server
const url = `https://${server}`
const instance: ElkInstance = reactive(getInstanceCache(server) || { uri: server })
const instance: ElkInstance = reactive(getInstanceCache(server) || { uri: server, accountDomain: server })
setParams({
url,
accessToken: user?.token,