From 0bc303a762ea5b9d0dc8ed3a1d8f6e9f009bbe9d Mon Sep 17 00:00:00 2001
From: Andy Burke <andy.burke@mailbox.earth>
Date: Sun, 9 Nov 2025 13:16:49 -0800
Subject: [PATCH] fix: more navigation and chat fixes

---
 public/api/users/index.ts |  2 +-
 public/js/app.js          | 61 ++++++++++-----------------------------
 2 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/public/api/users/index.ts b/public/api/users/index.ts
index 1164572..b3d8c46 100644
--- a/public/api/users/index.ts
+++ b/public/api/users/index.ts
@@ -161,7 +161,7 @@ export async function POST(req: Request, meta: Record<string, any>): Promise<Res
 			await INVITE_CODES.create(root_invite_code);
 		}
 
-		const secret_code = submitted_invite_code ?? root_invite_code_secret;
+		const secret_code = root_invite_code_secret ?? submitted_invite_code; // if it's the first user, use the autogen code, ignore anything they submit
 		if (typeof secret_code !== 'string' || secret_code.length < 3) {
 			return Response.json({
 				error: {
diff --git a/public/js/app.js b/public/js/app.js
index dd04c87..510eecb 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -57,29 +57,24 @@ const APP = {
 			groups: {},
 		};
 
-		/*
-		console.dir({
-			url: window.location.href,
-			hash: window.location.hash,
-			view,
-			channel_id,
-		});
-		*/
+		if (!document.body.dataset.view || document.body.dataset.view !== view) {
+			const previous = typeof document.body.dataset.view === 'string' ? document.body.dataset.view : undefined;
+			if ( view ) {
+				document.body.dataset.view = view;
+			}
+			else {
+				delete document.body.dataset.view;
+			}
+
+			this._emit( 'view_changed', {
+				previous,
+				view
+			});
+		}
 
 		if (!document.body.dataset.channel || document.body.dataset.channel !== channel_id) {
 			const previous = typeof document.body.dataset.channel === 'string' ? document.body.dataset.channel : undefined;
 
-			/*
-			console.dir({
-				channel_changed: {
-					detail: {
-						previous,
-						channel_id,
-					},
-				},
-			});
-			*/
-
 			if ( channel_id ) {
 				document.body.dataset.channel = channel_id;
 			}
@@ -90,7 +85,7 @@ const APP = {
 			const target_channel_id = channel_id ?? this.CHANNELS.CHANNEL_LIST[0]?.id;
 
 			// TODO: allow a different default than chat
-			const hash_target = '/chat' + ( target_channel_id ? `/channel/${ target_channel_id }` : '' );
+			const hash_target = `/${ view ? view : 'chat' }` + ( target_channel_id ? `/channel/${ target_channel_id }` : '' );
 
 			if ( window.location.hash?.slice( 1 ) !== hash_target ) {
 				if ( previous !== target_channel_id ) {
@@ -103,32 +98,6 @@ const APP = {
 				window.location.hash = hash_target;
 			}
 		}
-
-		if (!document.body.dataset.view || document.body.dataset.view !== view) {
-			const previous = typeof document.body.dataset.view === 'string' ? document.body.dataset.view : undefined;
-			if ( view ) {
-				document.body.dataset.view = view;
-			}
-			else {
-				delete document.body.dataset.view;
-			}
-
-			/*
-			console.dir({
-				view_changed: {
-					detail: {
-						previous,
-						view,
-					},
-				},
-			});
-			*/
-
-			this._emit( 'view_changed', {
-				previous,
-				view
-			});
-		}
 	},
 
 	load: async function() {