From 6f33f50cdfa15345935d402bbaa2e16df743e517 Mon Sep 17 00:00:00 2001 From: Usoka <27248545+Usoka@users.noreply.github.com> Date: Sun, 2 May 2021 20:54:46 +1200 Subject: [PATCH 1/2] Simplify mention regex --- backend/src/plugins/Tags/TagsPlugin.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/plugins/Tags/TagsPlugin.ts b/backend/src/plugins/Tags/TagsPlugin.ts index f6aa89e1..07e57131 100644 --- a/backend/src/plugins/Tags/TagsPlugin.ts +++ b/backend/src/plugins/Tags/TagsPlugin.ts @@ -203,7 +203,7 @@ export const TagsPlugin = zeppelinGuildPlugin()("tags", { return ""; } - if (input.match(/^<(?:@(?:!|&)?|#)\d+>$/)) { + if (input.match(/^<(?:@[!&]?|#)\d+>$/)) { return input; } From d8944dc961d789b03b41d9611174d136b4372d0d Mon Sep 17 00:00:00 2001 From: Usoka <27248545+Usoka@users.noreply.github.com> Date: Sun, 2 May 2021 20:55:02 +1200 Subject: [PATCH 2/2] Add isMention function --- backend/src/plugins/Tags/TagsPlugin.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backend/src/plugins/Tags/TagsPlugin.ts b/backend/src/plugins/Tags/TagsPlugin.ts index 07e57131..49977288 100644 --- a/backend/src/plugins/Tags/TagsPlugin.ts +++ b/backend/src/plugins/Tags/TagsPlugin.ts @@ -217,6 +217,14 @@ export const TagsPlugin = zeppelinGuildPlugin()("tags", { return ""; }, + + isMention: input => { + if (typeof input !== "string") { + return ""; + } + + return input.match(/^<(?:@[!&]?|#)\d+>$/); + }, }; for (const [name, fn] of Object.entries(state.tagFunctions)) {