diff --git a/src/plugins/consoleJanitor/index.tsx b/src/plugins/consoleJanitor/index.tsx index 5a3b3cd1..d32f525e 100644 --- a/src/plugins/consoleJanitor/index.tsx +++ b/src/plugins/consoleJanitor/index.tsx @@ -117,6 +117,7 @@ export default definePlugin({ this.settings.store.whitelistedLoggers?.split(";").map(x => x.trim()).forEach(logAllow.add.bind(logAllow)); }, + Noop, NoopLogger: () => NoopLogger, shouldLog(logger: string, level: keyof AllowLevels) { @@ -148,15 +149,15 @@ export default definePlugin({ { find: "is not a valid locale.", replacement: { - match: /\i\.error\(""\.concat\(\i," is not a valid locale."\)\);/, - replace: "" + match: /\i\.error(?=\(""\.concat\(\i," is not a valid locale."\)\))/, + replace: "$self.Noop" } }, { find: '"AppCrashedFatalReport: getLastCrash not supported."', replacement: { - match: /console\.log\("AppCrashedFatalReport: getLastCrash not supported\."\);/, - replace: "" + match: /console\.log(?=\("AppCrashedFatalReport: getLastCrash not supported\."\))/, + replace: "$self.Noop" } }, { diff --git a/src/plugins/customidle/index.ts b/src/plugins/customidle/index.ts index 7d353f15..9ffa889f 100644 --- a/src/plugins/customidle/index.ts +++ b/src/plugins/customidle/index.ts @@ -47,19 +47,11 @@ export default definePlugin({ { match: /\i\.\i\.dispatch\({type:"IDLE",idle:!1}\)/, replace: "$self.handleOnline()" - }, - { - match: /(setInterval\(\i,\.25\*)\i\.\i/, - replace: "$1$self.getIntervalDelay()" // For web installs } ] } ], - getIntervalDelay() { - return Math.min(6e5, this.getIdleTimeout()); - }, - handleOnline() { if (!settings.store.remainInIdle) { FluxDispatcher.dispatch({ diff --git a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx index eb39c16d..4afb7464 100644 --- a/src/plugins/decor/ui/modals/CreateDecorationModal.tsx +++ b/src/plugins/decor/ui/modals/CreateDecorationModal.tsx @@ -19,7 +19,7 @@ import { AvatarDecorationModalPreview } from "../components"; const FileUpload = findComponentByCodeLazy("fileUploadInput,"); -const { HelpMessage, HelpMessageTypes } = mapMangledModuleLazy('POSITIVE=3]="POSITIVE', { +const { HelpMessage, HelpMessageTypes } = mapMangledModuleLazy('POSITIVE="positive', { HelpMessageTypes: filters.byProps("POSITIVE", "WARNING", "INFO"), HelpMessage: filters.byCode(".iconDiv") }); diff --git a/src/plugins/ircColors/index.ts b/src/plugins/ircColors/index.ts index 74175269..50630372 100644 --- a/src/plugins/ircColors/index.ts +++ b/src/plugins/ircColors/index.ts @@ -66,8 +66,8 @@ export default definePlugin({ { find: '="SYSTEM_TAG"', replacement: { - match: /(?<=\i.gradientClassName]\),style:.{0,80}:void 0,)/, - replace: "style:{color:$self.calculateNameColorForMessageContext(arguments[0])}," + match: /\i.gradientClassName]\),style:/, + replace: "$&{color:$self.calculateNameColorForMessageContext(arguments[0])},_style:" } }, { diff --git a/src/plugins/messageLogger/index.tsx b/src/plugins/messageLogger/index.tsx index dee58f2f..4bce7f5e 100644 --- a/src/plugins/messageLogger/index.tsx +++ b/src/plugins/messageLogger/index.tsx @@ -401,7 +401,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 diff --git a/src/plugins/newGuildSettings/index.tsx b/src/plugins/newGuildSettings/index.tsx index e613f7a0..f8a517fa 100644 --- a/src/plugins/newGuildSettings/index.tsx +++ b/src/plugins/newGuildSettings/index.tsx @@ -128,7 +128,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});` } }, diff --git a/src/plugins/nsfwGateBypass/index.ts b/src/plugins/nsfwGateBypass/index.ts index e6f3ee40..6d0cb702 100644 --- a/src/plugins/nsfwGateBypass/index.ts +++ b/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 } ],