fix: let people dismiss disclaimer modal & show popup as expected

huggingface · Nov 5, 2024 · 51227b9 · 51227b9
1 parent 629b49c
commit 51227b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/lib/components/DisclaimerModal.svelte b/src/lib/components/DisclaimerModal.svelte
@@ -11,7 +11,7 @@
 	const settings = useSettingsStore();
 </script>
 
-<Modal>
+<Modal on:close>
 	<div
 		class="from-primary-500/40 via-primary-500/10 to-primary-500/0 flex w-full flex-col items-center gap-6 bg-gradient-to-b px-5 pb-8 pt-9 text-center sm:px-6"
 	>

diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
@@ -95,8 +95,10 @@ export const load: LayoutServerLoad = async ({ locals, depends }) => {
 
 	let loginRequired = false;
 
-	if (requiresUser && !locals.user && messagesBeforeLogin) {
-		if (nConversations > messagesBeforeLogin) {
+	if (requiresUser && !locals.user) {
+		if (messagesBeforeLogin === 0) {
+			loginRequired = true;
+		} else if (nConversations >= messagesBeforeLogin) {
 			loginRequired = true;
 		} else {
 			// get the number of messages where `from === "assistant"` across all conversations.
@@ -114,7 +116,7 @@ export const load: LayoutServerLoad = async ({ locals, depends }) => {
 						.toArray()
 				)[0]?.messages ?? 0;
 
-			loginRequired = totalMessages > messagesBeforeLogin;
+			loginRequired = totalMessages >= messagesBeforeLogin;
 		}
 	}
 

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -207,7 +207,7 @@
 </svelte:head>
 
 {#if !$settings.ethicsModalAccepted && $page.url.pathname !== `${base}/privacy` && envPublic.PUBLIC_APP_DISCLAIMER === "1"}
-	<DisclaimerModal />
+	<DisclaimerModal on:close={() => ($settings.ethicsModalAccepted = true)} />
 {/if}
 
 <ExpandNavigation