From ffa92d222c4ea6f3c1efb40a026681fe48c5a141 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 13 Apr 2025 19:30:57 -0400
Subject: [PATCH] swap search blocks to reduce merge effort

---
 packages/frontend/src/pages/search.user.vue | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue
index a10b93f18e..0601fb0902 100644
--- a/packages/frontend/src/pages/search.user.vue
+++ b/packages/frontend/src/pages/search.user.vue
@@ -88,17 +88,6 @@ async function search() {
 	}
 	//#endregion
 
-	if (query.length > 1 && !query.includes(' ') && query.startsWith('#')) {
-		const confirm = await os.confirm({
-			type: 'info',
-			text: i18n.ts.openTagPageConfirm,
-		});
-		if (!confirm.canceled) {
-			router.push(`/user-tags/${encodeURIComponent(query.substring(1))}`);
-			return;
-		}
-	}
-
 	if (query.match(/^@[a-z0-9_.-]+@[a-z0-9_.-]+$/i)) {
 		const confirm = await os.confirm({
 			type: 'info',
@@ -110,6 +99,17 @@ async function search() {
 		}
 	}
 
+	if (query.length > 1 && !query.includes(' ') && query.startsWith('#')) {
+		const confirm = await os.confirm({
+			type: 'info',
+			text: i18n.ts.openTagPageConfirm,
+		});
+		if (!confirm.canceled) {
+			router.push(`/user-tags/${encodeURIComponent(query.substring(1))}`);
+			return;
+		}
+	}
+
 	userPagination.value = {
 		endpoint: 'users/search',
 		limit: 10,