kglt/fyne-on
1
0
Fork 0
Code Pull requests 1 Activity Actions

fix: key current instance on user server, not user id (#466)

Browse source
This commit is contained in:
Daniel Roe 2022-12-20 00:16:15 +00:00 • committed by GitHub
parent 7484c5c072
commit 9a7c37db24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
composables/masto.ts
View file

@ -43,7 +43,8 @@ export function getShortHandle({ acct }: Account) {
export function getServerName(account: Account) {
if (account.acct.includes('@'))
return account.acct.split('@')[1]
return account.url.match(UserLinkRE)?.[1] || currentUser.value?.server || ''
// We should only lack the server name if we're on the same server as the account
return currentInstance.value?.uri || ''
}
export function getFullHandle(account: Account) {
@ -64,8 +65,9 @@ export function toShortHandle(fullHandle: string) {
export function getAccountRoute(account: Account) {
let handle = getFullHandle(account).slice(1)
if (handle.endsWith(`@${currentServer.value}`))
handle = handle.slice(0, -currentServer.value.length - 1)
const uri = currentInstance.value?.uri ?? currentServer.value
if (currentInstance.value && handle.endsWith(`@${uri}`))
handle = handle.slice(0, -uri.length - 1)
return useRouter().resolve({
name: 'account-index',