From 3b76280f309edeb80a0a5c0efc68c2fcfae70ab7 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 17 May 2023 22:43:40 +0200
Subject: [PATCH] fix username handling with non A_Z

---
 frontend/src/lib/components/Path.svelte            | 9 ++++++---
 frontend/src/routes/(root)/(logged)/+layout.svelte | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/Path.svelte b/frontend/src/lib/components/Path.svelte
index e2c7157c8d..aee464fcf8 100644
--- a/frontend/src/lib/components/Path.svelte
+++ b/frontend/src/lib/components/Path.svelte
@@ -77,14 +77,17 @@
 
 	export async function reset() {
 		if (path == '' || path == 'u//') {
-			if ($lastMetaUsed == undefined) {
+			if ($lastMetaUsed == undefined || $lastMetaUsed.owner != $userStore?.username) {
 				meta = {
 					ownerKind: 'user',
 					name: random_adj() + '_' + namePlaceholder,
 					owner: ''
 				}
-
-				meta.owner = $userStore!.username.split('@')[0].replace(/[^a-zA-Z0-9]/g, '')
+				if ($userStore?.username?.includes('@')) {
+					meta.owner = $userStore!.username.split('@')[0].replace(/[^a-zA-Z0-9_]/g, '')
+				} else {
+					meta.owner = $userStore!.username!
+				}
 			} else {
 				meta = { ...$lastMetaUsed, name: random_adj() + '_' + namePlaceholder }
 			}
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index 46cbf77edd..10b8ff5a33 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -143,7 +143,6 @@
 
 <svelte:window bind:innerWidth />
 <UserSettings bind:this={userSettings} />
-
 {#if $page.status == 404}
 	<CenteredModal title="Page not found, redirecting you to login">
 		<div class="w-full">