summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-02-28 21:20:57 +0000
committerHazelnoot <acomputerdog@gmail.com>2025-02-28 21:20:57 +0000
commit8a65074f23e656579dc0ff9e4b299d38d8947dfa (patch)
tree9bc7ae493a8d853d4a5a3482471ab785c8479963 /packages/frontend/src
parentmerge: Trim padded Actor keys to avoid `value too long` error (resolves #806)... (diff)
parentfix lookup confirmations (diff)
downloadsharkey-8a65074f23e656579dc0ff9e4b299d38d8947dfa.tar.gz
sharkey-8a65074f23e656579dc0ff9e4b299d38d8947dfa.tar.bz2
sharkey-8a65074f23e656579dc0ff9e4b299d38d8947dfa.zip
merge: fix lookup confirmations (!926)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/926 Approved-by: Marie <github@yuugi.dev> Approved-by: Hazelnoot <acomputerdog@gmail.com>
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/pages/search.user.vue39
1 files changed, 16 insertions, 23 deletions
diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue
index 772ee91d63..8d0899a30c 100644
--- a/packages/frontend/src/pages/search.user.vue
+++ b/packages/frontend/src/pages/search.user.vue
@@ -85,33 +85,26 @@ async function search() {
}
//#endregion
- if (query.length > 1 && !query.includes(' ')) {
- if (query.startsWith('@')) {
- const confirm = await os.confirm({
- type: 'info',
- text: i18n.ts.lookupConfirm,
- });
- if (!confirm.canceled) {
- router.push(`/${query}`);
- return;
- }
- }
-
- if (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.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)) {
- router.push(`/${query}`);
- return;
+ const confirm = await os.confirm({
+ type: 'info',
+ text: i18n.ts.lookupConfirm,
+ });
+ if (!confirm.canceled) {
+ router.push(`/${query}`);
+ return;
+ }
}
userPagination.value = {