From b1d3f5e52fc7592907a3a18d5bce3f3b785e4985 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Thu, 15 Sep 2022 18:03:48 +0200
Subject: [PATCH] Fix settings patch

---
 src/plugins/settings.ts   |  2 +-
 src/plugins/viewIcons.tsx | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/plugins/settings.ts b/src/plugins/settings.ts
index 63c36d6bd..fe125e772 100644
--- a/src/plugins/settings.ts
+++ b/src/plugins/settings.ts
@@ -16,7 +16,7 @@ export default definePlugin({
                 }
             },
             {
-                match: /\w\.createElement.+?["']Host ["'].+?\):null/,
+                match: /\w\.createElement.+?["']Host ["'].+?\):null/s,
                 replace: m => {
                     const idx = m.indexOf("Host") - 1;
                     const template = m.slice(0, idx);
diff --git a/src/plugins/viewIcons.tsx b/src/plugins/viewIcons.tsx
index 218b4ed59..433c1e53a 100644
--- a/src/plugins/viewIcons.tsx
+++ b/src/plugins/viewIcons.tsx
@@ -1,4 +1,3 @@
-import { REACT_GLOBAL } from "../utils/constants";
 import { Modal, openModal } from "../utils/modal";
 import definePlugin from '../utils/types';
 import { filters, waitFor } from "../webpack";
@@ -48,11 +47,11 @@ export default definePlugin({
                 },
                 {
                     match: /,(.{1,2})\((.{1,2})\.MenuGroup,\{\},void 0,(.{1,2})\)(?=\)\}.{1,2}\.displayName)/,
-                    replace: (_, factory, menu, copyIdElement) => `,${factory}(${menu}.MenuGroup,{},void 0,[` +
-                        `_guild.icon&&${REACT_GLOBAL}.createElement(${menu}.MenuItem,` +
-                        `{key:"viewicons-copy-icon",id:"viewicons-copy-icon",action:()=>${OPEN_URL}_guild.getIconURL(undefined,true)+"size=2048"),label:"View Icon",icon:null}),` +
-                        `_guild.banner&&${REACT_GLOBAL}.createElement(${menu}.MenuItem,` +
-                        `{key:"viewicons-copy-banner",id:"viewicons-copy-banner",action:()=>${OPEN_URL}Vencord.Webpack.findByProps("getGuildBannerURL").getGuildBannerURL(_guild).replace(/\\?size=.+/, "?size=2048")),label:"View Banner",icon:null}),${copyIdElement}])`
+                    replace: (_, createElement, menu, copyIdElement) => `,${createElement}(${menu}.MenuGroup,{},void 0,[` +
+                        `_guild.icon&&${createElement}(${menu}.MenuItem,` +
+                        `{id:"viewicons-copy-icon",label:"View Icon",action:()=>${OPEN_URL}_guild.getIconURL(void 0,true)+"size=2048")}),` +
+                        `_guild.banner&&${createElement}(${menu}.MenuItem,` +
+                        `{id:"viewicons-copy-banner",label:"View Banner",action:()=>${OPEN_URL}Vencord.Webpack.findByProps("getGuildBannerURL").getGuildBannerURL(_guild).replace(/\\?size=.+/, "?size=2048"))}),${copyIdElement}])`
                 }
             ]
         }