diff --git a/src/equicordplugins/betterBlockedUsers/index.tsx b/src/equicordplugins/betterBlockedUsers/index.tsx index 87876bbf7..c0747248c 100644 --- a/src/equicordplugins/betterBlockedUsers/index.tsx +++ b/src/equicordplugins/betterBlockedUsers/index.tsx @@ -9,11 +9,8 @@ import "./styles.css"; import { EquicordDevs } from "@utils/constants"; import { getIntlMessage, openUserProfile } from "@utils/discord"; import definePlugin from "@utils/types"; -import { findByPropsLazy } from "@webpack"; import { Button, React, RelationshipStore, TextInput, UserStore } from "@webpack/common"; -const ChannelActions = findByPropsLazy("openPrivateChannel"); - let lastSearch = ""; let updateFunc = (v: any) => { }; @@ -30,8 +27,8 @@ export default definePlugin({ replace: ",$1.listType==='blocked'?$self.renderSearchInput():null" }, { - match: /(?<=userId:(\i).*?\}\)\]\}\),)(\(.*?\)\}\))/, - replace: "$self.renderUser($1,$2),", + match: /(?<=userId:(\i).*?\}\)\]\}\),)(\(.*?loading:\i\}\))/, + replace: "$self.renderUser($1,$2)", }, { match: /(?<=\}=(\i).{0,10}(\i).useState\(.{0,1}\);)/, diff --git a/src/equicordplugins/holyNotes/index.tsx b/src/equicordplugins/holyNotes/index.tsx index 71f9ed698..c2bd7568e 100644 --- a/src/equicordplugins/holyNotes/index.tsx +++ b/src/equicordplugins/holyNotes/index.tsx @@ -99,7 +99,7 @@ export default definePlugin({ toolbarAction(e) { if (Array.isArray(e.toolbar)) - return e.toolbar.push( + return e.toolbar.unshift( diff --git a/src/equicordplugins/loginWithQR/index.tsx b/src/equicordplugins/loginWithQR/index.tsx index dc3b4ffb1..793c4939b 100644 --- a/src/equicordplugins/loginWithQR/index.tsx +++ b/src/equicordplugins/loginWithQR/index.tsx @@ -57,7 +57,7 @@ export default definePlugin({ replacement: { // Find the Edit User Profile button and insert our custom button. // A bit jank, but whatever - match: /,(\(.{1,90}#{intl::USER_SETTINGS_EDIT_USER_PROFILE}\)}\))/, + match: /,(\(.{1,90}#{intl::USER_SETTINGS_EDIT_USER_PROFILE}\),onClick:\i\}\))/, replace: ",$self.insertScanQrButton($1)", }, }, diff --git a/src/equicordplugins/messageLoggerEnhanced/index.tsx b/src/equicordplugins/messageLoggerEnhanced/index.tsx index e4c560d8c..8352300e9 100644 --- a/src/equicordplugins/messageLoggerEnhanced/index.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/index.tsx @@ -4,8 +4,6 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -export const VERSION = "4.0.0"; - export const Native = getNative(); import "./styles.css"; @@ -318,7 +316,7 @@ export default definePlugin({ addIconToToolBar(e: { toolbar: React.ReactNode[] | React.ReactNode; }) { if (Array.isArray(e.toolbar)) - return e.toolbar.push( + return e.toolbar.unshift( diff --git a/src/equicordplugins/messageLoggerEnhanced/settings.tsx b/src/equicordplugins/messageLoggerEnhanced/settings.tsx index d21ea4b0c..089304936 100644 --- a/src/equicordplugins/messageLoggerEnhanced/settings.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/settings.tsx @@ -21,7 +21,7 @@ export const settings = definePluginSettings({ saveMessages: { default: true, type: OptionType.BOOLEAN, - description: "Wether to save the deleted and edited messages.", + description: "Whether to save the deleted and edited messages.", }, saveImages: { @@ -103,12 +103,6 @@ export const settings = definePluginSettings({ description: "Vencord's base MessageLogger remove log button wiil delete logs permanently", }, - hideMessageFromMessageLoggers: { - default: false, - type: OptionType.BOOLEAN, - description: "When enabled, a context menu button will be added to messages to allow you to delete messages without them being logged by other loggers. Might not be safe, use at your own risk." - }, - ShowLogsButton: { default: true, type: OptionType.BOOLEAN, @@ -122,12 +116,6 @@ export const settings = definePluginSettings({ description: "Number of messages to display at once in logs & number of messages to load when loading more messages in logs.", }, - hideMessageFromMessageLoggersDeletedMessage: { - default: "redacted eh", - type: OptionType.STRING, - description: "The message content to replace the message with when using the hide message from message loggers feature.", - }, - messageLimit: { default: 200, type: OptionType.NUMBER, diff --git a/src/equicordplugins/messageLoggerEnhanced/utils/contextMenu.tsx b/src/equicordplugins/messageLoggerEnhanced/utils/contextMenu.tsx index e33ea2b91..fb876fa9f 100644 --- a/src/equicordplugins/messageLoggerEnhanced/utils/contextMenu.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/utils/contextMenu.tsx @@ -5,7 +5,7 @@ */ import { addContextMenuPatch, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu"; -import { FluxDispatcher, Menu, MessageActions, React, Toasts, UserStore } from "@webpack/common"; +import { FluxDispatcher, Menu, React, Toasts } from "@webpack/common"; import { openLogModal } from "../components/LogsModal"; import { deleteMessageIDB } from "../db"; @@ -62,8 +62,37 @@ export const contextMenuPath: NavContextMenuPatchCallback = (children, props) => if (!props) return; if (!children.some(child => child?.props?.id === "message-logger")) { + if (props.navId === "message" && (props.message?.deleted || props.message?.editHistory?.length > 0)) { + children.push( + + deleteMessageIDB(props.message.id) + .then(() => { + if (props.message.deleted) { + FluxDispatcher.dispatch({ + type: "MESSAGE_DELETE", + channelId: props.message.channel_id, + id: props.message.id, + mlDeleted: true + }); + } else { + props.message.editHistory = []; + } + }).catch(() => Toasts.show({ + type: Toasts.Type.FAILURE, + message: "Failed to remove message", + id: Toasts.genId() + })) + + } + /> + ); + } + children.push( - , {renderListOption("whitelistedIds", IdType as idKeys, props)} ))} - - { - props.navId === "message" - && (props.message?.deleted || props.message?.editHistory?.length > 0) - && ( - <> - - - deleteMessageIDB(props.message.id) - .then(() => { - if (props.message.deleted) { - FluxDispatcher.dispatch({ - type: "MESSAGE_DELETE", - channelId: props.message.channel_id, - id: props.message.id, - mlDeleted: true - }); - } else { - props.message.editHistory = []; - } - }).catch(() => Toasts.show({ - type: Toasts.Type.FAILURE, - message: "Failed to remove message", - id: Toasts.genId() - })) - - } - /> - - ) - } - - { - settings.store.hideMessageFromMessageLoggers - && props.navId === "message" - && props.message?.author?.id === UserStore.getCurrentUser().id - && props.message?.deleted === false - && ( - <> - - { - await MessageActions.deleteMessage(props.message.channel_id, props.message.id); - MessageActions._sendMessage(props.message.channel_id, { - "content": settings.store.hideMessageFromMessageLoggersDeletedMessage, - "tts": false, - "invalidEmojis": [], - "validNonShortcutEmojis": [] - }, { nonce: props.message.id }); - }} - - /> - - ) - } - ); } diff --git a/src/equicordplugins/questCompleter.discordDesktop/index.tsx b/src/equicordplugins/questCompleter.discordDesktop/index.tsx index 4cbaf8c27..02b6e0204 100644 --- a/src/equicordplugins/questCompleter.discordDesktop/index.tsx +++ b/src/equicordplugins/questCompleter.discordDesktop/index.tsx @@ -313,7 +313,7 @@ export default definePlugin({ }, toolbarAction(e) { if (Array.isArray(e.toolbar)) - return e.toolbar.push( + return e.toolbar.unshift( diff --git a/src/equicordplugins/soggy/index.tsx b/src/equicordplugins/soggy/index.tsx index 0ad68b751..41ccc9192 100644 --- a/src/equicordplugins/soggy/index.tsx +++ b/src/equicordplugins/soggy/index.tsx @@ -152,7 +152,7 @@ export default definePlugin({ // taken from message logger lol addIconToToolBar(e: { toolbar: React.ReactNode[] | React.ReactNode; }) { if (Array.isArray(e.toolbar)) - return e.toolbar.push( + return e.toolbar.unshift( diff --git a/src/equicordplugins/soundBoardLogger/index.tsx b/src/equicordplugins/soundBoardLogger/index.tsx index dd65610e7..6f9c8f185 100644 --- a/src/equicordplugins/soundBoardLogger/index.tsx +++ b/src/equicordplugins/soundBoardLogger/index.tsx @@ -36,7 +36,7 @@ export default definePlugin({ settings, addSBIconToToolBar(e: { toolbar: React.ReactNode[] | React.ReactNode; }) { if (Array.isArray(e.toolbar)) - return e.toolbar.push( + return e.toolbar.unshift( diff --git a/src/equicordplugins/statusPresets/index.tsx b/src/equicordplugins/statusPresets/index.tsx index 293bb3da5..ea18db868 100644 --- a/src/equicordplugins/statusPresets/index.tsx +++ b/src/equicordplugins/statusPresets/index.tsx @@ -154,7 +154,7 @@ export default definePlugin({ { find: "#{intl::CUSTOM_STATUS_SET_CUSTOM_STATUS}", replacement: { - match: /\.\i\i,children:\i\.\i\.string\(\i\.\i#{intl::SAVE}\)\}\)/, + match: /cancelButton,children:\i\.\i\.string\(\i\.\i#{intl::CANCEL}\)\}\)/, replace: "$&,$self.renderRememberButton(this.state)" } }, diff --git a/src/plugins/fakeProfileThemes/index.tsx b/src/plugins/fakeProfileThemes/index.tsx index 368131fe0..434ff30f1 100644 --- a/src/plugins/fakeProfileThemes/index.tsx +++ b/src/plugins/fakeProfileThemes/index.tsx @@ -126,7 +126,7 @@ export default definePlugin({ { find: "#{intl::USER_SETTINGS_RESET_PROFILE_THEME}", replacement: { - match: /#{intl::USER_SETTINGS_RESET_PROFILE_THEME}\)}\)(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/, + match: /#{intl::USER_SETTINGS_RESET_PROFILE_THEME}\),onClick:.{0,25}\}\)(?=\]\}\))(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/, replace: "$&,$self.addCopy3y3Button({primary:$1,accent:$2})" } } diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx index 0b4177921..cbb1b5451 100644 --- a/src/plugins/messageLogger/index.tsx +++ b/src/plugins/messageLogger/index.tsx @@ -74,26 +74,28 @@ const patchMessageContextMenu: NavContextMenuPatchCallback = ( ); } - children.push( - { - if (deleted) { - FluxDispatcher.dispatch({ - type: "MESSAGE_DELETE", - channelId: channel_id, - id, - mlDeleted: true, - }); - } else { - message.editHistory = []; - } - }} - />, - ); + if (!Vencord.Plugins.isPluginEnabled("MessageLoggerEnhanced")) { + children.push( + { + if (deleted) { + FluxDispatcher.dispatch({ + type: "MESSAGE_DELETE", + channelId: channel_id, + id, + mlDeleted: true, + }); + } else { + message.editHistory = []; + } + }} + />, + ); + } }; const patchChannelContextMenu: NavContextMenuPatchCallback = (