[Splash] Rewrites for splashText and themesync injection to be main-side

src/splash/index.html

@@ -141,12 +141,4 @@
       barFill.style.visibility = '';
     }
   });
-
-  document.querySelector('#debug').textContent = DiscordSplash.getDebugInfo();
-
-  DiscordSplash.getCSS((css) => {
-    const cssInject = document.createElement('style');
-    cssInject.appendChild(document.createTextNode(css));
-    document.body.appendChild(cssInject);
-  });
 </script>

src/splash/preload.js

@@ -17,15 +17,6 @@ contextBridge.exposeInMainWorld('DiscordSplash', {
   openUrl: saferShellOpenExternal,
   quitDiscord: () => ipcRenderer.send('DISCORD_SPLASH_SCREEN_QUIT'),
 
-  getDebugInfo: () => {
-    if (oaConfig.splashText === false) return '';
-
-    const buildInfo = require('../utils/buildInfo');
-
-    return `${buildInfo.releaseChannel} ${buildInfo.version}
-    OpenAsar ${urlParams.get('oaVersion')}`;
-  },
-
   getCSS: callback => oaConfig.themeSync !== false ? ipcRenderer.on('DISCORD_GET_CSS', (_, value) => {
     callback(value);
   }) : {}

src/splash/splashScreen.js

@@ -456,6 +456,15 @@ function launchSplashWindow(startMinimized) {
   _ipcMain.default.on('SPLASH_SCREEN_READY', () => {
     log('Splash', 'Window declared ready, showing and starting update process');
 
+    if (oaConfig.themeSync !== false) try { // Inject themesync CSS
+      splashWindow.webContents.insertCSS(JSON.parse(_fs.default.readFileSync(_path.default.join(paths.getUserData(), 'userDataCache.json'), 'utf8')).openasarSplashCSS);
+    } catch (e) { }
+
+    if (oaConfig.splashText !== false) try {
+      const buildInfo = require('../utils/buildInfo.js');
+      splashWindow.webContents.executeJavaScript(`debug.textContent = '${buildInfo.releaseChannel} ${buildInfo.version}\\nOpenAsar ${oaVersion}'`);
+    } catch (e) { }
+
     if (splashWindow && !startMinimized) {
       splashWindow.show();
     }
@@ -471,13 +480,7 @@ function launchSplashWindow(startMinimized) {
     pathname: _path.default.join(__dirname, 'index.html')
   });
 
-  try {
-    webContentsSend(splashWindow, 'GET_CSS', JSON.parse(_fs.default.readFileSync(_path.default.join(paths.getUserData(), 'userDataCache.json'), 'utf8')).openasarSplashCSS);
-  } catch (e) {
-    log('Splash', 'Failed to inject splash CSS');
-  }
-
-  splashWindow.loadURL(splashUrl + '?oaVersion=' + global.oaVersion + '&oaConfig=' + JSON.stringify(oaConfig));
+  splashWindow.loadURL(splashUrl);
 
   log('Splash', `Loading window (with url ${splashUrl})`);
 }