Skip to content

Commit 8a99304

Browse files
committed
fix: issues with page loading & assistant avatars
1 parent c3682cf commit 8a99304

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

src/lib/components/NavConversationItem.svelte

+7-5
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@
4040
{/if}
4141
{#if conv.avatarUrl}
4242
{#await conv.avatarUrl then avatarUrl}
43-
<img
44-
src="{base}{avatarUrl}"
45-
alt="Assistant avatar"
46-
class="mr-1.5 inline size-4 flex-none rounded-full object-cover"
47-
/>
43+
{#if avatarUrl}
44+
<img
45+
src="{base}{avatarUrl}"
46+
alt="Assistant avatar"
47+
class="mr-1.5 inline size-4 flex-none rounded-full object-cover"
48+
/>
49+
{/if}
4850
{/await}
4951
{conv.title.replace(/\p{Emoji}/gu, "")}
5052
{:else if conv.assistantId}

src/lib/types/ConvSidebar.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ export interface ConvSidebar {
44
updatedAt: Date;
55
model?: string;
66
assistantId?: string;
7-
avatarUrl?: string | Promise<string>;
7+
avatarUrl?: string | Promise<string | undefined>;
88
}

src/lib/utils/serialize.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ObjectId } from "mongodb";
1+
import type { ObjectId } from "mongodb";
22

33
export type Serialize<T> = T extends ObjectId | Date
44
? string

src/routes/+layout.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,14 @@ export const load = async ({ depends, fetch }) => {
5656
assistantId: conv.assistantId.toString(),
5757
avatarUrl: fetch(`${base}/api/v2/assistants/${conv.assistantId}`)
5858
.then((res) => res.json() as Promise<Serialize<Assistant>>)
59-
.then(
60-
(assistant) =>
61-
`/settings/assistants/${conv.assistantId}/avatar.jpg?hash=${assistant.avatar}`
62-
),
59+
.then((assistant) => {
60+
console.log(assistant);
61+
if (!assistant.avatar) {
62+
return undefined;
63+
}
64+
65+
return `/settings/assistants/${conv.assistantId}/avatar.jpg?hash=${assistant.avatar}`;
66+
}),
6367
}
6468
: {}),
6569
} satisfies ConvSidebar;

0 commit comments

Comments
 (0)