From b49ac6b541b91e61b85b188b42ceeba3a39f687a Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 14 Nov 2022 21:42:02 +0100
Subject: ClickableRoleDot -> BetterRoleDot; now allows using both role colour
 styles at once

---
 src/plugins/betterRoleDot.ts    | 70 +++++++++++++++++++++++++++++++++++++++++
 src/plugins/clickableRoleDot.ts | 59 ----------------------------------
 2 files changed, 70 insertions(+), 59 deletions(-)
 create mode 100644 src/plugins/betterRoleDot.ts
 delete mode 100644 src/plugins/clickableRoleDot.ts

(limited to 'src/plugins')

diff --git a/src/plugins/betterRoleDot.ts b/src/plugins/betterRoleDot.ts
new file mode 100644
index 0000000..37a2ea7
--- /dev/null
+++ b/src/plugins/betterRoleDot.ts
@@ -0,0 +1,70 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 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, Settings } from "../api/settings";
+import { Devs } from "../utils/constants";
+import definePlugin, { OptionType } from "../utils/types";
+import { Clipboard, Toasts } from "../webpack/common";
+
+migratePluginSettings("BetterRoleDot", "ClickableRoleDot");
+export default definePlugin({
+    name: "BetterRoleDot",
+    authors: [Devs.Ven],
+    description:
+        "Copy role colour on RoleDot (accessibility setting) click. Also allows using both RoleDot and coloured names simultaneously",
+
+    patches: [
+        {
+            find: "M0 4C0 1.79086 1.79086 0 4 0H16C18.2091 0 20 1.79086 20 4V16C20 18.2091 18.2091 20 16 20H4C1.79086 20 0 18.2091 0 16V4Z",
+            replacement: {
+                match: /viewBox:"0 0 20 20"/,
+                replace: "$&,onClick:()=>Vencord.Plugins.plugins.BetterRoleDot.copyToClipBoard(e.color),style:{cursor:'pointer'}",
+            },
+        },
+        {
+            find: '"username"===',
+            all: true,
+            predicate: () => Settings.plugins.BetterRoleDot.bothStyles,
+            replacement: {
+                match: /"(?:username|dot)"===\w\b/g,
+                replace: "true",
+            },
+        },
+    ],
+
+    options: {
+        bothStyles: {
+            type: OptionType.BOOLEAN,
+            description: "Show both role dot and coloured names",
+            default: false,
+        }
+    },
+
+    copyToClipBoard(color: string) {
+        Clipboard.copy(color);
+        Toasts.show({
+            message: "Copied to Clipboard!",
+            type: Toasts.Type.SUCCESS,
+            id: Toasts.genId(),
+            options: {
+                duration: 1000,
+                position: Toasts.Position.BOTTOM
+            }
+        });
+    },
+});
diff --git a/src/plugins/clickableRoleDot.ts b/src/plugins/clickableRoleDot.ts
deleted file mode 100644
index 14d0ed2..0000000
--- a/src/plugins/clickableRoleDot.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2022 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 { Devs } from "../utils/constants";
-import definePlugin from "../utils/types";
-import { Toasts } from "../webpack/common";
-
-export default definePlugin({
-    name: "ClickableRoleDot",
-    authors: [Devs.Ven],
-    description:
-        "Makes RoleDots (Accessibility Feature) copy colour to clipboard on click",
-    patches: [
-        {
-            find: "M0 4C0 1.79086 1.79086 0 4 0H16C18.2091 0 20 1.79086 20 4V16C20 18.2091 18.2091 20 16 20H4C1.79086 20 0 18.2091 0 16V4Z",
-            replacement: {
-                match: /(viewBox:"0 0 20 20")/,
-                replace: "$1,onClick:()=>Vencord.Plugins.plugins.ClickableRoleDot.copyToClipBoard(e.color)",
-            },
-        },
-    ],
-
-    copyToClipBoard(color: string) {
-        if (IS_WEB) {
-            navigator.clipboard.writeText(color)
-                .then(() => this.notifySuccess);
-        } else {
-            DiscordNative.clipboard.copy(color);
-            this.notifySuccess();
-        }
-    },
-
-    notifySuccess() {
-        Toasts.show({
-            message: "Copied to Clipboard!",
-            type: Toasts.Type.SUCCESS,
-            id: Toasts.genId(),
-            options: {
-                duration: 1000,
-                position: Toasts.Position.BOTTOM
-            }
-        });
-    }
-});
-- 
cgit