Fix Canary Patches

src/equicordplugins/clientSideBlock/index.tsx

@@ -179,7 +179,7 @@ export default definePlugin({
             find: ".GUILD_APPLICATION_PREMIUM_SUBSCRIPTION||",
             replacement: [
                 {
-                    match: /let \i;let\{repliedAuthor:/,
+                    match: /let \i,\{repliedAuthor:/,
                     replace: "if(arguments[0] != null && arguments[0].referencedMessage.message != null) { if($self.shouldHideUser(arguments[0].referencedMessage.message.author.id, arguments[0].baseMessage.messageReference.channel_id)) { return $self.hiddenReplyComponent(); } }$&"
                 }
             ]

src/equicordplugins/customUserColors/index.tsx

@@ -83,7 +83,7 @@ export default definePlugin({
             // this also affects name headers in chats outside of servers
             find: '="SYSTEM_TAG"',
             replacement: {
-                match: /(?<=\i.gradientClassName]\),style:.{0,80}:void 0,)/,
+                match: /(?<=\i.gradientClassName]\),style:.{0,80}:void 0\}\)\(\),)/,
                 replace: "style:{color:$self.colorIfServer(arguments[0])},"
             },
             predicate: () => !Settings.plugins.IrcColors.enabled

src/equicordplugins/messageLoggerEnhanced/index.tsx

@@ -254,7 +254,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "THREAD_STARTER_MESSAGE?null===",
+            find: "THREAD_STARTER_MESSAGE?null==",
             replacement: {
                 match: /deleted:\i\.deleted, editHistory:\i\.editHistory,/,
                 replace: "deleted:$self.getDeleted(...arguments), editHistory:$self.getEdited(...arguments),"

src/equicordplugins/moreStickers/index.tsx

@@ -56,7 +56,7 @@ export default definePlugin({
         {
             find: ".gifts)",
             replacement: {
-                match: /,.{0,5}\(null===\(\w=\w\.stickers\)\|\|void 0.*?(\w)\.push\((\(0,\w\.jsx\))\((.+?),{disabled:\w,type:(\w)},"sticker"\)\)\)/,
+                match: /,.{0,5}\(null==\(\i=\i\.stickers\)\?void 0.*?(\i)\.push\((\(0,\w\.jsx\))\((.+?),{disabled:\i,type:(\i)},"sticker"\)\)\)/,
                 replace: (m, _, jsx, compo, type) => {
                     const c = "arguments[0].type";
                     return `${m},${c}?.submit?.button&&${_}.push(${jsx}(${compo},{disabled:!${c}?.submit?.button,type:${type},stickersType:"stickers+"},"stickers+"))`;

src/equicordplugins/searchFix/index.tsx

@@ -28,7 +28,7 @@ export default definePlugin({
         {
             find: '"SearchStore",',
             replacement: {
-                match: /(\i)\.offset=null!==\((\i)=(\i)\.offset\)&&void 0!==(\i)\?(\i):0/i,
+                match: /(\i)\.offset=null!=\((\i)=(\i)\.offset\)\?(\i):0/i,
                 replace: (_, v, v1, query, v3, v4) => `$self.main(${query}), ${v}.offset = null !== (${v1} = ${query}.offset) && void 0 !== ${v3} ? ${v4} : 0`
             }
         }

src/equicordplugins/videoSpeed/index.tsx

@@ -27,7 +27,7 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: ".videoControls:",
+            find: /\.VIDEO\?\i\.videoControls:/,
             replacement: {
                 match: /children:\[this\.renderPlayIcon\(\),.{0,200}\.setDurationRef}\),/,
                 replace: "$&$self.SpeedButton(),"

src/plugins/consoleJanitor/index.tsx

@@ -148,14 +148,14 @@ export default definePlugin({
         {
             find: "is not a valid locale.",
             replacement: {
-                match: /\i\.error\(""\.concat\(\i," is not a valid locale."\)\);/,
+                match: /void \i\.error\(""\.concat\(\i," is not a valid locale."\)\)/,
                 replace: ""
             }
         },
         {
             find: '"AppCrashedFatalReport: getLastCrash not supported."',
             replacement: {
-                match: /console\.log\("AppCrashedFatalReport: getLastCrash not supported\."\);/,
+                match: /void console\.log\("AppCrashedFatalReport: getLastCrash not supported\."\)/,
                 replace: ""
             }
         },

src/plugins/customidle/index.ts

@@ -49,7 +49,7 @@ export default definePlugin({
                     replace: "$self.handleOnline()"
                 },
                 {
-                    match: /(setInterval\(\i,\.25\*)\i\.\i/,
+                    match: /(setInterval\(\i,30\*)\i\.\i/,
                     replace: "$1$self.getIntervalDelay()" // For web installs
                 }
             ]

src/plugins/ircColors/index.ts

@@ -67,7 +67,7 @@ export default definePlugin({
         {
             find: '="SYSTEM_TAG"',
             replacement: {
-                match: /(?<=\i.gradientClassName]\),style:.{0,80}:void 0,)/,
+                match: /(?<=\i.gradientClassName]\),style:.{0,80}:void 0\}\)\(\),)/,
                 replace: "style:{color:$self.calculateNameColorForMessageContext(arguments[0])},"
             }
         },

src/plugins/messageLogger/index.tsx

@@ -433,7 +433,7 @@ export default definePlugin({
 
         {
             // Updated message transformer(?)
-            find: "THREAD_STARTER_MESSAGE?null===",
+            find: "THREAD_STARTER_MESSAGE?null==",
             replacement: [
                 {
                     // Pass through editHistory & deleted & original attachments to the "edited message" transformer

src/plugins/newGuildSettings/index.tsx

@@ -134,7 +134,7 @@ export default definePlugin({
         {
             find: ",acceptInvite(",
             replacement: {
-                match: /INVITE_ACCEPT_SUCCESS.+?,(\i)=null!==.+?;/,
+                match: /INVITE_ACCEPT_SUCCESS.+?,(\i)=null!=.+?;/,
                 replace: (m, guildId) => `${m}$self.applyDefaultSettings(${guildId});`
             }
         },

src/plugins/nsfwGateBypass/index.ts

@@ -28,11 +28,11 @@ export default definePlugin({
             find: ".nsfwAllowed=null",
             replacement: [
                 {
-                    match: /(?<=\.nsfwAllowed=)null!==.+?(?=[,;])/,
+                    match: /(?<=\.nsfwAllowed=)null!=.+?(?=[,;])/,
                     replace: "true",
                 },
                 {
-                    match: /(?<=\.ageVerificationStatus=)null!==.+?(?=[,;])/,
+                    match: /(?<=\.ageVerificationStatus=)null!=.+?(?=[,;])/,
                     replace: "3", // VERIFIED_ADULT
                 }
             ],

src/webpack/common/components.ts

@@ -25,7 +25,7 @@ import * as t from "./types/components";
 
 const FormTitle = waitForComponent<t.FormTitle>("FormTitle", filters.componentByCode('["defaultMargin".concat', '="h5"'));
 const FormText = waitForComponent<t.FormText>("FormText", filters.componentByCode(".SELECTABLE),", ".DISABLED:"));
-const FormSection = waitForComponent<t.FormSection>("FormSection", filters.componentByCode(".titleId)&&"));
+const FormSection = waitForComponent<t.FormSection>("FormSection", filters.componentByCode(".titleId)?"));
 const FormDivider = waitForComponent<t.FormDivider>("FormDivider", filters.componentByCode(".divider,", ",style:", '"div"', /\.divider,\i\),style:/));
 
 export const Forms = {
@@ -74,7 +74,7 @@ export const ScrollerNone = LazyComponent(() => createScroller(scrollerClasses.n
 export const ScrollerThin = LazyComponent(() => createScroller(scrollerClasses.thin, scrollerClasses.fade, scrollerClasses.customTheme));
 export const ScrollerAuto = LazyComponent(() => createScroller(scrollerClasses.auto, scrollerClasses.fade, scrollerClasses.customTheme));
 
-const { FocusLock_ } = mapMangledModuleLazy("attachTo:null!==", {
+const { FocusLock_ } = mapMangledModuleLazy("attachTo:null!=", {
     FocusLock_: filters.componentByCode(".containerRef")
 }) as {
     FocusLock_: t.FocusLock;