Release v47.4

Closes #310

app/.idea/.idea.DiscordHistoryTracker/.idea/codeStyles/Project.xml

@@ -33,6 +33,7 @@
       <option name="USE_GENERIC_STYLE" value="true" />
     </HSQLCodeStyleSettings>
     <HTMLCodeStyleSettings>
+      <option name="HTML_UNIFORM_INDENT" value="true" />
       <option name="HTML_ALIGN_TEXT" value="true" />
       <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
       <option name="HTML_ELEMENTS_TO_REMOVE_NEW_LINE_BEFORE" value="" />
@@ -53,6 +54,7 @@
       <option name="ARRAY_WRAPPING" value="5" />
     </JSON>
     <JavaCodeStyleSettings>
+      <option name="GENERATE_USE_TYPE_ANNOTATION_BEFORE_TYPE" value="false" />
       <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
@@ -61,6 +63,7 @@
       </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
           <package name="" withSubpackages="true" static="false" />
           <package name="javax" withSubpackages="true" static="false" />
           <package name="java" withSubpackages="true" static="false" />
@@ -77,7 +80,6 @@
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="IMPORT_NESTED_CLASSES" value="true" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
       <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
@@ -103,6 +105,7 @@
     </OracleCodeStyleSettings>
     <PHPCodeStyleSettings>
       <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
+      <option name="ALIGN_MATCH_ARM_BODIES" value="true" />
       <option name="CONCAT_SPACES" value="false" />
       <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
       <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
@@ -110,11 +113,16 @@
       <option name="LOWER_CASE_NULL_CONST" value="true" />
       <option name="ELSE_IF_STYLE" value="COMBINE" />
       <option name="VARIABLE_NAMING_STYLE" value="SNAKE_CASE" />
+      <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
+      <option name="ALIGN_ENUM_CASES" value="true" />
+      <option name="BLANK_LINES_AFTER_FUNCTION" value="0" />
       <option name="KEEP_BLANK_LINES_AFTER_LBRACE" value="0" />
       <option name="SPACE_BEFORE_CLOSURE_LEFT_PARENTHESIS" value="false" />
       <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
       <option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
       <option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
+      <option name="FORCE_EMPTY_METHODS_IN_ONE_LINE" value="true" />
+      <option name="FORCE_EMPTY_CLASSES_IN_ONE_LINE" value="true" />
     </PHPCodeStyleSettings>
     <PostgresCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
@@ -156,8 +164,9 @@
       <option name="KEYWORD_CASE" value="2" />
       <option name="TYPE_CASE" value="2" />
       <option name="CUSTOM_TYPE_CASE" value="2" />
-      <option name="SUBQUERY_CONTENT" value="1" />
-      <option name="SUBQUERY_CLOSING" value="1" />
+      <option name="SUBQUERY_CONTENT" value="2" />
+      <option name="SUBQUERY_CLOSING" value="2" />
+      <option name="SUBQUERY_PAR_SPACE_BEFORE" value="1" />
       <option name="INSERT_TABLE_EL_LINE" value="0" />
       <option name="INSERT_EL_WRAP" value="2" />
       <option name="SET_EL_WRAP" value="2" />
@@ -237,12 +246,13 @@
     </codeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="RIGHT_MARGIN" value="999" />
-      <option name="BLANK_LINES_AFTER_PACKAGE" value="0" />
-      <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BETWEEN_PACKAGE_DECLARATION_AND_HEADER" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
-      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
-      <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
       <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
       <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
       <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
@@ -327,17 +337,20 @@
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="SPECIAL_ELSE_IF_TREATMENT" value="true" />
       <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="true" />
       <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
-      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
-      <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
       <option name="IF_BRACE_FORCE" value="3" />
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="WHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
         <option name="TAB_SIZE" value="2" />
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
@@ -423,6 +436,9 @@
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="METHOD_ANNOTATION_WRAP" value="0" />
       <option name="CLASS_ANNOTATION_WRAP" value="0" />

app/Resources/Tracker/loader/dht.user.js

@@ -68,7 +68,7 @@ function installConnectDialogButton() {
 }
 
 function getHelpIcon() {
-	return document.querySelector("div[class*='bar_'] a[href$='://support.discord.com'] > div[class*='clickable'] > svg");
+	return document.querySelector("div[class*='bar'] a[href$='://support.discord.com'] > div[class*='clickable'] > svg");
 }
 
 function showConnectDialog() {

app/Resources/Tracker/scripts/dom.js

@@ -16,7 +16,8 @@ class DOM {
 	 * @returns {HTMLElement}
 	 */
 	static queryReactClass(cls, parent) {
-		return (parent || document).querySelector(`[class*="${cls}_"]`);
+		parent = parent || document;
+		return parent.querySelector(`[class*="-${cls}"]`) || parent.querySelector(`[class*="${cls}_"]`);
 	}
 	
 	/**

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.2.0.0";
+	public const string Tag = "47.4.0.0";
 }