From 6dfc94e2a506933329d85962ca051dda8cb1395e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Thu, 1 Dec 2022 22:59:08 +0000
Subject: [PATCH] fix: improve permalink handling somewhat

---
 constants/index.ts       |  2 ++
 pages/[...permalink].vue |  8 ++++++--
 tests/permalinks.test.ts | 23 +++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 tests/permalinks.test.ts

diff --git a/constants/index.ts b/constants/index.ts
index c97ed791..a3a3c770 100644
--- a/constants/index.ts
+++ b/constants/index.ts
@@ -12,3 +12,5 @@ export const STORAGE_KEY_FIRST_VISIT = 'elk-first-visit'
 export const STORAGE_KEY_ZEN_MODE = 'elk-zenmode'
 export const STORAGE_KEY_LANG = 'elk-lang'
 export const STORAGE_KEY_FEATURE_FLAGS = 'elk-feature-flags'
+
+export const HANDLED_MASTO_URLS = /^(https?:\/\/)?([\w\d-]+\.)+\w+\/(@[@\w\d-\.]+)(\/objects)?(\/\d+)?$/
diff --git a/pages/[...permalink].vue b/pages/[...permalink].vue
index 48fd347e..ef658e52 100644
--- a/pages/[...permalink].vue
+++ b/pages/[...permalink].vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import { parseURL } from 'ufo'
+import { HANDLED_MASTO_URLS } from '~/constants'
 
 definePageMeta({
   name: 'permalink',
   middleware: async (to) => {
-    const HANDLED_MASTO_URL = /^(https?:\/\/)?(\w+\.)+\w+\/(@[@\w\d\.]+)(\/\d+)?$/
     try {
       let permalink = Array.isArray(to.params.permalink)
         ? to.params.permalink.join('/')
         : to.params.permalink
 
-      if (!HANDLED_MASTO_URL.test(permalink))
+      if (!HANDLED_MASTO_URLS.test(permalink))
         return '/home'
 
       if (!permalink.startsWith('http'))
@@ -19,6 +19,10 @@ definePageMeta({
       if (!currentUser.value) {
         const { host, pathname } = parseURL(permalink)
         await loginTo({ server: host! })
+
+        if (pathname.match(/^\/@[^/]+$/))
+          return `${pathname}@${host}`
+
         return pathname
       }
 
diff --git a/tests/permalinks.test.ts b/tests/permalinks.test.ts
new file mode 100644
index 00000000..d9e994c6
--- /dev/null
+++ b/tests/permalinks.test.ts
@@ -0,0 +1,23 @@
+import { describe, expect, it } from 'vitest'
+import { HANDLED_MASTO_URLS } from '../constants'
+
+const validPermalinks = [
+  'https://m1as-social34.to.social/@elk',
+  'https://m1as-social34.to.social/@elk22/123',
+  'https://m1as-social34.to.social/@elk22/objects/123',
+  'mas.to/@elk',
+]
+
+const invalidPermalinks = [
+  'https://mas.to',
+  'https://mas.to/elk/123',
+]
+
+describe('permalinks', () => {
+  it.each(validPermalinks)('should recognise %s', (url) => {
+    expect(HANDLED_MASTO_URLS.test(url)).toBe(true)
+  })
+  it.each(invalidPermalinks)('should not recognise %s', (url) => {
+    expect(HANDLED_MASTO_URLS.test(url)).toBe(false)
+  })
+})