diff --git a/src/renderer/coremods/notrack/index.ts b/src/renderer/coremods/notrack/index.ts deleted file mode 100644 index 273b304b9..000000000 --- a/src/renderer/coremods/notrack/index.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { waitForProps } from "@webpack"; -import { Injector } from "@replugged"; - -const inj = new Injector(); - -export async function start(): Promise { - const { AnalyticsActionHandlers } = await waitForProps<{ - AnalyticsActionHandlers: { - handleConnectionClosed: () => void; - handleConnectionOpen: (e: unknown) => void; - handleFingerprint: () => void; - handleTrack: (e: unknown) => void; - }; - }>("AnalyticsActionHandlers"); - - inj.instead(AnalyticsActionHandlers, "handleTrack", () => {}); -} - -export function stop(): void { - inj.uninjectAll(); -} diff --git a/src/renderer/coremods/notrack/plaintextPatches.ts b/src/renderer/coremods/notrack/plaintextPatches.ts index efba16a67..e774a27f1 100644 --- a/src/renderer/coremods/notrack/plaintextPatches.ts +++ b/src/renderer/coremods/notrack/plaintextPatches.ts @@ -2,14 +2,11 @@ import type { PlaintextPatch } from "src/types"; export default [ { + find: "AnalyticsActionHandlers.handleTrack", replacements: [ { - match: /window\.DiscordSentry=function\(\){/, - replace: "$&return;", - }, - { - match: /crossDomainError=function\(\){/, - replace: "$&return;", + match: /=>\w+\.AnalyticsActionHandlers\.handle\w+\([^)]*\)/g, + replace: "=>{}", }, ], }, @@ -17,7 +14,7 @@ export default [ find: "window.DiscordSentry", replacements: [ { - match: /null!=window.DiscordSentry/g, + match: /\w+=window\.DiscordSentry/g, replace: "false", }, ], @@ -27,18 +24,10 @@ export default [ replacements: [{ match: /updateCrashReporter\(\w+\){/, replace: "$&return;" }], }, { - find: "TRACKING_URL:", - replacements: [ - { - replace: "", - }, - ], - }, - { - find: /this\._metrics\.push\(.\);/, + find: /this\._metrics\.push\(.\),/, replacements: [ { - match: /this\._metrics\.push\(.\);/, + match: /this\._metrics\.push\(.\),/, replace: "", }, ], diff --git a/src/renderer/managers/coremods.ts b/src/renderer/managers/coremods.ts index 8f8b4bb7c..4d2b1a845 100644 --- a/src/renderer/managers/coremods.ts +++ b/src/renderer/managers/coremods.ts @@ -24,7 +24,6 @@ export namespace coremods { export let noDevtoolsWarning: Coremod; export let settings: Coremod; export let badges: Coremod; - export let notrack: Coremod; export let installer: Coremod; export let messagePopover: Coremod; export let notices: Coremod; @@ -59,7 +58,6 @@ export async function startAll(): Promise { coremods.watcher = await import("../coremods/watcher"); coremods.commands = await import("../coremods/commands"); coremods.welcome = await import("../coremods/welcome"); - coremods.notrack = await import("../coremods/notrack"); await Promise.all( Object.entries(coremods).map(async ([name, mod]) => {