teutat3s/elk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: Handle failure when fetching user preferences (#2069)

Browse source
This commit is contained in:
Natsu Kagami 2023-05-05 17:34:43 +00:00 committed by GitHub
parent d9e7a09d24
commit 1487932c1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
composables/users.ts
View file

@ -169,7 +169,7 @@ export async function loginTo(masto: ElkMasto, user: Overwrite<UserLogin, { acco
currentUserHandle.value = me.acct currentUserHandle.value = me.acct
} }
const accountPreferencesMap = new Map<string, mastodon.v1.Preference>() const accountPreferencesMap = new Map<string, Partial<mastodon.v1.Preference>>()
/** /**
* @returns `true` when user ticked the preference to always expand posts with content warnings * @returns `true` when user ticked the preference to always expand posts with content warnings
@ -193,9 +193,20 @@ export function getHideMediaByDefault(account: mastodon.v1.AccountCredentials) {
} }
export async function fetchAccountInfo(client: mastodon.Client, server: string) { export async function fetchAccountInfo(client: mastodon.Client, server: string) {
// Try to fetch user preferences if the backend supports it.
const fetchPrefs = async (): Promise<Partial<mastodon.v1.Preference>> => {
try {
return await client.v1.preferences.fetch()
}
catch (e) {
console.warn(`Cannot fetch preferences: ${e}`)
return {}
}
}
const [account, preferences] = await Promise.all([ const [account, preferences] = await Promise.all([
client.v1.accounts.verifyCredentials(), client.v1.accounts.verifyCredentials(),
client.v1.preferences.fetch(), fetchPrefs(),
]) ])
if (!account.acct.includes('@')) if (!account.acct.includes('@'))