メールアドレスの中も置換されないように

traPtitech · Dec 29, 2024 · 8d3ebc4 · 8d3ebc4
1 parent 99455db
commit 8d3ebc4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/lib/markdown/internalLinkEmbedder.ts b/src/lib/markdown/internalLinkEmbedder.ts
@@ -5,7 +5,7 @@
 // URLの一部になっているときは置換しない (URLの正規表現は完全ではない)
 const urlRegexStr = '(?:https?://)?(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]+(?:/[^/]+)*/?'
 const mentionRegex = new RegExp(
-  `(?<!${urlRegexStr}):?[@＠]([^\\s@＠]{0,31}[^\\s@＠:])`,
+  `(?<!${urlRegexStr}):?[@＠]([^\\s@＠.]{0,31}[^\\s@＠:.])\\.?`,
   'g'
 )
 const userStartsRegex = /^[@＠]([a-zA-Z0-9_-]{1,32})/g
@@ -123,9 +123,9 @@ const replaceAll = (m: string, getters: Readonly<ReplaceGetters>) => {
 const replaceMention = (m: string, getters: Readonly<UserAndGroupGetters>) => {
   return m.replace(mentionRegex, s => {
     // 始まりが:なものを除外
-    if (s.startsWith(':')) {
-      return s
-    }
+    if (s.startsWith(':')) return s
+    // 終わりが.のものを除外
+    if (s.endsWith('.')) return s    
 
     // .slice(1)は先頭の@を消すため
     // 小文字化はgetter内で行う

diff --git a/tests/unit/lib/markdown/internalLinkEmbedder.spec.ts b/tests/unit/lib/markdown/internalLinkEmbedder.spec.ts
@@ -20,6 +20,10 @@ const users = {
   'dfdff0c9-5de0-46ee-9721-2525e8bb3d47': {
     name: 'very_long_long_long_long_lo_name',
     id: 'dfdff0c9-5de0-46ee-9721-2525e8bb3d47'
+  },
+  'dfdff0c9-5de0-46ee-9721-2525e8bb3d48': {
+    name: 'trap',
+    id: 'dfdff0c9-5de0-46ee-9721-2525e8bb3d48'
   }
 }
 const groups = {
@@ -122,7 +126,9 @@ const specs: Spec[] = [
   [
     'example.com/users/@takashi_trap/hello',
     'example.com/users/@takashi_trap/hello'
-  ]
+  ],
+  ['[email protected]', '[email protected]'],
+  ['@ab', '@ab']
 ]
 
 describe('internalLinkEmbedder', () => {