notnite.com / moonlight
this repo has no description
fork atom

injector, core-extensions: Block discordapp.com as well

If migrating from discordapp.com to discord.com fails, the client will fallback
to discordapp.com. We only checked discord.com in requests, so the scripts would
never be blocked in injector. This means node-preload never gets kicked off, so
web-preload is missing, but also DiscordNative is never loaded.

This manifests in many things, but the notable ones are Moonbase missing, voice
being broken, and the window frame not working. User xylyra in the moonlight
Discord server reported this to us, and after a very long debugging session
(thank you for your cooperation!), we stumbled upon the old domain in the logs.

The easiest no-code fix for this would be telling users to manually create the
domainMigrated file, which signals to discord_desktop_core that migration
finished. This would wipe their localStorage, though, breaking all persisted
stores and their logins in the process.

This is mostly untested (it's hard to test such a niche case), but it should
work fine. moonlight still loads fine on discord.com.

This issue doesn't happen in browser, since the browser URL will always be
discord.com. This also updates the blocks in the core extensions to be safer.

notnite.com 1eb94b90 32cfe8c3

options
unified split
Changed files
+12 -3
packages
core-extensions
src
disableSentry
manifest.json
noTrack
manifest.json
injector
src
index.ts
+4 -1
packages/core-extensions/src/disableSentry/manifest.json 
···

       
12

       
12

       
 

       
    "https://*.sentry.io/*",


     

       
13

       
13

       
 

       
    "https://*.discord.com/error-reporting-proxy/*",


     

       
14

       
14

       
 

       
    "https://discord.com/assets/sentry.*.js",


     

       
15

       

       
-

       
    "https://*.discord.com/assets/sentry.*.js"


     

       

       
15

       
+

       
    "https://*.discord.com/assets/sentry.*.js",


     

       

       
16

       
+

       
    "https://*.discordapp.com/error-reporting-proxy/*",


     

       

       
17

       
+

       
    "https://discordapp.com/assets/sentry.*.js",


     

       

       
18

       
+

       
    "https://*.discordapp.com/assets/sentry.*.js"


     

       
16

       
19

       
 

       
  ]


     

       
17

       
20

       
 

       
}
+3 -1
packages/core-extensions/src/noTrack/manifest.json 
···

       
10

       
10

       
 

       
  },


     

       
11

       
11

       
 

       
  "blocked": [


     

       
12

       
12

       
 

       
    "https://*.discord.com/api/v*/science",


     

       
13

       

       
-

       
    "https://*.discord.com/api/v*/metrics"


     

       

       
13

       
+

       
    "https://*.discord.com/api/v*/metrics",


     

       

       
14

       
+

       
    "https://*.discordapp.com/api/v*/science",


     

       

       
15

       
+

       
    "https://*.discordapp.com/api/v*/metrics"


     

       
14

       
16

       
 

       
  ]


     

       
15

       
17

       
 

       
}
+5 -1
packages/injector/src/index.ts 
···

       
153

       
153

       
 

       
      if (details.resourceType === "script" && isMainWindow) {


     

       
154

       
154

       
 

       
        const url = new URL(details.url);


     

       
155

       
155

       
 

       
        const hasUrl = scriptUrls.some((scriptUrl) => {


     

       
156

       

       
-

       
          return details.url.includes(scriptUrl) && !url.searchParams.has("inj") && url.host.endsWith("discord.com");


     

       

       
156

       
+

       
          return (


     

       

       
157

       
+

       
            details.url.includes(scriptUrl) &&


     

       

       
158

       
+

       
            !url.searchParams.has("inj") &&


     

       

       
159

       
+

       
            (url.host.endsWith("discord.com") || url.host.endsWith("discordapp.com"))


     

       

       
160

       
+

       
          );


     

       
157

       
161

       
 

       
        });


     

       
158

       
162

       
 

       
        if (hasUrl) blockedScripts.add(details.url);


     

       
159

       
163