misc: tweak user handling

This commit is contained in:
Xylight committed 2024-07-16 09:49:55 -07:00
1 parent 602af2996c
commit 8c5478076e
1 file changed
+4 -5
+4 -5
View File
@@ -118,7 +118,7 @@ export let profile = derived<Writable<ProfileData>, Profile>(
site.set(res?.site) site.set(res?.site)
profile.user = res?.user profile.user = res?.user
profile.avatar = res?.user.local_user_view.person.avatar profile.avatar = res?.user?.local_user_view.person.avatar
checkInbox() checkInbox()
@@ -190,7 +190,7 @@ if (
const result = await setUser( const result = await setUser(
jwt, jwt,
env.PUBLIC_INSTANCE_URL ?? '', env.PUBLIC_INSTANCE_URL ?? '',
user?.user.local_user_view.person.name user?.user?.local_user_view.person.name
) )
if (result) if (result)
@@ -203,7 +203,7 @@ if (
} }
} }
export async function setUser(jwt: string, inst: string, username: string) { export async function setUser(jwt: string, inst: string, username?: string) {
try { try {
new URL(instanceToURL(inst)) new URL(instanceToURL(inst))
} catch (err) { } catch (err) {
@@ -248,7 +248,7 @@ export async function setUser(jwt: string, inst: string, username: string) {
async function userFromJwt( async function userFromJwt(
jwt: string, jwt: string,
instance: string instance: string
): Promise<{ user: PersonData; site: GetSiteResponse } | undefined> { ): Promise<{ user: PersonData | undefined; site: GetSiteResponse } | undefined> {
const sitePromise = client({ instanceURL: instance, auth: jwt }).getSite() const sitePromise = client({ instanceURL: instance, auth: jwt }).getSite()
let timer = setTimeout( let timer = setTimeout(
@@ -273,7 +273,6 @@ async function userFromJwt(
} }
const myUser = site.my_user const myUser = site.my_user
if (!myUser) return undefined
return { return {
user: myUser, user: myUser,