From 92fe7335fb378e0f06eb85aa2be06e751f600941 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 18 Aug 2024 00:20:36 -0400 Subject: [PATCH] BypassDND -> BypassStatus --- README.md | 2 +- .../{bypassDND => bypassStatus}/index.tsx | 30 +++++++++++++++++-- src/equicordplugins/emojiDumper/index.tsx | 2 -- src/equicordplugins/equicordCSS/index.ts | 4 +-- src/equicordplugins/godMode/index.ts | 2 -- src/equicordplugins/keyboardSounds/index.ts | 2 -- .../messageLoggerEnhanced/index.tsx | 3 +- src/equicordplugins/noAppsAllowed/index.tsx | 2 -- src/equicordplugins/purgeMessages/index.ts | 2 -- .../questionMarkReplacement/index.tsx | 3 +- src/equicordplugins/sekaiStickers/index.tsx | 3 +- src/plugins/streamerModeOnStream/index.ts | 2 -- 12 files changed, 32 insertions(+), 25 deletions(-) rename src/equicordplugins/{bypassDND => bypassStatus}/index.tsx (90%) diff --git a/README.md b/README.md index 0339fb0c..d8fae276 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend - BetterUserArea by Samwich - BlockKeywords by catcraft - BlockKrsip by D3SOX -- BypassDND by Inbestigator +- BypassStatus by Inbestigator and thororen - ChannelTabs by TheSun, TheKodeToad, keifufu, Nickyux - CleanChannelName by AutumnVN - ClientSideBlock by Samwich diff --git a/src/equicordplugins/bypassDND/index.tsx b/src/equicordplugins/bypassStatus/index.tsx similarity index 90% rename from src/equicordplugins/bypassDND/index.tsx rename to src/equicordplugins/bypassStatus/index.tsx index eb244655..198c4dff 100644 --- a/src/equicordplugins/bypassDND/index.tsx +++ b/src/equicordplugins/bypassStatus/index.tsx @@ -6,7 +6,7 @@ import { type NavContextMenuPatchCallback } from "@api/ContextMenu"; import { Notifications } from "@api/index"; -import { definePluginSettings } from "@api/Settings"; +import { definePluginSettings, migratePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import { getCurrentChannel } from "@utils/discord"; import { Logger } from "@utils/Logger"; @@ -119,11 +119,35 @@ const settings = definePluginSettings({ type: OptionType.BOOLEAN, description: "Whether the notification sound should be played", default: true, + }, + statusToUse: { + type: OptionType.SELECT, + description: "Status to use for whitelist", + options: [ + { + label: "Online", + value: "online", + }, + { + label: "Idle", + value: "idle", + }, + { + label: "Do Not Disturb", + value: "dnd", + default: true + }, + { + label: "Invisible", + value: "invisible", + } + ] } }); +migratePluginSettings("BypassStatus", "BypassDND"); export default definePlugin({ - name: "BypassDND", + name: "BypassStatus", description: "Still get notifications from specific sources when in do not disturb mode. Right-click on users/channels/guilds to set them to bypass do not disturb mode.", authors: [Devs.Inbestigator], flux: { @@ -132,7 +156,7 @@ export default definePlugin({ const currentUser = UserStore.getCurrentUser(); const userStatus = await PresenceStore.getStatus(currentUser.id); const currentChannelId = getCurrentChannel()?.id ?? "0"; - if (message.state === "SENDING" || message.content === "" || message.author.id === currentUser.id || (channelId === currentChannelId && WindowStore.isFocused()) || userStatus !== "dnd") { + if (message.state === "SENDING" || message.content === "" || message.author.id === currentUser.id || (channelId === currentChannelId && WindowStore.isFocused()) || userStatus !== settings.store.statusToUse) { return; } const mentioned = MessageStore.getMessage(channelId, message.id)?.mentioned; diff --git a/src/equicordplugins/emojiDumper/index.tsx b/src/equicordplugins/emojiDumper/index.tsx index 9569ad95..6c6b390e 100644 --- a/src/equicordplugins/emojiDumper/index.tsx +++ b/src/equicordplugins/emojiDumper/index.tsx @@ -5,7 +5,6 @@ */ import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu"; -import { migratePluginSettings } from "@api/Settings"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; import { Menu } from "@webpack/common"; @@ -23,7 +22,6 @@ const Patch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild; } }; -migratePluginSettings("EmojiDumper", "emojiDumper"); export default definePlugin({ name: "EmojiDumper", description: "Context menu to dump and download a server's emojis.", diff --git a/src/equicordplugins/equicordCSS/index.ts b/src/equicordplugins/equicordCSS/index.ts index 65973969..879d02b4 100644 --- a/src/equicordplugins/equicordCSS/index.ts +++ b/src/equicordplugins/equicordCSS/index.ts @@ -17,7 +17,7 @@ */ // Import required modules and components -import { definePluginSettings, migratePluginSettings } from "@api/Settings"; +import { definePluginSettings } from "@api/Settings"; import { disableStyle, enableStyle } from "@api/Styles"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; @@ -73,8 +73,6 @@ const settings = definePluginSettings({ let settingsArray: Array = []; let cssArray: Array = []; -// Define the Vencord plugin -migratePluginSettings("EquicordCSS", "EquicordBuiltIn"); export default definePlugin({ name: "EquicordCSS", description: "CSS for Equicord users. You will need to look at the settings.", diff --git a/src/equicordplugins/godMode/index.ts b/src/equicordplugins/godMode/index.ts index 5df51066..388ccd5d 100644 --- a/src/equicordplugins/godMode/index.ts +++ b/src/equicordplugins/godMode/index.ts @@ -16,12 +16,10 @@ * along with this program. If not, see . */ -import { migratePluginSettings } from "@api/Settings"; import { EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; import { PermissionStore } from "@webpack/common"; -migratePluginSettings("GodMode", "God Mode"); export default definePlugin({ name: "GodMode", description: "Get all permissions (client-side).", diff --git a/src/equicordplugins/keyboardSounds/index.ts b/src/equicordplugins/keyboardSounds/index.ts index 70338bf9..2b6d292a 100644 --- a/src/equicordplugins/keyboardSounds/index.ts +++ b/src/equicordplugins/keyboardSounds/index.ts @@ -16,7 +16,6 @@ * along with this program. If not, see . */ -import { migratePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; @@ -43,7 +42,6 @@ const keydown = (e: KeyboardEvent) => { } }; -migratePluginSettings("KeyboardSounds", "Keyboard Sounds"); export default definePlugin({ name: "KeyboardSounds", description: "Adds the Opera GX Keyboard Sounds to Discord", diff --git a/src/equicordplugins/messageLoggerEnhanced/index.tsx b/src/equicordplugins/messageLoggerEnhanced/index.tsx index 8c058200..95616174 100644 --- a/src/equicordplugins/messageLoggerEnhanced/index.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/index.tsx @@ -23,7 +23,7 @@ export const Native = getNative(); import "./styles.css"; import { NavContextMenuPatchCallback } from "@api/ContextMenu"; -import { definePluginSettings, migratePluginSettings, Settings } from "@api/Settings"; +import { definePluginSettings, Settings } from "@api/Settings"; import ErrorBoundary from "@components/ErrorBoundary"; import { Devs } from "@utils/constants"; import { Logger } from "@utils/Logger"; @@ -564,7 +564,6 @@ const contextMenuPath: NavContextMenuPatchCallback = (children, props) => { } }; -migratePluginSettings("MessageLoggerEnhanced", "MLEnhanced"); export default definePlugin({ name: "MessageLoggerEnhanced", authors: [Devs.Aria], diff --git a/src/equicordplugins/noAppsAllowed/index.tsx b/src/equicordplugins/noAppsAllowed/index.tsx index 00eb4729..a31bf239 100644 --- a/src/equicordplugins/noAppsAllowed/index.tsx +++ b/src/equicordplugins/noAppsAllowed/index.tsx @@ -4,11 +4,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -import { migratePluginSettings } from "@api/Settings"; import { EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; -migratePluginSettings("NoAppsAllowed", "noAppsAllowed"); export default definePlugin({ name: "NoAppsAllowed", description: "returns the bot's tag :skulk:", diff --git a/src/equicordplugins/purgeMessages/index.ts b/src/equicordplugins/purgeMessages/index.ts index 647724bb..d9e724ea 100644 --- a/src/equicordplugins/purgeMessages/index.ts +++ b/src/equicordplugins/purgeMessages/index.ts @@ -17,7 +17,6 @@ */ import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands"; -import { migratePluginSettings } from "@api/Settings"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; import { findByPropsLazy } from "@webpack"; @@ -45,7 +44,6 @@ async function deleteMessages(amount: number, channel: Channel, delay: number = return deleted; } -migratePluginSettings("PurgeMessages", "MessagePurge"); export default definePlugin({ name: "PurgeMessages", description: "Purges messages from a channel", diff --git a/src/equicordplugins/questionMarkReplacement/index.tsx b/src/equicordplugins/questionMarkReplacement/index.tsx index 98635403..73ae7584 100644 --- a/src/equicordplugins/questionMarkReplacement/index.tsx +++ b/src/equicordplugins/questionMarkReplacement/index.tsx @@ -5,7 +5,7 @@ */ import { addPreSendListener, removePreSendListener } from "@api/MessageEvents"; -import { definePluginSettings, migratePluginSettings } from "@api/Settings"; +import { definePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; @@ -28,7 +28,6 @@ function replaceQuestionMarks(content: string): string { } } -migratePluginSettings("QuestionMarkReplacement", "QuestionMarkReplace"); export default definePlugin({ name: "QuestionMarkReplacement", description: "Replace all question marks with chosen string, if message only contains question marks.", diff --git a/src/equicordplugins/sekaiStickers/index.tsx b/src/equicordplugins/sekaiStickers/index.tsx index 0723264a..1d00584f 100644 --- a/src/equicordplugins/sekaiStickers/index.tsx +++ b/src/equicordplugins/sekaiStickers/index.tsx @@ -5,7 +5,7 @@ */ import { addChatBarButton, ChatBarButton, removeChatBarButton } from "@api/ChatButtons"; -import { definePluginSettings, migratePluginSettings } from "@api/Settings"; +import { definePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import { openModal } from "@utils/modal"; import definePlugin, { OptionType } from "@utils/types"; @@ -30,7 +30,6 @@ const SekaiStickerChatButton: ChatBarButton = () => { }; let IS_FONTS_LOADED = false; -migratePluginSettings("SekaiStickers", "Sekai Stickers"); export default definePlugin({ name: "SekaiStickers", description: "Sekai Stickers built in discord originally from github.com/TheOriginalAyaka", diff --git a/src/plugins/streamerModeOnStream/index.ts b/src/plugins/streamerModeOnStream/index.ts index b10896f2..873e1fc7 100644 --- a/src/plugins/streamerModeOnStream/index.ts +++ b/src/plugins/streamerModeOnStream/index.ts @@ -16,7 +16,6 @@ * along with this program. If not, see . */ -import { migratePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import definePlugin from "@utils/types"; import { FluxDispatcher, UserStore } from "@webpack/common"; @@ -35,7 +34,6 @@ function toggleStreamerMode({ streamKey }: StreamEvent, value: boolean) { }); } -migratePluginSettings("StreamerModeOn", "StreamerModeOnStream"); export default definePlugin({ name: "StreamerModeOn", description: "Automatically enables streamer mode when you start streaming in Discord",