Release v47.4

Closes #310

app/Resources/Tracker/scripts/webpack.js

@@ -3,7 +3,12 @@
  *
  * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/renderer/src/modules/webpackmodules.js
  * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/LICENSE
+ * 
+ * https://github.com/BetterDiscord/BetterDiscord/blob/1b859560148a908f077278fba9625ea82e670222/src/betterdiscord/webpack/shared.ts
+ * https://github.com/BetterDiscord/BetterDiscord/blob/1b859560148a908f077278fba9625ea82e670222/LICENSE
  */
+
+// noinspection RedundantIfStatementJS
 class WEBPACK {
 	static get require() {
 		if (this._require) {
@@ -33,6 +38,31 @@ class WEBPACK {
 		return this.require.c;
 	}
 	
+	static shouldSkipModule(exports) {
+		if (!(typeof exports === "object" || typeof exports === "function")) {
+			return true;
+		}
+		if (!exports) {
+			return true;
+		}
+		if (exports === window) {
+			return true;
+		}
+		if (exports === document.documentElement) {
+			return true;
+		}
+		if (exports[Symbol.toStringTag] === "DOMTokenList") {
+			return true;
+		}
+		if (exports === Symbol) {
+			return true;
+		}
+		if (exports instanceof Window) {
+			return true;
+		}
+		return false;
+	}
+	
 	static filterByProps(...props) {
 		return module => props.every(prop => prop in module);
 	}
@@ -42,41 +72,40 @@ class WEBPACK {
 	}
 	
 	static findModules(filter) {
-		const defaultExport = true;
 		const moduleFilter = module => (typeof module === "object" || typeof module === "function") && filter(module);
 		
 		const results = [];
 		
 		for (const module of Object.values(this.getAllModules())) {
 			/**
-			 * @type {Object}
-			 * @property [Z]
-			 * @property [ZP]
-			 * @property [__esModule]
+			 * @type {Object} Exports
+			 * @property [A]
+			 * @property [Ay]
 			 * @property [default]
 			 */
 			const exports = module.exports;
-			if (!exports || exports === window || exports === document.documentElement || exports[Symbol.toStringTag] === "DOMTokenList") {
+			if (this.shouldSkipModule(exports)) {
 				continue;
 			}
 			
-			let foundModule = null;
-			if (exports.Z && moduleFilter(exports.Z)) {
-				foundModule = defaultExport ? exports.Z : exports;
+			let foundModule;
+			if (exports.A && moduleFilter(exports.A)) {
+				foundModule = exports.A;
 			}
-			if (exports.ZP && moduleFilter(exports.ZP)) {
-				foundModule = defaultExport ? exports.ZP : exports;
+			else if (exports.Ay && moduleFilter(exports.Ay)) {
+				foundModule = exports.Ay;
 			}
-			if (exports.__esModule && exports.default && moduleFilter(exports.default)) {
-				foundModule = defaultExport ? exports.default : exports;
+			else if (exports.default && moduleFilter(exports.default)) {
+				foundModule = exports.default;
 			}
-			if (moduleFilter(exports)) {
+			else if (moduleFilter(exports)) {
 				foundModule = exports;
 			}
-			
-			if (foundModule) {
-				results.push(foundModule);
+			else {
+				continue;
 			}
+			
+			results.push(foundModule);
 		}
 		
 		return results;

app/Resources/Viewer/styles/main.css

@@ -1,5 +1,5 @@
 body {
-  font-family: Whitney, "Helvetica Neue", Helvetica, Verdana, "Lucida Grande", sans-serif;
+  font-family: "gg sans", "Noto Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
   line-height: 1;
   margin: 0;
   padding: 0;

app/Version.cs

@@ -8,5 +8,5 @@ using DHT.Utils;
 namespace DHT.Utils;
 
 static class Version {
-	public const string Tag = "47.3.0.0";
+	public const string Tag = "47.4.0.0";
 }