From 7d8214fc37b4f4baeca1c7deb06ef37147c70fde Mon Sep 17 00:00:00 2001 From: Nuckyz <61953774+Nuckyz@users.noreply.github.com> Date: Wed, 28 Aug 2024 02:10:20 -0300 Subject: [PATCH 1/7] Fix PermissionsViewer on user popouts --- src/plugins/permissionsViewer/components/UserPermissions.tsx | 2 +- src/plugins/permissionsViewer/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/permissionsViewer/components/UserPermissions.tsx b/src/plugins/permissionsViewer/components/UserPermissions.tsx index f53f93b6..dc2aa6fa 100644 --- a/src/plugins/permissionsViewer/components/UserPermissions.tsx +++ b/src/plugins/permissionsViewer/components/UserPermissions.tsx @@ -37,7 +37,7 @@ type UserPermissions = Array; const { RoleRootClasses, RoleClasses, RoleBorderClasses } = proxyLazyWebpack(() => { const [RoleRootClasses, RoleClasses, RoleBorderClasses] = findBulk( - filters.byProps("root", "showMoreButton", "collapseButton"), + filters.byProps("root", "expandButton", "collapseButton"), filters.byProps("role", "roleCircle", "roleName"), filters.byProps("roleCircle", "dot", "dotBorderColor") ) as Record[]; diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx index 5039d04f..7c3967a3 100644 --- a/src/plugins/permissionsViewer/index.tsx +++ b/src/plugins/permissionsViewer/index.tsx @@ -172,7 +172,7 @@ export default definePlugin({ { find: ".VIEW_ALL_ROLES,", replacement: { - match: /children:"\+"\.concat\(\i\.length-\i\.length\).{0,20}\}\),/, + match: /\.collapseButton,.+?}\)}\),/, replace: "$&$self.ViewPermissionsButton(arguments[0])," } } From b5cf8b84cd91810e61127d847b73a9898cee1b6a Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Wed, 28 Aug 2024 09:01:29 -0400 Subject: [PATCH 2/7] Fix Invite Links --- .github/ISSUE_TEMPLATE/config.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 56216d2a..ad3a1ba0 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Equicord Support Server - url: https://discord.gg/XVAwhj6Z6c + url: https://discord.gg/5Xh2W87egW about: If you need help regarding Equicord, please join our support server! - name: Equicord Installer url: https://github.com/Equicord/Installer diff --git a/README.md b/README.md index ee7fadfb..bf69c574 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Equibop](https://img.shields.io/badge/Equibop-grey?style=flat)](https://github.com/Equicord/Equibop) [![Tests](https://github.com/Equicord/Equicord/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/Equicord/Equicord/actions/workflows/test.yml) -[![Discord](https://img.shields.io/discord/1207691698386501634.svg?color=768AD4&label=Discord&logo=discord&logoColor=white)](https://discord.gg/VasF3Ma4Ab) +[![Discord](https://img.shields.io/discord/1207691698386501634.svg?color=768AD4&label=Discord&logo=discord&logoColor=white)](https://discord.gg/5Xh2W87egW) Equicord is a fork of [Vencord](https://github.com/Vendicated/Vencord), with over 300+ plugins. From b10429e0ae8fa2e0696fd82334300b1463256fdb Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:37:13 -0400 Subject: [PATCH 3/7] Language Blacklist for MessageTranslate --- src/equicordplugins/messageTranslate/index.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/equicordplugins/messageTranslate/index.tsx b/src/equicordplugins/messageTranslate/index.tsx index 3b1739d6..f3ff8322 100644 --- a/src/equicordplugins/messageTranslate/index.tsx +++ b/src/equicordplugins/messageTranslate/index.tsx @@ -22,9 +22,16 @@ const settings = definePluginSettings( default: "0.8", restartNeeded: true }, + languageBlacklist: { + type: OptionType.STRING, + description: "Language codes to disable functionality in (separate with comma)", + default: "", + restartNeeded: true + }, }); async function translateAPI(sourceLang: string, targetLang: string, text: string): Promise { + if (settings.store.languageBlacklist.includes(sourceLang)) return; const url = `https://translate.googleapis.com/translate_a/single?client=gtx&sl=${sourceLang}&tl=${targetLang}&dt=t&dj=1&q=${encodeURIComponent(text)}`; const response = await fetch(url); From 6b4e0d54a916f28b0a4d6396f8d994f903e1849b Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:37:57 -0400 Subject: [PATCH 4/7] Revert "Language Blacklist for MessageTranslate" This reverts commit b10429e0ae8fa2e0696fd82334300b1463256fdb. --- src/equicordplugins/messageTranslate/index.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/equicordplugins/messageTranslate/index.tsx b/src/equicordplugins/messageTranslate/index.tsx index f3ff8322..3b1739d6 100644 --- a/src/equicordplugins/messageTranslate/index.tsx +++ b/src/equicordplugins/messageTranslate/index.tsx @@ -22,16 +22,9 @@ const settings = definePluginSettings( default: "0.8", restartNeeded: true }, - languageBlacklist: { - type: OptionType.STRING, - description: "Language codes to disable functionality in (separate with comma)", - default: "", - restartNeeded: true - }, }); async function translateAPI(sourceLang: string, targetLang: string, text: string): Promise { - if (settings.store.languageBlacklist.includes(sourceLang)) return; const url = `https://translate.googleapis.com/translate_a/single?client=gtx&sl=${sourceLang}&tl=${targetLang}&dt=t&dj=1&q=${encodeURIComponent(text)}`; const response = await fetch(url); From 5bfc608f7dc9e6c82f03adf3313a1c83e390291b Mon Sep 17 00:00:00 2001 From: Surge <112782958+surgedevs@users.noreply.github.com> Date: Thu, 29 Aug 2024 08:43:52 +0200 Subject: [PATCH 5/7] new plugin AlwaysExpandRoles ~ Alternative to ShowAllRoles (#2809) --- src/plugins/alwaysExpandRoles/README.md | 3 ++ src/plugins/alwaysExpandRoles/index.ts | 37 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 src/plugins/alwaysExpandRoles/README.md create mode 100644 src/plugins/alwaysExpandRoles/index.ts diff --git a/src/plugins/alwaysExpandRoles/README.md b/src/plugins/alwaysExpandRoles/README.md new file mode 100644 index 00000000..344268cb --- /dev/null +++ b/src/plugins/alwaysExpandRoles/README.md @@ -0,0 +1,3 @@ +# Always Expand Roles + +Always expands the role list in profile popouts diff --git a/src/plugins/alwaysExpandRoles/index.ts b/src/plugins/alwaysExpandRoles/index.ts new file mode 100644 index 00000000..1c20b977 --- /dev/null +++ b/src/plugins/alwaysExpandRoles/index.ts @@ -0,0 +1,37 @@ +/* + * Vencord, a modification for Discord's desktop app + * Copyright (c) 2023 Vendicated and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . +*/ + +import { migratePluginSettings } from "@api/Settings"; +import { Devs } from "@utils/constants"; +import definePlugin from "@utils/types"; + +migratePluginSettings("AlwaysExpandRoles", "ShowAllRoles"); +export default definePlugin({ + name: "AlwaysExpandRoles", + description: "Always expands the role list in profile popouts", + authors: [Devs.surgedevs], + patches: [ + { + find: 'action:"EXPAND_ROLES"', + replacement: { + match: /(roles:\i(?=.+?(\i)\(!0\)[,;]\i\({action:"EXPAND_ROLES"}\)).+?\[\i,\2\]=\i\.useState\()!1\)/, + replace: (_, rest, setExpandedRoles) => `${rest}!0)` + } + } + ] +}); From db2f5c9292ad40c5939e1023b21aed622a793a6f Mon Sep 17 00:00:00 2001 From: Nuckyz <61953774+Nuckyz@users.noreply.github.com> Date: Thu, 29 Aug 2024 03:56:21 -0300 Subject: [PATCH 6/7] ConsoleJanitor: Remove non needed patch notosans no longer errors --- src/plugins/consoleJanitor/index.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/plugins/consoleJanitor/index.ts b/src/plugins/consoleJanitor/index.ts index dfb59957..e847c412 100644 --- a/src/plugins/consoleJanitor/index.ts +++ b/src/plugins/consoleJanitor/index.ts @@ -60,13 +60,6 @@ export default definePlugin({ replace: "" } }, - { - find: "notosans-400-normalitalic", - replacement: { - match: /,"notosans-.+?"/g, - replace: "" - } - }, { find: 'console.warn("[DEPRECATED] Please use `subscribeWithSelector` middleware");', all: true, From 09c7176036c23fe0116864c67851d0e828727e76 Mon Sep 17 00:00:00 2001 From: verticalsync <60797172+verticalsync@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:23:03 +0300 Subject: [PATCH 7/7] i forgor --- src/plugins/permissionsViewer/index.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/plugins/permissionsViewer/index.tsx b/src/plugins/permissionsViewer/index.tsx index 3e15dc70..7c3967a3 100644 --- a/src/plugins/permissionsViewer/index.tsx +++ b/src/plugins/permissionsViewer/index.tsx @@ -60,12 +60,6 @@ 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: true, - restartNeeded: true } });