diff --git a/src/equicordplugins/messagePeek/index.tsx b/src/equicordplugins/messagePeek/index.tsx index 7e4ca60f3..1276700b8 100644 --- a/src/equicordplugins/messagePeek/index.tsx +++ b/src/equicordplugins/messagePeek/index.tsx @@ -17,7 +17,7 @@ import definePlugin from "@utils/types"; import { Activity, ApplicationStream, Channel, Message, OnlineStatus, User } from "@vencord/discord-types"; import { MessageFlags } from "@vencord/discord-types/enums"; import { findByCodeLazy, findByPropsLazy, findComponentByCodeLazy, findCssClassesLazy, findExportedComponentLazy, findLazy } from "@webpack"; -import { ChannelStore, MessageStore, RelationshipStore, SnowflakeUtils, UserStore, useStateFromStores } from "@webpack/common"; +import { ChannelStore, MessageStore, Parser, RelationshipStore, SnowflakeUtils, UserStore, useStateFromStores } from "@webpack/common"; const cl = classNameFactory("vc-message-peek-"); @@ -70,7 +70,7 @@ interface PrivateChannelProps extends ActivityCheckProps { } interface MessageContent { - text: string; + text: React.ReactNode; icon?: IconType; } @@ -115,7 +115,7 @@ function getMessageContent(message: Message): MessageContent | null { if (/https?:\/\/(\S+\.gif|tenor\.com|giphy\.com|klipy\.com)/i.test(message.content)) { return { text: "sent a GIF", icon: "gif" }; } - return { text: message.content }; + return { text: Parser.parseInlineReply(message.content) }; } if (message.flags & MessageFlags.IS_VOICE_MESSAGE) { @@ -151,14 +151,13 @@ function MessagePreviewContent({ channel, user }: { channel: Channel; user: User return <>Official Discord Message; } - if (channel.isMultiUserDM()) { - return <>{channel.recipients.length + 1} Members; + const smynName = isPluginEnabled(showMeYourName.name) ? showMeYourName.getMemberListProfilesReactionsVoiceNameText({ user: user ?? lastMessage?.author, type: "membersList" }) : null; + + if (!lastMessage) { + if (channel.isMultiUserDM()) return <>{channel.recipients.length + 1} Members; + return null; } - const smynName = (isPluginEnabled(showMeYourName.name) && showMeYourName.getMemberListProfilesReactionsVoiceNameText({ user: user ?? lastMessage?.author, type: "membersList" })); - - if (!lastMessage) return null; - const content = getMessageContent(lastMessage); if (!content) return null; diff --git a/src/equicordplugins/messagePeek/style.css b/src/equicordplugins/messagePeek/style.css index 67f587a9d..e3de61ee0 100644 --- a/src/equicordplugins/messagePeek/style.css +++ b/src/equicordplugins/messagePeek/style.css @@ -44,10 +44,10 @@ gap: 4px; } -.vc-message-peek-activity-row > [class*="textXs"] { +.vc-message-peek-activity-row>[class*="textXs"] { min-width: 0; } -.vc-message-peek-activity-row > [class*="vc-bactivities-row"] { +.vc-message-peek-activity-row>[class*="vc-bactivities-row"] { flex-shrink: 0; -} \ No newline at end of file +}