summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authordestruc7i0n <6181960+destruc7i0n@users.noreply.github.com>2020-08-04 19:09:27 -0400
committerGitHub <noreply@github.com>2020-08-04 19:09:27 -0400
commit49bcccec71e38cc487bfd2bc7b05294357487eb7 (patch)
tree23fd84df26563d6c4db21213d1eb24dfccf64ae0
parentMerge pull request #59 from MarshallOliver/master (diff)
parentUpdate regex for replaceDiscordMentions (diff)
downloadshulker-49bcccec71e38cc487bfd2bc7b05294357487eb7.tar.gz
shulker-49bcccec71e38cc487bfd2bc7b05294357487eb7.zip
Merge pull request #61 from MarshallOliver/Discord-mentions-regex
Update regex for replaceDiscordMentions
-rw-r--r--src/Discord.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Discord.ts b/src/Discord.ts
index bb3b9a2..12ac656 100644
--- a/src/Discord.ts
+++ b/src/Discord.ts
@@ -148,7 +148,7 @@ class Discord {
   }
 
   private replaceDiscordMentions(message: string): string {
-    const possibleMentions = message.match(/@*.*#[0-9]{4}/gim)
+    const possibleMentions = message.match(/@[^#\s]*[#]?[0-9]{4}/gim)
     if (possibleMentions) {
       for (let mention of possibleMentions) {
         const mentionParts = mention.split('#')
title='2014-01-14 02:00:07 +0100'>2014-01-14filter: basic write hooking infrastructureJason A. Donenfeld 2014-01-14filter: allow for cleanup hook for filter typesJason A. Donenfeld 2014-01-14filter: introduce "filter type" prefixJohn Keeping 2014-01-14filter: add interface layerJohn Keeping 2014-01-14filter: add fprintf_filter functionJohn Keeping 2014-01-14authors: specify maintainersJason A. Donenfeld 2014-01-13filters: Improved syntax-highlighting.pyStefan Tatschner 2014-01-12tests: add CGIT_TEST_OPTS variable to MakefileJohn Keeping 2014-01-12ui-repolist: HTML-escape cgit_rooturl() responseJohn Keeping 2014-01-12ui-shared: URL-escape script_nameJohn Keeping 2014-01-12ui-refs: escape HTML chars in author and tagger namesJohn Keeping 2014-01-12filter: pass extra arguments via cgit_open_filterJohn Keeping 2014-01-12ui-snapshot: set unused cgit_filter fields to zeroJohn Keeping 2014-01-12html: remove redundant htmlfd variableJohn Keeping 2014-01-12tests: add Valgrind supportJohn Keeping 2014-01-12cache: don't leave cache_slot fields uninitializedJohn Keeping 2014-01-10filter: split filter functions into their own fileJason A. Donenfeld 2014-01-10filter: make exit status localJason A. Donenfeld 2014-01-10parsing: fix header typoJason A. Donenfeld 2014-01-10cgit.c: Fix comment on bit mask hackLukas Fleischer 2014-01-10cgit.c: Use "else" for mutually exclusive branchesLukas Fleischer 2014-01-10ui-snapshot.c: Do not reinvent suffixcmp()Lukas Fleischer 2014-01-10Refactor cgit_parse_snapshots_mask()Lukas Fleischer 2014-01-10Disallow use of undocumented snapshot delimitersLukas Fleischer 2014-01-10Replace most uses of strncmp() with prefixcmp()Lukas Fleischer 2014-01-09README: Fix dependenciesLukas Fleischer 2014-01-08README: Spelling and formatting fixesLukas Fleischer 2014-01-08Fix UTF-8 with syntax-highlighting.pyPřemysl Janouch 2014-01-08Add a suggestion to the manpagePřemysl Janouch 2014-01-08Fix the example configurationPřemysl Janouch 2014-01-08Fix about-formatting.shPřemysl Janouch 2014-01-08Fix some spelling errorsPřemysl Janouch 2014-01-08filters: highlight.sh: add css comments for highlight 2.6 and 3.8Ferry Huberts