Merge pull request #14 from turt2live/turt2live-patch-1

Escape regex before parsing mentions

package.json

@@ -38,6 +38,7 @@
     "command-line-args": "^4.0.1",
     "command-line-usage": "^4.0.0",
     "discord.js": "^11.1.0",
+    "escape-string-regexp": "^1.0.5",
     "js-yaml": "^3.8.1",
     "marked": "^0.3.6",
     "matrix-appservice-bridge": "^1.4.0",

src/bot.ts

@@ -9,6 +9,7 @@ import * as Bluebird from "bluebird";
 import * as mime from "mime";
 import * as marked from "marked";
 import * as path from "path";
+import * as escapeStringRegexp from "escape-string-regexp";
 
 // Due to messages often arriving before we get a response from the send call,
 // messages get delayed from discord.
@@ -240,7 +241,7 @@ export class DiscordBot {
 
   private HandleMentions(body: string, members: Discord.GuildMember[]): string {
     for (const member of members) {
-      body = body.replace(new RegExp(member.displayName, "g"), `<@!${member.id}>`);
+      body = body.replace(new RegExp(escapeStringRegexp(member.displayName), "g"), `<@!${member.id}>`);
     }
     return body;
   }