app/Desktop/App.axaml

@@ -2,8 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:common="clr-namespace:DHT.Desktop.Common"
              xmlns:system="clr-namespace:System;assembly=System.Runtime"
-             x:Class="DHT.Desktop.App"
-             RequestedThemeVariant="Light">
+             x:Class="DHT.Desktop.App">
 
     <Application.Styles>
 

app/Desktop/Desktop.csproj

@@ -14,13 +14,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
+    <PackageReference Include="Avalonia" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.5" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
   </ItemGroup>
   
   <ItemGroup>

app/Resources/Tracker/scripts/discord.js

@@ -1,23 +1,5 @@
 // noinspection JSUnresolvedVariable
-// noinspection LocalVariableNamingConventionJS
 class DISCORD {
-	
-	// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
-	static CHANNEL_TYPE = {
-		DM: 1,
-		GROUP_DM: 3,
-		ANNOUNCEMENT_THREAD: 10,
-		PUBLIC_THREAD: 11,
-		PRIVATE_THREAD: 12
-	};
-	
-	// https://discord.com/developers/docs/resources/channel#message-object-message-types
-	static MESSAGE_TYPE = {
-		DEFAULT: 0,
-		REPLY: 19,
-		THREAD_STARTER: 21
-	};
-	
 	static getMessageOuterElement() {
 		return DOM.queryReactClass("messagesWrapper");
 	}
@@ -71,7 +53,7 @@ class DISCORD {
 		 */
 		const onMessageElementsChangedLater = function() {
 			window.clearTimeout(debounceTimer);
-			debounceTimer = window.setTimeout(onMessageElementsChanged, 100);
+			debounceTimer = window.setTimeout(onMessageElementsChanged, 200);
 		};
 		
 		const observer = new MutationObserver(function () {
@@ -209,8 +191,8 @@ class DISCORD {
 				
 				// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 				switch (obj.type) {
-					case DISCORD.CHANNEL_TYPE.DM: type = "DM"; break;
-					case DISCORD.CHANNEL_TYPE.GROUP_DM: type = "GROUP"; break;
+					case 1: type = "DM"; break;
+					case 3: type = "GROUP"; break;
 					default: return null;
 				}
 				
@@ -248,7 +230,7 @@ class DISCORD {
 					}
 				};
 				
-				if (obj.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
+				if (obj.parent_id) {
 					channel["extra"]["parent"] = obj.parent_id;
 				}
 				else {

app/Resources/Tracker/scripts/gui.js

@@ -86,12 +86,12 @@ const GUI = (function() {
 <label><input id='dht-cfg-autoscroll' type='checkbox'> Autoscroll</label><br>
 <br>
 <label>After reaching the first message in channel...</label><br>
-${radio("afm", "nothing", "Continue Tracking")}
+${radio("afm", "nothing", "Do Nothing")}
 ${radio("afm", "pause", "Pause Tracking")}
 ${radio("afm", "switch", "Switch to Next Channel")}
 <br>
 <label>After reaching a previously saved message...</label><br>
-${radio("asm", "nothing", "Continue Tracking")}
+${radio("asm", "nothing", "Do Nothing")}
 ${radio("asm", "pause", "Pause Tracking")}
 ${radio("asm", "switch", "Switch to Next Channel")}
 <p id='dht-cfg-note'>It is recommended to disable link and image previews to avoid putting unnecessary strain on your browser.</p>`;

app/Resources/Tracker/scripts/state.js

@@ -177,7 +177,8 @@ const STATE = (function() {
 		 * @param {DiscordMessage[]} discordMessageArray
 		 */
 		async addDiscordMessages(discordMessageArray) {
-			discordMessageArray = discordMessageArray.filter(msg => (msg.type === DISCORD.MESSAGE_TYPE.DEFAULT || msg.type === DISCORD.MESSAGE_TYPE.REPLY || msg.type === DISCORD.MESSAGE_TYPE.THREAD_STARTER) && msg.state === "SENT");
+			// https://discord.com/developers/docs/resources/channel#message-object-message-types
+			discordMessageArray = discordMessageArray.filter(msg => (msg.type === 0 || msg.type === 19 || msg.type === 21) && msg.state === "SENT");
 			
 			if (discordMessageArray.length === 0) {
 				return false;

app/Resources/Viewer/scripts/discord.js

@@ -1,8 +1,7 @@
 const DISCORD = (function() {
 	const regex = {
 		formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
-		formatItalic1: /\*([\s\S]+?)\*(?!\*)/g,
-		formatItalic2: /_([\s\S]+?)_(?!_)\b/g,
+		formatItalic: /(.)?([_*])([\s\S]+?)\2(?!\2)/g,
 		formatUnderline: /__([\s\S]+?)__(?!_)/g,
 		formatStrike: /~~([\s\S]+?)~~(?!~)/g,
 		formatCodeInline: /(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/g,
@@ -49,8 +48,7 @@ const DISCORD = (function() {
 				.replace(regex.specialEscapedDouble, full => full.replace(/\\/g, "").replace(/(.)/g, escapeHtmlMatch))
 				.replace(regex.formatBold, "<b>$1</b>")
 				.replace(regex.formatUnderline, "<u>$1</u>")
-				.replace(regex.formatItalic1, "<i>$1</i>")
-				.replace(regex.formatItalic2, "<i>$1</i>")
+				.replace(regex.formatItalic, (full, pre, char, match) => pre === "\\" ? full : (pre || "") + "<i>" + match + "</i>")
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		

app/Version.cs

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