Apply settings without reloading the page (#682)

* Invalidate conversation list when settings update * improve trimming on conv titles * Update src/routes/+layout.server.ts Co-authored-by: Mishig <[email protected]> --------- Co-authored-by: Mishig <[email protected]>
huggingface · Jan 8, 2024 · cdb33a9 · cdb33a9
1 parent 884fe73
commit cdb33a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/lib/stores/settings.ts b/src/lib/stores/settings.ts
@@ -1,5 +1,7 @@
 import { browser } from "$app/environment";
+import { invalidate } from "$app/navigation";
 import { base } from "$app/paths";
+import { UrlDependency } from "$lib/types/UrlDependency";
 import { getContext, setContext } from "svelte";
 import { type Writable, writable, get } from "svelte/store";
 
@@ -53,6 +55,7 @@ export function createSettingsStore(initialValue: Omit<SettingsStore, "recentlyS
 						recentlySaved: false,
 					}));
 				}, 3000);
+				invalidate(UrlDependency.ConversationList);
 			}, 300);
 			// debounce server calls by 300ms
 		}

diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
@@ -70,12 +70,21 @@ export const load: LayoutServerLoad = async ({ locals, depends }) => {
 				updatedAt: 1,
 				createdAt: 1,
 			})
-			.map((conv) => ({
-				id: conv._id.toString(),
-				title: settings?.hideEmojiOnSidebar ? conv.title.replace(/\p{Emoji}/gu, "") : conv.title,
-				model: conv.model ?? defaultModel,
-				updatedAt: conv.updatedAt,
-			}))
+			.map((conv) => {
+				// remove emojis if settings say so
+				if (settings?.hideEmojiOnSidebar) {
+					conv.title = conv.title.replace(/\p{Emoji}/gu, "");
+				}
+
+				// remove invalid unicode and trim whitespaces
+				conv.title = conv.title.replace(/\uFFFD/gu, "").trimStart();
+				return {
+					id: conv._id.toString(),
+					title: settings?.hideEmojiOnSidebar ? conv.title.replace(/\p{Emoji}/gu, "") : conv.title,
+					model: conv.model ?? defaultModel,
+					updatedAt: conv.updatedAt,
+				};
+			})
 			.toArray(),
 		settings: {
 			searchEnabled: !!(