From ac4a461bcf7495161261b8b2a6f84fc82ead0598 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 28 Jul 2024 12:36:51 -0400 Subject: [PATCH 1/4] Hardcode some asset links --- src/equicordplugins/loginWithQR/images.ts | 6 +++--- src/plugins/invisibleChat.desktop/index.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/equicordplugins/loginWithQR/images.ts b/src/equicordplugins/loginWithQR/images.ts index 865ea50a..c73d3e98 100644 --- a/src/equicordplugins/loginWithQR/images.ts +++ b/src/equicordplugins/loginWithQR/images.ts @@ -8,11 +8,11 @@ export const images = { cross: "https://i.imgur.com/XxRnu3b.png", deviceImage: { success: - "https://github.com/nexpid/Themelings/raw/data/icons/images/native/img_remote_auth_succeeded.png", + "https://github.com/nexpid/Themelings/blob/3a063c5188f4cac096171f29163f9e2659f275a3/icons/images/native/img_remote_auth_succeeded.png", notFound: - "https://github.com/nexpid/Themelings/raw/data/icons/images/native/img_remote_auth_not_found.png", + "https://github.com/nexpid/Themelings/blob/3a063c5188f4cac096171f29163f9e2659f275a3/icons/images/native/img_remote_auth_not_found.png", loading: - "https://github.com/nexpid/Themelings/raw/data/icons/images/native/img_remote_auth_loaded.png", + "https://github.com/nexpid/Themelings/blob/3a063c5188f4cac096171f29163f9e2659f275a3/icons/images/native/img_remote_auth_loaded.png", }, } as const; diff --git a/src/plugins/invisibleChat.desktop/index.tsx b/src/plugins/invisibleChat.desktop/index.tsx index bed20f3d..8be3a56a 100644 --- a/src/plugins/invisibleChat.desktop/index.tsx +++ b/src/plugins/invisibleChat.desktop/index.tsx @@ -54,7 +54,7 @@ function Indicator() { aria-label="Hidden Message Indicator (InvisibleChat)" onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave} - src="https://github.com/SammCheese/invisible-chat/raw/NewReplugged/src/assets/lock.png" + src="https://github.com/SammCheese/invisible-chat/blob/1c1a1111d5aed4ddd04bb76a8f10d138944e1d5a/src/assets/lock.png" width={20} height={20} style={{ transform: "translateY(4p)", paddingInline: 4 }} From c975439e9ad1dca207ba8c285884e68b39885ad3 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 28 Jul 2024 21:29:36 -0400 Subject: [PATCH 2/4] Fix Multiple Popups VCSupport --- src/plugins/_core/supportHelper.tsx | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/plugins/_core/supportHelper.tsx b/src/plugins/_core/supportHelper.tsx index ad28a2cf..cba19f1e 100644 --- a/src/plugins/_core/supportHelper.tsx +++ b/src/plugins/_core/supportHelper.tsx @@ -141,6 +141,8 @@ const settings = definePluginSettings({}).withPrivateSettings<{ dismissedDevBuildWarning?: boolean; }>(); +let clicked = false; + export default definePlugin({ name: "SupportHelper", required: true, @@ -177,18 +179,21 @@ export default definePlugin({ async CHANNEL_SELECT({ channelId }) { if (!SUPPORT_CHANNEL_IDS.includes(channelId)) return; - if (channelId === VC_SUPPORT_CHANNEL_ID && Vencord.Plugins.isPluginEnabled("VCSupport")) return Alerts.show({ - title: "You are entering the support channel!", - body:
- - - Before you ask for help, - Check for updates and if this - issue could be caused by Equicord! -
- }); + if (channelId === VC_SUPPORT_CHANNEL_ID && Vencord.Plugins.isPluginEnabled("VCSupport") && !clicked) { + clicked = true; + return Alerts.show({ + title: "You are entering the support channel!", + body:
+ + + Before you ask for help, + Check for updates and if this + issue could be caused by Equicord! +
+ }); + } const selfId = UserStore.getCurrentUser()?.id; if (!selfId || isPluginDev(selfId) || isEquicordPluginDev(selfId)) return; From bdf402519180ec8d9830398988e837e2c261f088 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:49:43 -0400 Subject: [PATCH 3/4] Joona Fixes --- src/plugins/permissionsViewer/index.tsx | 22 +++++++++++++++++---- src/plugins/reviewDB/index.tsx | 11 ++++++++++- src/plugins/reviewDB/settings.tsx | 6 ++++++ src/plugins/showConnections/index.tsx | 26 +++++++++++++------------ 4 files changed, 48 insertions(+), 17 deletions(-) diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx index 6a503f2d..05d99fda 100644 --- a/src/plugins/permissionsViewer/index.tsx +++ b/src/plugins/permissionsViewer/index.tsx @@ -60,6 +60,12 @@ export const settings = definePluginSettings({ description: "Whether the permissions dropdown on user popouts should be open by default", type: OptionType.BOOLEAN, default: false, + }, + preferButtonOverDropdown: { + description: "Show a button next to the roles instead of dropdown", + type: OptionType.BOOLEAN, + default: false, + restartNeeded: true } }); @@ -178,10 +184,18 @@ export default definePlugin({ }, { find: ".VIEW_ALL_ROLES,", - replacement: { - match: /children:"\+"\.concat\(\i\.length-\i\.length\).{0,20}\}\),/, - replace: "$&$self.ViewPermissionsButton(arguments[0])," - } + replacement: [ + { + match: /children:"\+"\.concat\(\i\.length-\i\.length\).{0,20}\}\),/, + replace: "$&$self.ViewPermissionsButton(arguments[0]),", + predicate: () => settings.store.preferButtonOverDropdown + }, + { + match: /0!==\i\.length\|\|\i\?\(0,.+?guild:(\i),guildMember:(\i).+?null/, + replace: "[$&,$self.UserPermissions($1,$2)]", + predicate: () => !settings.store.preferButtonOverDropdown + } + ] } ], diff --git a/src/plugins/reviewDB/index.tsx b/src/plugins/reviewDB/index.tsx index 456e15a5..fbe43a61 100644 --- a/src/plugins/reviewDB/index.tsx +++ b/src/plugins/reviewDB/index.tsx @@ -85,12 +85,21 @@ export default definePlugin({ replace: "$&,$self.getReviewsComponent($1)" } }, + { + find: /inline:!1,profileViewedAnalytics:\i}\),/, + replacement: { + match: /currentUser:\i,guild:\i}\)(?<=user:(\i),bio:null==\i\?.+?)/, + replace: "$&,$self.getReviewsComponent($1)" + }, + predicate: () => !settings.store.preferButtonOverDropdown + }, { find: ".BITE_SIZE,user:", replacement: { match: /(?<=\.BITE_SIZE,children:\[)\(0,\i\.jsx\)\(\i\.\i,\{user:(\i),/, replace: "$self.BiteSizeReviewsButton({user:$1}),$&" - } + }, + predicate: () => settings.store.preferButtonOverDropdown } ], diff --git a/src/plugins/reviewDB/settings.tsx b/src/plugins/reviewDB/settings.tsx index c3c806f5..d4b0cb5d 100644 --- a/src/plugins/reviewDB/settings.tsx +++ b/src/plugins/reviewDB/settings.tsx @@ -54,6 +54,12 @@ export const settings = definePluginSettings({ description: "Hide reviews from blocked users", default: true, }, + preferButtonOverDropdown: { + description: "Show a button instead of dropdown to view reviews", + type: OptionType.BOOLEAN, + default: false, + restartNeeded: true + }, buttons: { type: OptionType.COMPONENT, description: "ReviewDB buttons", diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx index db8b789a..6e14cfea 100644 --- a/src/plugins/showConnections/index.tsx +++ b/src/plugins/showConnections/index.tsx @@ -20,7 +20,6 @@ import "./styles.css"; import { definePluginSettings } from "@api/Settings"; import ErrorBoundary from "@components/ErrorBoundary"; -import { Flex } from "@components/Flex"; import { CopyIcon, LinkIcon } from "@components/Icons"; import { Devs } from "@utils/constants"; import { copyWithToast } from "@utils/misc"; @@ -106,13 +105,23 @@ function ConnectionsComponent({ id, theme, simplified }: { id: string, theme: st return null; const connectionsContainer = ( - + + Connections + {connections.map(connection => )} - + ); if (simplified) @@ -120,13 +129,6 @@ function ConnectionsComponent({ id, theme, simplified }: { id: string, theme: st return (
- - Connections - {connectionsContainer}
); @@ -211,9 +213,9 @@ export default definePlugin({ } }, { - find: /\.bio,hidePersonalInformation:\i,onClose:/, + find: /inline:!1,profileViewedAnalytics:\i}\),/, replacement: { - match: /currentUser:\i,guild:\i,onOpenProfile:.+?}\)(?=])(?<=user:(\i),bio:null==(\i)\?.+?)/, + match: /currentUser:\i,guild:\i}\)(?<=user:(\i),bio:null==(\i)\?.+?)/, replace: "$&,$self.profilePopoutComponent({ user: $1, displayProfile: $2, simplified: true })" } } From 5f272bd5a0d1ffac69ad9b06eefe737ca52c52c2 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:51:06 -0400 Subject: [PATCH 4/4] Prefer Button Over Dropdown By Default --- src/plugins/permissionsViewer/index.tsx | 2 +- src/plugins/reviewDB/settings.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx index 05d99fda..eaf90439 100644 --- a/src/plugins/permissionsViewer/index.tsx +++ b/src/plugins/permissionsViewer/index.tsx @@ -64,7 +64,7 @@ export const settings = definePluginSettings({ preferButtonOverDropdown: { description: "Show a button next to the roles instead of dropdown", type: OptionType.BOOLEAN, - default: false, + default: true, restartNeeded: true } }); diff --git a/src/plugins/reviewDB/settings.tsx b/src/plugins/reviewDB/settings.tsx index d4b0cb5d..b8b02171 100644 --- a/src/plugins/reviewDB/settings.tsx +++ b/src/plugins/reviewDB/settings.tsx @@ -57,7 +57,7 @@ export const settings = definePluginSettings({ preferButtonOverDropdown: { description: "Show a button instead of dropdown to view reviews", type: OptionType.BOOLEAN, - default: false, + default: true, restartNeeded: true }, buttons: {