diff --git a/src/Content/index.tsx b/src/Content/index.tsx index 0300576..52d527a 100644 --- 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 ? ( - - {props.message.content} - - ) : ( - - {props.message.content} - - )} + + {props.message.content} + {props.message.edited_timestamp && ( )} diff --git a/src/index.tsx b/src/index.tsx index dfcb0d0..423d44c 100644 --- 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 { Markdown, LinkMarkdown } from "./markdown/render"; diff --git a/src/markdown/render/index.tsx b/src/markdown/render/index.tsx index be9b5cc..db63856 100644 --- a/src/markdown/render/index.tsx +++ b/src/markdown/render/index.tsx @@ -160,8 +160,8 @@ const rulesWithoutMaskedLinks = createRules({ match: () => null, }, }); -const parse = parserFor(rulesWithoutMaskedLinks); +const parse = parserFor(rulesWithoutMaskedLinks); export const parseAllowLinks = parserFor(createRules(baseRules)); export const parseEmbedTitle = parserFor( R.omit( @@ -190,7 +190,7 @@ function handleUnicodeEmojis(content: string): string { ); } -function Markdown({ +export function Markdown({ children: content, mentions, users, @@ -221,5 +221,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 index a39a6c5..b739fc9 100644 --- a/src/stories/Normal.stories.tsx +++ b/src/stories/Normal.stories.tsx @@ -73,6 +73,38 @@ Basic.args = { ], }; +export const MaskedLinks: StoryFn = 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 = Template.bind({}); Optimistic.args = { messages: [