tempfix: possibly fix site not returning user info

This commit is contained in:
Xylight committed 2024-07-20 09:15:42 -07:00
1 parent f420ced79c
commit 95f67437ec
2 files changed
+5 -13

No files matched your search

+3 -12
View File
@@ -123,8 +123,9 @@ export let profile: Readable<Profile> = derived(
.then((res) => {
if (!res?.user)
toast({
content: 'Your login has expired. Re-login to fix this issue.',
type: 'warning',
content:
"Your account's instance did not return your user data. Your login may have expired.",
type: 'error',
})
site.set(res?.site)
@@ -324,16 +325,6 @@ function serializeUser(user: Profile): Profile {
}
}
instance.subscribe(async (i) => {
try {
// fetching site is handled by auth.ts if logged in
if (get(profile)?.jwt) return
const s = await new LemmyHttp(`https://${i}`).getSite()
site.set(s)
} catch (e) {}
})
export async function setUserID(id: number) {
profileData.update((p) => ({ ...p, profile: id }))
return get(profile)
+2 -1
View File
@@ -65,10 +65,11 @@ export function client({
let jwt = auth ? auth : get(profile)?.jwt
let headers = jwt ? { Authorization: `Bearer ${jwt}` } : { Authorization: '' }
let headers = jwt ? { Authorization: `Bearer ${jwt}` } : {}
return new LemmyHttp(instanceToURL(instanceURL), {
fetchFunction: (input, init) => customFetch(func, input, init, jwt),
//@ts-ignore
headers: headers,
})
}