feat: allow normal messages to use masked links

widgetbot-io · Feb 27, 2024 · daffe5e · daffe5e
1 parent f55f1ec
commit daffe5e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 30 deletions.
diff --git a/src/Content/index.tsx b/src/Content/index.tsx
@@ -7,7 +7,7 @@ import type { APIEmbedImage } from "discord-api-types/v10";
 import { MessageFlags } from "discord-api-types/v10";
 import Tooltip from "../Tooltip";
 import SvgFromUrl from "../SvgFromUrl";
-import Markdown, { LinkMarkdown } from "../markdown/render";
+import { LinkMarkdown } from "../markdown/render";
 import Attachment from "./Attachment";
 import Sticker from "./Sticker";
 import Embed from "./Embed";
@@ -215,15 +215,9 @@ function Content(props: ContentProps) {
           >
             {props.message.content.length > 0 ? (
               <>
-                {props.message.webhook_id !== undefined ? (
-                  <LinkMarkdown mentions={props.message.mentions}>
-                    {props.message.content}
-                  </LinkMarkdown>
-                ) : (
-                  <Markdown mentions={props.message.mentions}>
-                    {props.message.content}
-                  </Markdown>
-                )}
+                <LinkMarkdown mentions={props.message.mentions}>
+                  {props.message.content}
+                </LinkMarkdown>
                 {props.message.edited_timestamp && (
                   <Edited editedAt={props.message.edited_timestamp} />
                 )}

diff --git a/src/index.tsx b/src/index.tsx
@@ -53,4 +53,4 @@ export function MessageGroup(props: MessageProps) {
 
 export { default as Message } from "./Message";
 export { default as MessageRendererProvider } from "./MessageRendererProvider";
-export { default as Markdown, LinkMarkdown } from "./markdown/render";
+export { LinkMarkdown } from "./markdown/render";
diff --git a/src/markdown/render/index.tsx b/src/markdown/render/index.tsx
@@ -160,7 +160,6 @@ const rulesWithoutMaskedLinks = createRules({
     match: () => null,
   },
 });
-const parse = parserFor(rulesWithoutMaskedLinks);
 
 export const parseAllowLinks = parserFor(createRules(baseRules));
 export const parseEmbedTitle = parserFor(
@@ -190,22 +189,6 @@ function handleUnicodeEmojis(content: string): string {
   );
 }
 
-function Markdown({
-  children: content,
-  mentions,
-  users,
-}: {
-  children: string;
-  mentions?: ChatMessage["mentions"];
-  users?: Map<string, APIUser>;
-}) {
-  const unicodeEmojisHandled = handleUnicodeEmojis(content);
-
-  return content
-    ? parse(unicodeEmojisHandled, undefined, { mentions, users })
-    : null;
-}
-
 export function LinkMarkdown({
   children: content,
   mentions,
@@ -221,5 +204,3 @@ export function LinkMarkdown({
     ? parseAllowLinks(unicodeEmojisHandled, undefined, { mentions, users })
     : null;
 }
-
-export default Markdown;
diff --git a/src/stories/Normal.stories.tsx b/src/stories/Normal.stories.tsx
@@ -73,6 +73,38 @@ Basic.args = {
   ],
 };
 
+export const MaskedLinks: StoryFn<typeof MessageGroup> = Template.bind({});
+MaskedLinks.args = {
+  messages: [
+    {
+      id: "1101622366137749574",
+      type: 0,
+      content: "hi this is a [masked link](https://widgetbot.io/)",
+      channel_id: "697138785317814292",
+      author: {
+        id: "933123872641921044",
+        username: "therealjethro",
+        global_name: "Jeff",
+        avatar: "e4d8c186d8900eed2ace6aed5cefe1c0",
+        discriminator: "0",
+        public_flags: 4604871,
+      },
+      attachments: [],
+      embeds: [],
+      mentions: [],
+      mention_roles: [],
+      pinned: false,
+      mention_everyone: false,
+      tts: false,
+      timestamp: "2023-04-28T21:33:59.241000+00:00",
+      edited_timestamp: "2023-05-04T16:50:42.356000+00:00",
+      flags: 1,
+      components: [],
+      reactions: [],
+    },
+  ],
+};
+
 export const Optimistic: StoryFn<typeof MessageGroup> = Template.bind({});
 Optimistic.args = {
   messages: [