Fix and enhance escapeDisruptiveContent helper

Author: vcarl

app/helpers/discord.test.ts

@@ -0,0 +1,16 @@
+import { escapeDisruptiveContent } from "./discord";
+
+test("escapeDisruptiveContent", () => {
+  expect(escapeDisruptiveContent("@everyone")).toBe("@ everyone");
+  expect(escapeDisruptiveContent("@everyone ")).toBe("@ everyone ");
+  expect(escapeDisruptiveContent(" @everyone")).toBe(" @ everyone");
+  expect(escapeDisruptiveContent(" @everyonebutts")).toBe(" @ everyonebutts");
+  expect(escapeDisruptiveContent("butts@everyone")).toBe("butts@ everyone");
+  expect(escapeDisruptiveContent("butts@everyonebutts")).toBe(
+    "butts@ everyonebutts",
+  );
+
+  expect(escapeDisruptiveContent("https://example.com")).toBe(
+    "<https://example.com>",
+  );
+});

app/helpers/discord.ts

@@ -55,12 +55,16 @@ export const quoteMessageContent = (content: string) => {
   return `> ${content.replace("`", "\\`").replace(/[\n]/g, "\n> ")}`;
 };
 
+/*
+ * Escape content that Discord would otherwise do undesireable things with.
+ * Sepecifically, suppresses @-mentions and link previews.
+ */
 export const escapeDisruptiveContent = (content: string) => {
   return (
     content
       // Silence pings
-      .replace(/@(.*?)\s/g, "@ $1 ")
+      .replace(/@(\S*)(\s)?/g, "@ $1$2")
       // Wrap links in <> so they don't make a preview
-      .replace(/(https?:\/\/.*?)\s/g, "<$1> ")
+      .replace(/(https?:\/\/.*)\s?/g, "<$1>")
   );
 };