pull upstream equicord dev

.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

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.
 

src/plugins/alwaysExpandRoles/README.md

@@ -0,0 +1,3 @@
+# Always Expand Roles
+
+Always expands the role list in profile popouts

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 <https://www.gnu.org/licenses/>.
+*/
+
+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)`
+            }
+        }
+    ]
+});

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,

src/plugins/permissionsViewer/components/UserPermissions.tsx

@@ -37,7 +37,7 @@ type UserPermissions = Array<UserPermission>;
 
 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<string, string>[];

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
     }
 });
 
@@ -177,18 +171,10 @@ export default definePlugin({
     patches: [
         {
             find: ".VIEW_ALL_ROLES,",
-            replacement: [
+            replacement: {
-                {
+                match: /\.collapseButton,.+?}\)}\),/,
-                    match: /children:"\+"\.concat\(\i\.length-\i\.length\).{0,20}\}\),/,
+                replace: "$&$self.ViewPermissionsButton(arguments[0]),"
-                    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
-                }
-            ]
         }
     ],