Merge pull request #4399 from traPtitech/fix/not_mention_start_with_colon

Author: nokhnaton

src/lib/markdown/internalLinkEmbedder.ts

@@ -6,7 +6,7 @@
 const urlRegexStr = '(?:https?://)?(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]+(?:/[^/]+)*/?'
 const urlStartRegex = new RegExp(`^${urlRegexStr}`)
 const mentionRegex = new RegExp(
-  `(${urlRegexStr})?:?[@＠]([^\\s@＠.]{0,31}[^\\s@＠:.])\\.?`,
+  `(${urlRegexStr})?([@＠]([^\\s@＠.]{0,31}[^\\s@＠:.]))\\.?|(:[@＠]([^\\s@＠.]{0,31}[^\\s@＠:.]:))\\.?`,
   'g'
 )
 const userStartsRegex = /^[@＠]([a-zA-Z0-9_-]{1,32})/g
@@ -122,21 +122,32 @@ const replaceMention = (m: string, getters: Readonly<UserAndGroupGetters>) => {
   return m.replace(mentionRegex, s => {
     const urlStart = s.match(urlStartRegex)
     if (urlStart && urlStart.length !== 0) return s
-    // 始まりが:なものを除外
-    if (s.startsWith(':')) return s
+    const isStartsWithColon = s.startsWith(':')
+
+    // 始まりと終わりが:なものを除外
+    if (isStartsWithColon && s.endsWith(':')) {
+      return s
+    }
+
     // 終わりが.のものを除外
     if (s.endsWith('.')) return s
 
-    // .slice(1)は先頭の@を消すため
+    const sColonRemoved = isStartsWithColon ? s.slice(1) : s.slice(0)
+
+    // .slice(1)は先頭の@および:@を消すため
     // 小文字化はgetter内で行う
-    const name = s.slice(1)
+    const name = sColonRemoved.slice(1)
     const uid = getters.getUser(name)?.id
     if (uid) {
-      return `!{"type":"user","raw":"${s}","id":"${uid}"}`
+      return `${
+        isStartsWithColon ? ':' : ''
+      }!{"type":"user","raw":"${sColonRemoved}","id":"${uid}"}`
     }
     const gid = getters.getGroup(name)?.id
     if (gid) {
-      return `!{"type":"group","raw":"${s}","id":"${gid}"}`
+      return `${
+        isStartsWithColon ? ':' : ''
+      }!{"type":"group","raw":"${sColonRemoved}","id":"${gid}"}`
     }
 
     return s.replace(userStartsRegex, s => {

tests/unit/lib/markdown/internalLinkEmbedder.spec.ts

@@ -118,6 +118,22 @@ const specs: Spec[] = [
     '@a',
     '!{"type":"user","raw":"@a","id":"dfdff0c9-5de0-46ee-9721-2525e8bb3d44"}'
   ],
+  [
+    ':@takashi_trapo @takashi_trape',
+    ':!{"type":"group","raw":"@takashi_trapo","id":"dfabf0c9-5de0-46ee-9721-2525e8bb3d46"} !{"type":"user","raw":"@takashi_trape","id":"dfdff0c9-5de0-46ee-9721-2525e8bb3d46"}'
+  ],
+  [
+    ':@takashi_trap',
+    ':!{"type":"user","raw":"@takashi_trap","id":"dfdff0c9-5de0-46ee-9721-2525e8bb3d45"}'
+  ],
+  [
+    ':@takashi_trapああ',
+    ':!{"type":"user","raw":"@takashi_trap","id":"dfdff0c9-5de0-46ee-9721-2525e8bb3d45"}ああ'
+  ],
+  [
+    ':@takashi_trap:@takashi_trap',
+    ':@takashi_trap:!{"type":"user","raw":"@takashi_trap","id":"dfdff0c9-5de0-46ee-9721-2525e8bb3d45"}'
+  ],
   // must not embed cases
   ['https://example.com#a', 'https://example.com#a'],
   ['example.com/#a', 'example.com/#a'],