- {parseEditContent(edit.content, message)}
-
-
- {" "}
- ({i18n.Messages.MESSAGE_EDITED})
-
-
-
- ))}
-
- )
- );
+ contextMenus: {
+ message: patchMessageContextMenu,
+ "channel-context": patchChannelContextMenu,
+ "thread-context": patchChannelContextMenu,
+ "user-context": patchChannelContextMenu,
+ "gdm-context": patchChannelContextMenu,
},
- { noop: true },
- ),
- makeEdit(newMessage: any, oldMessage: any): any {
- return {
- timestamp: new Date(newMessage.edited_timestamp),
- content: oldMessage.content,
- };
- },
-
- options: {
- deleteStyle: {
- type: OptionType.SELECT,
- description: "The style of deleted messages",
- default: "text",
- options: [
- { label: "Red text", value: "text", default: true },
- { label: "Red overlay", value: "overlay" },
- ],
- onChange: () => addDeleteStyle(),
+ start() {
+ addDeleteStyle();
},
- logDeletes: {
- type: OptionType.BOOLEAN,
- description: "Whether to log deleted messages",
- default: true,
- },
- collapseDeleted: {
- type: OptionType.BOOLEAN,
- description:
- "Whether to collapse deleted messages, similar to blocked messages",
- default: false,
- },
- logEdits: {
- type: OptionType.BOOLEAN,
- description: "Whether to log edited messages",
- default: true,
- },
- inlineEdits: {
- type: OptionType.BOOLEAN,
- description: "Whether to display edit history as part of message content",
- default: true,
- },
- ignoreBots: {
- type: OptionType.BOOLEAN,
- description: "Whether to ignore messages by bots",
- default: false,
- },
- ignoreSelf: {
- type: OptionType.BOOLEAN,
- description: "Whether to ignore messages by yourself",
- default: false,
- },
- ignoreUsers: {
- type: OptionType.STRING,
- description: "Comma-separated list of user IDs to ignore",
- default: "",
- },
- ignoreChannels: {
- type: OptionType.STRING,
- description: "Comma-separated list of channel IDs to ignore",
- default: "",
- },
- ignoreGuilds: {
- type: OptionType.STRING,
- description: "Comma-separated list of guild IDs to ignore",
- default: "",
- },
- },
- handleDelete(
- cache: any,
- data: { ids: string[]; id: string; mlDeleted?: boolean },
- isBulk: boolean,
- ) {
- try {
- if (cache == null || (!isBulk && !cache.has(data.id))) return cache;
+ renderEdits: ErrorBoundary.wrap(
+ ({
+ message: { id: messageId, channel_id: channelId },
+ }: {
+ message: Message;
+ }) => {
+ const message = useStateFromStores(
+ [MessageStore],
+ () => MessageStore.getMessage(channelId, messageId) as MLMessage,
+ null,
+ (oldMsg, newMsg) => oldMsg?.editHistory === newMsg?.editHistory,
+ );
- const mutate = (id: string) => {
- const msg = cache.get(id);
- if (!msg) return;
-
- const EPHEMERAL = 64;
- const shouldIgnore =
- data.mlDeleted ||
- (msg.flags & EPHEMERAL) === EPHEMERAL ||
- this.shouldIgnore(msg);
-
- if (shouldIgnore) {
- cache = cache.remove(id);
- } else {
- cache = cache.update(id, (m) =>
- m.set("deleted", true).set(
- "attachments",
- m.attachments.map((a) => ((a.deleted = true), a)),
- ),
- );
- }
- };
-
- if (isBulk) {
- data.ids.forEach(mutate);
- } else {
- mutate(data.id);
- }
- } catch (e) {
- new Logger("MessageLogger").error("Error during handleDelete", e);
- }
- return cache;
- },
-
- shouldIgnore(message: any, isEdit = false) {
- const {
- ignoreBots,
- ignoreSelf,
- ignoreUsers,
- ignoreChannels,
- ignoreGuilds,
- logEdits,
- logDeletes,
- } = Settings.plugins.MessageLogger;
- const myId = UserStore.getCurrentUser().id;
-
- return (
- (ignoreBots && message.author?.bot) ||
- (ignoreSelf && message.author?.id === myId) ||
- ignoreUsers.includes(message.author?.id) ||
- ignoreChannels.includes(message.channel_id) ||
- ignoreChannels.includes(
- ChannelStore.getChannel(message.channel_id)?.parent_id,
- ) ||
- (isEdit ? !logEdits : !logDeletes) ||
- ignoreGuilds.includes(
- ChannelStore.getChannel(message.channel_id)?.guild_id,
- ) ||
- // Ignore Venbot in the support channel
- (message.channel_id === "1026515880080842772" &&
- message.author?.id === "1017176847865352332") ||
- // Ignore VOT on dev-playground
- (message.channel_id === "1297239805972709521" &&
- message.author?.id === "1199905841004937257")
- );
- },
-
- EditMarker({ message, className, children, ...props }: any) {
- return (
- openHistoryModal(message)}
- aria-role="button"
- >
- {children}
-
- );
- },
-
- Messages: proxyLazy(() => ({
- DELETED_MESSAGE_COUNT: getMessage(
- "{count, plural, =0 {No deleted messages} one {{count} deleted message} other {{count} deleted messages}}",
+ return (
+ Settings.plugins.MessageLogger.inlineEdits && (
+ <>
+ {message.editHistory?.map(edit => (
+
+ {parseEditContent(edit.content, message)}
+
+
+ {" "}
+ ({i18n.Messages.MESSAGE_EDITED})
+
+
+
+ ))}
+
+ )
+ );
+ },
+ { noop: true },
),
- })),
- patches: [
- {
- // MessageStore
- find: '"MessageStore"',
- replacement: [
- {
- // Add deleted=true to all target messages in the MESSAGE_DELETE event
- match:
- /MESSAGE_DELETE:function\((\i)\){let.+?((?:\i\.){2})getOrCreate.+?},/,
- replace:
- "MESSAGE_DELETE:function($1){" +
- " var cache = $2getOrCreate($1.channelId);" +
- " cache = $self.handleDelete(cache, $1, false);" +
- " $2commit(cache);" +
- "},",
- },
- {
- // Add deleted=true to all target messages in the MESSAGE_DELETE_BULK event
- match:
- /MESSAGE_DELETE_BULK:function\((\i)\){let.+?((?:\i\.){2})getOrCreate.+?},/,
- replace:
- "MESSAGE_DELETE_BULK:function($1){" +
- " var cache = $2getOrCreate($1.channelId);" +
- " cache = $self.handleDelete(cache, $1, true);" +
- " $2commit(cache);" +
- "},",
- },
- {
- // Add current cached content + new edit time to cached message's editHistory
- match: /(MESSAGE_UPDATE:function\((\i)\).+?)\.update\((\i)/,
- replace:
- "$1" +
- ".update($3,m =>" +
- " (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message, true)) ? m :" +
- " $2.message.edited_timestamp && $2.message.content !== m.content ?" +
- " m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
- " m" +
- ")" +
- ".update($3",
- },
- {
- // fix up key (edit last message) attempting to edit a deleted message
- match: /(?<=getLastEditableMessage\(\i\)\{.{0,200}\.find\((\i)=>)/,
- replace: "!$1.deleted &&",
- },
- ],
+ makeEdit(newMessage: any, oldMessage: any): any {
+ return {
+ timestamp: new Date(newMessage.edited_timestamp),
+ content: oldMessage.content,
+ };
},
- {
- // Message domain model
- find: "}addReaction(",
- replacement: [
- {
- match: /this\.customRenderedContent=(\i)\.customRenderedContent,/,
- replace:
- "this.customRenderedContent = $1.customRenderedContent," +
- "this.deleted = $1.deleted || false," +
- "this.editHistory = $1.editHistory || []," +
- "this.firstEditTimestamp = $1.firstEditTimestamp || this.editedTimestamp || this.timestamp,",
+ options: {
+ deleteStyle: {
+ type: OptionType.SELECT,
+ description: "The style of deleted messages",
+ default: "text",
+ options: [
+ { label: "Red text", value: "text", default: true },
+ { label: "Red overlay", value: "overlay" },
+ ],
+ onChange: () => addDeleteStyle(),
+ },
+ logDeletes: {
+ type: OptionType.BOOLEAN,
+ description: "Whether to log deleted messages",
+ default: true,
+ },
+ collapseDeleted: {
+ type: OptionType.BOOLEAN,
+ description:
+ "Whether to collapse deleted messages, similar to blocked messages",
+ default: false,
+ },
+ logEdits: {
+ type: OptionType.BOOLEAN,
+ description: "Whether to log edited messages",
+ default: true,
+ },
+ inlineEdits: {
+ type: OptionType.BOOLEAN,
+ description: "Whether to display edit history as part of message content",
+ default: true,
+ },
+ ignoreBots: {
+ type: OptionType.BOOLEAN,
+ description: "Whether to ignore messages by bots",
+ default: false,
+ },
+ ignoreSelf: {
+ type: OptionType.BOOLEAN,
+ description: "Whether to ignore messages by yourself",
+ default: false,
+ },
+ ignoreUsers: {
+ type: OptionType.STRING,
+ description: "Comma-separated list of user IDs to ignore",
+ default: "",
+ },
+ ignoreChannels: {
+ type: OptionType.STRING,
+ description: "Comma-separated list of channel IDs to ignore",
+ default: "",
+ },
+ ignoreGuilds: {
+ type: OptionType.STRING,
+ description: "Comma-separated list of guild IDs to ignore",
+ default: "",
},
- ],
},
- {
- // Updated message transformer(?)
- find: "THREAD_STARTER_MESSAGE?null===",
- replacement: [
+ handleDelete(
+ cache: any,
+ data: { ids: string[]; id: string; mlDeleted?: boolean; },
+ isBulk: boolean,
+ ) {
+ try {
+ if (cache == null || (!isBulk && !cache.has(data.id))) return cache;
+
+ const mutate = (id: string) => {
+ const msg = cache.get(id);
+ if (!msg) return;
+
+ const EPHEMERAL = 64;
+ const shouldIgnore =
+ data.mlDeleted ||
+ (msg.flags & EPHEMERAL) === EPHEMERAL ||
+ this.shouldIgnore(msg);
+
+ if (shouldIgnore) {
+ cache = cache.remove(id);
+ } else {
+ cache = cache.update(id, m =>
+ m.set("deleted", true).set(
+ "attachments",
+ m.attachments.map(a => ((a.deleted = true), a)),
+ ),
+ );
+ }
+ };
+
+ if (isBulk) {
+ data.ids.forEach(mutate);
+ } else {
+ mutate(data.id);
+ }
+ } catch (e) {
+ new Logger("MessageLogger").error("Error during handleDelete", e);
+ }
+ return cache;
+ },
+
+ shouldIgnore(message: any, isEdit = false) {
+ const {
+ ignoreBots,
+ ignoreSelf,
+ ignoreUsers,
+ ignoreChannels,
+ ignoreGuilds,
+ logEdits,
+ logDeletes,
+ } = Settings.plugins.MessageLogger;
+ const myId = UserStore.getCurrentUser().id;
+
+ return (
+ (ignoreBots && message.author?.bot) ||
+ (ignoreSelf && message.author?.id === myId) ||
+ ignoreUsers.includes(message.author?.id) ||
+ ignoreChannels.includes(message.channel_id) ||
+ ignoreChannels.includes(
+ ChannelStore.getChannel(message.channel_id)?.parent_id,
+ ) ||
+ (isEdit ? !logEdits : !logDeletes) ||
+ ignoreGuilds.includes(
+ ChannelStore.getChannel(message.channel_id)?.guild_id,
+ ) ||
+ // Ignore Venbot in the support channel
+ (message.channel_id === "1026515880080842772" &&
+ message.author?.id === "1017176847865352332") ||
+ // Ignore VOT on dev-playground
+ (message.channel_id === "1297239805972709521" &&
+ message.author?.id === "1199905841004937257")
+ );
+ },
+
+ EditMarker({ message, className, children, ...props }: any) {
+ return (
+ openHistoryModal(message)}
+ aria-role="button"
+ >
+ {children}
+
+ );
+ },
+
+ Messages: proxyLazy(() => ({
+ DELETED_MESSAGE_COUNT: getMessage(
+ "{count, plural, =0 {No deleted messages} one {{count} deleted message} other {{count} deleted messages}}",
+ ),
+ })),
+
+ patches: [
{
- // Pass through editHistory & deleted & original attachments to the "edited message" transformer
- match:
- /(?<=null!=\i\.edited_timestamp\)return )\i\(\i,\{reactions:(\i)\.reactions.{0,50}\}\)/,
- replace:
- "Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory, firstEditTimestamp:$1.firstEditTimestamp })",
+ // MessageStore
+ find: '"MessageStore"',
+ replacement: [
+ {
+ // Add deleted=true to all target messages in the MESSAGE_DELETE event
+ match:
+ /MESSAGE_DELETE:function\((\i)\){let.+?((?:\i\.){2})getOrCreate.+?},/,
+ replace:
+ "MESSAGE_DELETE:function($1){" +
+ " var cache = $2getOrCreate($1.channelId);" +
+ " cache = $self.handleDelete(cache, $1, false);" +
+ " $2commit(cache);" +
+ "},",
+ },
+ {
+ // Add deleted=true to all target messages in the MESSAGE_DELETE_BULK event
+ match:
+ /MESSAGE_DELETE_BULK:function\((\i)\){let.+?((?:\i\.){2})getOrCreate.+?},/,
+ replace:
+ "MESSAGE_DELETE_BULK:function($1){" +
+ " var cache = $2getOrCreate($1.channelId);" +
+ " cache = $self.handleDelete(cache, $1, true);" +
+ " $2commit(cache);" +
+ "},",
+ },
+ {
+ // Add current cached content + new edit time to cached message's editHistory
+ match: /(MESSAGE_UPDATE:function\((\i)\).+?)\.update\((\i)/,
+ replace:
+ "$1" +
+ ".update($3,m =>" +
+ " (($2.message.flags & 64) === 64 || $self.shouldIgnore($2.message, true)) ? m :" +
+ " $2.message.edited_timestamp && $2.message.content !== m.content ?" +
+ " m.set('editHistory',[...(m.editHistory || []), $self.makeEdit($2.message, m)]) :" +
+ " m" +
+ ")" +
+ ".update($3",
+ },
+ {
+ // fix up key (edit last message) attempting to edit a deleted message
+ match: /(?<=getLastEditableMessage\(\i\)\{.{0,200}\.find\((\i)=>)/,
+ replace: "!$1.deleted &&",
+ },
+ ],
},
{
- // Construct new edited message and add editHistory & deleted (ref above)
- // Pass in custom data to attachment parser to mark attachments deleted as well
- match: /attachments:(\i)\((\i)\)/,
- replace:
- "attachments: $1((() => {" +
- " if ($self.shouldIgnore($2)) return $2;" +
- " let old = arguments[1]?.attachments;" +
- " if (!old) return $2;" +
- " let new_ = $2.attachments?.map(a => a.id) ?? [];" +
- " let diff = old.filter(a => !new_.includes(a.id));" +
- " old.forEach(a => a.deleted = true);" +
- " $2.attachments = [...diff, ...$2.attachments];" +
- " return $2;" +
- "})())," +
- "deleted: arguments[1]?.deleted," +
- "editHistory: arguments[1]?.editHistory," +
- "firstEditTimestamp: new Date(arguments[1]?.firstEditTimestamp ?? $2.editedTimestamp ?? $2.timestamp)",
+ // Message domain model
+ find: "}addReaction(",
+ replacement: [
+ {
+ match: /this\.customRenderedContent=(\i)\.customRenderedContent,/,
+ replace:
+ "this.customRenderedContent = $1.customRenderedContent," +
+ "this.deleted = $1.deleted || false," +
+ "this.editHistory = $1.editHistory || []," +
+ "this.firstEditTimestamp = $1.firstEditTimestamp || this.editedTimestamp || this.timestamp,",
+ },
+ ],
},
- {
- // Preserve deleted attribute on attachments
- match: /(\((\i)\){return null==\2\.attachments.+?)spoiler:/,
- replace: "$1deleted: arguments[0]?.deleted," + "spoiler:",
- },
- ],
- },
- {
- // Attachment renderer
- find: ".removeMosaicItemHoverButton",
- group: true,
- replacement: [
{
- match: /(className:\i,item:\i),/,
- replace: "$1,item: deleted,",
- },
- {
- match: /\[\i\.obscured\]:.+?,/,
- replace: "$& 'messagelogger-deleted-attachment': deleted,",
- },
- ],
- },
+ // Updated message transformer(?)
+ find: "THREAD_STARTER_MESSAGE?null===",
+ replacement: [
+ {
+ // Pass through editHistory & deleted & original attachments to the "edited message" transformer
+ match:
+ /(?<=null!=\i\.edited_timestamp\)return )\i\(\i,\{reactions:(\i)\.reactions.{0,50}\}\)/,
+ replace:
+ "Object.assign($&,{ deleted:$1.deleted, editHistory:$1.editHistory, firstEditTimestamp:$1.firstEditTimestamp })",
+ },
- {
- // Base message component renderer
- find: "Message must not be a thread starter message",
- replacement: [
- {
- // Append messagelogger-deleted to classNames if deleted
- match: /\)\("li",\{(.+?),className:/,
- replace:
- ')("li",{$1,className:(arguments[0].message.deleted ? "messagelogger-deleted " : "")+',
+ {
+ // Construct new edited message and add editHistory & deleted (ref above)
+ // Pass in custom data to attachment parser to mark attachments deleted as well
+ match: /attachments:(\i)\((\i)\)/,
+ replace:
+ "attachments: $1((() => {" +
+ " if ($self.shouldIgnore($2)) return $2;" +
+ " let old = arguments[1]?.attachments;" +
+ " if (!old) return $2;" +
+ " let new_ = $2.attachments?.map(a => a.id) ?? [];" +
+ " let diff = old.filter(a => !new_.includes(a.id));" +
+ " old.forEach(a => a.deleted = true);" +
+ " $2.attachments = [...diff, ...$2.attachments];" +
+ " return $2;" +
+ "})())," +
+ "deleted: arguments[1]?.deleted," +
+ "editHistory: arguments[1]?.editHistory," +
+ "firstEditTimestamp: new Date(arguments[1]?.firstEditTimestamp ?? $2.editedTimestamp ?? $2.timestamp)",
+ },
+ {
+ // Preserve deleted attribute on attachments
+ match: /(\((\i)\){return null==\2\.attachments.+?)spoiler:/,
+ replace: "$1deleted: arguments[0]?.deleted," + "spoiler:",
+ },
+ ],
},
- ],
- },
- {
- // Message content renderer
- find: 'Messages.MESSAGE_EDITED,")"',
- replacement: [
{
- // Render editHistory in the deepest div for message content
- match: /(\)\("div",\{id:.+?children:\[)/,
- replace:
- "$1 (!!arguments[0].message.editHistory?.length && $self.renderEdits(arguments[0])),",
+ // Attachment renderer
+ find: ".removeMosaicItemHoverButton",
+ group: true,
+ replacement: [
+ {
+ match: /(className:\i,item:\i),/,
+ replace: "$1,item: deleted,",
+ },
+ {
+ match: /\[\i\.obscured\]:.+?,/,
+ replace: "$& 'messagelogger-deleted-attachment': deleted,",
+ },
+ ],
},
- {
- // Make edit marker clickable
- match: /"span",\{(?=className:\i\.edited,)/,
- replace: "$self.EditMarker,{message:arguments[0].message,",
- },
- ],
- },
- {
- // ReferencedMessageStore
- find: '"ReferencedMessageStore"',
- replacement: [
{
- match: /MESSAGE_DELETE:function\((\i)\).+?},/,
- replace: "MESSAGE_DELETE:function($1){},",
+ // Base message component renderer
+ find: "Message must not be a thread starter message",
+ replacement: [
+ {
+ // Append messagelogger-deleted to classNames if deleted
+ match: /\)\("li",\{(.+?),className:/,
+ replace:
+ ')("li",{$1,className:(arguments[0].message.deleted ? "messagelogger-deleted " : "")+',
+ },
+ ],
},
- {
- match: /MESSAGE_DELETE_BULK:function\((\i)\).+?},/,
- replace: "MESSAGE_DELETE_BULK:function($1){},",
- },
- ],
- },
- {
- // Message context base menu
- find: "useMessageMenu:",
- replacement: [
{
- // Remove the first section if message is deleted
- match: /children:(\[""===.+?\])/,
- replace: "children:arguments[0].message.deleted?[]:$1",
+ // Message content renderer
+ find: 'Messages.MESSAGE_EDITED,")"',
+ replacement: [
+ {
+ // Render editHistory in the deepest div for message content
+ match: /(\)\("div",\{id:.+?children:\[)/,
+ replace:
+ "$1 (!!arguments[0].message.editHistory?.length && $self.renderEdits(arguments[0])),",
+ },
+ {
+ // Make edit marker clickable
+ match: /"span",\{(?=className:\i\.edited,)/,
+ replace: "$self.EditMarker,{message:arguments[0].message,",
+ },
+ ],
},
- ],
- },
- {
- // Message grouping
- find: "NON_COLLAPSIBLE.has(",
- replacement: {
- match: /if\((\i)\.blocked\)return \i\.\i\.MESSAGE_GROUP_BLOCKED;/,
- replace: '$&else if($1.deleted) return"MESSAGE_GROUP_DELETED";',
- },
- predicate: () => Settings.plugins.MessageLogger.collapseDeleted,
- },
- {
- // Message group rendering
- find: "Messages.NEW_MESSAGES_ESTIMATED_WITH_DATE",
- replacement: [
+
{
- match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\|\|/,
- replace: '$&$1.type==="MESSAGE_GROUP_DELETED"||',
+ // ReferencedMessageStore
+ find: '"ReferencedMessageStore"',
+ replacement: [
+ {
+ match: /MESSAGE_DELETE:function\((\i)\).+?},/,
+ replace: "MESSAGE_DELETE:function($1){},",
+ },
+ {
+ match: /MESSAGE_DELETE_BULK:function\((\i)\).+?},/,
+ replace: "MESSAGE_DELETE_BULK:function($1){},",
+ },
+ ],
+ },
+
+ {
+ // Message context base menu
+ find: "useMessageMenu:",
+ replacement: [
+ {
+ // Remove the first section if message is deleted
+ match: /children:(\[""===.+?\])/,
+ replace: "children:arguments[0].message.deleted?[]:$1",
+ },
+ ],
},
{
- match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\?.*?:/,
- replace:
- '$&$1.type==="MESSAGE_GROUP_DELETED"?$self.Messages.DELETED_MESSAGE_COUNT:',
+ // Message grouping
+ find: "NON_COLLAPSIBLE.has(",
+ replacement: {
+ match: /if\((\i)\.blocked\)return \i\.\i\.MESSAGE_GROUP_BLOCKED;/,
+ replace: '$&else if($1.deleted) return"MESSAGE_GROUP_DELETED";',
+ },
+ predicate: () => Settings.plugins.MessageLogger.collapseDeleted,
},
- ],
- predicate: () => Settings.plugins.MessageLogger.collapseDeleted,
- },
- ],
+ {
+ // Message group rendering
+ find: "Messages.NEW_MESSAGES_ESTIMATED_WITH_DATE",
+ replacement: [
+ {
+ match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\|\|/,
+ replace: '$&$1.type==="MESSAGE_GROUP_DELETED"||',
+ },
+ {
+ match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\?.*?:/,
+ replace:
+ '$&$1.type==="MESSAGE_GROUP_DELETED"?$self.Messages.DELETED_MESSAGE_COUNT:',
+ },
+ ],
+ predicate: () => Settings.plugins.MessageLogger.collapseDeleted,
+ },
+ ],
});
diff --git a/src/plugins/serverInfo/GuildInfoModal.tsx b/src/plugins/serverInfo/GuildInfoModal.tsx
index e2007dfe..d0ede9c5 100644
--- a/src/plugins/serverInfo/GuildInfoModal.tsx
+++ b/src/plugins/serverInfo/GuildInfoModal.tsx
@@ -7,7 +7,7 @@
import "./styles.css";
import { classNameFactory } from "@api/Styles";
-import { openMediaModal, openUserProfile } from "@utils/discord";
+import { openImageModal, openUserProfile } from "@utils/discord";
import { classes } from "@utils/misc";
import { ModalRoot, ModalSize, openModal } from "@utils/modal";
import { useAwaiter } from "@utils/react";
@@ -80,7 +80,7 @@ function GuildInfoModal({ guild }: GuildProps) {
className={cl("banner")}
src={bannerUrl}
alt=""
- onClick={() => openMediaModal(bannerUrl)}
+ onClick={() => openImageModal(bannerUrl)}
/>
)}
@@ -89,7 +89,9 @@ function GuildInfoModal({ guild }: GuildProps) {
? {guild.acronym}
}
@@ -151,7 +153,7 @@ function Owner(guildId: string, owner: User) {
return (
- 
openMediaModal(ownerAvatarUrl)} />
+ openImageModal(ownerAvatarUrl)} />
{Parser.parse(`<@${owner.id}>`)}
);
diff --git a/src/plugins/serverInfo/index.tsx b/src/plugins/serverInfo/index.tsx
index be3172f0..7a6fa62c 100644
--- a/src/plugins/serverInfo/index.tsx
+++ b/src/plugins/serverInfo/index.tsx
@@ -31,6 +31,7 @@ export default definePlugin({
description: "Allows you to view info about a server",
authors: [Devs.Ven, Devs.Nuckyz],
tags: ["guild", "info", "ServerProfile"],
+ dependencies: ["ImageModalAPI"],
contextMenus: {
"guild-context": Patch,
"guild-header-popout": Patch
diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index 72b63733..aef0c736 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -21,7 +21,7 @@ import "./spotifyStyles.css";
import { Flex } from "@components/Flex";
import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
import { debounce } from "@shared/debounce";
-import { openMediaModal } from "@utils/discord";
+import { openImageModal } from "@utils/discord";
import { classes, copyWithToast } from "@utils/misc";
import { ContextMenuApi, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
@@ -229,7 +229,7 @@ function AlbumContextMenu({ track }: { track: Track; }) {
id="view-cover"
label="View Album Cover"
// trolley
- action={() => openMediaModal(track.album.image.url)}
+ action={() => openImageModal(track.album.image.url)}
icon={ImageIcon}
/>