Merge branch 'chylex:master' into master

Closes #290

.github/FUNDING.yml

@@ -1,3 +1 @@
-github: chylex
-patreon: chylex
 ko_fi: chylex

README.md

@@ -18,7 +18,7 @@ Folder organization:
 * `app/` contains a Visual Studio solution for the desktop app
 * `web/` contains source code of the [official website](https://dht.chylex.com), which can be used as a template when making your own website
 
-To start editing source code for the desktop app, install the [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
+To start editing source code for the desktop app, install the [.NET 9 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
 
 ### Building
 
@@ -28,18 +28,18 @@ To build a `Release` version of the desktop app, follow the instructions for you
 
 #### Release – Windows (64-bit)
 
-1. Install [Powershell 5](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) or newer (on Windows 10, the included version of Powershell should be enough)
+1. Install Debian in WSL and open a terminal in the project folder.
+2. Run the `app/build.wsl.sh` script.
+3. Read the [Distribution](#distribution) section below.
 
-Run the `app/build.bat` script, and read the [Distribution](#distribution) section below.
+Note: The build script expects `dotnet.exe` to be installed in `C:\Program Files\dotnet`.
 
 #### Release – Other Operating Systems
 
-1. Install the `zip` package from your repository
-
-Run the `app/build.sh` script, and read the [Distribution](#distribution) section below.
+1. Install the `zip` package from your repository.
+2. Run the `app/build.sh` script.
+3. Read the [Distribution](#distribution) section below.
 
 #### Distribution
 
-The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires .NET 8 to be installed.
-
-Note that when building on Windows, the generated `.zip` files for Linux and Mac will not have correct file permissions, so it will not be possible to run them by double-clicking the executable. Since .NET 8 fixed several issues with publishing Windows executables on Linux, I recommend using Linux to build the app for all operating systems.
+The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires the ASP.NET Core Runtime to be installed.

app/.editorconfig

@@ -0,0 +1,2 @@
+[*.cs]
+propertychanged.auto_notify = false

app/.idea/.idea.DiscordHistoryTracker/.idea/avalonia.xml

@@ -13,6 +13,7 @@
         <entry key="Desktop/Main/Controls/MessageFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />

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

@@ -13,10 +13,10 @@
     <CssCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </CssCodeStyleSettings>
-    <DB2CodeStyleSettings version="6">
+    <DB2CodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </DB2CodeStyleSettings>
-    <DerbyCodeStyleSettings version="6">
+    <DerbyCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </DerbyCodeStyleSettings>
     <GoCodeStyleSettings>
@@ -26,10 +26,10 @@
       <option name="WRAP_FUNC_PARAMS" value="5" />
       <option name="WRAP_FUNC_RESULT" value="5" />
     </GoCodeStyleSettings>
-    <H2CodeStyleSettings version="6">
+    <H2CodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </H2CodeStyleSettings>
-    <HSQLCodeStyleSettings version="6">
+    <HSQLCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </HSQLCodeStyleSettings>
     <HTMLCodeStyleSettings>
@@ -85,10 +85,10 @@
     <LessCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </LessCodeStyleSettings>
-    <MSSQLCodeStyleSettings version="6">
+    <MSSQLCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </MSSQLCodeStyleSettings>
-    <MySQLCodeStyleSettings version="6">
+    <MySQLCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </MySQLCodeStyleSettings>
     <Objective-C>
@@ -98,7 +98,7 @@
       <option name="SPACE_BEFORE_INIT_LIST" value="true" />
       <option name="SPACE_AFTER_DICTIONARY_LITERAL_COLON" value="false" />
     </Objective-C>
-    <OracleCodeStyleSettings version="6">
+    <OracleCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </OracleCodeStyleSettings>
     <PHPCodeStyleSettings>
@@ -116,7 +116,7 @@
       <option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
       <option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
     </PHPCodeStyleSettings>
-    <PostgresCodeStyleSettings version="6">
+    <PostgresCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </PostgresCodeStyleSettings>
     <Properties>
@@ -143,13 +143,16 @@
       <option name="INDENT_WHEN_CASES" value="true" />
       <option name="CHAIN_CALLS_ALIGNMENT" value="2" />
     </Ruby>
-    <SQLiteCodeStyleSettings version="6">
+    <SQLiteCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </SQLiteCodeStyleSettings>
     <ScssCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </ScssCodeStyleSettings>
-    <SqlCodeStyleSettings version="6">
+    <Shell_Script>
+      <option name="KEEP_COLUMN_ALIGNMENT_PADDING" value="true" />
+    </Shell_Script>
+    <SqlCodeStyleSettings version="7">
       <option name="KEYWORD_CASE" value="2" />
       <option name="TYPE_CASE" value="2" />
       <option name="CUSTOM_TYPE_CASE" value="2" />
@@ -173,9 +176,10 @@
       <option name="CONSTRAINT_WRAP_3" value="true" />
       <option name="CONSTRAINT_WRAP_4" value="true" />
       <option name="VIEW_INDENT_QUERY" value="true" />
+      <option name="IMP_LOOP_LOOP_INDENT" value="false" />
       <option name="EXPR_CASE_WHEN_WRAP" value="false" />
     </SqlCodeStyleSettings>
-    <SybaseCodeStyleSettings version="6">
+    <SybaseCodeStyleSettings version="7">
       <option name="USE_GENERIC_STYLE" value="true" />
     </SybaseCodeStyleSettings>
     <TypeScriptCodeStyleSettings version="0">
@@ -203,6 +207,11 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="Gherkin">
+      <indentOptions>
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="Groovy">
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
@@ -282,6 +291,13 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="Markdown">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="ObjectiveC">
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
@@ -342,7 +358,6 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="Rust">
-      <option name="RIGHT_MARGIN" value="140" />
       <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
@@ -357,6 +372,7 @@
     </codeStyleSettings>
     <codeStyleSettings language="SCSS">
       <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
@@ -367,13 +383,6 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
-    <codeStyleSettings language="Shell Script">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="4" />
-        <option name="USE_TAB_CHARACTER" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
     <codeStyleSettings language="TOML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -427,6 +436,9 @@
     </codeStyleSettings>
     <codeStyleSettings language="liquid">
       <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>
     </codeStyleSettings>

app/.idea/.idea.DiscordHistoryTracker/.idea/inspectionProfiles/Project.xml

@@ -91,7 +91,6 @@
     <inspection_tool class="ComparatorNotSerializable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CompareToUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ComparisonOfShortAndChar" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ComposeMissingKeys" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="ConditionSignal" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ConditionalExpression" enabled="true" level="INFORMATION" enabled_by_default="true">
       <option name="ignoreSimpleAssignmentsAndReturns" value="true" />
@@ -362,7 +361,7 @@
     </inspection_tool>
     <inspection_tool class="LocalVariableDeclarationSideOnly" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="LocalVariableNamingConventionJS" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_regex" value="[a-z][A-Za-z]*" />
+      <option name="m_regex" value="[a-z][A-Za-z0-9]*" />
       <option name="m_minLength" value="0" />
       <option name="m_maxLength" value="99" />
     </inspection_tool>

app/.idea/.idea.DiscordHistoryTracker/.idea/libraries/Generated_files.xml

@@ -1,22 +0,0 @@
-<component name="libraryTable">
-  <library name="Generated files" type="javaScript">
-    <properties>
-      <sourceFilesUrls>
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/discord.js" />
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/dom.js" />
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/gui.js" />
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/settings.js" />
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/state.js" />
-      </sourceFilesUrls>
-    </properties>
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/discord.js" />
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/dom.js" />
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/gui.js" />
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/settings.js" />
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/state.js" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

app/Desktop/App.axaml

@@ -51,9 +51,20 @@
 
         <Style Selector="Expander">
             <Setter Property="MinHeight" Value="40" />
+            <Setter Property="Padding" Value="12" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
 
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel">
+            <Setter Property="ItemSpacing" Value="8" />
+        </Style>
+        <Style Selector="Panel.buttons Button">
+            <Setter Property="MinWidth" Value="80" />
+        </Style>
+
     </Application.Styles>
 
     <Application.Resources>

app/Desktop/Arguments.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using DHT.Utils.Logging;
 
@@ -9,12 +8,13 @@ sealed class Arguments {
 	
 	private const int FirstArgument = 1;
 	
-	public static Arguments Empty => new (Array.Empty<string>());
+	public static Arguments Empty => new ([]);
 	
 	public bool Console { get; }
 	public string? DatabaseFile { get; }
 	public ushort? ServerPort { get; }
 	public string? ServerToken { get; }
+	public byte? ConcurrentDownloads { get; }
 	
 	public Arguments(IReadOnlyList<string> args) {
 		for (int i = FirstArgument; i < args.Count; i++) {
@@ -50,11 +50,11 @@ sealed class Arguments {
 					continue;
 				
 				case "-port": {
-					if (ushort.TryParse(value, out var port)) {
-						ServerPort = port;
+					if (!ushort.TryParse(value, out ushort port)) {
+						Log.Warn("Invalid port number: " + value);
 					}
 					else {
-						Log.Warn("Invalid port number: " + value);
+						ServerPort = port;
 					}
 					
 					continue;
@@ -64,6 +64,20 @@ sealed class Arguments {
 					ServerToken = value;
 					continue;
 				
+				case "-concurrentdownloads":
+					if (!ulong.TryParse(value, out ulong concurrentDownloads) || concurrentDownloads == 0) {
+						Log.Warn("Invalid concurrent downloads count: " + value);
+					}
+					else if (concurrentDownloads > 10) {
+						Log.Warn("Limiting concurrent downloads to 10");
+						ConcurrentDownloads = 10;
+					}
+					else {
+						ConcurrentDownloads = (byte) concurrentDownloads;
+					}
+					
+					continue;
+				
 				default:
 					Log.Warn("Unknown command line argument: " + key);
 					break;

app/Desktop/Common/DatabaseGui.cs

@@ -20,7 +20,7 @@ static class DatabaseGui {
 	private const string DatabaseFileInitialName = "archive.dht";
 	
 	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = [
-		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"])
+		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"]),
 	];
 	
 	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
@@ -28,7 +28,7 @@ static class DatabaseGui {
 			Title = "Open Database File",
 			FileTypeFilter = DatabaseFileDialogFilter,
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			AllowMultiple = true
+			AllowMultiple = true,
 		});
 	}
 	
@@ -38,7 +38,7 @@ static class DatabaseGui {
 			FileTypeChoices = DatabaseFileDialogFilter,
 			SuggestedFileName = DatabaseFileInitialName,
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			ShowOverwritePrompt = false
+			ShowOverwritePrompt = false,
 		});
 	}
 	

app/Desktop/Common/SystemUtils.cs

@@ -0,0 +1,9 @@
+using System.Diagnostics;
+
+namespace DHT.Desktop.Common;
+
+static class SystemUtils {
+	public static void OpenUrl(string url) {
+		Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+	}
+}

app/Desktop/Desktop.csproj

@@ -15,15 +15,18 @@
   </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.ReactiveUI" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
+    <PackageReference Include="Avalonia" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
+    <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   
   <ItemGroup>
@@ -39,11 +42,6 @@
     <EmbeddedResource Include="Resources/tracker-loader.js">
       <LogicalName>tracker-loader.js</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="../Resources/Viewer/**">
-      <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
   </ItemGroup>
 
 </Project>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -15,24 +15,6 @@
         <namespace:CheckBoxDialogModel />
     </Window.DataContext>
 
-    <Window.Styles>
-        <Style Selector="Panel.buttons">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right">
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
-        <Style Selector="Panel.buttons Button">
-            <Setter Property="MinWidth" Value="80" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.left Button">
-            <Setter Property="Margin" Value="0 0 8 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right Button">
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
-    </Window.Styles>
-
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
             <ItemsRepeater ItemsSource="{Binding Items}">
@@ -48,11 +30,11 @@
             </ItemsRepeater>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel Classes="left">
+            <WrapPanel>
                 <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
                 <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
             </WrapPanel>
-            <WrapPanel Classes="right">
+            <WrapPanel HorizontalAlignment="Right">
                 <Button Click="ClickOk">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -1,27 +1,26 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-class CheckBoxDialogModel : ObservableObject {
+partial class CheckBoxDialogModel {
 	public string Title { get; init; } = "";
 	
-	private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
+	private IReadOnlyList<CheckBoxItem> items = [];
 	
 	public IReadOnlyList<CheckBoxItem> Items {
 		get => items;
 		
 		protected set {
-			foreach (var item in items) {
+			foreach (CheckBoxItem item in items) {
 				item.PropertyChanged -= OnItemPropertyChanged;
 			}
 			
 			items = value;
 			
-			foreach (var item in items) {
+			foreach (CheckBoxItem item in items) {
 				item.PropertyChanged += OnItemPropertyChanged;
 			}
 		}
@@ -29,7 +28,10 @@ class CheckBoxDialogModel : ObservableObject {
 	
 	private bool pauseCheckEvents = false;
 	
+	[DependsOn(nameof(Items))]
 	public bool AreAllSelected => Items.All(static item => item.IsChecked);
+	
+	[DependsOn(nameof(Items))]
 	public bool AreNoneSelected => Items.All(static item => !item.IsChecked);
 	
 	public void SelectAll() => SetAllChecked(true);
@@ -38,7 +40,7 @@ class CheckBoxDialogModel : ObservableObject {
 	private void SetAllChecked(bool isChecked) {
 		pauseCheckEvents = true;
 		
-		foreach (var item in Items) {
+		foreach (CheckBoxItem item in Items) {
 			item.IsChecked = isChecked;
 		}
 		
@@ -47,8 +49,7 @@ class CheckBoxDialogModel : ObservableObject {
 	}
 	
 	private void UpdateBulkButtons() {
-		OnPropertyChanged(nameof(AreAllSelected));
-		OnPropertyChanged(nameof(AreNoneSelected));
+		OnPropertyChanged(new PropertyChangedEventArgs(nameof(Items)));
 	}
 	
 	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
@@ -65,6 +66,6 @@ sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
 	
 	public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
 		this.Items = new List<CheckBoxItem<T>>(items);
-		base.Items = this.Items;
+		base.Items = Items;
 	}
 }

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

@@ -1,12 +1,12 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-partial class CheckBoxItem : ObservableObject {
+partial class CheckBoxItem {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private bool isChecked = false;
 }
 

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -8,6 +8,10 @@ using Avalonia.Platform.Storage;
 namespace DHT.Desktop.Dialogs.File;
 
 static class FileDialogs {
+	public static async Task<string[]> OpenFolders(this IStorageProvider storageProvider, FolderPickerOpenOptions options) {
+		return (await storageProvider.OpenFolderPickerAsync(options)).ToLocalPaths();
+	}
+	
 	public static async Task<string[]> OpenFiles(this IStorageProvider storageProvider, FilePickerOpenOptions options) {
 		return (await storageProvider.OpenFilePickerAsync(options)).ToLocalPaths();
 	}
@@ -18,7 +22,7 @@ static class FileDialogs {
 	
 	public static FilePickerFileType CreateFilter(string name, string[] extensions) {
 		return new FilePickerFileType(name) {
-			Patterns = extensions.Select(static ext => "*." + ext).ToArray()
+			Patterns = extensions.Select(static ext => "*." + ext).ToArray(),
 		};
 	}
 	
@@ -26,11 +30,11 @@ static class FileDialogs {
 		return suggestedDirectory == null ? Task.FromResult<IStorageFolder?>(null) : window.StorageProvider.TryGetFolderFromPathAsync(suggestedDirectory);
 	}
 	
-	private static string ToLocalPath(this IStorageFile file) {
-		return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
+	private static string ToLocalPath(this IStorageItem itme) {
+		return itme.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
 	}
 	
-	private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
-		return files.Select(ToLocalPath).ToArray();
+	private static string[] ToLocalPaths(this IReadOnlyList<IStorageItem> items) {
+		return items.Select(ToLocalPath).ToArray();
 	}
 }

app/Desktop/Dialogs/Message/Dialog.cs

@@ -15,8 +15,8 @@ static class Dialog {
 			DataContext = new MessageDialogModel {
 				Title = title,
 				Message = message,
-				IsOkVisible = true
-			}
+				IsOkVisible = true,
+			},
 		}.ShowDialog<DialogResult.All>(owner);
 	}
 	
@@ -30,8 +30,8 @@ static class Dialog {
 				Title = title,
 				Message = message,
 				IsOkVisible = true,
-				IsCancelVisible = true
-			}
+				IsCancelVisible = true,
+			},
 		}.ShowDialog<DialogResult.All?>(owner);
 		
 		return result.ToOkCancel();
@@ -47,8 +47,8 @@ static class Dialog {
 				Title = title,
 				Message = message,
 				IsYesVisible = true,
-				IsNoVisible = true
-			}
+				IsNoVisible = true,
+			},
 		}.ShowDialog<DialogResult.All?>(owner);
 		
 		return result.ToYesNo();
@@ -65,8 +65,8 @@ static class Dialog {
 				Message = message,
 				IsYesVisible = true,
 				IsNoVisible = true,
-				IsCancelVisible = true
-			}
+				IsCancelVisible = true,
+			},
 		}.ShowDialog<DialogResult.All?>(owner);
 		
 		return result.ToYesNoCancel();

app/Desktop/Dialogs/Message/DialogResult.cs

@@ -7,26 +7,26 @@ static class DialogResult {
 		Ok,
 		Yes,
 		No,
-		Cancel
+		Cancel,
 	}
 	
 	public enum OkCancel {
 		Closed,
 		Ok,
-		Cancel
+		Cancel,
 	}
 	
 	public enum YesNo {
 		Closed,
 		Yes,
-		No
+		No,
 	}
 	
 	public enum YesNoCancel {
 		Closed,
 		Yes,
 		No,
-		Cancel
+		Cancel,
 	}
 	
 	public static OkCancel ToOkCancel(this All? result) {
@@ -34,7 +34,7 @@ static class DialogResult {
 			null       => OkCancel.Closed,
 			All.Ok     => OkCancel.Ok,
 			All.Cancel => OkCancel.Cancel,
-			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to ok/cancel.")
+			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to ok/cancel."),
 		};
 	}
 	
@@ -43,7 +43,7 @@ static class DialogResult {
 			null    => YesNo.Closed,
 			All.Yes => YesNo.Yes,
 			All.No  => YesNo.No,
-			_       => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no.")
+			_       => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no."),
 		};
 	}
 	
@@ -53,7 +53,7 @@ static class DialogResult {
 			All.Yes    => YesNoCancel.Yes,
 			All.No     => YesNoCancel.No,
 			All.Cancel => YesNoCancel.Cancel,
-			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no/cancel.")
+			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no/cancel."),
 		};
 	}
 }

app/Desktop/Dialogs/Message/MessageDialog.axaml

@@ -20,24 +20,18 @@
             <Setter Property="FontSize" Value="15" />
             <Setter Property="TextWrapping" Value="Wrap" />
         </Style>
-        <Style Selector="WrapPanel">
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="Margin" Value="0 8 0 0" />
-        </Style>
-        <Style Selector="Button">
-            <Setter Property="Margin" Value="8 0 0 0" />
-            <Setter Property="MinWidth" Value="80" />
-        </Style>
     </Window.Styles>
 
     <StackPanel Margin="20">
         <TextBlock Text="{Binding Message}" />
-        <WrapPanel>
-            <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
-            <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
-            <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
-            <Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
-        </WrapPanel>
+        <Panel Classes="buttons">
+            <WrapPanel HorizontalAlignment="Right">
+                <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
+                <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
+                <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
+                <Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
+            </WrapPanel>
+        </Panel>
     </StackPanel>
 
 </Window>

app/Desktop/Dialogs/Progress/DelayedProgressDialog.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Threading;
+
+namespace DHT.Desktop.Dialogs.Progress;
+
+static class DelayedProgressDialog {
+	public static async ValueTask Await(Func<Task> taskProvider, TimeSpan delay, Window window, string progressDialogTitle, string progressDialogDescription) {
+		Dispatcher.UIThread.VerifyAccess();
+		
+		Task task = Task.Run(taskProvider);
+		if (task.IsCompleted) {
+			return;
+		}
+		
+		// Freeze the UI thread for a short while in case the task finishes quickly.
+		_ = Task.WhenAny(Task.Delay(delay), task).GetAwaiter().GetResult();
+		
+		if (!task.IsCompleted) {
+			await ProgressDialog.ShowIndeterminate(window, progressDialogTitle, progressDialogDescription, _ => task);
+		}
+	}
+}

app/Desktop/Dialogs/Progress/IProgressCallback.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 namespace DHT.Desktop.Dialogs.Progress;
 
 interface IProgressCallback {
-	Task Update(string message, int finishedItems, int totalItems);
+	Task Update(string message, long finishedItems, long totalItems);
 	Task UpdateIndeterminate(string message);
 	Task Hide();
 }

app/Desktop/Dialogs/Progress/ProgressDialog.axaml.cs

@@ -7,59 +7,42 @@ namespace DHT.Desktop.Dialogs.Progress;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class ProgressDialog : Window {
+	private static readonly TimeSpan MinimumShowDuration = TimeSpan.FromMilliseconds(500);
+	
 	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
-		var taskCompletionSource = new TaskCompletionSource();
 		var dialog = new ProgressDialog();
-		
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			try {
-				await action(dialog, callbacks[0]);
-				taskCompletionSource.SetResult();
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => await action(dialog, callbacks[0]));
 		await dialog.ShowProgressDialog(owner);
-		await taskCompletionSource.Task;
 	}
 	
-	internal static async Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
-		var taskCompletionSource = new TaskCompletionSource();
-		var dialog = new ProgressDialog();
-		
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			await callbacks[0].UpdateIndeterminate(message);
-			try {
-				await action(dialog);
-				taskCompletionSource.SetResult();
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
-		await dialog.ShowProgressDialog(owner);
-		await taskCompletionSource.Task;
-	}
-	
-	internal static async Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
+	internal static async Task<T> Show<T>(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task<T>> action) {
 		var taskCompletionSource = new TaskCompletionSource<T>();
 		var dialog = new ProgressDialog();
 		
 		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			await callbacks[0].UpdateIndeterminate(message);
-			try {
-				taskCompletionSource.SetResult(await action(dialog));
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
+			taskCompletionSource.SetResult(await action(dialog, callbacks[0]));
 		});
 		
 		await dialog.ShowProgressDialog(owner);
 		return await taskCompletionSource.Task;
 	}
 	
+	internal static Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
+		return Show(owner, title, async (dialog, callback) => {
+			await callback.UpdateIndeterminate(message);
+			await action(dialog);
+		});
+	}
+	
+	internal static Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
+		return Show<T>(owner, title, async (dialog, callback) => {
+			await callback.UpdateIndeterminate(message);
+			return await action(dialog);
+		});
+	}
+	
 	private bool isFinished = false;
+	private DateTime startTime = DateTime.Now;
 	private Task progressTask = Task.CompletedTask;
 	
 	public ProgressDialog() {
@@ -67,6 +50,8 @@ public sealed partial class ProgressDialog : Window {
 	}
 	
 	public void OnOpened(object? sender, EventArgs e) {
+		startTime = DateTime.Now;
+		
 		if (DataContext is ProgressDialogModel model) {
 			progressTask = Task.Run(model.StartTask);
 			progressTask.ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
@@ -77,8 +62,14 @@ public sealed partial class ProgressDialog : Window {
 		e.Cancel = !isFinished;
 	}
 	
-	private void OnFinished(Task task) {
+	private async Task OnFinished(Task task) {
 		isFinished = true;
+		
+		TimeSpan elapsedTime = DateTime.Now - startTime;
+		if (elapsedTime < MinimumShowDuration) {
+			await Task.Delay(MinimumShowDuration - elapsedTime);
+		}
+		
 		Close();
 	}
 	

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -10,7 +10,7 @@ namespace DHT.Desktop.Dialogs.Progress;
 sealed class ProgressDialogModel {
 	public string Title { get; init; } = "";
 	
-	public IReadOnlyList<ProgressItem> Items { get; } = Array.Empty<ProgressItem>();
+	public IReadOnlyList<ProgressItem> Items { get; } = [];
 	
 	private readonly TaskRunner? task;
 	
@@ -20,7 +20,7 @@ sealed class ProgressDialogModel {
 	public ProgressDialogModel(string title, TaskRunner task, int progressItems = 1) {
 		this.Title = title;
 		this.task = task;
-		this.Items = Enumerable.Range(0, progressItems).Select(static _ => new ProgressItem()).ToArray();
+		this.Items = Enumerable.Range(start: 0, progressItems).Select(static _ => new ProgressItem()).ToArray();
 	}
 	
 	internal async Task StartTask() {
@@ -38,7 +38,7 @@ sealed class ProgressDialogModel {
 			this.item = item;
 		}
 		
-		public async Task Update(string message, int finishedItems, int totalItems) {
+		public async Task Update(string message, long finishedItems, long totalItems) {
 			await Dispatcher.UIThread.InvokeAsync(() => {
 				item.Message = message;
 				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
@@ -57,7 +57,7 @@ sealed class ProgressDialogModel {
 		}
 		
 		public Task Hide() {
-			return Update(string.Empty, 0, 0);
+			return Update(string.Empty, finishedItems: 0, totalItems: 0);
 		}
 	}
 }

app/Desktop/Dialogs/Progress/ProgressItem.cs

@@ -1,30 +1,23 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
-sealed partial class ProgressItem : ObservableObject {
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(Opacity))]
-	private bool isVisible = false;
-
-	public double Opacity => IsVisible ? 1.0 : 0.0;
-
+sealed partial class ProgressItem {
+	[Notify]
 	private string message = "";
 	
-	public string Message {
-		get => message;
-		set {
-			SetProperty(ref message, value);
-			IsVisible = !string.IsNullOrEmpty(value);
-		}
-	}
-
-	[ObservableProperty]
+	[Notify]
 	private string items = "";
 	
-	[ObservableProperty]
-	private int progress = 0;
+	[Notify]
+	private long progress = 0L;
 	
-	[ObservableProperty]
+	[Notify]
 	private bool isIndeterminate;
+	
+	[DependsOn(nameof(Message))]
+	public bool IsVisible => !string.IsNullOrEmpty(Message);
+	
+	[DependsOn(nameof(IsVisible))]
+	public double Opacity => IsVisible ? 1.0 : 0.0;
 }

app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml

@@ -15,19 +15,6 @@
         <namespace:TextBoxDialogModel />
     </Window.DataContext>
 
-    <Window.Styles>
-        <Style Selector="Panel.buttons">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right">
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
-        <Style Selector="Panel.buttons Button">
-            <Setter Property="MinWidth" Value="80" />
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
-    </Window.Styles>
-
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
             <StackPanel Spacing="10">
@@ -47,7 +34,7 @@
             </StackPanel>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel Classes="right">
+            <WrapPanel HorizontalAlignment="Right">
                 <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -1,37 +1,37 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.TextBox;
 
-class TextBoxDialogModel : ObservableObject {
+partial class TextBoxDialogModel {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
 	
-	private IReadOnlyList<TextBoxItem> items = Array.Empty<TextBoxItem>();
+	private IReadOnlyList<TextBoxItem> items = [];
 	
 	public IReadOnlyList<TextBoxItem> Items {
 		get => items;
 		
 		protected set {
-			foreach (var item in items) {
+			foreach (TextBoxItem item in items) {
 				item.ErrorsChanged -= OnItemErrorsChanged;
 			}
 			
 			items = value;
 			
-			foreach (var item in items) {
+			foreach (TextBoxItem item in items) {
 				item.ErrorsChanged += OnItemErrorsChanged;
 			}
 		}
 	}
 	
+	[DependsOn(nameof(Items))]
 	public bool HasErrors => Items.Any(static item => !item.IsValid);
 	
 	private void OnItemErrorsChanged(object? sender, DataErrorsChangedEventArgs e) {
-		OnPropertyChanged(nameof(HasErrors));
+		OnPropertyChanged(new PropertyChangedEventArgs(nameof(Items)));
 	}
 }
 

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

@@ -1,25 +1,22 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
-using CommunityToolkit.Mvvm.ComponentModel;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.TextBox;
 
-class TextBoxItem : ObservableObject, INotifyDataErrorInfo {
+partial class TextBoxItem : INotifyDataErrorInfo {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 	
 	public Func<string, bool> ValidityCheck { get; init; } = static _ => true;
 	public bool IsValid => ValidityCheck(Value);
 	
+	[Notify]
 	private string value = string.Empty;
 	
-	public string Value {
-		get => this.value;
-		set {
-			SetProperty(ref this.value, value);
-			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
-		}
+	private void OnValueChanged() {
+		ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
 	}
 	
 	public IEnumerable GetErrors(string? propertyName) {

app/Desktop/Discord/DiscordAppSettings.cs

@@ -39,7 +39,7 @@ static class DiscordAppSettings {
 	
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-			var settingsJson = await ReadSettingsJson();
+			JsonObject settingsJson = await ReadSettingsJson();
 			return AreDevToolsEnabled(settingsJson);
 		} catch (Exception e) {
 			Log.Error("Cannot read settings file.");
@@ -49,7 +49,7 @@ static class DiscordAppSettings {
 	}
 	
 	private static bool AreDevToolsEnabled(JsonObject json) {
-		return json.TryGetPropertyValue(JsonKeyDevTools, out var node) && node?.GetValueKind() == JsonValueKind.True;
+		return json.TryGetPropertyValue(JsonKeyDevTools, out JsonNode? node) && node?.GetValueKind() == JsonValueKind.True;
 	}
 	
 	public static async Task<SettingsJsonResult> ConfigureDevTools(bool enable) {
@@ -89,7 +89,7 @@ static class DiscordAppSettings {
 			
 			if (File.Exists(JsonBackupFilePath)) {
 				try {
-					File.Move(JsonBackupFilePath, JsonFilePath, true);
+					File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
 					Log.Info("Restored settings file from backup.");
 				} catch (Exception e2) {
 					Log.Error("Cannot restore settings file from backup.");

app/Desktop/Discord/SettingsJsonResult.cs

@@ -6,5 +6,5 @@ enum SettingsJsonResult {
 	FileNotFound,
 	ReadError,
 	InvalidJson,
-	WriteError
+	WriteError,
 }

app/Desktop/Main/AboutWindow.axaml

@@ -3,12 +3,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:main="clr-namespace:DHT.Desktop.Main"
-        mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
+        mc:Ignorable="d" d:DesignWidth="510" d:DesignHeight="425"
         x:Class="DHT.Desktop.Main.AboutWindow"
         x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="480" Height="295" CanResize="False"
+        Width="510" Height="425" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Design.DataContext>
@@ -16,16 +16,12 @@
     </Design.DataContext>
 
     <Window.Styles>
-        <Style Selector="StackPanel">
-            <Setter Property="Orientation" Value="Horizontal" />
-            <Setter Property="Spacing" Value="5" />
-        </Style>
         <Style Selector="TextBlock">
             <Setter Property="TextWrapping" Value="Wrap" />
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
         <Style Selector="Grid > Button">
-            <Setter Property="Margin" Value="0 4" />
+            <Setter Property="Margin" Value="0 3" />
             <Setter Property="Padding" Value="8 4" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
@@ -33,35 +29,55 @@
 
     <StackPanel Orientation="Vertical" Margin="20" Spacing="12">
 
-        <TextBlock VerticalAlignment="Center">
-            Discord History Tracker was created by chylex and released under the MIT license.
-        </TextBlock>
-
-        <StackPanel>
-            <Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
-            <Button Command="{Binding ShowSourceCode}">Source Code</Button>
+        <StackPanel Orientation="Vertical" Spacing="3">
+            <TextBlock TextWrapping="Wrap">Discord History Tracker was created by chylex.</TextBlock>
+            <TextBlock>It is available under the MIT license.</TextBlock>
         </StackPanel>
 
-        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
+        <StackPanel Orientation="Horizontal" Spacing="8">
+            <Button Command="{Binding OpenOfficialWebsite}">Official Website</Button>
+            <Button Command="{Binding OpenIssueTracker}">Issue Tracker</Button>
+            <Button Command="{Binding OpenSourceCode}">Source Code</Button>
+        </StackPanel>
+
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="*,115,90" Margin="0 10 0 0">
             <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Third-Party Software</TextBlock>
             <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
             <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
 
-            <TextBlock Grid.Row="2" Grid.Column="0">.NET 8</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="0">.NET</TextBlock>
             <TextBlock Grid.Row="2" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="2" Grid.Column="2" Command="{Binding ShowLibraryNetCore}">GitHub</Button>
+            <Button Grid.Row="2" Grid.Column="2" Command="{Binding OpenThirdPartyNetCore}">GitHub</Button>
 
             <TextBlock Grid.Row="3" Grid.Column="0">Avalonia</TextBlock>
             <TextBlock Grid.Row="3" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">NuGet</Button>
+            <Button Grid.Row="3" Grid.Column="2" Command="{Binding OpenThirdPartyAvalonia}">GitHub</Button>
 
-            <TextBlock Grid.Row="4" Grid.Column="0">SQLite</TextBlock>
-            <TextBlock Grid.Row="4" Grid.Column="1">Public Domain</TextBlock>
-            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</Button>
+            <TextBlock Grid.Row="4" Grid.Column="0">Rx.NET</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding OpenThirdPartyRxNet}">GitHub</Button>
 
-            <TextBlock Grid.Row="5" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
-            <TextBlock Grid.Row="5" Grid.Column="1">Apache-2.0</TextBlock>
-            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
+            <TextBlock Grid.Row="5" Grid.Column="0">SQLite</TextBlock>
+            <TextBlock Grid.Row="5" Grid.Column="1">Public Domain</TextBlock>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding OpenThirdPartySqlite}">Website</Button>
+
+            <TextBlock Grid.Row="6" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
+            <TextBlock Grid.Row="6" Grid.Column="1">Apache-2.0</TextBlock>
+            <Button Grid.Row="6" Grid.Column="2" Command="{Binding OpenThirdPartyMicrosoftDataSqlite}">NuGet</Button>
+
+            <TextBlock Grid.Row="7" Grid.Column="0">PropertyChanged.SourceGenerator</TextBlock>
+            <TextBlock Grid.Row="7" Grid.Column="1">MIT</TextBlock>
+            <Button Grid.Row="7" Grid.Column="2" Command="{Binding OpenThirdPartyPropertyChangedSourceGenerator}">GitHub</Button>
+        </Grid>
+
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="*,115,90" Margin="0 5 0 0">
+            <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Additional Thanks</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
+
+            <TextBlock Grid.Row="2" Grid.Column="0">BetterDiscord, for Webpack hooks</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="1">Apache-2.0</TextBlock>
+            <Button Grid.Row="2" Grid.Column="2" Command="{Binding OpenThirdPartyBetterDiscord}">GitHub</Button>
         </Grid>
 
     </StackPanel>

app/Desktop/Main/AboutWindowModel.cs

@@ -1,33 +1,45 @@
-using System.Diagnostics;
+using DHT.Desktop.Common;
 
 namespace DHT.Desktop.Main;
 
 sealed class AboutWindowModel {
-	public void ShowOfficialWebsite() {
-		OpenUrl("https://dht.chylex.com");
+	public void OpenOfficialWebsite() {
+		SystemUtils.OpenUrl(Program.Website);
 	}
 	
-	public void ShowSourceCode() {
-		OpenUrl("https://github.com/chylex/Discord-History-Tracker");
+	public void OpenIssueTracker() {
+		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker/issues");
 	}
 	
-	public void ShowLibraryAvalonia() {
-		OpenUrl("https://www.nuget.org/packages/Avalonia");
+	public void OpenSourceCode() {
+		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker");
 	}
 	
-	public void ShowLibrarySqlite() {
-		OpenUrl("https://www.sqlite.org");
+	public void OpenThirdPartyNetCore() {
+		SystemUtils.OpenUrl("https://github.com/dotnet/core");
 	}
 	
-	public void ShowLibrarySqliteAdoNet() {
-		OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
+	public void OpenThirdPartyAvalonia() {
+		SystemUtils.OpenUrl("https://github.com/AvaloniaUI/Avalonia");
 	}
 	
-	public void ShowLibraryNetCore() {
-		OpenUrl("https://github.com/dotnet/core");
+	public void OpenThirdPartyPropertyChangedSourceGenerator() {
+		SystemUtils.OpenUrl("https://github.com/canton7/PropertyChanged.SourceGenerator");
 	}
 	
-	private static void OpenUrl(string url) {
-		Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
+	public void OpenThirdPartySqlite() {
+		SystemUtils.OpenUrl("https://www.sqlite.org");
+	}
+	
+	public void OpenThirdPartyMicrosoftDataSqlite() {
+		SystemUtils.OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
+	}
+	
+	public void OpenThirdPartyRxNet() {
+		SystemUtils.OpenUrl("https://github.com/dotnet/reactive");
+	}
+	
+	public void OpenThirdPartyBetterDiscord() {
+		SystemUtils.OpenUrl("https://github.com/BetterDiscord/BetterDiscord");
 	}
 }

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

@@ -13,12 +13,8 @@
 
     <UserControl.Styles>
         <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Margin" Value="0 20 40 0" />
             <Setter Property="Spacing" Value="4" />
         </Style>
-        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
         <Style Selector="Grid > Label">
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
@@ -30,9 +26,9 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel>
+    <StackPanel Spacing="20">
         <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel>
+        <WrapPanel ItemSpacing="40" LineSpacing="20">
             <StackPanel>
                 <CheckBox IsChecked="{Binding LimitSize}">Limit Size</CheckBox>
                 <StackPanel Orientation="Horizontal">

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -1,41 +1,47 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.ReactiveUI;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Server;
 using DHT.Server.Data.Filters;
+using DHT.Server.Data.Settings;
+using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposable {
+sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
+	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
+	
 	public sealed record Unit(string Name, uint Scale);
 	
 	private static readonly Unit[] AllUnits = [
-		new Unit("B", 1),
-		new Unit("kB", 1024),
-		new Unit("MB", 1024 * 1024)
+		new Unit("B", Scale: 1),
+		new Unit("kB", Scale: 1024),
+		new Unit("MB", Scale: 1024 * 1024)
 	];
 	
 	private static readonly HashSet<string> FilterProperties = [
 		nameof(LimitSize),
 		nameof(MaximumSize),
-		nameof(MaximumSizeUnit)
+		nameof(MaximumSizeUnit),
 	];
 	
-	public string FilterStatisticsText { get; private set; } = "";
+	[Notify(Setter.Private)]
+	private string filterStatisticsText = "";
 	
-	[ObservableProperty]
+	[Notify]
 	private bool limitSize = false;
 	
-	[ObservableProperty]
-	private ulong maximumSize = 0L;
+	[Notify]
+	private ulong maximumSize = 0UL;
 	
-	[ObservableProperty]
+	[Notify]
 	private Unit maximumSizeUnit = AllUnits[0];
 	
 	public IEnumerable<Unit> Units => AllUnits;
@@ -43,6 +49,9 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 	private readonly State state;
 	private readonly string verb;
 	
+	private readonly DelayedThrottledTask<FilterSettings> saveFilterSettingsTask;
+	private bool isLoadingFilterSettings;
+	
 	private readonly RestartableTask<long> downloadItemCountTask;
 	private long? matchingItemCount;
 	
@@ -56,6 +65,8 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 		this.state = state;
 		this.verb = verb;
 		
+		this.saveFilterSettingsTask = new DelayedThrottledTask<FilterSettings>(Log, TimeSpan.FromSeconds(5), SaveFilterSettings);
+		
 		this.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
 		this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
 		
@@ -64,13 +75,51 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 		PropertyChanged += OnPropertyChanged;
 	}
 	
-	public void Dispose() {
+	public async Task Initialize() {
+		isLoadingFilterSettings = true;
+		
+		LimitSize = await state.Db.Settings.Get(SettingsKey.DownloadsLimitSize, LimitSize);
+		MaximumSize = await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSize, MaximumSize);
+		
+		if (await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSizeUnit, defaultValue: null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
+			MaximumSizeUnit = unitValue;
+		}
+		
+		isLoadingFilterSettings = false;
+	}
+	
+	public async ValueTask DisposeAsync() {
+		saveFilterSettingsTask.Dispose();
+		
 		downloadItemCountTask.Cancel();
 		downloadItemCountSubscription.Dispose();
+		
+		await SaveFilterSettings(new FilterSettings(this));
+	}
+	
+	private sealed record FilterSettings(bool LimitSize, ulong MaximumSize, Unit MaximumSizeUnit) {
+		public FilterSettings(DownloadItemFilterPanelModel model) : this(model.LimitSize, model.MaximumSize, model.MaximumSizeUnit) {}
+	}
+	
+	private async Task SaveFilterSettings(FilterSettings settings) {
+		try {
+			await state.Db.Settings.Set(async setter => {
+				await setter.Set(SettingsKey.DownloadsLimitSize, settings.LimitSize);
+				await setter.Set(SettingsKey.DownloadsMaximumSize, settings.MaximumSize);
+				await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
+			});
+		} catch (Exception e) {
+			Log.Error("Could not save download filter settings");
+			Log.Error(e);
+		}
 	}
 	
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
 		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
+			if (!isLoadingFilterSettings) {
+				saveFilterSettingsTask.Post(new FilterSettings(this));
+			}
+			
 			UpdateFilterStatistics();
 		}
 	}
@@ -82,7 +131,7 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 	
 	
 	private void UpdateFilterStatistics() {
-		var filter = CreateFilter();
+		DownloadItemFilter filter = CreateFilter();
 		if (filter.IsEmpty) {
 			downloadItemCountTask.Cancel();
 			matchingItemCount = totalItemCount;
@@ -101,11 +150,9 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 	}
 	
 	private void UpdateFilterStatisticsText() {
-		var matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
-		var totalItemCountStr = totalItemCount?.Format() ?? "(...)";
-
+		string matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
+		string totalItemCountStr = totalItemCount?.Format() ?? "(...)";
 		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
-		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 	
 	public DownloadItemFilter CreateFilter() {

app/Desktop/Main/Controls/MessageFilterPanel.axaml

@@ -13,12 +13,8 @@
 
     <UserControl.Styles>
         <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Margin" Value="0 20 40 0" />
             <Setter Property="Spacing" Value="4" />
         </Style>
-        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
         <Style Selector="Grid > Label">
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
@@ -36,9 +32,9 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel>
+    <StackPanel Spacing="20">
         <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel>
+        <WrapPanel ItemSpacing="40" LineSpacing="20">
             <StackPanel>
                 <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
                 <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">

app/Desktop/Main/Controls/MessageFilterPanel.axaml.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using Avalonia.Controls;
 
 namespace DHT.Desktop.Main.Controls;
@@ -8,8 +9,8 @@ public sealed partial class MessageFilterPanel : UserControl {
 	public MessageFilterPanel() {
 		InitializeComponent();
 		
-		var culture = Program.Culture;
-		foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
+		CultureInfo culture = Program.Culture;
+		foreach (CalendarDatePicker picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
 			picker.FirstDayOfWeek = culture.DateTimeFormat.FirstDayOfWeek;
 			picker.SelectedDateFormat = CalendarDatePickerFormat.Custom;
 			picker.CustomDateFormatString = culture.DateTimeFormat.ShortDatePattern;

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -7,7 +7,6 @@ using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.ReactiveUI;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.CheckBox;
 using DHT.Desktop.Dialogs.Message;
@@ -16,10 +15,11 @@ using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
 using DHT.Utils.Tasks;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
+sealed partial class MessageFilterPanelModel : IDisposable {
 	private static readonly HashSet<string> FilterProperties = [
 		nameof(FilterByDate),
 		nameof(StartDate),
@@ -27,40 +27,41 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		nameof(FilterByChannel),
 		nameof(IncludedChannels),
 		nameof(FilterByUser),
-		nameof(IncludedUsers)
+		nameof(IncludedUsers),
 	];
 	
-	public string FilterStatisticsText { get; private set; } = "";
-
 	public event PropertyChangedEventHandler? FilterPropertyChanged;
 	
 	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
 	
-	[ObservableProperty]
+	[Notify]
+	private string filterStatisticsText = "";
+	
+	[Notify]
 	private bool filterByDate = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private DateTime? startDate = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private DateTime? endDate = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private bool filterByChannel = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private HashSet<ulong>? includedChannels = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private bool filterByUser = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private HashSet<ulong>? includedUsers = null;
 	
-	[ObservableProperty]
+	[Notify]
 	private string channelFilterLabel = "";
 	
-	[ObservableProperty]
+	[Notify]
 	private string userFilterLabel = "";
 	
 	private readonly Window window;
@@ -160,7 +161,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 	}
 	
 	private void UpdateFilterStatistics() {
-		var filter = CreateFilter();
+		MessageFilter filter = CreateFilter();
 		if (filter.IsEmpty) {
 			exportedMessageCountTask.Cancel();
 			exportedMessageCount = totalMessageCount;
@@ -179,26 +180,24 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 	}
 	
 	private void UpdateFilterStatisticsText() {
-		var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
-		var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
-
+		string exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
+		string totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
 		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
-		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 	
 	public async Task OpenChannelFilterDialog() {
 		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
 			var items = new List<CheckBoxItem<ulong>>();
-			var servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
+			Dictionary<ulong, DHT.Server.Data.Server> servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
 			
-			await foreach (var channel in state.Db.Channels.Get()) {
-				var channelId = channel.Id;
-				var channelName = channel.Name;
+			await foreach (Channel channel in state.Db.Channels.Get()) {
+				ulong channelId = channel.Id;
+				string channelName = channel.Name;
 				
 				string title;
 				if (servers.TryGetValue(channel.Server, out var server)) {
 					var titleBuilder = new StringBuilder();
-					var serverType = server.Type;
+					ServerType? serverType = server.Type;
 					
 					titleBuilder.Append('[')
 					            .Append(ServerTypes.ToString(serverType))
@@ -221,7 +220,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 				
 				items.Add(new CheckBoxItem<ulong>(channelId) {
 					Title = title,
-					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId)
+					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId),
 				});
 			}
 			
@@ -238,7 +237,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 			return;
 		}
 		
-		var result = await OpenIdFilterDialog(Title, items);
+		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
 		if (result != null) {
 			IncludedChannels = result;
 		}
@@ -248,13 +247,10 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
 			var checkBoxItems = new List<CheckBoxItem<ulong>>();
 			
-			await foreach (var user in state.Db.Users.Get()) {
-				var name = user.Name;
-				var discriminator = user.Discriminator;
-
+			await foreach (User user in state.Db.Users.Get()) {
 				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
-					Title = discriminator == null ? name : name + " #" + discriminator,
-					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
+					Title = user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})",
+					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id),
 				});
 			}
 			
@@ -271,7 +267,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 			return;
 		}
 		
-		var result = await OpenIdFilterDialog(Title, items);
+		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
 		if (result != null) {
 			IncludedUsers = result;
 		}
@@ -281,7 +277,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
 		
 		var model = new CheckBoxDialogModel<ulong>(items) {
-			Title = title
+			Title = title,
 		};
 		
 		var dialog = new CheckBoxDialog { DataContext = model };

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

@@ -16,18 +16,21 @@
             <Setter Property="FontFamily" Value="Consolas,Courier" />
             <Setter Property="FontSize" Value="15" />
         </Style>
+        <Style Selector="Label">
+            <Setter Property="Margin" Value="0 5" />
+            <Setter Property="Padding" Value="0" />
+        </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Orientation" Value="Vertical" />
-            <Setter Property="Margin" Value="0 0 10 10" />
         </Style>
     </UserControl.Styles>
 
-    <StackPanel>
+    <StackPanel Spacing="10">
         <Button Command="{Binding OnClickToggleServerButton}" Content="{Binding ToggleServerButtonText}" IsEnabled="{Binding IsToggleServerButtonEnabled}" />
-        <TextBlock TextWrapping="Wrap" Margin="0 15">
-            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script again.
+        <TextBlock TextWrapping="Wrap" Margin="0 5">
+            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script or connection code again.
         </TextBlock>
-        <WrapPanel>
+        <WrapPanel ItemSpacing="10" LineSpacing="10">
             <StackPanel>
                 <Label Target="Port">Port</Label>
                 <TextBox x:Name="Port" Width="70" Text="{Binding InputPort}" />

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -1,30 +1,30 @@
 using System;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Service;
 using DHT.Utils.Logging;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
+sealed partial class ServerConfigurationPanelModel : IDisposable {
 	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
 	
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
+	[Notify]
 	private string inputPort;
 	
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
+	[Notify]
 	private string inputToken;
 	
+	[DependsOn(nameof(InputPort), nameof(InputToken))]
 	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private bool isToggleServerButtonEnabled = true;
 	
 	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
@@ -53,7 +53,7 @@ sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposab
 	}
 	
 	private void UpdateServerStatus() {
-		OnPropertyChanged(nameof(ToggleServerButtonText));
+		OnPropertyChanged(new PropertyChangedEventArgs(nameof(ToggleServerButtonText)));
 	}
 	
 	private async Task StartServer() {
@@ -106,7 +106,7 @@ sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposab
 		ServerConfiguration.Port = port;
 		ServerConfiguration.Token = inputToken;
 		
-		OnPropertyChanged(nameof(HasMadeChanges));
+		OnPropertyChanged(new PropertyChangedEventArgs(nameof(HasMadeChanges)));
 		
 		await StartServer();
 	}

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -2,32 +2,32 @@ using System;
 using System.Reactive.Linq;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Server;
 using DHT.Server.Service;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class StatusBarModel : ObservableObject, IDisposable {
-	[ObservableProperty(Setter = Access.Private)]
+sealed partial class StatusBarModel : IDisposable {
+	[Notify(Setter.Private)]
 	private long? serverCount;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private long? channelCount;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private long? messageCount;
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
+	[Notify(Setter.Private)]
 	private ServerManager.Status serverStatus;
 	
-	public string ServerStatusText => serverStatus switch {
+	[DependsOn(nameof(ServerStatus))]
+	public string ServerStatusText => ServerStatus switch {
 		ServerManager.Status.Starting => "STARTING",
 		ServerManager.Status.Started  => "READY",
 		ServerManager.Status.Stopping => "STOPPING",
 		ServerManager.Status.Stopped  => "STOPPED",
-		_                             => ""
+		_                             => "",
 	};
 	
 	private readonly State state;
@@ -45,7 +45,7 @@ sealed partial class StatusBarModel : ObservableObject, IDisposable {
 		channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newChannelCount => ChannelCount = newChannelCount);
 		messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newMessageCount => MessageCount = newMessageCount);
 		
-		state.Server.StatusChanged += OnServerStatusChanged;
+		state.Server.StatusChanged += OnStateServerStatusChanged;
 		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
 	}
 	
@@ -54,10 +54,10 @@ sealed partial class StatusBarModel : ObservableObject, IDisposable {
 		channelCountSubscription.Dispose();
 		messageCountSubscription.Dispose();
 		
-		state.Server.StatusChanged -= OnServerStatusChanged;
+		state.Server.StatusChanged -= OnStateServerStatusChanged;
 	}
 	
-	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
+	private void OnStateServerStatusChanged(object? sender, ServerManager.Status e) {
 		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
 	}
 }

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml

@@ -0,0 +1,57 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:namespace="clr-namespace:DHT.Desktop.Main.Dialogs"
+        mc:Ignorable="d" d:DesignWidth="450"
+        x:Class="DHT.Desktop.Main.Dialogs.NewDatabaseSettingsDialog"
+        x:DataType="namespace:NewDatabaseSettingsDialogModel"
+        Title="New Database Settings"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Closing="OnClosing"
+        Width="450" SizeToContent="Height" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Window.DataContext>
+        <namespace:NewDatabaseSettingsDialogModel />
+    </Window.DataContext>
+
+    <Window.Styles>
+        <Style Selector="Label > StackPanel">
+            <Setter Property="Margin" Value="0 4 0 0" />
+            <Setter Property="Orientation" Value="Vertical" />
+            <Setter Property="Spacing" Value="5" />
+        </Style>
+        <Style Selector="TextBlock.dim">
+            <Setter Property="Foreground" Value="DimGray" />
+            <Setter Property="FontSize" Value="13" />
+        </Style>
+    </Window.Styles>
+
+    <StackPanel Orientation="Vertical" Margin="20">
+        <StackPanel Orientation="Vertical" Spacing="15">
+            <CheckBox IsChecked="{Binding SeparateFileForDownloads}">
+                <Label>
+                    <StackPanel>
+                        <TextBlock>Use a Separate Database File for Downloads</TextBlock>
+                        <TextBlock Classes="dim">Downloaded files will be stored separately from messages. This cannot be changed later.</TextBlock>
+                    </StackPanel>
+                </Label>
+            </CheckBox>
+            <CheckBox IsChecked="{Binding DownloadsAutoStart}">
+                <Label>
+                    <StackPanel>
+                        <TextBlock>Download Files Automatically</TextBlock>
+                        <TextBlock Classes="dim">Enables automatic downloads of files hosted on Discord. This can be changed later in the Downloads tab.</TextBlock>
+                    </StackPanel>
+                </Label>
+            </CheckBox>
+        </StackPanel>
+        <Panel Classes="buttons">
+            <WrapPanel HorizontalAlignment="Right">
+                <Button Click="ClickOk">OK</Button>
+            </WrapPanel>
+        </Panel>
+    </StackPanel>
+
+</Window>

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml.cs

@@ -0,0 +1,22 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace DHT.Desktop.Main.Dialogs;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class NewDatabaseSettingsDialog : Window {
+	public NewDatabaseSettingsDialog() {
+		InitializeComponent();
+	}
+	
+	private void OnClosing(object? sender, WindowClosingEventArgs e) {
+		if (!e.IsProgrammatic) {
+			e.Cancel = true;
+		}
+	}
+	
+	private void ClickOk(object? sender, RoutedEventArgs e) {
+		Close();
+	}
+}

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialogModel.cs

@@ -0,0 +1,11 @@
+using PropertyChanged.SourceGenerator;
+
+namespace DHT.Desktop.Main.Dialogs;
+
+sealed partial class NewDatabaseSettingsDialogModel {
+	[Notify]
+	private bool separateFileForDownloads = true;
+	
+	[Notify]
+	private bool downloadsAutoStart = true;
+}

app/Desktop/Main/MainWindow.axaml.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Desktop.Main.Pages;
 using DHT.Utils.Logging;
 using JetBrains.Annotations;
 
@@ -43,13 +41,5 @@ public sealed partial class MainWindow : Window {
 				Log.Error("Caught exception while disposing window: " + ex);
 			}
 		}
-
-		foreach (var temporaryFile in ViewerPageModel.TemporaryFiles) {
-			try {
-				File.Delete(temporaryFile);
-			} catch (Exception) {
-				// ignored
-			}
-		}
 	}
 }

app/Desktop/Main/MainWindowModel.cs

@@ -3,25 +3,26 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Screens;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Database;
 using DHT.Utils.Logging;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main;
 
-sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
+sealed partial class MainWindowModel : IAsyncDisposable {
 	private const string DefaultTitle = "Discord History Tracker";
 	
 	private static readonly Log Log = Log.ForType<MainWindowModel>();
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private string title = DefaultTitle;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private UserControl currentScreen;
 	
 	private readonly WelcomeScreen welcomeScreen;
@@ -30,6 +31,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	private MainContentScreenModel? mainContentScreenModel;
 	
 	private readonly Window window;
+	private readonly int? concurrentDownloads;
 	
 	private State? state;
 	
@@ -45,7 +47,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
 		currentScreen = welcomeScreen;
 		
-		var dbFile = args.DatabaseFile;
+		string? dbFile = args.DatabaseFile;
 		if (!string.IsNullOrWhiteSpace(dbFile)) {
 			async void OnWindowOpened(object? o, EventArgs eventArgs) {
 				window.Opened -= OnWindowOpened;
@@ -73,6 +75,8 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		if (args.ServerToken != null) {
 			ServerConfiguration.Token = args.ServerToken;
 		}
+		
+		concurrentDownloads = args.ConcurrentDownloads;
 	}
 	
 	private async void OnDatabaseSelected(object? sender, IDatabaseFile db) {
@@ -80,7 +84,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		
 		await DisposeState();
 		
-		state = new State(db);
+		state = new State(db, concurrentDownloads);
 		
 		try {
 			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
@@ -92,6 +96,8 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		mainContentScreenModel = new MainContentScreenModel(window, state);
 		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
 		
+		await mainContentScreenModel.Initialize();
+		
 		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
 		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
 		
@@ -99,29 +105,33 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	}
 	
 	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-		if (mainContentScreenModel != null) {
-			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
-			mainContentScreenModel.Dispose();
-			mainContentScreenModel = null;
-		}
-
-		await DisposeState();
+		await DisposeContent();
 		
 		Title = DefaultTitle;
 		CurrentScreen = welcomeScreen;
 		
+		await DisposeState();
+		
 		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
 	}
 	
+	private async Task DisposeContent() {
+		if (mainContentScreenModel != null) {
+			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
+			await mainContentScreenModel.DisposeAsync();
+			mainContentScreenModel = null;
+		}
+	}
+	
 	private async Task DisposeState() {
 		if (state != null) {
-			await state.DisposeAsync();
+			await DelayedProgressDialog.Await(() => state.DisposeAsync().AsTask(), TimeSpan.FromMilliseconds(200), window, "Close Database", "Please wait for the database to close...");
 			state = null;
 		}
 	}
 	
 	public async ValueTask DisposeAsync() {
-		mainContentScreenModel?.Dispose();
+		await DisposeContent();
 		await DisposeState();
 	}
 }

app/Desktop/Main/Pages/AdvancedPage.axaml

@@ -16,11 +16,5 @@
         <Expander Header="Internal Server Configuration" IsExpanded="True">
             <controls:ServerConfigurationPanel DataContext="{Binding ServerConfigurationModel}" />
         </Expander>
-        <Expander Header="Database Tools" IsExpanded="True">
-            <StackPanel Orientation="Vertical" Spacing="10">
-                <TextBlock TextWrapping="Wrap">Recreates the database to remove any traces of deleted data, which frees up space and prevents forensic recovery.</TextBlock>
-                <Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>
-            </StackPanel>
-        </Expander>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/AdvancedPageModel.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Server;
 
@@ -11,26 +8,14 @@ namespace DHT.Desktop.Main.Pages;
 sealed class AdvancedPageModel : IDisposable {
 	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
 	
-	private readonly Window window;
-	private readonly State state;
-
 	[Obsolete("Designer")]
 	public AdvancedPageModel() : this(null!, State.Dummy) {}
 	
 	public AdvancedPageModel(Window window, State state) {
-		this.window = window;
-		this.state = state;
-
 		ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
 	}
 	
 	public void Dispose() {
 		ServerConfigurationModel.Dispose();
 	}
-
-	public async Task VacuumDatabase() {
-		const string Title = "Vacuum Database";
-		await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => state.Db.Vacuum());
-		await Dialog.ShowOk(window, Title, "Done.");
-	}
 }

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -11,22 +11,22 @@
         <pages:DatabasePageModel />
     </Design.DataContext>
 
-    <UserControl.Styles>
-        <Style Selector="WrapPanel > Button">
-            <Setter Property="Margin" Value="0 0 10 10" />
-        </Style>
-    </UserControl.Styles>
-
     <StackPanel Spacing="10">
         <DockPanel>
             <Button Command="{Binding CloseDatabase}" DockPanel.Dock="Right">Close Database</Button>
             <TextBox Text="{Binding Db.Path}" Width="NaN" Margin="0 0 10 0" IsReadOnly="True" />
         </DockPanel>
-        <WrapPanel>
+        <WrapPanel ItemSpacing="10" LineSpacing="10">
             <Button Command="{Binding OpenDatabaseFolder}">Open Database Folder</Button>
             <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
             <Button Command="{Binding ImportLegacyArchive}">Import Legacy Archive(s)...</Button>
         </WrapPanel>
+        <Expander Header="Advanced Tools" Margin="0 25 0 0">
+            <StackPanel Orientation="Vertical" Spacing="10">
+                <TextBlock TextWrapping="Wrap">Recreate the database to free up space after deleting data.</TextBlock>
+                <Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>
+            </StackPanel>
+        </Expander>
     </StackPanel>
 
 </UserControl>

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -19,6 +19,7 @@ using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Server.Database.Import;
 using DHT.Server.Database.Sqlite.Schema;
+using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Main.Pages;
@@ -54,11 +55,11 @@ sealed class DatabasePageModel {
 				break;
 			
 			case PlatformID.Unix:
-				Process.Start("xdg-open", new string[] { folder });
+				Process.Start("xdg-open", [ folder ]);
 				break;
 			
 			case PlatformID.MacOSX:
-				Process.Start("open", new string[] { folder });
+				Process.Start("open", [ folder ]);
 				break;
 			
 			default:
@@ -72,16 +73,29 @@ sealed class DatabasePageModel {
 	}
 	
 	public async Task MergeWithDatabase() {
-		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
-		if (paths.Length > 0) {
-			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
+		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		if (paths.Length == 0) {
+			return;
 		}
+		
+		const string Title = "Database Merge";
+		
+		ImportResult? result;
+		try {
+			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
+			return;
+		}
+		
+		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "database file"));
 	}
 	
-	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+	private static async Task<ImportResult?> MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
 		
-		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
+		return await PerformImport(target, paths, dialog, callback, "Database Merge", async path => {
 			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
 			
 			if (db == null) {
@@ -97,14 +111,11 @@ sealed class DatabasePageModel {
 		});
 	}
 	
-	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
-		private readonly ProgressDialog dialog;
-		private readonly int total;
+	private sealed class SchemaUpgradeCallbacks(ProgressDialog dialog, int total) : ISchemaUpgradeCallbacks {
 		private bool? decision;
 		
-		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
-			this.total = total;
-			this.dialog = dialog;
+		public Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+			return Task.FromResult<InitialDatabaseSettings?>(null);
 		}
 		
 		public async Task<bool> CanUpgrade() {
@@ -133,21 +144,34 @@ sealed class DatabasePageModel {
 	}
 	
 	public async Task ImportLegacyArchive() {
-		var paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+		string[] paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Legacy DHT Archive",
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
-			AllowMultiple = true
+			AllowMultiple = true,
 		});
 		
-		if (paths.Length > 0) {
-			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
+		if (paths.Length == 0) {
+			return;
 		}
+		
+		const string Title = "Legacy Archive Import";
+		
+		ImportResult? result;
+		try {
+			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
+			return;
+		}
+		
+		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "archive file"));
 	}
 	
-	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+	private static async Task<ImportResult?> ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var fakeSnowflake = new FakeSnowflake();
 		
-		await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
+		return await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", async path => {
 			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
 			
 			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
@@ -167,16 +191,16 @@ sealed class DatabasePageModel {
 		
 		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
 		
-		foreach (var server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
+		foreach (DHT.Server.Data.Server server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
 			items.Add(new TextBoxItem<DHT.Server.Data.Server>(server) {
 				Title = server.Name + " (" + ServerTypes.ToNiceString(server.Type) + ")",
-				ValidityCheck = IsValidSnowflake
+				ValidityCheck = IsValidSnowflake,
 			});
 		}
 		
 		var model = new TextBoxDialogModel<DHT.Server.Data.Server>(items) {
 			Title = "Imported Server IDs",
-			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID."
+			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID.",
 		};
 		
 		var dialog = new TextBoxDialog { DataContext = model };
@@ -191,9 +215,9 @@ sealed class DatabasePageModel {
 		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
 	}
 	
-	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
+	private static async Task<ImportResult?> PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string dialogTitle, Func<string, Task<bool>> performImport) {
 		int total = paths.Length;
-		var oldStatistics = await DatabaseStatistics.Take(target);
+		DatabaseStatistics oldStatistics = await DatabaseStatistics.Take(target);
 		
 		int successful = 0;
 		int finished = 0;
@@ -203,7 +227,7 @@ sealed class DatabasePageModel {
 			++finished;
 			
 			if (!File.Exists(path)) {
-				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
+				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
 				continue;
 			}
 			
@@ -213,19 +237,18 @@ sealed class DatabasePageModel {
 				}
 			} catch (Exception ex) {
 				Log.Error(ex);
-				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
+				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
 		}
 		
 		await callback.Update("Done", finished, total);
 		
 		if (successful == 0) {
-			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
-			return;
+			return null;
 		}
 		
-		var newStatistics = await DatabaseStatistics.Take(target);
-		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
+		DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
+		return new ImportResult(oldStatistics, newStatistics, successful, total);
 	}
 	
 	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
@@ -239,20 +262,29 @@ sealed class DatabasePageModel {
 		}
 	}
 	
-	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
+	private sealed record ImportResult(DatabaseStatistics OldStatistics, DatabaseStatistics NewStatistics, int SuccessfulItems, int TotalItems);
+	
+	private static string GetImportDialogMessage(ImportResult? result, string itemName) {
+		if (result == null) {
+			return "Nothing was imported.";
+		}
+		
+		var oldStatistics = result.OldStatistics;
+		var newStatistics = result.NewStatistics;
+		
 		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
 		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
 		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
 		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
 		
-		StringBuilder message = new StringBuilder();
+		var message = new StringBuilder();
 		message.Append("Processed ");
 		
-		if (successfulItems == totalItems) {
-			message.Append(successfulItems.Pluralize(itemName));
+		if (result.SuccessfulItems == result.TotalItems) {
+			message.Append(result.SuccessfulItems.Pluralize(itemName));
 		}
 		else {
-			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
+			message.Append(result.SuccessfulItems.Format()).Append(" out of ").Append(result.TotalItems.Pluralize(itemName));
 		}
 		
 		message.Append(" and added:\n\n  \u2022 ");
@@ -263,4 +295,18 @@ sealed class DatabasePageModel {
 		
 		return message.ToString();
 	}
+	
+	public async Task VacuumDatabase() {
+		const string Title = "Vacuum Database";
+		
+		try {
+			await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
+			return;
+		}
+		
+		await Dialog.ShowOk(window, Title, "Done.");
+	}
 }

app/Desktop/Main/Pages/DebugPage.axaml

@@ -16,24 +16,27 @@
             <Setter Property="FontFamily" Value="Consolas,Courier" />
             <Setter Property="FontSize" Value="15" />
         </Style>
+        <Style Selector="Label">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="Padding" Value="0" />
+        </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Orientation" Value="Vertical" />
-            <Setter Property="Margin" Value="0 0 10 10" />
         </Style>
     </UserControl.Styles>
 
     <StackPanel Orientation="Vertical" Spacing="10">
         <Expander Header="Generate Random Data" IsExpanded="True">
-            <WrapPanel>
-                <StackPanel>
+            <WrapPanel ItemSpacing="10" LineSpacing="10">
+                <StackPanel Spacing="8">
                     <Label Target="Channels">Channels</Label>
                     <TextBox x:Name="Channels" Width="100" Text="{Binding GenerateChannels}" />
                 </StackPanel>
-                <StackPanel>
+                <StackPanel Spacing="8">
                     <Label Target="Users">Users</Label>
                     <TextBox x:Name="Users" Width="100" Text="{Binding GenerateUsers}" />
                 </StackPanel>
-                <StackPanel>
+                <StackPanel Spacing="8">
                     <Label Target="Messages">Messages</Label>
                     <TextBox x:Name="Messages" Width="100" Text="{Binding GenerateMessages}" />
                 </StackPanel>

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -10,164 +10,165 @@ using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Service;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class DebugPageModel {
-		public string GenerateChannels { get; set; } = "0";
-		public string GenerateUsers { get; set; } = "0";
-		public string GenerateMessages { get; set; } = "0";
+namespace DHT.Desktop.Main.Pages;
 
-		private readonly Window window;
-		private readonly State state;
+sealed class DebugPageModel {
+	public string GenerateChannels { get; set; } = "0";
+	public string GenerateUsers { get; set; } = "0";
+	public string GenerateMessages { get; set; } = "0";
 	
-		[Obsolete("Designer")]
-		public DebugPageModel() : this(null!, State.Dummy) {}
+	private readonly Window window;
+	private readonly State state;
 	
-		public DebugPageModel(Window window, State state) {
-			this.window = window;
-			this.state = state;
+	[Obsolete("Designer")]
+	public DebugPageModel() : this(null!, State.Dummy) {}
+	
+	public DebugPageModel(Window window, State state) {
+		this.window = window;
+		this.state = state;
+	}
+	
+	public async void OnClickAddRandomDataToDatabase() {
+		if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
+			await Dialog.ShowOk(window, "Generate Random Data", "Amount of channels must be at least 1!");
+			return;
 		}
 		
-		public async void OnClickAddRandomDataToDatabase() {
-			if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
-				await Dialog.ShowOk(window, "Generate Random Data", "Amount of channels must be at least 1!");
-				return;
-			}
-
-			if (!int.TryParse(GenerateUsers, out int users) || users < 1) {
-				await Dialog.ShowOk(window, "Generate Random Data", "Amount of users must be at least 1!");
-				return;
-			}
-
-			if (!int.TryParse(GenerateMessages, out int messages) || messages < 1) {
-				await Dialog.ShowOk(window, "Generate Random Data", "Amount of messages must be at least 1!");
-				return;
-			}
-
-			await ProgressDialog.Show(window, "Generating Random Data", async (_, callback) => await GenerateRandomData(channels, users, messages, callback));
+		if (!int.TryParse(GenerateUsers, out int users) || users < 1) {
+			await Dialog.ShowOk(window, "Generate Random Data", "Amount of users must be at least 1!");
+			return;
 		}
 		
-		private const int BatchSize = 500;
+		if (!int.TryParse(GenerateMessages, out int messages) || messages < 1) {
+			await Dialog.ShowOk(window, "Generate Random Data", "Amount of messages must be at least 1!");
+			return;
+		}
 		
-		private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
-			int batchCount = (messageCount + BatchSize - 1) / BatchSize;
-			await callback.Update("Adding messages in batches of " + BatchSize, 0, batchCount);
+		await ProgressDialog.Show(window, "Generating Random Data", async (_, callback) => await GenerateRandomData(channels, users, messages, callback));
+	}
 	
-			var rand = new Random();
-			var server = new DHT.Server.Data.Server {
-				Id = RandomId(rand),
-				Name = RandomName("s"),
-				Type = ServerType.Server,
-			};
+	private const int BatchSize = 500;
 	
-			var channels = Enumerable.Range(0, channelCount).Select(i => new Channel {
-				Id = RandomId(rand),
-				Server = server.Id,
-				Name = RandomName("c"),
-				ParentId = null,
-				Position = i,
-				Topic = RandomText(rand, 10),
-				Nsfw = rand.Next(4) == 0,
+	private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
+		int batchCount = (messageCount + BatchSize - 1) / BatchSize;
+		await callback.Update("Adding messages in batches of " + BatchSize, finishedItems: 0, totalItems: batchCount);
+		
+		var rand = new Random();
+		var server = new DHT.Server.Data.Server {
+			Id = RandomId(rand),
+			Name = RandomName("s"),
+			Type = ServerType.Server,
+		};
+		
+		Channel[] channels = Enumerable.Range(start: 0, channelCount).Select(i => new Channel {
+			Id = RandomId(rand),
+			Server = server.Id,
+			Name = RandomName("c"),
+			ParentId = null,
+			Position = i,
+			Topic = RandomText(rand, maxWords: 10),
+			Nsfw = rand.Next(4) == 0,
+		}).ToArray();
+		
+		User[] users = Enumerable.Range(start: 0, userCount).Select(_ => new User {
+			Id = RandomId(rand),
+			Name = RandomName("u"),
+			DisplayName = RandomName("u"),
+			AvatarHash = null,
+			Discriminator = rand.Next(minValue: 0, maxValue: 9999).ToString(),
+		}).ToArray();
+		
+		await state.Db.Users.Add(users);
+		await state.Db.Servers.Add([server]);
+		await state.Db.Channels.Add(channels);
+		
+		DateTimeOffset now = DateTimeOffset.Now;
+		int batchIndex = 0;
+		
+		while (messageCount > 0) {
+			int hourOffset = batchIndex;
+			
+			Message[] messages = Enumerable.Range(start: 0, Math.Min(messageCount, BatchSize)).Select(i => {
+				DateTimeOffset time = now.AddHours(hourOffset).AddMinutes(i * 60.0 / BatchSize);
+				DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(minValue: 1, maxValue: 60)) : null;
+				
+				long timeMillis = time.ToUnixTimeMilliseconds();
+				long? editMillis = edit?.ToUnixTimeMilliseconds();
+				
+				return new Message {
+					Id = (ulong) timeMillis,
+					Sender = RandomBiasedIndex(rand, users).Id,
+					Channel = RandomBiasedIndex(rand, channels).Id,
+					Text = RandomText(rand, maxWords: 100),
+					Timestamp = timeMillis,
+					EditTimestamp = editMillis,
+					RepliedToId = null,
+					Attachments = ImmutableList<Attachment>.Empty,
+					Embeds = ImmutableList<Embed>.Empty,
+					Reactions = ImmutableList<Reaction>.Empty,
+				};
 			}).ToArray();
 			
-			var users = Enumerable.Range(0, userCount).Select(_ => new User {
-				Id = RandomId(rand),
-				Name = RandomName("u"),
-				AvatarUrl = null,
-				Discriminator = rand.Next(0, 9999).ToString(),
-			}).ToArray();
+			await state.Db.Messages.Add(messages);
 			
-			await state.Db.Users.Add(users);
-			await state.Db.Servers.Add([server]);
-			await state.Db.Channels.Add(channels);
-
-			var now = DateTimeOffset.Now;
-			int batchIndex = 0;
-
-			while (messageCount > 0) {
-				int hourOffset = batchIndex;
-
-				var messages = Enumerable.Range(0, Math.Min(messageCount, BatchSize)).Select(i => {
-					DateTimeOffset time = now.AddHours(hourOffset).AddMinutes(i * 60.0 / BatchSize);
-					DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(1, 60)) : null;
-
-					var timeMillis = time.ToUnixTimeMilliseconds();
-					var editMillis = edit?.ToUnixTimeMilliseconds();
-
-					return new Message {
-						Id = (ulong) timeMillis,
-						Sender = RandomBiasedIndex(rand, users).Id,
-						Channel = RandomBiasedIndex(rand, channels).Id,
-						Text = RandomText(rand, 100),
-						Timestamp = timeMillis,
-						EditTimestamp = editMillis,
-						RepliedToId = null,
-						Attachments = ImmutableList<Attachment>.Empty,
-						Embeds = ImmutableList<Embed>.Empty,
-						Reactions = ImmutableList<Reaction>.Empty,
-					};
-				}).ToArray();
-
-				await state.Db.Messages.Add(messages);
-
-				messageCount -= BatchSize;
-				await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
-			}
+			messageCount -= BatchSize;
+			await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
 		}
+	}
 	
-		private static ulong RandomId(Random rand) {
-			ulong h = unchecked((ulong) rand.Next());
-			ulong l = unchecked((ulong) rand.Next());
-			return (h << 32) | l;
-		}
+	private static ulong RandomId(Random rand) {
+		ulong h = unchecked((ulong) rand.Next());
+		ulong l = unchecked((ulong) rand.Next());
+		return (h << 32) | l;
+	}
 	
-		private static string RandomName(string prefix) {
-			return prefix + "-" + ServerUtils.GenerateRandomToken(5);
-		}
+	private static string RandomName(string prefix) {
+		return prefix + "-" + ServerUtils.GenerateRandomToken(5);
+	}
 	
-		private static T RandomBiasedIndex<T>(Random rand, T[] options) {
-			return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
-		}
+	private static T RandomBiasedIndex<T>(Random rand, T[] options) {
+		return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
+	}
 	
-		private static readonly string[] RandomWords = [
-			"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
-			"banana", "bean", "beechnut", "beet", "blackberry", "blackcurrant", "blueberry", "boysenberry", "bramble", "broccoli",
-			"cabbage", "cacao", "cantaloupe", "caper", "carambola", "carrot", "cauliflower", "celery", "chard", "cherry", "chokeberry", "citron", "clementine", "coconut", "corn", "crabapple", "cranberry", "cucumber", "currant",
-			"daikon", "date", "dewberry", "durian",
-			"edamame", "eggplant", "elderberry", "endive",
-			"fig",
-			"garlic", "ginger", "gooseberry", "grape", "grapefruit", "guava",
-			"honeysuckle", "horseradish", "huckleberry",
-			"jackfruit", "jicama",
-			"kale", "kiwi", "kohlrabi", "kumquat",
-			"leek", "lemon", "lentil", "lettuce", "lime",
-			"mandarin", "mango", "mushroom", "myrtle",
-			"nectarine", "nut",
-			"olive", "okra", "onion", "orange",
-			"papaya", "parsnip", "pawpaw", "peach", "pear", "pea", "pepper", "persimmon", "pineapple", "plum", "plantain", "pomegranate", "pomelo", "potato", "prune", "pumpkin",
-			"quandong", "quinoa",
-			"radicchio", "radish", "raisin", "raspberry", "redcurrant", "rhubarb", "rutabaga",
-			"spinach", "strawberry", "squash",
-			"tamarind", "tangerine", "tomatillo", "tomato", "turnip",
-			"vanilla",
-			"watercress", "watermelon",
-			"yam",
-			"zucchini"
-		];
+	private static readonly string[] RandomWords = [
+		"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
+		"banana", "bean", "beechnut", "beet", "blackberry", "blackcurrant", "blueberry", "boysenberry", "bramble", "broccoli",
+		"cabbage", "cacao", "cantaloupe", "caper", "carambola", "carrot", "cauliflower", "celery", "chard", "cherry", "chokeberry", "citron", "clementine", "coconut", "corn", "crabapple", "cranberry", "cucumber", "currant",
+		"daikon", "date", "dewberry", "durian",
+		"edamame", "eggplant", "elderberry", "endive",
+		"fig",
+		"garlic", "ginger", "gooseberry", "grape", "grapefruit", "guava",
+		"honeysuckle", "horseradish", "huckleberry",
+		"jackfruit", "jicama",
+		"kale", "kiwi", "kohlrabi", "kumquat",
+		"leek", "lemon", "lentil", "lettuce", "lime",
+		"mandarin", "mango", "mushroom", "myrtle",
+		"nectarine", "nut",
+		"olive", "okra", "onion", "orange",
+		"papaya", "parsnip", "pawpaw", "peach", "pear", "pea", "pepper", "persimmon", "pineapple", "plum", "plantain", "pomegranate", "pomelo", "potato", "prune", "pumpkin",
+		"quandong", "quinoa",
+		"radicchio", "radish", "raisin", "raspberry", "redcurrant", "rhubarb", "rutabaga",
+		"spinach", "strawberry", "squash",
+		"tamarind", "tangerine", "tomatillo", "tomato", "turnip",
+		"vanilla",
+		"watercress", "watermelon",
+		"yam",
+		"zucchini",
+	];
 	
-		private static string RandomText(Random rand, int maxWords) {
-			int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), 3));
-			return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
-		}
+	private static string RandomText(Random rand, int maxWords) {
+		int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), y: 3));
+		return string.Join(separator: ' ', Enumerable.Range(start: 0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
 	}
 }
 #else
-namespace DHT.Desktop.Main.Pages {
-	sealed class DebugPageModel {
-		public string GenerateChannels { get; set; } = "0";
-		public string GenerateUsers { get; set; } = "0";
-		public string GenerateMessages { get; set; } = "0";
+namespace DHT.Desktop.Main.Pages;
 
-		public void OnClickAddRandomDataToDatabase() {}
-	}
+sealed class DebugPageModel {
+	public string GenerateChannels { get; set; } = "0";
+	public string GenerateUsers { get; set; } = "0";
+	public string GenerateMessages { get; set; } = "0";
+
+	public void OnClickAddRandomDataToDatabase() {}
 }
 #endif

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -13,9 +13,6 @@
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="Expander">
-            <Setter Property="Margin" Value="0 5 0 0" />
-        </Style>
         <Style Selector="DataGridColumnHeader">
             <Setter Property="FontWeight" Value="Medium" />
         </Style>
@@ -31,21 +28,24 @@
     </UserControl.Styles>
 
     <StackPanel Orientation="Vertical" Spacing="20">
-        <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
+        <WrapPanel Orientation="Horizontal" ItemSpacing="10" LineSpacing="10">
+            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
+            <Button Command="{Binding OnClickRetryFailed}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed</Button>
+            <Button Command="{Binding OnClickDeleteOrphaned}">Delete Orphaned</Button>
+            <Button Command="{Binding OnClickExportAll}" IsEnabled="{Binding HasSuccessfulDownloads}">Export All...</Button>
+        </WrapPanel>
         <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
-        <StackPanel Orientation="Vertical" Spacing="12">
-            <Expander Header="Download Status" IsExpanded="True">
-                <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="State" Binding="{Binding State, Mode=OneWay}" Width="*" />
-                        <DataGridTextColumn Header="Files" Binding="{Binding Items, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
-                        <DataGridTextColumn Header="Size" Binding="{Binding SizeText, Mode=OneWay}" Width="*" CellStyleClasses="right" />
-                    </DataGrid.Columns>
-                </DataGrid>
-            </Expander>
-            <StackPanel Orientation="Horizontal" Spacing="10">
-                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
-            </StackPanel>
-        </StackPanel>
+        <TextBlock TextWrapping="Wrap">
+            Downloading state and filter settings are remembered per-database.
+        </TextBlock>
+        <Expander Header="Download Status" IsExpanded="True">
+            <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="State" Binding="{Binding State, Mode=OneWay}" Width="*" />
+                    <DataGridTextColumn Header="Files" Binding="{Binding Items, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
+                    <DataGridTextColumn Header="Size" Binding="{Binding SizeText, Mode=OneWay}" Width="*" CellStyleClasses="right" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Expander>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -1,39 +1,51 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using Avalonia.ReactiveUI;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Server;
+using DHT.Server.Data;
 using DHT.Server.Data.Aggregations;
 using DHT.Server.Data.Filters;
+using DHT.Server.Data.Settings;
 using DHT.Server.Download;
 using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
+sealed partial class DownloadsPageModel : IAsyncDisposable {
 	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private bool isToggleDownloadButtonEnabled = true;
 	
+	[DependsOn(nameof(IsDownloading))]
 	public string ToggleDownloadButtonText => IsDownloading ? "Stop Downloading" : "Start Downloading";
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
+	[Notify(Setter.Private)]
 	private bool isRetryingFailedDownloads = false;
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
+	[Notify(Setter.Private)]
+	private bool hasSuccessfulDownloads;
+	
+	[Notify(Setter.Private)]
 	private bool hasFailedDownloads;
 	
+	[DependsOn(nameof(IsRetryingFailedDownloads), nameof(HasFailedDownloads))]
 	public bool IsRetryFailedOnDownloadsButtonEnabled => !IsRetryingFailedDownloads && HasFailedDownloads;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private string downloadMessage = "";
 	
 	public DownloadItemFilterPanelModel FilterModel { get; }
@@ -47,6 +59,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 	
 	public bool IsDownloading => state.Downloader.IsDownloading;
 	
+	private readonly Window window;
 	private readonly State state;
 	private readonly ThrottledTask<DownloadStatusStatistics> downloadStatisticsTask;
 	private readonly IDisposable downloadItemCountSubscription;
@@ -54,9 +67,10 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 	private IDisposable? finishedItemsSubscription;
 	private DownloadItemFilter? currentDownloadFilter;
 	
-	public DownloadsPageModel() : this(State.Dummy) {}
+	public DownloadsPageModel() : this(null!, State.Dummy) {}
 	
-	public DownloadsPageModel(State state) {
+	public DownloadsPageModel(Window window, State state) {
+		this.window = window;
 		this.state = state;
 		
 		FilterModel = new DownloadItemFilterPanelModel(state);
@@ -65,7 +79,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 			statisticsPending,
 			statisticsDownloaded,
 			statisticsFailed,
-			statisticsSkipped
+			statisticsSkipped,
 		];
 		
 		downloadStatisticsTask = new ThrottledTask<DownloadStatusStatistics>(Log, UpdateStatistics, TaskScheduler.FromCurrentSynchronizationContext());
@@ -74,13 +88,21 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 		RecomputeDownloadStatistics();
 	}
 	
-	public void Dispose() {
+	public async Task Initialize() {
+		await FilterModel.Initialize();
+		
+		if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, defaultValue: false)) {
+			await StartDownload();
+		}
+	}
+	
+	public async ValueTask DisposeAsync() {
 		finishedItemsSubscription?.Dispose();
 		
 		downloadItemCountSubscription.Dispose();
 		downloadStatisticsTask.Dispose();
 		
-		FilterModel.Dispose();
+		await FilterModel.DisposeAsync();
 	}
 	
 	private void OnDownloadCountChanged(long newDownloadCount) {
@@ -91,33 +113,47 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 		IsToggleDownloadButtonEnabled = false;
 		
 		if (IsDownloading) {
-			await state.Downloader.Stop();
-			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
-
-			finishedItemsSubscription?.Dispose();
-			finishedItemsSubscription = null;
-			
-			currentDownloadFilter = null;
+			await StopDownload();
 		}
 		else {
-			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
-			
-			var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
-			finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
+			await StartDownload();
 		}
 		
+		await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
+		IsToggleDownloadButtonEnabled = true;
+	}
+	
+	private async Task StartDownload() {
+		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+		
+		IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
+		finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
+		
+		OnDownloadStateChanged();
+	}
+	
+	private async Task StopDownload() {
+		await state.Downloader.Stop();
+		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+		
+		finishedItemsSubscription?.Dispose();
+		finishedItemsSubscription = null;
+		
+		currentDownloadFilter = null;
+		OnDownloadStateChanged();
+	}
+	
+	private void OnDownloadStateChanged() {
 		RecomputeDownloadStatistics();
 		
-		OnPropertyChanged(nameof(ToggleDownloadButtonText));
-		OnPropertyChanged(nameof(IsDownloading));
-		IsToggleDownloadButtonEnabled = true;
+		OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsDownloading)));
 	}
 	
 	private void OnItemFinished(DownloadItem item) {
 		RecomputeDownloadStatistics();
 	}
 	
-	public async Task OnClickRetryFailedDownloads() {
+	public async Task OnClickRetryFailed() {
 		IsRetryingFailedDownloads = true;
 		
 		try {
@@ -134,6 +170,96 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 		downloadStatisticsTask.Post(cancellationToken => state.Db.Downloads.GetStatistics(currentDownloadFilter ?? new DownloadItemFilter(), cancellationToken));
 	}
 	
+	public async Task OnClickDeleteOrphaned() {
+		const string Title = "Delete Orphaned Downloads";
+		
+		try {
+			await ProgressDialog.Show(window, Title, async (_, callback) => {
+				await callback.UpdateIndeterminate("Searching for orphaned downloads...");
+				
+				HashSet<string> reachableNormalizedUrls = [];
+				HashSet<string> orphanedNormalizedUrls = [];
+				
+				await foreach (FileUrl fileUrl in state.Db.Downloads.FindReachableFiles()) {
+					reachableNormalizedUrls.Add(fileUrl.NormalizedUrl);
+				}
+				
+				await foreach (Download download in state.Db.Downloads.Get()) {
+					string normalizedUrl = download.NormalizedUrl;
+					if (!reachableNormalizedUrls.Contains(normalizedUrl)) {
+						orphanedNormalizedUrls.Add(normalizedUrl);
+					}
+				}
+				
+				if (orphanedNormalizedUrls.Count == 0) {
+					await Dialog.ShowOk(window, Title, "No orphaned downloads found.");
+					return;
+				}
+				
+				if (await Dialog.ShowYesNo(window, Title, orphanedNormalizedUrls.Count + " orphaned download(s) will be removed from this database. This action cannot be undone. Proceed?") != DialogResult.YesNo.Yes) {
+					return;
+				}
+				
+				await callback.UpdateIndeterminate("Deleting orphaned downloads...");
+				await state.Db.Downloads.Remove(orphanedNormalizedUrls);
+				RecomputeDownloadStatistics();
+				
+				if (await Dialog.ShowYesNo(window, Title, "Orphaned downloads deleted. Vacuum database now to reclaim space?") != DialogResult.YesNo.Yes) {
+					return;
+				}
+				
+				await callback.UpdateIndeterminate("Vacuuming database...");
+				await state.Db.Vacuum();
+			});
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, Title, "Could not delete orphaned downloads: " + e.Message);
+		}
+	}
+	
+	public async Task OnClickExportAll() {
+		const string Title = "Export Downloaded Files";
+		
+		string[] folders = await window.StorageProvider.OpenFolders(new FolderPickerOpenOptions {
+			Title = Title,
+			AllowMultiple = false,
+		});
+		
+		if (folders.Length != 1) {
+			return;
+		}
+		
+		string folderPath = folders[0];
+		
+		DownloadExporter exporter = new DownloadExporter(state.Db, folderPath);
+		DownloadExporter.Result result;
+		try {
+			result = await ProgressDialog.Show(window, Title, async (_, callback) => {
+				await callback.UpdateIndeterminate("Exporting downloaded files...");
+				return await exporter.Export(new ExportProgressReporter(callback));
+			});
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, Title, "Could not export downloaded files: " + e.Message);
+			return;
+		}
+		
+		string messageStart = "Exported " + result.SuccessfulCount.Pluralize("file");
+		
+		if (result.FailedCount > 0L) {
+			await Dialog.ShowOk(window, Title, messageStart + " (" + result.FailedCount.Format() + " failed).");
+		}
+		else {
+			await Dialog.ShowOk(window, Title, messageStart + ".");
+		}
+	}
+	
+	private sealed class ExportProgressReporter(IProgressCallback callback) : DownloadExporter.IProgressReporter {
+		public Task ReportProgress(long processedCount, long totalCount) {
+			return callback.Update("Exporting downloaded files...", processedCount, totalCount);
+		}
+	}
+	
 	private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
 		statisticsPending.Items = statusStatistics.PendingCount;
 		statisticsPending.Size = statusStatistics.PendingTotalSize;
@@ -151,24 +277,23 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 		statisticsSkipped.Size = statusStatistics.SkippedTotalSize;
 		statisticsSkipped.HasFilesWithUnknownSize = statusStatistics.SkippedWithUnknownSizeCount > 0;
 		
+		HasSuccessfulDownloads = statusStatistics.SuccessfulCount > 0;
 		HasFailedDownloads = statusStatistics.FailedCount > 0;
 	}
 	
-	[ObservableObject]
 	public sealed partial class StatisticsRow(string state) {
 		public string State { get; } = state;
 		
-		[ObservableProperty]
+		[Notify]
 		private int items;
 		
-		[ObservableProperty]
-		[NotifyPropertyChangedFor(nameof(SizeText))]
+		[Notify]
 		private ulong? size;
 		
-		[ObservableProperty]
-		[NotifyPropertyChangedFor(nameof(SizeText))]
+		[Notify]
 		private bool hasFilesWithUnknownSize;
 		
+		[DependsOn(nameof(Size), nameof(HasFilesWithUnknownSize))]
 		public string SizeText {
 			get {
 				if (size == null) {

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -11,17 +11,44 @@
         <pages:TrackingPageModel />
     </Design.DataContext>
 
-    <StackPanel Spacing="10">
-        <TextBlock TextWrapping="Wrap">
-            To start tracking messages, copy the tracking script and paste it into the console of either the Discord app, or your browser. The console is usually opened by pressing Ctrl+Shift+I.
-        </TextBlock>
-        <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="10">
-            <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick" IsEnabled="{Binding IsCopyTrackingScriptButtonEnabled}">Copy Tracking Script</Button>
-        </StackPanel>
-        <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
-            By default, the Discord app does not allow opening the console. The button below will change a hidden setting in the Discord app that controls whether the Ctrl+Shift+I shortcut is enabled.
-        </TextBlock>
-        <Button DockPanel.Dock="Right" Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
+    <UserControl.Styles>
+        <Style Selector="TextBlock">
+            <Setter Property="TextWrapping" Value="Wrap" />
+        </Style>
+    </UserControl.Styles>
+
+    <StackPanel Spacing="20">
+        <Expander Header="Method 1: Manual" IsExpanded="True">
+            <StackPanel Orientation="Vertical" Spacing="10">
+                <TextBlock>
+                    <TextBlock.Text>
+                        <MultiBinding StringFormat="Use {0} to open Dev Tools in your browser or the Discord app, copy the tracking script, and paste it into the console.">
+                            <Binding Path="OpenDevToolsShortcutText" />
+                        </MultiBinding>
+                    </TextBlock.Text>
+                </TextBlock>
+                <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick">Copy Tracking Script</Button>
+                <TextBlock Margin="0 5 0 0">
+                    By default, the Discord app blocks the Dev Tools shortcut. The button below changes a hidden setting to unblock the shortcut.
+                </TextBlock>
+                <Button Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
+            </StackPanel>
+        </Expander>
+        <Expander Header="Method 2: Userscript" IsExpanded="True">
+            <StackPanel Orientation="Vertical" Spacing="10">
+                <TextBlock>
+                    Requires a userscript manager in your browser. The userscript adds a DHT icon next to the Help icon on Discord.
+                    If the icon does not appear, update this app and reinstall the userscript.
+                </TextBlock>
+                <TextBlock>
+                    Copy the Connection Code, click the DHT icon, and paste the code into the prompt.
+                </TextBlock>
+                <WrapPanel ItemSpacing="10" LineSpacing="10">
+                    <Button Command="{Binding OnClickInstallOrUpdateUserscript}">Install or Update Userscript</Button>
+                    <Button x:Name="CopyConnectionCode" Click="CopyConnectionScriptButton_OnClick">Copy Connection Code</Button>
+                </WrapPanel>
+            </StackPanel>
+        </Expander>
     </StackPanel>
 
 </UserControl>

app/Desktop/Main/Pages/TrackingPage.axaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -8,24 +9,36 @@ namespace DHT.Desktop.Main.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class TrackingPage : UserControl {
-	private bool isCopyingScript;
+	private readonly HashSet<Button> copyingButtons = new (ReferenceEqualityComparer.Instance);
 	
 	public TrackingPage() {
 		InitializeComponent();
 	}
 	
 	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+		await HandleCopyButton(CopyTrackingScript, "Script Copied!", static model => model.OnClickCopyTrackingScript());
+	}
+	
+	public async void CopyConnectionScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+		await HandleCopyButton(CopyConnectionCode, "Code Copied!", static model => model.OnClickCopyConnectionCode());
+	}
+	
+	private async Task HandleCopyButton(Button button, string copiedText, Func<TrackingPageModel, Task<bool>> onClick) {
 		if (DataContext is TrackingPageModel model) {
-			var originalText = CopyTrackingScript.Content;
-			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;
+			object? originalText = button.Content;
+			button.MinWidth = button.Bounds.Width;
 			
-			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
-				isCopyingScript = true;
-				CopyTrackingScript.Content = "Script Copied!";
+			if (await onClick(model) && copyingButtons.Add(button)) {
+				button.IsEnabled = false;
+				button.Content = copiedText;
 				
-				await Task.Delay(TimeSpan.FromSeconds(2));
-				CopyTrackingScript.Content = originalText;
-				isCopyingScript = false;
+				try {
+					await Task.Delay(TimeSpan.FromSeconds(2));
+				} finally {
+					copyingButtons.Remove(button);
+					button.IsEnabled = true;
+					button.Content = originalText;
+				}
 			}
 		}
 	}

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,28 +1,32 @@
 using System;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Input.Platform;
+using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
+using DHT.Utils.Logging;
+using PropertyChanged.SourceGenerator;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class TrackingPageModel : ObservableObject {
-	[ObservableProperty(Setter = Access.Private)]
-	private bool isCopyTrackingScriptButtonEnabled = true;
+sealed partial class TrackingPageModel {
+	private static readonly Log Log = Log.ForType<TrackingPageModel>();
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
+	[Notify(Setter.Private)]
 	private bool? areDevToolsEnabled = null;
 	
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
+	[Notify(Setter.Private)]
 	private bool isToggleAppDevToolsButtonEnabled = false;
 	
+	public string OpenDevToolsShortcutText { get; } = OperatingSystem.IsMacOS() ? "Cmd+Shift+I" : "Ctrl+Shift+I";
+	
+	[DependsOn(nameof(AreDevToolsEnabled), nameof(IsToggleAppDevToolsButtonEnabled))]
 	public string ToggleAppDevToolsButtonText {
 		get {
 			if (!AreDevToolsEnabled.HasValue) {
@@ -33,7 +37,7 @@ sealed partial class TrackingPageModel : ObservableObject {
 				return "Unavailable";
 			}
 			
-			return AreDevToolsEnabled.Value ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+			return (AreDevToolsEnabled.Value ? "Disable" : "Enable") + " " + OpenDevToolsShortcutText;
 		}
 	}
 	
@@ -49,32 +53,9 @@ sealed partial class TrackingPageModel : ObservableObject {
 	}
 	
 	public async Task<bool> OnClickCopyTrackingScript() {
-		IsCopyTrackingScriptButtonEnabled = false;
-
-		try {
-			return await CopyTrackingScript();
-		} finally {
-			IsCopyTrackingScriptButtonEnabled = true;
-		}
-	}
-
-	private async Task<bool> CopyTrackingScript() {
-		string url = $"http://127.0.0.1:{ServerConfiguration.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
+		string url = ServerConfiguration.HttpHost + $"/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
 		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
-
-		var clipboard = window.Clipboard;
-		if (clipboard == null) {
-			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
-			return false;
-		}
-
-		try {
-			await clipboard.SetTextAsync(script);
-			return true;
-		} catch {
-			await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
-			return false;
-		}
+		return await TryCopy(script, "Copy Tracking Script");
 	}
 	
 	private async Task InitializeDevToolsToggle() {
@@ -102,11 +83,11 @@ sealed partial class TrackingPageModel : ObservableObject {
 		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
 			case SettingsJsonResult.Success:
 				AreDevToolsEnabled = newState;
-				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
+				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
 				break;
 			
 			case SettingsJsonResult.AlreadySet:
-				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
+				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " is already " + (newState ? "enabled." : "disabled."));
 				AreDevToolsEnabled = newState;
 				break;
 			
@@ -130,4 +111,44 @@ sealed partial class TrackingPageModel : ObservableObject {
 				throw new ArgumentOutOfRangeException();
 		}
 	}
+	
+	public async Task OnClickInstallOrUpdateUserscript() {
+		try {
+			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/get-userscript/dht.user.js");
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, "Install or Update Userscript", "Could not open the browser: " + e.Message);
+		}
+	}
+	
+	[GeneratedRegex("^[a-zA-Z0-9]{1,100}$")]
+	private static partial Regex ConnectionCodeTokenRegex();
+	
+	public async Task<bool> OnClickCopyConnectionCode() {
+		const string Title = "Copy Connection Code";
+		
+		if (ConnectionCodeTokenRegex().IsMatch(ServerConfiguration.Token)) {
+			return await TryCopy(ServerConfiguration.Port + ":" + ServerConfiguration.Token, Title);
+		}
+		else {
+			await Dialog.ShowOk(window, Title, "The internal server token cannot be used to create a connection code.\n\nCheck the 'Advanced' tab and ensure the token is 1-100 characters long, and only contains plain letters and numbers.");
+			return false;
+		}
+	}
+	
+	private async Task<bool> TryCopy(string script, string errorDialogTitle) {
+		IClipboard? clipboard = window.Clipboard;
+		if (clipboard == null) {
+			await Dialog.ShowOk(window, errorDialogTitle, "Clipboard is not available on this system.");
+			return false;
+		}
+		
+		try {
+			await clipboard.SetTextAsync(script);
+			return true;
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
+			return false;
+		}
+	}
 }

app/Desktop/Main/Pages/ViewerPage.axaml

@@ -21,7 +21,6 @@
     <StackPanel Orientation="Vertical" Spacing="20">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
             <Button Command="{Binding OnClickOpenViewer}" Margin="0 0 5 0">Open Viewer</Button>
-            <Button Command="{Binding OnClickSaveViewer}" Margin="5 0 0 0">Save Viewer</Button>
         </StackPanel>
         <controls:MessageFilterPanel DataContext="{Binding FilterModel}" />
         <Expander Header="Database Tools">

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,38 +1,28 @@
 using System;
-using System.Collections.Concurrent;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-using Avalonia.Platform.Storage;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
-using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Data.Filters;
-using DHT.Server.Database.Export;
-using static DHT.Desktop.Program;
+using DHT.Server.Service.Viewer;
+using DHT.Utils.Logging;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class ViewerPageModel : ObservableObject, IDisposable {
-	public static readonly ConcurrentBag<string> TemporaryFiles = [];
-
-	private static readonly FilePickerFileType[] ViewerFileTypes = [
-		FileDialogs.CreateFilter("Discord History Viewer", ["html"])
-	];
+sealed partial class ViewerPageModel : IDisposable {
+	private static readonly Log Log = Log.ForType<ViewerPageModel>();
 	
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 	
-	[ObservableProperty]
+	[Notify]
 	private bool hasFilters = false;
 	
 	public MessageFilterPanelModel FilterModel { get; }
@@ -61,118 +51,51 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 	
 	public async void OnClickOpenViewer() {
 		try {
-			var fullPath = await PrepareTemporaryViewerFile();
-			
-			string jsConstants = $"""
-			                      window.DHT_SERVER_URL = "{HttpUtility.JavaScriptStringEncode("http://127.0.0.1:" + ServerConfiguration.Port)}";
-			                      window.DHT_SERVER_TOKEN = "{HttpUtility.JavaScriptStringEncode(ServerConfiguration.Token)}";
-			                      """;
-
-			await ProgressDialog.ShowIndeterminate(window, "Open Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(fullPath, jsConstants)));
-			
-			Process.Start(new ProcessStartInfo(fullPath) {
-				UseShellExecute = true
-			});
+			string serverToken = ServerConfiguration.Token;
+			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
+			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
 		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Open Viewer", "Could not create or save viewer: " + e.Message);
+			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
 		}
 	}
 	
-	private async Task<string> PrepareTemporaryViewerFile() {
-		return await Task.Run(() => {
-			string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
-			string filenameBase = Path.GetFileNameWithoutExtension(state.Db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
-			string fullPath = Path.Combine(rootPath, filenameBase + ".html");
-			
-			int counter = 0;
-
-			while (File.Exists(fullPath)) {
-				++counter;
-				fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
-			}
-
-			TemporaryFiles.Add(fullPath);
-
-			Directory.CreateDirectory(rootPath);
-
-			return fullPath;
-		});
-	}
-
-	public async void OnClickSaveViewer() {
-		string? path = await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
-			Title = "Save Viewer",
-			FileTypeChoices = ViewerFileTypes,
-			SuggestedFileName = Path.GetFileNameWithoutExtension(state.Db.Path) + ".html",
-			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(state.Db.Path)),
-		});
-
-		if (path == null) {
-			return;
-		}
-
-		try {
-			await ProgressDialog.ShowIndeterminate(window, "Save Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(path, string.Empty)));
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Save Viewer", "Could not create or save viewer: " + e.Message);
-		}
-	}
-
-	private async Task WriteViewerFile(string path, string jsConstants) {
-		const string ArchiveTag = "/*[ARCHIVE]*/";
-
-		string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
-		string viewerTemplate = indexFile.Replace("/*[CONSTANTS]*/", jsConstants)
-		                                 .Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
-		                                 .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
-
-		int viewerArchiveTagStart = viewerTemplate.IndexOf(ArchiveTag);
-		int viewerArchiveTagEnd = viewerArchiveTagStart + ArchiveTag.Length;
-
-		string jsonTempFile = path + ".tmp";
-
-		await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
-			await ViewerJsonExport.Generate(jsonStream, state.Db, FilterModel.CreateFilter());
-
-			char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
-			jsonStream.Position = 0;
-
-			await using (var outputStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
-			await using (var outputWriter = new StreamWriter(outputStream, Encoding.UTF8)) {
-				await outputWriter.WriteAsync(viewerTemplate[..viewerArchiveTagStart]);
-
-				using (var jsonReader = new StreamReader(jsonStream, Encoding.UTF8)) {
-					int readBytes;
-					while ((readBytes = await jsonReader.ReadAsync(jsonBuffer, 0, jsonBuffer.Length)) > 0) {
-						string jsonChunk = new string(jsonBuffer, 0, readBytes);
-						await outputWriter.WriteAsync(HttpUtility.JavaScriptStringEncode(jsonChunk));
-					}
-				}
-
-				await outputWriter.WriteAsync(viewerTemplate[viewerArchiveTagEnd..]);
-			}
-		}
-
-		File.Delete(jsonTempFile);
-	}
-
 	public async Task OnClickApplyFiltersToDatabase() {
-		var filter = FilterModel.CreateFilter();
-		var messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
+		try {
+			MessageFilter filter = FilterModel.CreateFilter();
+			long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
 			
-		if (DatabaseToolFilterModeKeep) {
-			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
-				await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
+			if (DatabaseToolFilterModeKeep) {
+				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
+					await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
+				}
 			}
-		}
-		else if (DatabaseToolFilterModeRemove) {
-			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
-				await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
+			else if (DatabaseToolFilterModeRemove) {
+				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
+					await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
+				}
 			}
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
 		}
 	}
 	
 	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {
-		await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Removing messages...", _ => state.Db.Messages.Remove(filter, removalMode));
+		await ProgressDialog.Show(window, "Apply Filters", async (_, callback) => {
+			await callback.UpdateIndeterminate("Removing messages...");
+			Log.Info("Removed messages: " + await state.Db.Messages.Remove(filter, removalMode));
+			
+			await callback.UpdateIndeterminate("Cleaning up attachments...");
+			Log.Info("Removed orphaned attachments: " + await state.Db.Messages.RemoveUnreachableAttachments());
+			
+			await callback.UpdateIndeterminate("Cleaning up users...");
+			Log.Info("Removed orphaned users: " + await state.Db.Users.RemoveUnreachable());
+			
+			await callback.UpdateIndeterminate("Cleaning up channels...");
+			Log.Info("Removed orphaned channels: " + await state.Db.Channels.RemoveUnreachable());
+			
+			await callback.UpdateIndeterminate("Cleaning up servers...");
+			Log.Info("Removed orphaned servers: " + await state.Db.Servers.RemoveUnreachable());
+		});
 	}
 }

app/Desktop/Main/Screens/MainContentScreen.axaml

@@ -40,13 +40,13 @@
         <Style Selector="TabItem:pointerover /template/ Border">
             <Setter Property="Background" Value="#455785" />
         </Style>
-        <Style Selector="TabItem:pointerover > TextBlock">
+        <Style Selector="TabItem:pointerover /template/ ContentPresenter">
             <Setter Property="Foreground" Value="#E9E9E9" />
         </Style>
         <Style Selector="TabItem:selected:pointerover /template/ Border">
             <Setter Property="Background" Value="#FFFFFF" />
         </Style>
-        <Style Selector="TabItem:selected:pointerover > TextBlock">
+        <Style Selector="TabItem:selected:pointerover /template/ ContentPresenter">
             <Setter Property="Foreground" Value="#1A2234" />
         </Style>
         <Style Selector="TabItem:selected">
@@ -56,9 +56,11 @@
         <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
             <Setter Property="IsVisible" Value="False" />
         </Style>
-        <Style Selector="TabItem:disabled > TextBlock">
+        <Style Selector="TabItem:disabled /template/ ContentPresenter">
             <Setter Property="Foreground" Value="#B2B2B2" />
-            <Setter Property="TextDecorations" Value="Strikethrough" />
+        </Style>
+        <Style Selector="TabItem:disabled /template/ ContentPresenter">
+            <Setter Property="AccessText.TextDecorations" Value="Strikethrough" />
         </Style>
         <Style Selector="TabItem.first">
             <Setter Property="Margin" Value="0 13 0 0" />

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Main.Pages;
@@ -6,7 +7,7 @@ using DHT.Server;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed class MainContentScreenModel : IDisposable {
+sealed class MainContentScreenModel : IAsyncDisposable {
 	public DatabasePage DatabasePage { get; }
 	private DatabasePageModel DatabasePageModel { get; }
 	
@@ -34,12 +35,8 @@ sealed class MainContentScreenModel : IDisposable {
 	public StatusBarModel StatusBarModel { get; }
 	
 	public event EventHandler? DatabaseClosed {
-		add {
-			DatabasePageModel.DatabaseClosed += value;
-		}
-		remove {
-			DatabasePageModel.DatabaseClosed -= value;
-		}
+		add => DatabasePageModel.DatabaseClosed += value;
+		remove => DatabasePageModel.DatabaseClosed -= value;
 	}
 	
 	[Obsolete("Designer")]
@@ -52,7 +49,7 @@ sealed class MainContentScreenModel : IDisposable {
 		TrackingPageModel = new TrackingPageModel(window);
 		TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
 		
-		DownloadsPageModel = new DownloadsPageModel(state);
+		DownloadsPageModel = new DownloadsPageModel(window, state);
 		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
 		
 		ViewerPageModel = new ViewerPageModel(window, state);
@@ -71,8 +68,12 @@ sealed class MainContentScreenModel : IDisposable {
 		StatusBarModel = new StatusBarModel(state);
 	}
 	
-	public void Dispose() {
-		DownloadsPageModel.Dispose();
+	public async Task Initialize() {
+		await DownloadsPageModel.Initialize();
+	}
+	
+	public async ValueTask DisposeAsync() {
+		await DownloadsPageModel.DisposeAsync();
 		ViewerPageModel.Dispose();
 		AdvancedPageModel.Dispose();
 		StatusBarModel.Dispose();

app/Desktop/Main/Screens/WelcomeScreen.axaml

@@ -22,20 +22,21 @@
             <Setter Property="HorizontalAlignment" Value="Center" />
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
-        <Style Selector="Button">
-            <Setter Property="Margin" Value="5 0" />
+        <Style Selector="Grid#ButtonPanel > Button">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
     </UserControl.Styles>
 
     <Panel Name="RootPanel">
-        <StackPanel Margin="42">
-            <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
+        <StackPanel Margin="42 30">
+            <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 25" HorizontalAlignment="Center" />
 
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
-                <Button Command="{Binding ShowAboutDialog}">About</Button>
-                <Button Command="{Binding Exit}">Exit</Button>
-            </StackPanel>
+            <Grid Name="ButtonPanel" RowDefinitions="Auto,12,Auto,12,Auto" ColumnDefinitions="*,12,*" Margin="12 0" HorizontalAlignment="Stretch">
+                <Button Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
+                <Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Command="{Binding CheckUpdates}">Check For Updates</Button>
+                <Button Grid.Row="4" Grid.Column="0" Command="{Binding ShowAboutDialog}">About</Button>
+                <Button Grid.Row="4" Grid.Column="2" Command="{Binding Exit}">Exit</Button>
+            </Grid>
         </StackPanel>
     </Panel>
 </UserControl>

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -1,21 +1,28 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
+using DHT.Desktop.Main.Dialogs;
 using DHT.Server.Database;
 using DHT.Server.Database.Sqlite.Schema;
+using DHT.Server.Database.Sqlite.Utils;
+using DHT.Utils.Logging;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed partial class WelcomeScreenModel : ObservableObject {
+sealed partial class WelcomeScreenModel {
+	private static readonly Log Log = Log.ForType<WelcomeScreenModel>();
+	
 	public string Version => Program.Version;
 	
-	[ObservableProperty(Setter = Access.Private)]
+	[Notify(Setter.Private)]
 	private bool isOpenOrCreateDatabaseButtonEnabled = true;
 	
 	public event EventHandler<IDatabaseFile>? DatabaseSelected;
@@ -34,7 +41,7 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 	public async Task OpenOrCreateDatabase() {
 		IsOpenOrCreateDatabaseButtonEnabled = false;
 		try {
-			var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
+			string? path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
 			if (path != null) {
 				await OpenOrCreateDatabaseFromPath(path);
 			}
@@ -46,17 +53,20 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 	public async Task OpenOrCreateDatabaseFromPath(string path) {
 		dbFilePath = path;
 		
-		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
+		IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
 		if (db != null) {
 			DatabaseSelected?.Invoke(this, db);
 		}
 	}
 	
-	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
-		private readonly Window window;
+	private sealed class SchemaUpgradeCallbacks(Window window) : ISchemaUpgradeCallbacks {
+		public async Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+			var model = new NewDatabaseSettingsDialogModel();
 			
-		public SchemaUpgradeCallbacks(Window window) {
-			this.window = window;
+			var dialog = new NewDatabaseSettingsDialog { DataContext = model };
+			await dialog.ShowDialog(window);
+			
+			return new InitialDatabaseSettings(model.SeparateFileForDownloads, model.DownloadsAutoStart);
 		}
 		
 		public async Task<bool> CanUpgrade() {
@@ -75,17 +85,9 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 			await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
 		}
 		
-		private sealed class ProgressReporter : ISchemaUpgradeCallbacks.IProgressReporter {
-			private readonly IReadOnlyList<IProgressCallback> callbacks;
-			
-			private readonly int versionSteps;
+		private sealed class ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) : ISchemaUpgradeCallbacks.IProgressReporter {
 			private int versionProgress = 0;
 			
-			public ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) {
-				this.callbacks = callbacks;
-				this.versionSteps = versionSteps;
-			}
-
 			public async Task NextVersion() {
 				await callbacks[0].Update("Upgrading schema version...", versionProgress++, versionSteps);
 				await HideChildren(0);
@@ -109,6 +111,47 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 		}
 	}
 	
+	public async Task CheckUpdates() {
+		string response;
+		try {
+			response = await ProgressDialog.ShowIndeterminate<string>(window, "Check Updates", "Checking for updates...", static async _ => {
+				var client = new HttpClient(new SocketsHttpHandler {
+					AutomaticDecompression = DecompressionMethods.None,
+					AllowAutoRedirect = false,
+					UseCookies = false,
+				});
+				
+				client.Timeout = TimeSpan.FromSeconds(30);
+				client.MaxResponseContentBufferSize = 1024;
+				client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
+				
+				return await client.GetStringAsync(Program.Website + "/version");
+			});
+		} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
+			await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
+			return;
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
+			return;
+		}
+		
+		if (!System.Version.TryParse(response, out Version? latestVersion)) {
+			await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
+			return;
+		}
+		
+		if (Program.AssemblyVersion >= latestVersion) {
+			await Dialog.ShowOk(window, "Check Updates", "You are using the latest version.");
+			return;
+		}
+		
+		if (await Dialog.ShowYesNo(window, "Check Updates", "A newer version is available: v" + Program.VersionToString(latestVersion) + "\nVisit the official website and close the app?") == DialogResult.YesNo.Yes) {
+			SystemUtils.OpenUrl(Program.Website);
+			Exit();
+		}
+	}
+	
 	public async Task ShowAboutDialog() {
 		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
 	}

app/Desktop/Program.cs

@@ -9,17 +9,18 @@ namespace DHT.Desktop;
 
 static class Program {
 	public static string Version { get; }
+	public static Version AssemblyVersion { get; }
 	public static CultureInfo Culture { get; }
 	public static ResourceLoader Resources { get; }
 	public static Arguments Arguments { get; }
 	
+	public const string Website = "https://dht.chylex.com";
+	
 	static Program() {
 		var assembly = Assembly.GetExecutingAssembly();
 		
-		Version = assembly.GetName().Version?.ToString() ?? "";
-		while (Version.EndsWith(".0")) {
-			Version = Version[..^2];
-		}
+		AssemblyVersion = assembly.GetName().Version ?? new Version(major: 0, minor: 0, build: 0, revision: 0);
+		Version = VersionToString(AssemblyVersion);
 		
 		Culture = CultureInfo.CurrentCulture;
 		CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
@@ -31,6 +32,16 @@ static class Program {
 		Arguments = new Arguments(Environment.GetCommandLineArgs());
 	}
 	
+	public static string VersionToString(Version version) {
+		string versionStr = version.ToString();
+		
+		while (versionStr.EndsWith(".0")) {
+			versionStr = versionStr[..^2];
+		}
+		
+		return versionStr;
+	}
+	
 	public static void Main(string[] args) {
 		if (Arguments.Console && OperatingSystem.IsWindows()) {
 			WindowsConsole.AllocConsole();

app/Desktop/Server/ServerConfiguration.cs

@@ -3,6 +3,8 @@ using DHT.Server.Service;
 namespace DHT.Desktop.Server;
 
 static class ServerConfiguration {
-	public static ushort Port { get; set; } = ServerUtils.FindAvailablePort(50000, 60000);
+	public static ushort Port { get; set; } = ServerUtils.FindAvailablePort(min: 50000, max: 60000);
 	public static string Token { get; set; } = ServerUtils.GenerateRandomToken(20);
+	
+	public static string HttpHost => "http://127.0.0.1:" + Port;
 }

app/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
   
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>12</LangVersion>
+    <TargetFramework>net9.0</TargetFramework>
+    <LangVersion>13</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
@@ -21,12 +21,13 @@
   <PropertyGroup>
     <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
     <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>partial</TrimMode>
+    <TrimMode>full</TrimMode>
     <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
     <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
     <EventSourceSupport>false</EventSourceSupport>
     <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
+    <XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
   </PropertyGroup>
   
   <PropertyGroup>
@@ -39,6 +40,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugSymbols>false</DebugSymbols>
     <DebugType>none</DebugType>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
   
   <PropertyGroup>

app/Resources/Schemas/track-users.yml

@@ -9,6 +9,8 @@ items:
           pattern: "^[0-9]+$"
         name:
           type: string
+        displayName:
+          type: string
         avatar:
           type: string
         discriminator:

app/Resources/Tracker/bootstrap.js

@@ -10,11 +10,16 @@
 		return;
 	}
 	
+	/*[IMPORTS]*/
+	
+	if (!DISCORD.isCompatible()) {
+		alert("Discord History Tracker is not compatible with this version of Discord.");
+		return;
+	}
+	
 	window.DHT_LOADED = true;
 	window.DHT_ON_UNLOAD = [];
 	
-	/*[IMPORTS]*/
-	
 	const port = 0; /*[PORT]*/
 	const token = "/*[TOKEN]*/";
 	STATE.setup(port, token);
@@ -46,7 +51,7 @@
 		return action === null || action === CONSTANTS.AUTOSCROLL_ACTION_NOTHING;
 	};
 	
-	const onTrackingContinued = function(anyNewMessages) {
+	const onTrackingContinued = function(anyNewMessages, hasMoreBefore) {
 		if (!STATE.isTracking()) {
 			return;
 		}
@@ -63,7 +68,7 @@
 		if (SETTINGS.autoscroll) {
 			let action = null;
 			
-			if (!DISCORD.hasMoreMessages()) {
+			if (!hasMoreBefore) {
 				console.debug("[DHT] Reached first message.");
 				action = SETTINGS.afterFirstMsg;
 			}
@@ -84,7 +89,7 @@
 	
 	let waitUntilSendingFinishedTimer = null;
 	
-	const onMessagesUpdated = async messages => {
+	const onMessagesUpdated = async (server, channel, messages, hasMoreBefore) => {
 		if (!STATE.isTracking() || delayedStopRequests > 0) {
 			return;
 		}
@@ -94,24 +99,16 @@
 			
 			waitUntilSendingFinishedTimer = window.setTimeout(() => {
 				waitUntilSendingFinishedTimer = null;
-				onMessagesUpdated(messages);
+				onMessagesUpdated(server, channel, messages, hasMoreBefore);
 			}, 100);
 			
 			return;
 		}
 		
-		const info = DISCORD.getSelectedChannel();
-		
-		if (!info) {
-			GUI.setStatus("Error (Unknown Channel)");
-			stopTrackingDelayed();
-			return;
-		}
-		
 		isSending = true;
 		
 		try {
-			await STATE.addDiscordChannel(info.server, info.channel);
+			await STATE.addDiscordChannel(server, channel);
 		} catch (e) {
 			onError(e);
 			return;
@@ -120,35 +117,33 @@
 		try {
 			if (!messages.length) {
 				isSending = false;
-				onTrackingContinued(false);
+				onTrackingContinued(false, hasMoreBefore);
 			}
 			else {
 				const anyNewMessages = await STATE.addDiscordMessages(messages);
-				onTrackingContinued(anyNewMessages);
+				onTrackingContinued(anyNewMessages, hasMoreBefore);
 			}
 		} catch (e) {
 			onError(e);
 		}
 	};
 	
-	DISCORD.setupMessageCallback(onMessagesUpdated);
+	const starter = DISCORD.setupMessageCallback(onMessagesUpdated);
 	
 	STATE.onTrackingStateChanged(enabled => {
 		if (enabled) {
-			const messages = DISCORD.getMessages();
-			
-			if (messages.length === 0) {
-				stopTrackingDelayed(() => alert("Cannot see any messages."));
-				return;
-			}
-			
 			GUI.setStatus("Starting");
+			GUI.createTrackingStyles();
 			hasJustStarted = true;
-			// noinspection JSIgnoredPromiseFromCall
-			onMessagesUpdated(messages);
+			
+			if (!starter()) {
+				stopTrackingDelayed(() => alert("Cannot see any messages."));
+				hasJustStarted = false;
+			}
 		}
 		else {
 			isSending = false;
+			GUI.deleteTrackingStyles();
 		}
 	});
 	

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

@@ -0,0 +1,273 @@
+// ==UserScript==
+// @name         Discord History Tracker
+// @license      MIT
+// @namespace    https://chylex.com
+// @homepageURL  https://dht.chylex.com/
+// @supportURL   https://github.com/chylex/Discord-History-Tracker/issues
+// @include      https://discord.com/*
+// @run-at       document-idle
+// @grant        none
+// @noframes
+// ==/UserScript==
+
+function startMutationObserver(callback) {
+	let hasDebounceStarted = false;
+	
+	function handleMutations(mutations, observer) {
+		if (hasDebounceStarted) {
+			return;
+		}
+		
+		hasDebounceStarted = true;
+		window.setTimeout(() => {
+			hasDebounceStarted = false;
+			callback(observer);
+		}, 20);
+	}
+	
+	new MutationObserver(handleMutations).observe(document.body, { childList: true, subtree: true });
+}
+
+startMutationObserver(observer => {
+	const triggerButton = installConnectDialogButton();
+	if (triggerButton === null) {
+		return;
+	}
+	
+	observer.disconnect();
+	
+	startMutationObserver(() => {
+		if (!triggerButton.isConnected) {
+			getHelpIcon()?.parentElement.parentElement.insertAdjacentElement("afterend", triggerButton);
+		}
+	});
+});
+
+function installConnectDialogButton() {
+	const helpIcon = getHelpIcon();
+	if (!helpIcon) {
+		return null;
+	}
+	
+	const helpIconWrapper = helpIcon.parentElement;
+	const helpIconLink = helpIconWrapper.parentElement;
+	
+	helpIconLink.insertAdjacentHTML("afterend", `
+<div id="dht-connector-show-dialog" role="button" class="${helpIconWrapper.getAttribute("class")}">
+  <svg viewBox="0 0 24 20" fill="currentColor" class="${helpIcon.getAttribute("class")}" style="width: auto;">
+    <path d="M7.446,9.924c-0,0.846 -0.105,1.593 -0.315,2.234c-0.21,0.644 -0.497,1.181 -0.86,1.615c-0.365,0.431 -0.795,0.761 -1.292,0.982c-0.494,0.22 -1.029,0.332 -1.605,0.332l-3.374,-0l0,-10.174l3.021,0c0.645,0 1.239,0.1 1.781,0.296c0.542,0.198 1.011,0.501 1.4,0.911c0.391,0.408 0.695,0.928 0.914,1.56c0.22,0.629 0.33,1.378 0.33,2.244Zm-1.765,-0c0,-0.592 -0.067,-1.1 -0.198,-1.524c-0.134,-0.422 -0.318,-0.77 -0.554,-1.042c-0.236,-0.272 -0.518,-0.473 -0.848,-0.604c-0.332,-0.128 -0.697,-0.195 -1.096,-0.195l-1.237,-0l0,6.882l1.483,0c0.351,0 0.676,-0.076 0.977,-0.224c0.298,-0.15 0.556,-0.372 0.776,-0.668c0.22,-0.295 0.389,-0.663 0.513,-1.101c0.122,-0.439 0.184,-0.947 0.184,-1.524Z"/>
+    <path d="M14.147,15.087l-0,-4.362l-3.637,-0l-0,4.362l-1.748,-0l-0,-10.174l1.748,0l-0,4.052l3.637,-0l-0,-4.052l1.75,0l0,10.174l-1.75,-0Z"/>
+    <path d="M21.297,6.559l-0,8.528l-1.748,-0l-0,-8.528l-2.699,-0l0,-1.646l7.15,0l0,1.646l-2.703,-0Z"/>
+  </svg>
+</div>
+`);
+	
+	const button = document.getElementById("dht-connector-show-dialog");
+	button.addEventListener("click", showConnectDialog);
+	return button;
+}
+
+function getHelpIcon() {
+	return document.querySelector("div[class*='bar_'] a[href$='://support.discord.com'] > div[class*='clickable'] > svg");
+}
+
+function showConnectDialog() {
+	if (window.DHT_LOADED) {
+		alert("Discord History Tracker is already loaded.");
+		return;
+	}
+	
+	const dialogElement = document.createElement("dialog");
+	dialogElement.id = "dht-connector-dialog";
+	dialogElement.innerHTML = `
+<form id="dht-connector-dialog-form">
+  <label for="dht-connector-dialog-input-code">Connection Code</label>
+  <input id="dht-connector-dialog-input-code" type="text">
+  <p id="dht-connector-dialog-input-error"></p>
+  
+  <div id="dht-connector-dialog-buttons">
+    <button type="submit" id="dht-connector-dialog-button-connect">Connect</button>
+    <button type="button" id="dht-connector-dialog-button-close">Cancel</button>
+  </div>
+</form>
+<style>
+  #dht-connector-dialog {
+    width: 300px;
+    padding: 18px;
+    font-size: 16px;
+    border: none;
+    border-radius: 8px;
+    background-color: #313338;
+  }
+  
+  #dht-connector-dialog::backdrop {
+    background-color: rgba(0, 0, 0, 0.6);
+  }
+  
+  #dht-connector-dialog label {
+    display: block;
+    margin: 0 0 9px;
+    font-weight: 500;
+    letter-spacing: .02em;
+    color: #fbfbfb;
+  }
+  
+  #dht-connector-dialog-input-error {
+    margin: 11px 1px;
+    color: #ff484c;
+    font-size: 15px;
+    font-weight: 500;
+  }
+  
+  #dht-connector-dialog input[type="text"] {
+    box-sizing: border-box;
+    width: 100%;
+    padding: 12px 10px;
+    border: 1px solid rgba(151, 151, 159, 0.2);
+    border-radius: 8px;
+    color: #efeff0;
+    background-color: #1d1d21;
+  }
+  
+  #dht-connector-dialog-buttons {
+    margin-top: 15px;
+    display: flex;
+    justify-content: end;
+    gap: 12px;
+  }
+  
+  #dht-connector-dialog button {
+    padding: 8px 16px;
+    border: none;
+    border-radius: 8px;
+    font-size: 14px;
+    font-weight: 500;
+    color: #fff;
+    background-color: #5865f2;
+    transition: background-color 200ms ease, color 200ms ease;
+  }
+  
+  #dht-connector-dialog button:hover {
+    background-color: #4752c4;
+  }
+  
+  #dht-connector-dialog button[disabled] {
+    cursor: not-allowed;
+    opacity: 0.5;
+  }
+</style>
+	`;
+	
+	document.body.insertAdjacentElement("beforeend", dialogElement);
+	
+	const formElement = document.getElementById("dht-connector-dialog-form");
+	const codeErrorElement = document.getElementById("dht-connector-dialog-input-error");
+	const codeInputElement = document.getElementById("dht-connector-dialog-input-code");
+	const connectButtonElement = document.getElementById("dht-connector-dialog-button-connect");
+	const closeButtonElement = document.getElementById("dht-connector-dialog-button-close");
+	
+	dialogElement.addEventListener("close", function() {
+		dialogElement.remove();
+	});
+	
+	closeButtonElement.addEventListener("click", function() {
+		dialogElement.close();
+	});
+	
+	codeInputElement.addEventListener("paste", function() {
+		setTimeout(async function() {
+			const code = parseConnectionCode(codeInputElement.value);
+			if (code !== null) {
+				await onSubmit(code);
+			}
+		}, 0);
+	});
+	
+	formElement.addEventListener("submit", async function(e) {
+		e.preventDefault();
+		
+		const code = parseConnectionCode(codeInputElement.value);
+		if (code === null) {
+			codeErrorElement.innerText = "Code is not valid.";
+		}
+		else {
+			await onSubmit(code);
+		}
+	});
+	
+	let isSubmitting = false;
+	
+	async function onSubmit(code) {
+		if (isSubmitting) {
+			return;
+		}
+		
+		isSubmitting = true;
+		connectButtonElement.setAttribute("disabled", "");
+		try {
+			await loadTrackingScript(code);
+		} catch (e) {
+			onError("Could not load tracking script.", e);
+		} finally {
+			isSubmitting = false;
+			connectButtonElement.removeAttribute("disabled");
+		}
+	}
+	
+	async function loadTrackingScript(code) {
+		const trackingScript = await getTrackingScript(code.port, code.token);
+		
+		if (dialogElement.isConnected) {
+			// noinspection DynamicallyGeneratedCodeJS
+			eval(trackingScript);
+			dialogElement.close();
+		}
+	}
+	
+	function onError(message, e) {
+		console.error(message, e);
+		codeErrorElement.innerText = message;
+	}
+	
+	dialogElement.showModal();
+}
+
+/**
+ * @param {string} code
+ * @return {?{port: number, token: string}}
+ */
+function parseConnectionCode(code) {
+	if (code.length > 5 + 1 + 100) {
+		return null;
+	}
+	
+	const match = code.match(/^(\d{1,5}):([a-zA-Z0-9]{1,100})$/);
+	if (!match) {
+		return null;
+	}
+	
+	const port = Number(match[1]);
+	if (port < 0 || port > 65535) {
+		return null;
+	}
+	
+	return { port, token: match[2] };
+}
+
+async function getTrackingScript(port, token) {
+	const url = "http://127.0.0.1:" + port + "/get-tracking-script?token=" + encodeURIComponent(token);
+	const response = await fetch(url, {
+		credentials: "omit",
+		signal: AbortSignal.timeout(2000),
+	});
+	
+	if (!response.ok) {
+		throw response.status + " " + response.statusText;
+	}
+	
+	if (response.headers.get("X-DHT") !== "1") {
+		throw "Invalid response";
+	}
+	
+	return await response.text();
+}

app/Resources/Tracker/scripts/discord.js

@@ -4,11 +4,26 @@ class DISCORD {
 	
 	// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 	static CHANNEL_TYPE = {
+		GUILD_TEXT: 0,
 		DM: 1,
 		GROUP_DM: 3,
+		GUILD_ANNOUNCEMENT: 5,
 		ANNOUNCEMENT_THREAD: 10,
 		PUBLIC_THREAD: 11,
-		PRIVATE_THREAD: 12
+		PRIVATE_THREAD: 12,
+		
+		isPrivate(type) {
+			return type === this.DM
+				|| type === this.GROUP_DM;
+		},
+		
+		isNavigableGuildChannel(type) {
+			return type === this.GUILD_TEXT
+				|| type === this.GUILD_ANNOUNCEMENT
+				|| type === this.ANNOUNCEMENT_THREAD
+				|| type === this.PUBLIC_THREAD
+				|| type === this.PRIVATE_THREAD;
+		}
 	};
 	
 	// https://discord.com/developers/docs/resources/channel#message-object-message-types
@@ -18,6 +33,74 @@ class DISCORD {
 		THREAD_STARTER: 21
 	};
 	
+	// https://discord.com/developers/docs/topics/permissions#permissions-bitwise-permission-flags
+	static PERMISSION = {
+		VIEW_CHANNEL: 1n << 10n
+	};
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): ?DiscordGuild} getGuild
+	 */
+	static #guildStore = WEBPACK.findModule("guildStore", WEBPACK.filterByProps("getGuild", "getGuilds", "getGuildIds"));
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): Boolean} isOptInEnabled
+	 * @property {function(String): Set<String>} getOptedInChannels
+	 */
+	static #guildSettings = WEBPACK.findModule("guildSettings", WEBPACK.filterByProps("isOptInEnabled", "getOptedInChannels"));
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): ?DiscordChannel} getChannel
+	 * @property {function(String): Array<DiscordChannel>} getMutableGuildChannelsForGuild
+	 * @property {function(): Array<DiscordChannel>} getSortedPrivateChannels
+	 */
+	static #channelStore = WEBPACK.findModule("channelStore", WEBPACK.filterByProps("getChannel", "getMutableGuildChannelsForGuild", "getSortedPrivateChannels"));
+	
+	/**
+	 * @type {function(BigInt, Object): Boolean}
+	 */
+	static #hasPermission = WEBPACK.findFunction("can", [ "getGuildPermissions", "getChannelPermissions" ]);
+	
+	/**
+	 * @type {function(String): MessageData}
+	 */
+	static #getMessages = WEBPACK.findFunction("getMessages");
+	
+	/**
+	 * @type {function(String): void}
+	 */
+	static #jumpToMessage = WEBPACK.findFunction("jumpToMessage");
+	
+	/**
+	 * @type {function(): String}
+	 */
+	static #getCurrentlySelectedChannelId = WEBPACK.findFunction("getCurrentlySelectedChannelId");
+	
+	/**
+	 * @type {function(String): void}
+	 */
+	static #selectPrivateChannel = WEBPACK.findFunction("selectPrivateChannel", [ "selectChannel" ]);
+	
+	/**
+	 * @type {function(String, Object, String=null): void}
+	 */
+	static #transitionToGuildSync = WEBPACK.findFunction("transitionToGuildSync");
+	
+	static isCompatible() {
+		return !!this.#guildStore
+			&& !!this.#guildSettings
+			&& !!this.#channelStore
+			&& !!this.#hasPermission
+			&& !!this.#getMessages
+			&& !!this.#jumpToMessage
+			&& !!this.#getCurrentlySelectedChannelId
+			&& !!this.#selectPrivateChannel
+			&& !!this.#transitionToGuildSync;
+	}
+	
 	static getMessageOuterElement() {
 		return DOM.queryReactClass("messagesWrapper");
 	}
@@ -26,14 +109,6 @@ class DISCORD {
 		return DOM.queryReactClass("scroller", this.getMessageOuterElement());
 	}
 	
-	static getMessageElements() {
-		return this.getMessageOuterElement().querySelectorAll("[class*='message_']");
-	}
-	
-	static hasMoreMessages() {
-		return document.querySelector("#messagesNavigationDescription + [class^=container]") === null;
-	}
-	
 	static loadOlderMessages() {
 		const view = this.getMessageScrollerElement();
 		
@@ -42,26 +117,43 @@ class DISCORD {
 		}
 	}
 	
+	static getMessagesFromSelectedChannel() {
+		const channelId = this.#getCurrentlySelectedChannelId();
+		return channelId ? this.#getMessages(channelId) : null;
+	}
+	
 	/**
 	 * Calls the provided function with a list of messages whenever the currently loaded messages change.
+	 * @param callback {function(server: ?DiscordGuild, channel: DiscordChannel, messages: Array<DiscordMessage>, hasMoreBefore: boolean)}
 	 */
 	static setupMessageCallback(callback) {
 		const previousMessages = new Set();
 		
-		const onMessageElementsChanged = function() {
-			const messages = DISCORD.getMessages();
-			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !DISCORD.hasMoreMessages();
+		const onMessageElementsChanged = force => {
+			const messages = this.getMessagesFromSelectedChannel();
+			if (!messages || !messages.ready || messages.loadingMore) {
+				return false;
+			}
 			
+			const channel = this.#channelStore.getChannel(messages.channelId);
+			if (!channel) {
+				return false;
+			}
+			
+			const hasChanged = force || !messages.hasMoreBefore || messages.some(message => !previousMessages.has(message.id));
 			if (!hasChanged) {
-				return;
+				return false;
 			}
 			
 			previousMessages.clear();
-			for (const message of messages) {
+			for (const message of messages._array) {
 				previousMessages.add(message.id);
 			}
 			
-			callback(messages);
+			const server = this.#guildStore.getGuild(channel.guild_id);
+			
+			callback(server, channel, messages._array, messages.hasMoreBefore);
+			return true;
 		};
 		
 		let debounceTimer;
@@ -74,7 +166,7 @@ class DISCORD {
 			debounceTimer = window.setTimeout(onMessageElementsChanged, 100);
 		};
 		
-		const observer = new MutationObserver(function () {
+		const observer = new MutationObserver(function() {
 			onMessageElementsChangedLater();
 		});
 		
@@ -112,216 +204,54 @@ class DISCORD {
 			observedElement = null;
 			window.clearInterval(observerTimer);
 		});
-	}
 		
-	/**
-	 * Returns the message from a message element.
-	 * @returns { null | DiscordMessage } }
-	 */
-	static getMessageFromElement(ele) {
-		const props = DOM.getReactProps(ele);
-		
-		if (props && Array.isArray(props.children)) {
-			for (const child of props.children) {
-				if (!(child instanceof Object)) {
-					continue;
-				}
-				
-				const childProps = child.props;
-				if (childProps instanceof Object && "message" in childProps) {
-					return childProps.message;
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Returns an array containing currently loaded messages.
-	 */
-	static getMessages() {
-		try {
-			const messages = [];
-			
-			for (const ele of this.getMessageElements()) {
-				try {
-					const message = this.getMessageFromElement(ele);
-					
-					if (message != null) {
-						messages.push(message);
-					}
-				} catch (e) {
-					console.error("[DHT] Error extracing message data, skipping it.", e, ele, DOM.tryGetReactProps(ele));
-				}
-			}
-			
-			return messages;
-		} catch (e) {
-			console.error("[DHT] Error retrieving messages.", e);
-			return [];
-		}
-	}
-	
-	/**
-	 * Returns an object containing the selected server and channel information.
-	 * For types DM and GROUP, the server and channel ids and names are identical.
-	 * @returns { {} | null }
-	 */
-	static getSelectedChannel() {
-		try {
-			let obj = null;
-			
-			try {
-				for (const child of DOM.getReactProps(DOM.queryReactClass("chatContent")).children) {
-					if (child && child.props && child.props.channel) {
-						obj = child.props.channel;
-						break;
-					}
-				}
-			} catch (e) {
-				console.error("[DHT] Error retrieving selected channel from 'chatContent' element.", e);
-			}
-			
-			if (!obj || typeof obj.id !== "string") {
-				return null;
-			}
-			
-			const dms = DOM.queryReactClass("privateChannels");
-			
-			if (dms) {
-				let name;
-				
-				for (const ele of dms.querySelectorAll("[class*='channel_'] [class*='selected_'] [class^='name_'] *")) {
-					const node = Array.prototype.find.call(ele.childNodes, node => node.nodeType === Node.TEXT_NODE);
-					
-					if (node) {
-						name = node.nodeValue;
-						break;
-					}
-				}
-				
-				if (!name) {
-					return null;
-				}
-				
-				let type;
-				
-				// 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;
-					default: return null;
-				}
-				
-				const id = obj.id;
-				const server = { id, name, type };
-				const channel = { id, name };
-				
-				return { server, channel };
-			}
-			else if (obj.guild_id) {
-				let guild;
-				
-				for (const child of DOM.getReactProps(document.querySelector("nav header [class*='headerContent_']")).children) {
-					if (child && child.props && child.props.guild) {
-						guild = child.props.guild;
-						break;
-					}
-				}
-				
-				if (!guild || typeof guild.name !== "string" || obj.guild_id !== guild.id) {
-					return null;
-				}
-				
-				const server = {
-					"id": guild.id,
-					"name": guild.name,
-					"type": "SERVER"
-				};
-				
-				const channel = {
-					"id": obj.id,
-					"name": obj.name,
-					"extra": {
-						"nsfw": obj.nsfw
-					}
-				};
-				
-				if (obj.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
-					channel["extra"]["parent"] = obj.parent_id;
-				}
-				else {
-					channel["extra"]["position"] = obj.position;
-					channel["extra"]["topic"] = obj.topic;
-				}
-				
-				return { server, channel };
-			}
-			else {
-				return null;
-			}
-		} catch (e) {
-			console.error("[DHT] Error retrieving selected channel.", e);
-			return null;
-		}
+		return () => onMessageElementsChanged(true);
 	}
 	
 	/**
 	 * Selects the next text channel and returns true, otherwise returns false if there are no more channels.
 	 */
 	static selectNextTextChannel() {
-		const dms = DOM.queryReactClass("privateChannels");
+		const currentChannel = this.#channelStore.getChannel(this.#getCurrentlySelectedChannelId());
+		if (!currentChannel) {
+			return false;
+		}
 		
-		if (dms) {
-			const currentChannel = DOM.queryReactClass("selected", dms);
-			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel_']");
-			const nextChannel = currentChannelContainer && currentChannelContainer.nextElementSibling;
+		if (this.CHANNEL_TYPE.isPrivate(currentChannel.type)) {
+			const privateChannel = this.#channelStore.getSortedPrivateChannels();
+			const currentIndex = privateChannel.findIndex(channel => channel.id === currentChannel.id);
 			
-			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel_")) {
+			if (currentIndex === -1 || currentIndex === privateChannel.length - 1) {
 				return false;
 			}
 			
-			const nextChannelLink = nextChannel.querySelector("a[href*='/@me/']");
-			if (!nextChannelLink) {
-				return false;
-			}
-			
-			nextChannelLink.click();
-			nextChannelLink.scrollIntoView(true);
+			this.#selectPrivateChannel(privateChannel[currentIndex + 1].id);
 			return true;
 		}
 		else {
-			const channelListEle = document.getElementById("channels");
-			if (!channelListEle) {
+			const guildId = currentChannel.guild_id;
+			
+			let isChannelOptedIn;
+			if (this.#guildSettings.isOptInEnabled(guildId)) {
+				const optedInChannels = this.#guildSettings.getOptedInChannels(guildId);
+				isChannelOptedIn = channel => optedInChannels.has(channel.id);
+			}
+			else {
+				isChannelOptedIn = _ => true;
+			}
+			
+			const guildChannelMap = this.#channelStore.getMutableGuildChannelsForGuild(guildId);
+			const guildChannels = Object.values(guildChannelMap)
+				.filter(channel => this.CHANNEL_TYPE.isNavigableGuildChannel(channel.type) && isChannelOptedIn(channel) && this.#hasPermission(this.PERMISSION.VIEW_CHANNEL, channel))
+				.sort((a, b) => a.position - b.position);
+			
+			const currentIndex = guildChannels.findIndex(channel => channel.id === currentChannel.id);
+			
+			if (currentIndex === -1 || currentIndex === guildChannels.length - 1) {
 				return false;
 			}
 			
-			function getLinkElement(channel) {
-				return channel.querySelector("a[href^='/channels/'][role='link']");
-			}
-			
-			const allTextChannels = Array.prototype.filter.call(channelListEle.querySelectorAll("[class*='containerDefault']"), ele => getLinkElement(ele) !== null);
-			let nextChannel = null;
-			
-			for (let index = 0; index < allTextChannels.length - 1; index++) {
-				if (allTextChannels[index].className.includes("selected_")) {
-					nextChannel = allTextChannels[index + 1];
-					break;
-				}
-			}
-			
-			if (nextChannel === null) {
-				return false;
-			}
-			
-			const nextChannelLink = getLinkElement(nextChannel);
-			if (!nextChannelLink) {
-				return false;
-			}
-			
-			nextChannelLink.click();
-			nextChannel.scrollIntoView(true);
+			this.#transitionToGuildSync(guildId, {}, guildChannels[currentIndex + 1].id);
 			return true;
 		}
 	}

app/Resources/Tracker/scripts/dom.js

@@ -1,6 +1,8 @@
 class DOM {
 	/**
 	 * Returns a child element by its ID. Parent defaults to the entire document.
+	 * @param {string} id
+	 * @param {HTMLElement?} [parent]
 	 * @returns {HTMLElement}
 	 */
 	static id(id, parent) {
@@ -9,6 +11,9 @@ class DOM {
 	
 	/**
 	 * Returns the first child element containing the specified obfuscated class. Parent defaults to the entire document.
+	 * @param {string} cls
+	 * @param {HTMLElement?} [parent]
+	 * @returns {HTMLElement}
 	 */
 	static queryReactClass(cls, parent) {
 		return (parent || document).querySelector(`[class*="${cls}_"]`);
@@ -55,31 +60,4 @@ class DOM {
 		const value = document.cookie.replace(new RegExp("(?:(?:^|.*;\\s*)" + name + "\\s*\\=\\s*([^;]*).*$)|^.*$"), "$1");
 		return value.length ? JSON.parse(decodeURIComponent(value)) : null;
 	}
-	
-	/**
-	 * Returns internal React state object of an element.
-	 */
-	static getReactProps(ele) {
-		const keys = Object.keys(ele || {});
-		let key = keys.find(key => key.startsWith("__reactInternalInstance"));
-		
-		if (key) {
-			// noinspection JSUnresolvedVariable
-			return ele[key].memoizedProps;
-		}
-		
-		key = keys.find(key => key.startsWith("__reactProps$"));
-		return key ? ele[key] : null;
-	}
-	
-	/**
-	 * Returns internal React state object of an element, or null if the retrieval throws.
-	 */
-	static tryGetReactProps(ele) {
-		try {
-			return this.getReactProps(ele);
-		} catch (e) {
-			return null;
-		}
-	}
 }

app/Resources/Tracker/scripts/gui.js

@@ -2,14 +2,17 @@
 const GUI = (function() {
 	let controller = null;
 	let settings = null;
+	let trackingStyles = null;
 	
 	const stateChangedEvent = () => {
 		if (settings) {
 			settings.ui.cbAutoscroll.checked = SETTINGS.autoscroll;
+			settings.ui.cbHidePreviewsWhileAutoscrolling.checked = SETTINGS.hidePreviewsWhileAutoscrolling;
 			settings.ui.optsAfterFirstMsg[SETTINGS.afterFirstMsg].checked = true;
 			settings.ui.optsAfterSavedMsg[SETTINGS.afterSavedMsg].checked = true;
 			
 			const autoscrollDisabled = !SETTINGS.autoscroll;
+			settings.ui.cbHidePreviewsWhileAutoscrolling.disabled = autoscrollDisabled;
 			Object.values(settings.ui.optsAfterFirstMsg).forEach(ele => ele.disabled = autoscrollDisabled);
 			Object.values(settings.ui.optsAfterSavedMsg).forEach(ele => ele.disabled = autoscrollDisabled);
 		}
@@ -54,6 +57,7 @@ const GUI = (function() {
 			
 			controller.ui.btnClose.addEventListener("click", () => {
 				this.hideController();
+				this.deleteTrackingStyles();
 				window.DHT_ON_UNLOAD.forEach(f => f());
 				delete window.DHT_ON_UNLOAD;
 				delete window.DHT_LOADED;
@@ -84,6 +88,7 @@ const GUI = (function() {
 			const radio = (type, id, label) => "<label><input id='dht-cfg-" + type + "-" + id + "' name='dht-" + type + "' type='radio'> " + label + "</label><br>";
 			const html = `
 <label><input id='dht-cfg-autoscroll' type='checkbox'> Autoscroll</label><br>
+<label><input id='dht-cfg-hide-previews-while-autoscrolling' type='checkbox'> Hide previews to improve browser performance</label><br>
 <br>
 <label>After reaching the first message in channel...</label><br>
 ${radio("afm", "nothing", "Continue Tracking")}
@@ -93,8 +98,7 @@ ${radio("afm", "switch", "Switch to Next Channel")}
 <label>After reaching a previously saved message...</label><br>
 ${radio("asm", "nothing", "Continue Tracking")}
 ${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>`;
+${radio("asm", "switch", "Switch to Next Channel")}`;
 			
 			settings = {
 				styles: DOM.createStyle(`/*[CSS-SETTINGS]*/`),
@@ -107,9 +111,10 @@ ${radio("asm", "switch", "Switch to Next Channel")}
 			});
 			
 			settings.ui = {
-				cbAutoscroll: DOM.id("dht-cfg-autoscroll"),
-				optsAfterFirstMsg: {},
-				optsAfterSavedMsg: {}
+				/** @type {HTMLInputElement} */ cbAutoscroll: DOM.id("dht-cfg-autoscroll"),
+				/** @type {HTMLInputElement} */ cbHidePreviewsWhileAutoscrolling: DOM.id("dht-cfg-hide-previews-while-autoscrolling"),
+				/** @type {Object.<number, HTMLInputElement>} */ optsAfterFirstMsg: {},
+				/** @type {Object.<number, HTMLInputElement>} */ optsAfterSavedMsg: {}
 			};
 			
 			settings.ui.optsAfterFirstMsg[CONSTANTS.AUTOSCROLL_ACTION_NOTHING] = DOM.id("dht-cfg-afm-nothing");
@@ -124,6 +129,10 @@ ${radio("asm", "switch", "Switch to Next Channel")}
 				SETTINGS.autoscroll = settings.ui.cbAutoscroll.checked;
 			});
 			
+			settings.ui.cbHidePreviewsWhileAutoscrolling.addEventListener("change", () => {
+				SETTINGS.hidePreviewsWhileAutoscrolling = settings.ui.cbHidePreviewsWhileAutoscrolling.checked;
+			});
+			
 			Object.keys(settings.ui.optsAfterFirstMsg).forEach(key => {
 				settings.ui.optsAfterFirstMsg[key].addEventListener("click", () => {
 					SETTINGS.afterFirstMsg = key;
@@ -152,6 +161,29 @@ ${radio("asm", "switch", "Switch to Next Channel")}
 			if (controller) {
 				controller.ui.textStatus.innerText = state;
 			}
+		},
+		
+		createTrackingStyles() {
+			if (trackingStyles) {
+				return;
+			}
+			
+			let style = "";
+			
+			if (SETTINGS.autoscroll && SETTINGS.hidePreviewsWhileAutoscrolling) {
+				style += `div[id^="message-accessories-"] { display: none; }`;
+			}
+			
+			if (style.length > 0) {
+				trackingStyles = DOM.createStyle(style);
+			}
+		},
+		
+		deleteTrackingStyles() {
+			if (trackingStyles) {
+				DOM.removeElement(trackingStyles);
+				trackingStyles = null;
+			}
 		}
 	};
 })();

app/Resources/Tracker/scripts/settings.js

@@ -35,17 +35,28 @@ const SETTINGS = (function() {
 		obj[name] = value;
 	};
 	
+	const defaults = {
+		"_autoscroll": true,
+		"_hidePreviewsWhileAutoscrolling": true,
+		"_afterFirstMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
+		"_afterSavedMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
+	};
+	
 	let loaded = DOM.loadFromCookie("DHT_SETTINGS");
+	let hasChanged = false;
 	
 	if (!loaded) {
-		loaded = {
-			"_autoscroll": true,
-			"_afterFirstMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
-			"_afterSavedMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE
-		};
-		
+		loaded = defaults;
 		IS_FIRST_RUN = true;
 	}
+	else {
+		for (const property in defaults) {
+			if (!(property in loaded)) {
+				loaded[property] = defaults[property];
+				hasChanged = true;
+			}
+		}
+	}
 	
 	const root = {
 		onSettingsChanged(callback) {
@@ -54,10 +65,11 @@ const SETTINGS = (function() {
 	};
 	
 	defineTriggeringProperty(root, "autoscroll", loaded._autoscroll);
+	defineTriggeringProperty(root, "hidePreviewsWhileAutoscrolling", loaded._hidePreviewsWhileAutoscrolling);
 	defineTriggeringProperty(root, "afterFirstMsg", loaded._afterFirstMsg);
 	defineTriggeringProperty(root, "afterSavedMsg", loaded._afterSavedMsg);
 	
-	if (IS_FIRST_RUN) {
+	if (IS_FIRST_RUN || hasChanged) {
 		saveSettings();
 	}
 	

app/Resources/Tracker/scripts/state.js

@@ -48,69 +48,49 @@ const STATE = (function() {
 		});
 	};
 	
+	const getDate = function(date) {
+		if (date instanceof Date) {
+			return date;
+		}
+		else {
+			// noinspection JSUnresolvedReference
+			return date.toDate();
+		}
+	};
+	
+	/**
+	 * @param {DiscordChannel} channel
+	 */
+	const getPrivateChannelName = function(channel) {
+		if (channel.name === "") {
+			return channel.rawRecipients.map(user => user.username).join(", ");
+		}
+		else {
+			return channel.name;
+		}
+	};
+	
+	/**
+	 * @param {Number} type
+	 */
+	const getChannelTypeName = function(type) {
+		if (type === DISCORD.CHANNEL_TYPE.DM) {
+			return "DM";
+		}
+		else if (type === DISCORD.CHANNEL_TYPE.GROUP_DM) {
+			return "GROUP";
+		}
+		else {
+			return "SERVER";
+		}
+	};
+	
 	const trackingStateChangedListeners = [];
 	let isTracking = false;
 	
 	const addedChannels = new Set();
 	const addedUsers = new Set();
 	
-	/**
-	 * @name DiscordUser
-	 * @property {String} id
-	 * @property {String} username
-	 * @property {String} discriminator
-	 * @property {String} [avatar]
-	 * @property {Boolean} [bot]
-	 */
-	
-	/**
-	 * @name DiscordMessage
-	 * @property {String} id
-	 * @property {String} channel_id
-	 * @property {DiscordUser} author
-	 * @property {String} content
-	 * @property {Timestamp} timestamp
-	 * @property {Timestamp|null} editedTimestamp
-	 * @property {DiscordAttachment[]} attachments
-	 * @property {Object[]} embeds
-	 * @property {DiscordMessageReaction[]} [reactions]
-	 * @property {DiscordMessageReference} [messageReference]
-	 * @property {Number} type
-	 * @property {String} state
-	 */
-	
-	/**
-	 * @name DiscordAttachment
-	 * @property {String} id
-	 * @property {String} filename
-	 * @property {String} [content_type]
-	 * @property {String} size
-	 * @property {String} url
-	 */
-	
-	/**
-	 * @name DiscordMessageReaction
-	 * @property {DiscordEmoji} emoji
-	 * @property {Number} count
-	 */
-	
-	/**
-	 * @name DiscordMessageReference
-	 * @property {String} [message_id]
-	 */
-	
-	/**
-	 * @name DiscordEmoji
-	 * @property {String|null} id
-	 * @property {String|null} name
-	 * @property {Boolean} animated
-	 */
-	
-	/**
-	 * @name Timestamp
-	 * @property {Function} toDate
-	 */
-	
 	return {
 		setup(port, token) {
 			serverPort = port;
@@ -141,32 +121,59 @@ const STATE = (function() {
 			}
 		},
 		
+		/**
+		 * @param {?DiscordGuild} serverInfo
+		 * @param {DiscordChannel} channelInfo
+		 */
 		async addDiscordChannel(serverInfo, channelInfo) {
 			if (addedChannels.has(channelInfo.id)) {
 				return;
 			}
 			
 			const server = {
-				id: serverInfo.id,
-				name: serverInfo.name,
-				type: serverInfo.type
+				type: getChannelTypeName(channelInfo.type)
 			};
 			
 			const channel = {
 				id: channelInfo.id,
-				name: channelInfo.name
+				extra: {}
 			};
 			
-			if ("extra" in channelInfo) {
-				const extra = channelInfo.extra;
+			if (DISCORD.CHANNEL_TYPE.isPrivate(channelInfo.type)) {
+				server.id = channelInfo.id;
+				server.name = channel.name = getPrivateChannelName(channelInfo);
 				
-				if ("parent" in extra) {
-					channel.parent = extra.parent;
+				if (channelInfo.icon) {
+					server.icon = channelInfo.icon;
 				}
+			}
+			else if (serverInfo) {
+				server.id = serverInfo.id;
+				server.name = serverInfo.name;
+				channel.name = channelInfo.name;
 				
-				channel.position = extra.position;
-				channel.topic = extra.topic;
-				channel.nsfw = extra.nsfw;
+				if (serverInfo.icon) {
+					server.icon = serverInfo.icon;
+				}
+			}
+			else {
+				return;
+			}
+			
+			if ("nsfw" in channelInfo) {
+				channel.extra.nsfw = channelInfo.nsfw;
+			}
+			
+			if ("topic" in channelInfo) {
+				channel.extra.topic = channelInfo.topic;
+			}
+			
+			if ("position" in channelInfo) {
+				channel.extra.position = channelInfo.position;
+			}
+			
+			if (channelInfo.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || channelInfo.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || channelInfo.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
+				channel.extra.parent = channelInfo.parent_id;
 			}
 			
 			await post("/track-channel", { server, channel });
@@ -195,6 +202,10 @@ const STATE = (function() {
 						name: user.username
 					};
 					
+					if (user.globalName) {
+						obj.displayName = user.globalName;
+					}
+					
 					if (user.avatar) {
 						obj.avatar = user.avatar;
 					}
@@ -223,12 +234,12 @@ const STATE = (function() {
 					sender: msg.author.id,
 					channel: msg.channel_id,
 					text: msg.content,
-					timestamp: msg.timestamp.toDate().getTime()
+					timestamp: getDate(msg.timestamp).getTime()
 				};
 				
 				if (msg.editedTimestamp !== null) {
 					// noinspection JSUnusedGlobalSymbols
-					obj.editTimestamp = msg.editedTimestamp.toDate().getTime();
+					obj.editTimestamp = getDate(msg.editedTimestamp).getTime();
 				}
 				
 				if (msg.messageReference !== null) {
@@ -283,7 +294,7 @@ const STATE = (function() {
 				}
 				
 				if (msg.reactions.length > 0) {
-					obj.reactions = msg.reactions.map(reaction => {
+					obj.reactions = msg.reactions.filter(reaction => reaction.count > 0).map(reaction => {
 						const emoji = reaction.emoji;
 						
 						const mapped = {

app/Resources/Tracker/scripts/types.js

@@ -0,0 +1,84 @@
+/**
+ * @name DiscordGuild
+ * @property {String} id
+ * @property {String} name
+ * @property {String|null|undefined} [icon]
+ */
+
+/**
+ * @name DiscordChannel
+ * @property {String} id
+ * @property {String} name
+ * @property {Number} type
+ * @property {String} [guild_id]
+ * @property {String} [parent_id]
+ * @property {Number} [position]
+ * @property {String} [topic]
+ * @property {Boolean} [nsfw]
+ * @property {String|null|undefined} [icon]
+ * @property {DiscordUser[]} [rawRecipients]
+ */
+
+/**
+ * @name DiscordUser
+ * @property {String} id
+ * @property {String} username
+ * @property {String} discriminator
+ * @property {String} [globalName]
+ * @property {String} [avatar]
+ * @property {Boolean} [bot]
+ */
+
+/**
+ * @name DiscordMessage
+ * @property {String} id
+ * @property {String} channel_id
+ * @property {DiscordUser} author
+ * @property {String} content
+ * @property {Date} timestamp
+ * @property {Date|null} editedTimestamp
+ * @property {DiscordAttachment[]} attachments
+ * @property {Object[]} embeds
+ * @property {DiscordMessageReaction[]} [reactions]
+ * @property {DiscordMessageReference} [messageReference]
+ * @property {Number} type
+ * @property {String} state
+ */
+
+/**
+ * @name DiscordAttachment
+ * @property {String} id
+ * @property {String} filename
+ * @property {String} [content_type]
+ * @property {String} size
+ * @property {String} url
+ */
+
+/**
+ * @name DiscordMessageReaction
+ * @property {DiscordEmoji} emoji
+ * @property {Number} count
+ */
+
+/**
+ * @name DiscordMessageReference
+ * @property {String} [message_id]
+ */
+
+/**
+ * @name DiscordEmoji
+ * @property {String|null} id
+ * @property {String|null} name
+ * @property {Boolean} animated
+ */
+
+/**
+ * @name MessageData
+ * @type {Object}
+ * @property {String} channelId
+ * @property {Boolean} ready
+ * @property {Boolean} loadingMore
+ * @property {Boolean} hasMoreAfter
+ * @property {Boolean} hasMoreBefore
+ * @property {Array<DiscordMessage>} _array
+ */

app/Resources/Tracker/scripts/webpack.js

@@ -0,0 +1,100 @@
+/**
+ * Parts copied from Better Discord, licensed under Apache License 2.0.
+ *
+ * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/renderer/src/modules/webpackmodules.js
+ * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/LICENSE
+ */
+class WEBPACK {
+	static get require() {
+		if (this._require) {
+			return this._require;
+		}
+		
+		/**
+		 * @type {Object}
+		 * @property {Object} m
+		 * @property {Object} c
+		 */
+		let hookedRequire;
+		
+		const id = Symbol("dht-webpackmodules-" + new Date().getTime());
+		if (typeof (window["webpackChunkdiscord_app"]) !== "undefined") {
+			window["webpackChunkdiscord_app"].push([ [ id ], {}, internalRequire => {
+				if ("b" in internalRequire) {
+					hookedRequire = internalRequire;
+				}
+			}]);
+		}
+		
+		return this._require = hookedRequire;
+	}
+	
+	static getAllModules() {
+		return this.require.c;
+	}
+	
+	static filterByProps(...props) {
+		return module => props.every(prop => prop in module);
+	}
+	
+	static filterByPropsWithPredicate(predicate, ...props) {
+		return module => props.every(prop => prop in module && predicate(module[prop]));
+	}
+	
+	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]
+			 * @property [default]
+			 */
+			const exports = module.exports;
+			if (!exports || exports === window || exports === document.documentElement || exports[Symbol.toStringTag] === "DOMTokenList") {
+				continue;
+			}
+			
+			let foundModule = null;
+			if (exports.Z && moduleFilter(exports.Z)) {
+				foundModule = defaultExport ? exports.Z : exports;
+			}
+			if (exports.ZP && moduleFilter(exports.ZP)) {
+				foundModule = defaultExport ? exports.ZP : exports;
+			}
+			if (exports.__esModule && exports.default && moduleFilter(exports.default)) {
+				foundModule = defaultExport ? exports.default : exports;
+			}
+			if (moduleFilter(exports)) {
+				foundModule = exports;
+			}
+			
+			if (foundModule) {
+				results.push(foundModule);
+			}
+		}
+		
+		return results;
+	}
+	
+	static findModule(name, filter) {
+		const modules = this.findModules(filter);
+		if (modules.length === 1) {
+			return modules[0];
+		}
+		
+		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length);
+		return null;
+	}
+	
+	static findFunction(name, additionalRequiredProps) {
+		const searchedProps = additionalRequiredProps ? [ name, ...additionalRequiredProps ] : [ name ];
+		const matchingModule = this.findModule("containing function " + name, this.filterByPropsWithPredicate(prop => typeof (prop) === "function", ...searchedProps));
+		return matchingModule == null ? null : matchingModule[name].bind(matchingModule);
+	}
+}

app/Resources/Tracker/styles/settings.css

@@ -18,11 +18,13 @@
   height: 262px;
   margin-left: -400px;
   margin-top: -131px;
+  line-height: 120%;
   padding: 8px;
   background-color: #fff;
   z-index: 1000002;
 }
 
-#dht-cfg-note {
-  margin-top: 22px;
+#dht-cfg label {
+  display: inline-block;
+  margin: 1px 0;
 }

app/Resources/Viewer/index.html

@@ -2,21 +2,32 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <meta name="referrer" content="no-referrer">
+    
     <title>Discord Offline History</title>
     
+    <link rel="icon" href="favicon.ico">
+    
+    <link rel="stylesheet" href="styles/main.css">
+    <link rel="stylesheet" href="styles/menu.css">
+    <link rel="stylesheet" href="styles/servers.css">
+    <link rel="stylesheet" href="styles/channels.css">
+    <link rel="stylesheet" href="styles/messages.css">
+    <link rel="stylesheet" href="styles/modal.css">
+    
     <script type="text/javascript">
-		window.DHT_EMBEDDED = "/*[ARCHIVE]*/";
-		/*[CONSTANTS]*/
-		/*[JS]*/
+		const query = new URLSearchParams(location.search);
+		window.DHT_SERVER_TOKEN = query.get("token");
+		window.DHT_SERVER_SESSION = query.get("session");
     </script>
-    <style>
-      /*[CSS]*/
-    </style>
+    <script type="module" src="scripts/bootstrap.mjs"></script>
   </head>
   <body>
     <div id="menu">
       <button id="btn-settings">Settings</button>
       
+      <div class="splitter"></div>
+      
       <div> <!-- needed to stop the select from messing up -->
         <select id="opt-messages-per-page">
           <option value="50">50 messages per page&nbsp;</option>
@@ -65,7 +76,10 @@
     </div>
     
     <div id="app">
-      <div id="channels"></div>
+      <div id="servers"></div>
+      <div id="channels">
+        <div class="loading"></div>
+      </div>
       <div id="messages"></div>
     </div>
     

app/Resources/Viewer/scripts/bootstrap.js

@@ -1,39 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
-	DISCORD.setup();
-	GUI.setup();
-	
-	GUI.onOptionMessagesPerPageChanged(() => {
-		STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
-	});
-	
-	STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
-	
-	GUI.onOptMessageFilterChanged(filter => {
-		STATE.setActiveFilter(filter);
-	});
-	
-	GUI.onNavigationButtonClicked(action => {
-		STATE.updateCurrentPage(action);
-	});
-	
-	STATE.onUsersRefreshed(users => {
-		GUI.updateUserList(users);
-	});
-	
-	STATE.onChannelsRefreshed((channels, selected) => {
-		GUI.updateChannelList(channels, selected, STATE.selectChannel);
-	});
-	
-	STATE.onMessagesRefreshed(messages => {
-		GUI.updateNavigation(STATE.getCurrentPage(), STATE.getPageCount());
-		GUI.updateMessageList(messages);
-		GUI.scrollMessagesToTop();
-	});
-	
-	try {
-		STATE.uploadFile(JSON.parse(window.DHT_EMBEDDED));
-	} catch (e) {
-		console.error(e);
-		alert("Could not parse embedded file, see console for details.");
-	}
-});

app/Resources/Viewer/scripts/bootstrap.mjs

@@ -0,0 +1,114 @@
+import discord from "./discord.mjs";
+import gui from "./gui.mjs";
+import state from "./state.mjs";
+import "./polyfills.mjs";
+import servers from "./servers.mjs";
+
+window.DISCORD = discord;
+
+document.addEventListener("DOMContentLoaded", () => {
+	discord.setup();
+	gui.setup();
+	
+	gui.onOptionMessagesPerPageChanged(() => {
+		state.setMessagesPerPage(gui.getOptionMessagesPerPage());
+	});
+	
+	state.setMessagesPerPage(gui.getOptionMessagesPerPage());
+	
+	gui.onOptMessageFilterChanged(filter => {
+		state.setActiveFilter(filter);
+	});
+	
+	gui.onNavigationButtonClicked(action => {
+		state.updateCurrentPage(action);
+	});
+	
+	state.onUsersRefreshed(users => {
+		gui.updateUserList(users);
+		servers.update()
+	});
+	
+	state.onChannelsRefreshed((channels, selected) => {
+		gui.updateChannelList(channels, selected, state.selectChannel);
+		servers.update()
+	});
+	
+	state.onMessagesRefreshed(messages => {
+		gui.updateNavigation(state.getCurrentPage(), state.getPageCount());
+		gui.updateMessageList(messages);
+		gui.scrollMessagesToTop();
+	});
+	
+	async function fetchUrl(path, contentType) {
+		const response = await fetch("/" + path + "?token=" + encodeURIComponent(window.DHT_SERVER_TOKEN) + "&session=" + encodeURIComponent(window.DHT_SERVER_SESSION), {
+			method: "GET",
+			headers: {
+				"Content-Type": contentType,
+			},
+			credentials: "omit",
+			redirect: "error",
+		});
+		
+		if (!response.ok) {
+			throw "Unexpected response status: " + response.statusText;
+		}
+		
+		return response;
+	}
+	
+	async function processLines(response, callback) {
+		let body = "";
+		
+		for await (const chunk of response.body.pipeThrough(new TextDecoderStream("utf-8"))) {
+			body += chunk;
+			
+			let startIndex = 0;
+			
+			while (true) {
+				const endIndex = body.indexOf("\n", startIndex);
+				if (endIndex === -1) {
+					break;
+				}
+				
+				callback(body.substring(startIndex, endIndex));
+				startIndex = endIndex + 1;
+			}
+			
+			body = body.substring(startIndex);
+		}
+		
+		if (body !== "") {
+			callback(body);
+		}
+	}
+	
+	async function loadData() {
+		try {
+			const metadataResponse = await fetchUrl("get-viewer-metadata", "application/json");
+			const metadataJson = await metadataResponse.json();
+			
+			const messagesResponse = await fetchUrl("get-viewer-messages", "application/x-ndjson");
+			const messages = {};
+			
+			await processLines(messagesResponse, line => {
+				const message = JSON.parse(line);
+				const channel = message.c;
+				
+				const channelMessages = messages[channel] || (messages[channel] = {});
+				channelMessages[message.id] = message;
+				
+				delete message.id;
+				delete message.c;
+			});
+			
+			state.uploadFile(metadataJson, messages);
+		} catch (e) {
+			console.error(e);
+			alert("Could not load data, see console for details.");
+			document.querySelector("#channels > div.loading").remove();
+		}
+	}
+	
+	loadData();
+});

app/Resources/Viewer/scripts/discord.mjs

@@ -1,4 +1,10 @@
-const DISCORD = (function() {
+import discord from "./discord.mjs";
+import dom from "./dom.mjs";
+import template from "./template.mjs";
+import settings from "./settings.mjs";
+import state from "./state.mjs";
+
+export default (function() {
 	const regex = {
 		formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
 		formatItalic1: /\*([\s\S]+?)\*(?!\*)/g,
@@ -35,17 +41,14 @@ const DISCORD = (function() {
 	let templateReaction;
 	let templateReactionCustom;
 	
-	const fileUrlProcessor = function(serverUrl, serverToken) {
-		if (typeof serverUrl === "string" && typeof serverToken === "string") {
-			return url => serverUrl + "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
+	const fileUrlProcessor = function(serverToken) {
+		if (typeof serverToken === "string") {
+			return url => "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
 		}
 		else {
 			return url => url;
 		}
-	}(
-		window["DHT_SERVER_URL"],
-		window["DHT_SERVER_TOKEN"]
-	);
+	}(window.DHT_SERVER_TOKEN);
 	
 	const getEmoji = function(name, id, extension) {
 		const tag = ":" + name + ":";
@@ -53,9 +56,9 @@ const DISCORD = (function() {
 	};
 	
 	const processMessageContents = function(contents) {
-		let processed = DOM.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
+		let processed = dom.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
 		
-		if (SETTINGS.enableFormatting) {
+		if (settings.enableFormatting) {
 			const escapeHtmlMatch = (full, match) => "&#" + match.charCodeAt(0) + ";";
 			
 			processed = processed
@@ -71,13 +74,13 @@ const DISCORD = (function() {
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		
-		const animatedEmojiExtension = SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
+		const animatedEmojiExtension = settings.enableAnimatedEmoji ? "gif" : "webp";
 		
 		// noinspection HtmlUnknownTarget
 		processed = processed
 			.replace(regex.formatUrl, "<a href='$1' target='_blank' rel='noreferrer'>$1</a>")
-			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + STATE.getChannelName(match) + "</span>")
-			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (STATE.getUserTag(match) || "????") + "'>@" + STATE.getUserName(match) + "</span>")
+			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + state.getChannelName(match) + "</span>")
+			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='" + state.getUserName(match) + "'>@" + state.getUserDisplayName(match) + "</span>")
 			.replace(regex.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
 			.replace(regex.customEmojiAnimated, (full, m1, m2) => getEmoji(m1, m2, animatedEmojiExtension));
 		
@@ -89,7 +92,7 @@ const DISCORD = (function() {
 	};
 	
 	const getImageEmbed = function(url, image) {
-		if (!SETTINGS.enableImagePreviews) {
+		if (!settings.enableImagePreviews) {
 			return "";
 		}
 		
@@ -109,36 +112,37 @@ const DISCORD = (function() {
 	
 	return {
 		setup() {
-			templateChannelServer = new TEMPLATE([
-				"<div data-channel='{id}'>",
+			templateChannelServer = new template([
+				"<div class='channel ServerChannel' data-channel='{id}' server-id='{serverId}' server-name='{server.name}' server-type='{server.type}'>",
 				"<div class='info' title='{topic}'><strong class='name'>#{name}</strong>{nsfw}<span class='tag'>{msgcount}</span></div>",
-				"<span class='server'>{server.name} ({server.type})</span>",
+				"<!--<span class='server'>{server.name} ({server.type})</span>-->",
 				"</div>"
 			].join(""));
 			
-			templateChannelPrivate = new TEMPLATE([
-				"<div data-channel='{id}'>",
+			templateChannelPrivate = new template([
+				"<div class='channel UserChannel' data-channel='{id}' server-id='0' server-name='{server.name}' server-type='{server.type}'>",
+				"<div class='avatar'>{icon}</div>",
 				"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
-				"<span class='server'>({server.type})</span>",
+				"<!--<span class='server'>{server.name} ({server.type})</span>-->",
 				"</div>"
 			].join(""));
 			
-			templateMessageNoAvatar = new TEMPLATE([
+			templateMessageNoAvatar = new template([
 				"<div>",
 				"<div class='reply-message'>{reply}</div>",
-				"<h2><strong class='username' title='#{user.tag}'>{user.name}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
+				"<h2><strong class='username' title='{user.name}'>{user.displayName}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
 				"<div class='message'>{contents}{embeds}{attachments}</div>",
 				"{reactions}",
 				"</div>"
 			].join(""));
 			
-			templateMessageWithAvatar = new TEMPLATE([
+			templateMessageWithAvatar = new template([
 				"<div>",
 				"<div class='reply-message reply-message-with-avatar'>{reply}</div>",
 				"<div class='avatar-wrapper'>",
 				"<div class='avatar'>{avatar}</div>",
 				"<div>",
-				"<h2><strong class='username' title='#{user.tag}'>{user.name}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
+				"<h2><strong class='username' title='{user.name}'>{user.displayName}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
 				"<div class='message'>{contents}{embeds}{attachments}</div>",
 				"{reactions}",
 				"</div>",
@@ -147,50 +151,50 @@ const DISCORD = (function() {
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateUserAvatar = new TEMPLATE([
+			templateUserAvatar = new template([
 				"<img src='{url}' alt=''>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateAttachmentDownload = new TEMPLATE([
+			templateAttachmentDownload = new template([
 				"<a href='{url}' class='embed download'>Download {name}</a>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedImage = new TEMPLATE([
-				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
+			templateEmbedImage = new template([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedImageWithSize = new TEMPLATE([
-				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
+			templateEmbedImageWithSize = new template([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedRich = new TEMPLATE([
+			templateEmbedRich = new template([
 				"<div class='embed download'><a href='{url}' class='title'>{title}</a><p class='desc'>{description}</p></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedRichNoDescription = new TEMPLATE([
+			templateEmbedRichNoDescription = new template([
 				"<div class='embed download'><a href='{url}' class='title'>{title}</a></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedUrl = new TEMPLATE([
+			templateEmbedUrl = new template([
 				"<a href='{url}' class='embed download'>{url}</a>"
 			].join(""));
 			
-			templateEmbedUnsupported = new TEMPLATE([
+			templateEmbedUnsupported = new template([
 				"<div class='embed download'><p>(Unsupported embed)</p></div>"
 			].join(""));
 			
-			templateReaction = new TEMPLATE([
+			templateReaction = new template([
 				"<span class='reaction-wrapper'><span class='reaction-emoji'>{n}</span><span class='count'>{c}</span></span>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateReactionCustom = new TEMPLATE([
+			templateReactionCustom = new template([
 				"<span class='reaction-wrapper'><img src='{url}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
 			].join(""));
 		},
@@ -207,7 +211,7 @@ const DISCORD = (function() {
 		},
 		
 		isImageAttachment(attachment) {
-			const url = DOM.tryParseUrl(attachment.url);
+			const url = dom.tryParseUrl(attachment.url);
 			return url != null && isImageUrl(url);
 		},
 		
@@ -220,15 +224,15 @@ const DISCORD = (function() {
 		},
 		
 		getMessageHTML(message) { // noinspection FunctionWithInconsistentReturnsJS
-			return (SETTINGS.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
+			return (settings.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
 				if (property === "avatar") {
 					return value ? templateUserAvatar.apply(getAvatarUrlObject(value)) : "";
 				}
-				else if (property === "user.tag") {
-					return value ? value : "????";
+				else if (property === "user.displayName") {
+					return value ? value : message.user.name;
 				}
 				else if (property === "timestamp") {
-					return DOM.getHumanReadableTime(value);
+					return dom.getHumanReadableTime(value);
 				}
 				else if (property === "contents") {
 					return value && value.length > 0 ? processMessageContents(value) : "";
@@ -243,10 +247,10 @@ const DISCORD = (function() {
 							return templateEmbedUnsupported.apply(embed);
 						}
 						else if ("image" in embed && embed.image.url) {
-							return getImageEmbed(fileUrlProcessor(embed.url), embed.image);
+							return getImageEmbed(embed.url, embed.image);
 						}
 						else if ("thumbnail" in embed && embed.thumbnail.url) {
-							return getImageEmbed(fileUrlProcessor(embed.url), embed.thumbnail);
+							return getImageEmbed(embed.url, embed.thumbnail);
 						}
 						else if ("title" in embed && "description" in embed) {
 							return templateEmbedRich.apply(embed);
@@ -267,7 +271,7 @@ const DISCORD = (function() {
 					return value.map(attachment => {
 						const url = fileUrlProcessor(attachment.url);
 						
-						if (!DISCORD.isImageAttachment(attachment) || !SETTINGS.enableImagePreviews) {
+						if (!discord.isImageAttachment(attachment) || !settings.enableImagePreviews) {
 							return templateAttachmentDownload.apply({ url, name: attachment.name });
 						}
 						else if ("width" in attachment && "height" in attachment) {
@@ -279,30 +283,30 @@ const DISCORD = (function() {
 					}).join("");
 				}
 				else if (property === "edit") {
-					return value ? "<span class='info edited'>Edited " + DOM.getHumanReadableTime(value) + "</span>" : "";
+					return value ? "<span class='info edited'>Edited " + dom.getHumanReadableTime(value) + "</span>" : "";
 				}
 				else if (property === "jump") {
-					return STATE.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
+					return state.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
 				}
 				else if (property === "reply") {
 					if (!value) {
 						return value === null ? "<span class='reply-contents reply-missing'>(replies to an unknown message)</span>" : "";
 					}
 					
-					const user = "<span class='reply-username' title='#" + (value.user.tag ? value.user.tag : "????") + "'>" + value.user.name + "</span>";
-					const avatar = SETTINGS.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
+					const user = "<span class='reply-username' title='" + value.user.name + "'>" + (value.user.displayName ?? value.user.name) + "</span>";
+					const avatar = settings.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
 					const contents = value.contents ? "<span class='reply-contents'>" + processMessageContents(value.contents) + "</span>" : "";
 					
 					return "<span class='jump' data-jump='" + value.id + "'>Jump to reply</span><span class='user'>" + avatar + user + "</span>" + contents;
 				}
-				else if (property === "reactions"){
-					if (!value){
+				else if (property === "reactions") {
+					if (!value) {
 						return "";
 					}
 					
 					return "<div class='reactions'>" + value.map(reaction => {
-						if ("id" in reaction){
-							const ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
+						if ("id" in reaction) {
+							const ext = reaction.a && settings.enableAnimatedEmoji ? "gif" : "webp";
 							const url = fileUrlProcessor("https://cdn.discordapp.com/emojis/" + reaction.id + "." + ext);
 							// noinspection JSUnusedGlobalSymbols
 							return templateReactionCustom.apply({ url, n: reaction.n, c: reaction.c });

app/Resources/Viewer/scripts/dom.mjs

@@ -8,9 +8,12 @@ const HTML_ENTITY_MAP = {
 
 const HTML_ENTITY_REGEX = /[&<>"']/g;
 
-class DOM {
+export default class {
 	/**
 	 * Returns a child element by its ID. Parent defaults to the entire document.
+	 * @param {string} id
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement|null}
 	 */
 	static id(id, parent) {
 		return (parent || document).getElementById(id);
@@ -18,6 +21,9 @@ class DOM {
 	
 	/**
 	 * Returns an array of all child elements containing the specified class. Parent defaults to the entire document.
+	 * @param {string} cls
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement[]}
 	 */
 	static cls(cls, parent) {
 		return Array.prototype.slice.call((parent || document).getElementsByClassName(cls));
@@ -25,6 +31,9 @@ class DOM {
 	
 	/**
 	 * Returns an array of all child elements that have the specified tag. Parent defaults to the entire document.
+	 * @param {string} tag
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement[]}
 	 */
 	static tag(tag, parent) {
 		return Array.prototype.slice.call((parent || document).getElementsByTagName(tag));
@@ -32,6 +41,9 @@ class DOM {
 	
 	/**
 	 * Returns the first child element containing the specified class. Parent defaults to the entire document.
+	 * @param {string} cls
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement}
 	 */
 	static fcls(cls, parent) {
 		return (parent || document).getElementsByClassName(cls)[0];

app/Resources/Viewer/scripts/gui.mjs

@@ -1,10 +1,16 @@
-const GUI = (function() {
+import dom from "./dom.mjs";
+import discord from "./discord.mjs";
+import settings from "./settings.mjs";
+import state from "./state.mjs";
+
+export default (function() {
 	let eventOnOptMessagesPerPageChanged;
 	let eventOnOptMessageFilterChanged;
 	let eventOnNavButtonClicked;
 	
 	const getActiveFilter = function() {
-		const active = DOM.fcls("active", DOM.id("opt-filter-list"));
+		/** @type HTMLSelectElement */
+		const active = dom.fcls("active", dom.id("opt-filter-list"));
 		
 		return active && active.value !== "" ? {
 			"type": active.getAttribute("data-filter-type"),
@@ -17,12 +23,12 @@ const GUI = (function() {
 	};
 	
 	const showModal = function(width, html) {
-		const dialog = DOM.id("dialog");
+		const dialog = dom.id("dialog");
 		dialog.innerHTML = html;
 		dialog.style.width = width + "px";
 		dialog.style.marginLeft = (-width / 2) + "px";
 		
-		DOM.id("modal").classList.add("visible");
+		dom.id("modal").classList.add("visible");
 		return dialog;
 	};
 	
@@ -38,9 +44,9 @@ const GUI = (function() {
 <label><input id='dht-cfg-animemoji' type='checkbox'> Animated Emoji</label><br>`);
 		
 		const setupCheckBox = function(id, settingName) {
-			const ele = DOM.id(id);
-			ele.checked = SETTINGS[settingName];
-			ele.addEventListener("change", () => SETTINGS[settingName] = ele.checked);
+			const ele = dom.id(id);
+			ele.checked = settings[settingName];
+			ele.addEventListener("change", () => settings[settingName] = ele.checked);
 		};
 		
 		setupCheckBox("dht-cfg-imgpreviews", "enableImagePreviews");
@@ -65,20 +71,20 @@ const GUI = (function() {
 		// ---------
 		
 		setup() {
-			const inputMessageFilter = DOM.id("opt-messages-filter");
-			const containerFilterList = DOM.id("opt-filter-list");
+			const inputMessageFilter = dom.id("opt-messages-filter");
+			const containerFilterList = dom.id("opt-filter-list");
 			
 			const resetActiveFilter = function() {
 				inputMessageFilter.value = "";
 				inputMessageFilter.dispatchEvent(new Event("change"));
 				
-				DOM.id("opt-filter-contents").value = "";
+				dom.id("opt-filter-contents").value = "";
 			};
 			
 			inputMessageFilter.value = ""; // required to prevent browsers from remembering old value
 			
 			inputMessageFilter.addEventListener("change", () => {
-				DOM.cls("active", containerFilterList).forEach(ele => ele.classList.remove("active"));
+				dom.cls("active", containerFilterList).forEach(ele => ele.classList.remove("active"));
 				
 				if (inputMessageFilter.value) {
 					containerFilterList.querySelector("[data-filter-type='" + inputMessageFilter.value + "']").classList.add("active");
@@ -91,11 +97,11 @@ const GUI = (function() {
 				ele.addEventListener(ele.tagName === "SELECT" ? "change" : "input", () => triggerFilterChanged());
 			});
 			
-			DOM.id("opt-messages-per-page").addEventListener("change", () => {
+			dom.id("opt-messages-per-page").addEventListener("change", () => {
 				eventOnOptMessagesPerPageChanged && eventOnOptMessagesPerPageChanged();
 			});
 			
-			DOM.tag("button", DOM.fcls("nav")).forEach(button => {
+			dom.tag("button", dom.fcls("nav")).forEach(button => {
 				button.disabled = true;
 				
 				button.addEventListener("click", () => {
@@ -103,34 +109,34 @@ const GUI = (function() {
 				});
 			});
 			
-			DOM.id("btn-settings").addEventListener("click", () => {
+			dom.id("btn-settings").addEventListener("click", () => {
 				showSettingsModal();
 			});
 			
-			DOM.id("btn-about").addEventListener("click", () => {
+			dom.id("btn-about").addEventListener("click", () => {
 				showInfoModal();
 			});
 			
-			DOM.id("messages").addEventListener("click", e => {
+			dom.id("messages").addEventListener("click", e => {
 				const jump = e.target.getAttribute("data-jump");
 				
 				if (jump) {
 					resetActiveFilter();
 					
-					const index = STATE.navigateToMessage(jump);
+					const index = state.navigateToMessage(jump);
 					
 					if (index === -1) {
 						alert("Message not found.");
 					}
 					else {
-						DOM.id("messages").children[index].scrollIntoView();
+						dom.id("messages").children[index].scrollIntoView();
 					}
 				}
 			});
 			
-			DOM.id("overlay").addEventListener("click", () => {
-				DOM.id("modal").classList.remove("visible");
-				DOM.id("dialog").innerHTML = "";
+			dom.id("overlay").addEventListener("click", () => {
+				dom.id("modal").classList.remove("visible");
+				dom.id("dialog").innerHTML = "";
 			});
 		},
 		
@@ -168,19 +174,19 @@ const GUI = (function() {
 		 */
 		getOptionMessagesPerPage() {
 			/** @type HTMLInputElement */
-			const messagesPerPage = DOM.id("opt-messages-per-page");
+			const messagesPerPage = dom.id("opt-messages-per-page");
 			return parseInt(messagesPerPage.value, 10);
 		},
 		
 		updateNavigation(currentPage, totalPages) {
-			DOM.id("nav-page-current").innerHTML = currentPage;
-			DOM.id("nav-page-total").innerHTML = totalPages || "?";
+			dom.id("nav-page-current").innerHTML = currentPage;
+			dom.id("nav-page-total").innerHTML = totalPages || "?";
 			
-			DOM.id("nav-first").disabled = currentPage === 1;
-			DOM.id("nav-prev").disabled = currentPage === 1;
-			DOM.id("nav-pick").disabled = (totalPages || 0) <= 1;
-			DOM.id("nav-next").disabled = currentPage === (totalPages || 1);
-			DOM.id("nav-last").disabled = currentPage === (totalPages || 1);
+			dom.id("nav-first").disabled = currentPage === 1;
+			dom.id("nav-prev").disabled = currentPage === 1;
+			dom.id("nav-pick").disabled = (totalPages || 0) <= 1;
+			dom.id("nav-next").disabled = currentPage === (totalPages || 1);
+			dom.id("nav-last").disabled = currentPage === (totalPages || 1);
 		},
 		
 		// --------------
@@ -191,7 +197,7 @@ const GUI = (function() {
 		 * Updates the channel list and sets up their click events. The callback is triggered whenever a channel is selected, and takes the channel ID as its argument.
 		 */
 		updateChannelList(channels, selected, callback) {
-			const eleChannels = DOM.id("channels");
+			const eleChannels = dom.id("channels");
 			
 			if (!channels) {
 				eleChannels.innerHTML = "";
@@ -201,11 +207,11 @@ const GUI = (function() {
 					channels = channels.filter(channel => channel.msgcount > 0);
 				}
 				
-				eleChannels.innerHTML = channels.map(channel => DISCORD.getChannelHTML(channel)).join("");
+				eleChannels.innerHTML = channels.map(channel => discord.getChannelHTML(channel)).join("");
 				
 				Array.prototype.forEach.call(eleChannels.children, ele => {
 					ele.addEventListener("click", () => {
-						const currentChannel = DOM.fcls("active", eleChannels);
+						const currentChannel = dom.fcls("active", eleChannels);
 						
 						if (currentChannel) {
 							currentChannel.classList.remove("active");
@@ -224,12 +230,12 @@ const GUI = (function() {
 		},
 		
 		updateMessageList(messages) {
-			DOM.id("messages").innerHTML = messages ? messages.map(message => DISCORD.getMessageHTML(message)).join("") : "";
+			dom.id("messages").innerHTML = messages ? messages.map(message => discord.getMessageHTML(message)).join("") : "";
 		},
 		
 		updateUserList(users) {
 			/** @type HTMLSelectElement */
-			const eleSelect = DOM.id("opt-filter-user");
+			const eleSelect = dom.id("opt-filter-user");
 			
 			while (eleSelect.length > 1) {
 				eleSelect.remove(1);
@@ -237,10 +243,11 @@ const GUI = (function() {
 			
 			const options = [];
 			
-			for (const key of Object.keys(users)) {
+			for (const id of Object.keys(users)) {
+				const user = users[id];
 				const option = document.createElement("option");
-				option.value = key;
-				option.text = users[key].name;
+				option.value = id;
+				option.text = user.displayName ? `${user.displayName} (${user.name})` : user.name;
 				options.push(option);
 			}
 			
@@ -249,7 +256,7 @@ const GUI = (function() {
 		},
 		
 		scrollMessagesToTop() {
-			DOM.id("messages").scrollTop = 0;
+			dom.id("messages").scrollTop = 0;
 		}
 	};
 })();

app/Resources/Viewer/scripts/polyfills.mjs

@@ -0,0 +1,35 @@
+// https://gist.github.com/MattiasBuelens/496fc1d37adb50a733edd43853f2f60e/088f061ab79b296f29225467ae9ba86ff990195d
+
+ReadableStream.prototype.values ??= function({ preventCancel = false } = {}) {
+	const reader = this.getReader();
+	return {
+		async next() {
+			try {
+				const result = await reader.read();
+				if (result.done) {
+					reader.releaseLock();
+				}
+				return result;
+			} catch (e) {
+				reader.releaseLock();
+				throw e;
+			}
+		},
+		async return(value) {
+			if (!preventCancel) {
+				const cancelPromise = reader.cancel(value);
+				reader.releaseLock();
+				await cancelPromise;
+			}
+			else {
+				reader.releaseLock();
+			}
+			return { done: true, value };
+		},
+		[Symbol.asyncIterator]() {
+			return this;
+		}
+	};
+};
+
+ReadableStream.prototype[Symbol.asyncIterator] ??= ReadableStream.prototype.values;

app/Resources/Viewer/scripts/processor.mjs

@@ -1,16 +1,16 @@
-const PROCESSOR = {};
+import discord from "./discord.mjs";
 
 // ------------------------
 // Global filter generators
 // ------------------------
 
-PROCESSOR.FILTER = {
-	byUser: ((userindex) => message => message.u === userindex),
+const filter = {
+	byUser: ((user) => message => message.u === user),
 	byTime: ((timeStart, timeEnd) => message => message.t >= timeStart && message.t <= timeEnd),
 	byContents: ((substr) => message => ("m" in message ? message.m : "").indexOf(substr) !== -1),
 	byRegex: ((regex) => message => regex.test("m" in message ? message.m : "")),
-	withImages: (() => message => (message.e && message.e.some(embed => embed.type === "image")) || (message.a && message.a.some(DISCORD.isImageAttachment))),
-	withDownloads: (() => message => message.a && message.a.some(attachment => !DISCORD.isImageAttachment(attachment))),
+	withImages: (() => message => (message.e && message.e.some(embed => embed.type === "image")) || (message.a && message.a.some(discord.isImageAttachment))),
+	withDownloads: (() => message => message.a && message.a.some(attachment => !discord.isImageAttachment(attachment))),
 	withEmbeds: (() => message => message.e && message.e.length > 0),
 	withAttachments: (() => message => message.a && message.a.length > 0),
 	isEdited: (() => message => ("te" in message) ? message.te : (message.f & 1) === 1)
@@ -20,7 +20,7 @@ PROCESSOR.FILTER = {
 // Global sorters
 // --------------
 
-PROCESSOR.SORTER = {
+const sorter = {
 	oldestToNewest: (key1, key2) => {
 		if (key1.length === key2.length) {
 			return key1 > key2 ? 1 : key1 < key2 ? -1 : 0;
@@ -39,3 +39,8 @@ PROCESSOR.SORTER = {
 		}
 	}
 };
+
+export default {
+	FILTER: filter,
+	SORTER: sorter
+};

app/Resources/Viewer/scripts/servers.mjs

@@ -0,0 +1,109 @@
+import state from "./state.mjs";
+
+const servers = (() => {
+    let currentServerId = "0";
+
+    function getIcon(name) {
+        return name.split(" ").map(word => {
+            if (word.startsWith("[") && word.length > 1) return word[1];
+            return word[0] || "";
+        }).join("");
+    }
+
+    function update() {
+        const channels = document.querySelectorAll("#channels .channel");
+        const serversMap = new Map();
+
+        // Check if there are any channels with server-id 0 (DM)
+        const hasDMChannels = Array.from(channels).some(channel => {
+            return channel.getAttribute("server-id") === "0";
+        });
+
+        if (hasDMChannels) {
+            serversMap.set("0", {
+                id: "0",
+                name: "DM",
+                icon: "DM",
+            });
+        }
+
+        channels.forEach(channel => {
+            const serverId = channel.getAttribute("server-id") || "0";
+            const serverType = channel.getAttribute("server-type");
+            const serverName = channel.getAttribute("server-name");
+
+            if (serverType === "server" && !serversMap.has(serverId)) {
+                serversMap.set(serverId, {
+                    id: serverId,
+                    name: serverName,
+                    icon: getIcon(serverName),
+                });
+            }
+        });
+
+        const serversDiv = document.getElementById("servers");
+        serversDiv.innerHTML = "";
+
+        if (hasDMChannels) {
+            const dmServer = serversMap.get("0");
+            const dmElement = document.createElement("div");
+            dmElement.className = `Server${dmServer.id === currentServerId ? " active" : ""}`;
+            dmElement.id = "DM";
+            dmElement.dataset.serverId = dmServer.id;
+            dmElement.innerHTML = `
+                <div class="icon">DM</div>
+                <div class="name" title="Direct Messages">Direct Messages</div>
+            `;
+            dmElement.addEventListener("click", () => selectServer(dmServer.id));
+            serversDiv.appendChild(dmElement);
+        }
+
+        serversMap.forEach(server => {
+            if (server.id === "0") return; // Skip DM since it's already added
+
+            const serverElement = document.createElement("div");
+            serverElement.className = `Server${server.id === currentServerId ? " active" : ""}`;
+            serverElement.dataset.serverId = server.id;
+            serverElement.innerHTML = `
+                <div class="icon">${server.icon}</div>
+                <div class="name" title="${server.name}">${server.name}</div>
+            `;
+            serverElement.addEventListener("click", () => selectServer(server.id));
+            serversDiv.appendChild(serverElement);
+        });
+
+        if (!serversMap.has(currentServerId)) {
+            currentServerId = "0";
+        }
+
+        updateChannelVisibility();
+    }
+
+    function selectServer(serverId) {
+        // Remove active class from all servers
+        document.querySelectorAll("#servers .Server").forEach(server => {
+            server.classList.remove("active");
+        });
+
+        // Add active class to the selected server
+        const selectedServer = document.querySelector(`#servers .Server[data-server-id="${serverId}"]`);
+        if (selectedServer) {
+            selectedServer.classList.add("active");
+        }
+
+        currentServerId = serverId;
+        updateChannelVisibility();
+        state.selectChannel(null);
+    }
+
+    function updateChannelVisibility() {
+        document.querySelectorAll("#channels .channel").forEach(channel => {
+            const channelServerId = channel.getAttribute("server-id") || "0";
+            channel.classList.toggle("visible", channelServerId === currentServerId);
+        });
+    }
+
+    return { update };
+})();
+
+export default servers;

app/Resources/Viewer/scripts/settings.mjs

@@ -1,4 +1,4 @@
-const SETTINGS = (function() {
+export default (function() {
 	/**
 	 * @type {{}}
 	 * @property {Function} onSettingsChanged

app/Resources/Viewer/scripts/state.mjs

@@ -1,12 +1,26 @@
+import settings from "./settings.mjs";
+import processor from "./processor.mjs";
+
 // noinspection FunctionWithInconsistentReturnsJS
-const STATE = (function() {
+export default (function () {
 	/**
 	 * @type {{}}
 	 * @property {{}} users
-	 * @property {String[]} userindex
-	 * @property {{}[]} servers
+	 * @property {{}} servers
 	 * @property {{}} channels
 	 */
+
+
+	const fileUrlProcessor = function (serverToken) {
+		if (typeof serverToken === "string") {
+			return url => "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
+		}
+		else {
+			return url => url;
+		}
+	}(window.DHT_SERVER_TOKEN);
+
+
 	let loadedFileMeta;
 	let loadedFileData;
 
@@ -17,23 +31,39 @@ const STATE = (function() {
 	let currentPage;
 	let messagesPerPage;
 
-	const getUser = function(index) {
-		return loadedFileMeta.users[loadedFileMeta.userindex[index]] || { "name": "<unknown>" };
+	const getUser = function (id) {
+		return loadedFileMeta.users[id] || { "name": "<unknown>" };
 	};
 
-	const getUserId = function(index) {
-		return loadedFileMeta.userindex[index];
-	};
-	
-	const getUserList = function() {
+	const getUserList = function () {
 		return loadedFileMeta ? loadedFileMeta.users : [];
 	};
 
-	const getServer = function(index) {
-		return loadedFileMeta.servers[index] || { "name": "<unknown>", "type": "unknown" };
+	const getServer = function (id) {
+		return loadedFileMeta.servers[id] || { "name": "<unknown>", "type": "unknown" };
 	};
 
-	const generateChannelHierarchy = function() {
+	const getUserIDByName = function (name) {
+		for (let userId in loadedFileMeta.users) {
+			let user = loadedFileMeta.users[userId];
+			if (user.name === name) {
+				return userId;
+			}
+		}
+		return 0;
+	};
+
+	const getUserByName = function (name) {
+		for (let userId in loadedFileMeta.users) {
+			let user = loadedFileMeta.users[userId];
+			if (user.name === name) {
+				return user;
+			}
+		}
+		return 0;
+	};
+
+	const generateChannelHierarchy = function () {
 		/**
 		 * @type {Map<string, Set>}
 		 */
@@ -57,7 +87,7 @@ const STATE = (function() {
 			return children;
 		}
 
-		for (const [ id, channel ] of Object.entries(loadedFileMeta.channels)) {
+		for (const [id, channel] of Object.entries(loadedFileMeta.channels)) {
 			getChildren(channel.parent || "").add(id);
 		}
 
@@ -90,7 +120,7 @@ const STATE = (function() {
 		return hierarchy;
 	};
 
-	const generateChannelOrder = function() {
+	const generateChannelOrder = function () {
 		if (!loadedFileMeta) {
 			return {};
 		}
@@ -138,7 +168,7 @@ const STATE = (function() {
 		return orderMap;
 	};
 
-	const getChannelList = function() {
+	const getChannelList = function () {
 		if (!loadedFileMeta) {
 			return [];
 		}
@@ -146,23 +176,28 @@ const STATE = (function() {
 		const channels = loadedFileMeta.channels;
 		const channelOrder = generateChannelOrder();
 
+
 		return Object.keys(channels).map(key => ({
 			"id": key,
+			"serverId": channels[key].server,
 			"name": channels[key].name,
 			"server": getServer(channels[key].server),
 			"msgcount": getFilteredMessageKeys(key).length,
 			"topic": channels[key].topic || "",
 			"nsfw": channels[key].nsfw || false,
+			"icon": getServer(channels[key].server).type === "group"
+				? `<!--<span>${channels[key].name.split(" ").map(word => word[0]).join("")}</span>-->` //Discord default naming without a icon
+				: `<img src='${fileUrlProcessor("https://cdn.discordapp.com/avatars/" + getUserIDByName(channels[key].name) + "/" + getUserByName(channels[key].name).avatar+".webp")}'>`
 		})).sort((ac, bc) => {
 			return channelOrder[ac.id] - channelOrder[bc.id];
 		});
 	};
 
-	const getMessages = function(channel) {
+	const getMessages = function (channel) {
 		return loadedFileData[channel] || {};
 	};
 
-	const getMessageById = function(id) {
+	const getMessageById = function (id) {
 		for (const messages of Object.values(loadedFileData)) {
 			if (id in messages) {
 				return messages[id];
@@ -172,8 +207,8 @@ const STATE = (function() {
 		return null;
 	};
 
-	const getMessageChannel = function(id) {
-		for (const [ channel, messages ] of Object.entries(loadedFileData)) {
+	const getMessageChannel = function (id) {
+		for (const [channel, messages] of Object.entries(loadedFileData)) {
 			if (id in messages) {
 				return channel;
 			}
@@ -182,7 +217,7 @@ const STATE = (function() {
 		return null;
 	};
 
-	const getMessageList = function() {
+	const getMessageList = function () {
 		if (!loadedMessages) {
 			return [];
 		}
@@ -204,7 +239,7 @@ const STATE = (function() {
 			 */
 			const message = messages[key];
 			const user = getUser(message.u);
-			const avatar = user.avatar ? { id: getUserId(message.u), path: user.avatar } : null;
+			const avatar = user.avatar ? { id: message.u, path: user.avatar } : null;
 
 			const obj = {
 				user,
@@ -232,7 +267,7 @@ const STATE = (function() {
 			if ("r" in message) {
 				const replyMessage = getMessageById(message.r);
 				const replyUser = replyMessage ? getUser(replyMessage.u) : null;
-				const replyAvatar = replyUser && replyUser.avatar ? { id: getUserId(replyMessage.u), path: replyUser.avatar } : null;
+				const replyAvatar = replyUser && replyUser.avatar ? { id: replyMessage.u, path: replyUser.avatar } : null;
 
 				obj["reply"] = replyMessage ? {
 					"id": message.r,
@@ -254,19 +289,19 @@ const STATE = (function() {
 	let eventOnChannelsRefreshed;
 	let eventOnMessagesRefreshed;
 
-	const triggerUsersRefreshed = function() {
+	const triggerUsersRefreshed = function () {
 		eventOnUsersRefreshed && eventOnUsersRefreshed(getUserList());
 	};
 
-	const triggerChannelsRefreshed = function(selectedChannel) {
+	const triggerChannelsRefreshed = function (selectedChannel) {
 		eventOnChannelsRefreshed && eventOnChannelsRefreshed(getChannelList(), selectedChannel);
 	};
 
-	const triggerMessagesRefreshed = function() {
+	const triggerMessagesRefreshed = function () {
 		eventOnMessagesRefreshed && eventOnMessagesRefreshed(getMessageList());
 	};
 
-	const getFilteredMessageKeys = function(channel) {
+	const getFilteredMessageKeys = function (channel) {
 		const messages = getMessages(channel);
 		let keys = Object.keys(messages);
 
@@ -290,20 +325,17 @@ const STATE = (function() {
 			eventOnUsersRefreshed = callback;
 		},
 
-		/**
-		 * @param {{ meta, data }} file
-		 */
-		uploadFile(file) {
+		uploadFile(meta, data) {
 			if (loadedFileMeta != null) {
 				throw "A file is already loaded!";
 			}
 
-			if (!file || typeof file.meta !== "object" || typeof file.data !== "object") {
+			if (typeof meta !== "object" || typeof data !== "object") {
 				throw "Invalid file format!";
 			}
 
-			loadedFileMeta = file.meta;
-			loadedFileData = file.data;
+			loadedFileMeta = meta;
+			loadedFileData = data;
 			loadedMessages = null;
 
 			selectedChannel = null;
@@ -313,7 +345,7 @@ const STATE = (function() {
 			triggerChannelsRefreshed();
 			triggerMessagesRefreshed();
 
-			SETTINGS.onSettingsChanged(() => triggerMessagesRefreshed());
+			settings.onSettingsChanged(() => triggerMessagesRefreshed());
 		},
 
 		getChannelName(channel) {
@@ -321,21 +353,21 @@ const STATE = (function() {
 			return (channelObj && channelObj.name) || channel;
 		},
 
-		getUserTag(user) {
-			const userObj = loadedFileMeta.users[user];
-			return (userObj && userObj.tag) || "????";
-		},
-		
 		getUserName(user) {
 			const userObj = loadedFileMeta.users[user];
 			return (userObj && userObj.name) || user;
 		},
 
+		getUserDisplayName(user) {
+			const userObj = loadedFileMeta.users[user];
+			return (userObj && (userObj.displayName || userObj.name)) || user;
+		},
+
 		selectChannel(channel) {
 			currentPage = 1;
 			selectedChannel = channel;
 
-			loadedMessages = getFilteredMessageKeys(channel).sort(PROCESSOR.SORTER.oldestToNewest);
+			loadedMessages = getFilteredMessageKeys(channel).sort(processor.SORTER.oldestToNewest);
 			triggerMessagesRefreshed();
 		},
 
@@ -416,23 +448,23 @@ const STATE = (function() {
 		setActiveFilter(filter) {
 			switch (filter ? filter.type : "") {
 				case "user":
-					filterFunction = PROCESSOR.FILTER.byUser(loadedFileMeta.userindex.indexOf(filter.value));
+					filterFunction = processor.FILTER.byUser(filter.value);
 					break;
 
 				case "contents":
-					filterFunction = PROCESSOR.FILTER.byContents(filter.value);
+					filterFunction = processor.FILTER.byContents(filter.value);
 					break;
 
 				case "withimages":
-					filterFunction = PROCESSOR.FILTER.withImages();
+					filterFunction = processor.FILTER.withImages();
 					break;
 
 				case "withdownloads":
-					filterFunction = PROCESSOR.FILTER.withDownloads();
+					filterFunction = processor.FILTER.withDownloads();
 					break;
 
 				case "edited":
-					filterFunction = PROCESSOR.FILTER.isEdited();
+					filterFunction = processor.FILTER.isEdited();
 					break;
 
 				default:

app/Resources/Viewer/scripts/template.js

@@ -1,20 +0,0 @@
-const TEMPLATE_REGEX = /{([^{}]+?)}/g;
-
-class TEMPLATE {
-	constructor(contents) {
-		this.contents = contents;
-	};
-	
-	apply(obj, processor) {
-		return this.contents.replace(TEMPLATE_REGEX, (full, match) => {
-			const value = match.split(".").reduce((o, property) => o[property], obj);
-			
-			if (processor) {
-				const updated = processor(match, value);
-				return typeof updated === "undefined" ? DOM.escapeHTML(value) : updated;
-			}
-			
-			return DOM.escapeHTML(value);
-		});
-	}
-}

app/Resources/Viewer/scripts/template.mjs

@@ -0,0 +1,28 @@
+import dom from "./dom.mjs";
+
+const TEMPLATE_REGEX = /{([^{}]+?)}/g;
+
+export default class {
+	constructor(contents) {
+		this.contents = contents;
+	};
+	
+	apply(obj, processor) {
+
+		//Keys to not escape
+		const allowHTMLKeys = new Set(["icon"]); //Example with more: Set(["icon", "description", "content"]);
+	
+		return this.contents.replace(TEMPLATE_REGEX, (full, match) => {
+			const value = match.split(".").reduce((o, property) => o[property], obj);
+			
+			if (processor) {
+				const updated = processor(match, value);
+				return typeof updated === "undefined" ? (allowHTMLKeys.has(match) ? value : dom.escapeHTML(value)) : updated;
+			}
+
+	
+			return allowHTMLKeys.has(match) ? value : dom.escapeHTML(value);
+		});
+	}
+	
+}

app/Resources/Viewer/styles/channels.css

@@ -3,32 +3,105 @@
   min-width: 215px;
   max-width: 300px;
   overflow-y: auto;
-  background-color: #1c1e22;
+  color: #eee;
+  background-color: #2B2D31;
+  font-size: 15px;
+  padding: 2px;
 }
 
-#channels > div {
+#channels > div.loading {
+  margin: 0 auto;
+  width: 150px;
+  height: 150px;
+}
+
+#channels > div.loading {
+  background-color: rgba(0, 0, 0, 0) !important;
+}
+
+
+#channels > div.channel.visible {
+  display: flex !important;
+}
+
+#channels > div.channel {
+  display: none !important;
+
   cursor: pointer;
-  padding: 10px 12px;
+  padding: 5px 8px;
+
   color: #eee;
   font-size: 15px;
-  border-bottom: 1px solid #333333;
+
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-start;
+
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+
+  border-radius: 5px;
 }
 
-#channels > div:hover, #channels > div.active {
-  background-color: #282b30;
+
+.ServerChannel {
+  padding: 8px 8px !important;
 }
 
+#channels > div.channel:hover,
+#channels > div.channel.active {
+  background-color: rgba(78, 80, 88, 0.6);
+}
+
+#channels > div.channel.active > .info > .name {
+  color: oklab(0.999994 0.0000455678 0.0000200868);
+}
+
+
 #channels .info {
   display: flex;
-  height: 16px;
-  margin-bottom: 4px;
+  width: 100%;
+}
+
+.ServerChannel > .info {
+  padding: 0px !important;
+}
+
+.UserChannel > .info {
+  align-self: center;
+  padding-left: 6px !important;
+  align-items: center;
+
+  width: 150px !important;
+}
+
+
+[server-type="group"] > .info {
+  padding: 6px;
+
+  width: 172px !important;
+}
+
+.UserChannel > .info > .name {
+  min-height: 18px;
 }
 
 #channels .name {
   flex-grow: 1;
+  overflow-x: hidden;
+  overflow-y: clip;
   text-overflow: ellipsis;
   white-space: nowrap;
-  overflow: hidden;
+  color: oklab(0.686636 -0.00407365 -0.0149199);
+  font-weight: 500;
+  font-size: 16px;
+  /* max-width: 200px; */
+}
+
+.ServerChannel .name {
+  height: 18px;
 }
 
 #channels .tag {
@@ -40,3 +113,25 @@
   padding: 2px 5px;
   font-size: 11px;
 }
+
+
+#channels > div:hover,
+#channels > div.active {
+  background-color: #404249
+}
+
+#channels > div > .avatar {
+  padding: 0;
+  margin: 0;
+}
+
+#channels > div > .avatar > * {
+  width: 30px;
+
+  min-width: 30px;
+  min-height: 30px;
+  /*Make not loaded images be 30px*/
+
+  border-radius: 100%;
+  font-size: 1em;
+}

app/Resources/Viewer/styles/main.css

@@ -11,3 +11,24 @@ body {
   display: flex;
   flex-direction: row;
 }
+
+.loading {
+  position: relative;
+  --loading-backdrop: rgba(0, 0, 0, 0);
+}
+
+.loading:hover {
+  background-color: rgba(0, 0, 0, 0) !important;
+}
+
+.loading::after {
+  content: "";
+  background: var(--loading-backdrop)
+  url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
+  no-repeat center center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}

app/Resources/Viewer/styles/menu.css

@@ -1,15 +1,16 @@
 #menu {
-  width: 100%;
-  height: 48px;
   display: flex;
   flex-direction: row;
-  background-color: #17181c;
-  border-bottom: 1px dotted #5d626b;
+  align-items: stretch;
+  gap: 8px;
+  padding: 8px;
+  background-color: #313338;
+  border-bottom: 2px solid #27292D;
 }
 
 #menu .splitter {
-  width: 1px;
-  margin: 9px 4px;
+  flex: 0 0 1px;
+  margin: 9px 1px;
   background-color: #5d626b;
 }
 
@@ -22,8 +23,11 @@
   cursor: default;
 }
 
-#menu button, #menu select, #menu input[type="text"] {
-  margin: 8px;
+#menu button,
+#menu select,
+#menu input[type="text"] {
+  height: 31px;
+  padding: 0 10px;
   background-color: #7289da;
   color: #fff;
   text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.75);
@@ -31,28 +35,25 @@
 
 #menu button {
   font-size: 17px;
-  padding: 0 12px;
   border: 0;
   cursor: pointer;
+  white-space: nowrap;
 }
 
 #menu select {
   font-size: 14px;
-  padding: 6px;
   border: 0;
   cursor: pointer;
 }
 
 #menu input[type="text"] {
   font-size: 14px;
-  padding: 7px 12px;
   border: 0;
 }
 
 #menu .nav {
   display: flex;
   flex-direction: row;
-  margin: 0 8px;
 }
 
 #menu .nav > button {
@@ -65,14 +66,20 @@
   padding: 0 8px;
 }
 
-#menu .nav > button, #menu .nav > p {
-  margin: 8px 1px;
+#menu .nav > button,
+#menu .nav > p {
+  margin: 0 1px;
 }
 
-#opt-filter-list > select, #opt-filter-list > input {
+#opt-filter-list > select,
+#opt-filter-list > input {
   display: none;
 }
 
 #opt-filter-list > .active {
   display: block;
 }
+
+#btn-about {
+  margin-left: auto;
+}

app/Resources/Viewer/styles/messages.css

@@ -1,13 +1,18 @@
 #messages {
   flex: 1 1 0;
   overflow-y: auto;
-  background-color: #36393E;
+  background-color: #36393e;
 }
 
 #messages > div {
-  margin: 0 24px;
-  padding: 4px 0 12px;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.04);
+  padding: 0 4px 0 24px;
+
+  margin-bottom: 17px;
+}
+
+
+#messages > div:hover {
+  background-color: oklab(0.0846607 0.00000385568 0.00000169128 / 0.06);
 }
 
 #messages h2 {
@@ -23,6 +28,8 @@
   align-content: flex-start;
 }
 
+
+
 #messages .avatar-wrapper > div {
   flex: 1 1 auto;
 }
@@ -38,7 +45,7 @@
 }
 
 #messages .username {
-  color: #FFF;
+  color: #fff;
   font-size: 15px;
   font-weight: 600;
   margin-right: 3px;
@@ -50,14 +57,9 @@
   font-size: 12px;
   font-weight: 500;
   letter-spacing: 0;
+  margin-left: 5px;
 }
 
-#messages .info::before {
-  content: "\2022";
-  text-align: center;
-  display: inline-block;
-  width: 14px;
-}
 
 #messages .jump {
   cursor: pointer;
@@ -66,21 +68,23 @@
 }
 
 .message {
-  margin-top: 6px;
-  color: rgba(255, 255, 255, 0.7);
-  font-size: 15px;
+  margin-top: 2px;
+  color: oklab(0.89908 -0.00192907 -0.0048306);
+  font-size: 16px;
   line-height: 1.1em;
   white-space: pre-wrap;
   word-wrap: break-word;
 }
 
-.message .link, .reply-message .link {
-  color: #7289DA;
+.message .link,
+.reply-message .link {
+  color: #7289da;
   background-color: rgba(115, 139, 215, 0.1);
 }
 
-.message a, .reply-message a {
-  color: #0096CF;
+.message a,
+.reply-message a {
+  color: #0096cf;
   text-decoration: none;
 }
 
@@ -107,23 +111,11 @@
 }
 
 .message .thumbnail {
-  position: relative;
+  --loading-backdrop: rgba(0, 0, 0, 0.75);
   max-width: calc(100% - 20px);
   max-height: 320px;
 }
 
-.message .thumbnail.loading::after {
-  content: "";
-  background: rgba(0, 0, 0, 0.75)
-              url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
-              no-repeat center center;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-
 .message .thumbnail img {
   width: auto;
   max-width: 100%;
@@ -138,12 +130,13 @@
   border-radius: 3px;
 }
 
-.message .embed:first-child, .message .download + .download {
+.message .embed:first-child,
+.message .download+.download {
   margin-top: 0;
 }
 
 .message code {
-  background-color: #2E3136;
+  background-color: #2e3136;
   border-radius: 5px;
   font-family: Menlo, Consolas, Monaco, monospace;
   font-size: 14px;
@@ -156,7 +149,7 @@
 
 .message code.block {
   display: block;
-  border: 2px solid #282B30;
+  border: 2px solid #282b30;
   margin-top: 6px;
   padding: 7px;
 }
@@ -210,7 +203,7 @@
 }
 
 .reply-username {
-  color: #FFF;
+  color: #fff;
   font-size: 12px;
   font-weight: 600;
   letter-spacing: 0;
@@ -230,7 +223,7 @@
 }
 
 .reply-contents code {
-  background-color: #2E3136;
+  background-color: #2e3136;
   font-family: Menlo, Consolas, Monaco, monospace;
   padding: 1px 2px;
 }

app/Resources/Viewer/styles/servers.css

@@ -0,0 +1,81 @@
+#servers {
+    width: 76px;
+    background-color: #1e1f22;
+    padding: 0px;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+
+.Server {
+    width: 54px;
+    height: 54px;
+    margin-left: 11px;
+    margin-top: 8px;
+    border-radius: 100%;
+    transition: .15s ease-out;
+    cursor: pointer;
+    background-color: #313338;
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+}
+
+.Server:hover {
+    border-radius: 20px;
+    background-color: #5865f2;
+}
+
+.Server.active {
+    border-radius: 20px;
+    background-color: #5865f2;
+}
+
+.ServerImg {
+    width: 100%;
+    height: 100%;
+}
+
+svg.ServerImg {
+    width: 100%;
+    height: 70%;
+    /* margin-top: 15%; */
+    color: white;
+}
+
+#servers .Server .icon {
+    font-weight: bold;
+    font-size: 1.5em;
+    text-align: center;
+    word-wrap: break-word;
+    word-break: break-all;
+    white-space: normal;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+    color: white;
+}
+
+#servers .Server .name {
+    display: none;
+    font-weight: bold;
+    white-space: normal;
+    word-wrap: break-word;
+    text-align: center;
+}
+#servers .Server .name {
+    display: none;
+}
+
+#servers .Server:hover .name {
+    display: block;
+    position: absolute;
+    background: rgba(0, 0, 0, 0.8);
+    color: white;
+    padding: 5px;
+    border-radius: 4px;
+    margin-left: 60px;
+    white-space: nowrap;
+}

app/Server/Data/DownloadStatus.cs

@@ -10,5 +10,5 @@ public enum DownloadStatus {
 	GenericError = 1,
 	Downloading = 2,
 	LastCustomCode = 99,
-	Success = HttpStatusCode.OK
+	Success = HttpStatusCode.OK,
 }

app/Server/Data/DownloadWithData.cs

@@ -1,3 +0,0 @@
-namespace DHT.Server.Data;
-
-public readonly record struct DownloadWithData(Download Download, byte[]? Data);

app/Server/Data/EmojiFlags.cs

@@ -5,5 +5,5 @@ namespace DHT.Server.Data;
 [Flags]
 public enum EmojiFlags : ushort {
 	None = 0,
-	Animated = 0b1
+	Animated = 0b1,
 }

app/Server/Data/FileUrl.cs

@@ -0,0 +1,9 @@
+namespace DHT.Server.Data;
+
+public readonly record struct FileUrl(string NormalizedUrl, string DownloadUrl, string? Type) {
+	public FileUrl(string url, string? type) : this(url, url, type) {}
+	
+	public Download ToPendingDownload() {
+		return new Download(NormalizedUrl, DownloadUrl, DownloadStatus.Pending, Type, size: null);
+	}
+}

app/Server/Data/Filters/FilterRemovalMode.cs

@@ -2,5 +2,5 @@ namespace DHT.Server.Data.Filters;
 
 public enum FilterRemovalMode {
 	KeepMatching,
-	RemoveMatching
+	RemoveMatching,
 }

app/Server/Data/Server.cs

@@ -1,7 +1,12 @@
+using DHT.Server.Download;
+
 namespace DHT.Server.Data;
 
 public readonly struct Server {
 	public ulong Id { get; init; }
 	public string Name { get; init; }
 	public ServerType? Type { get; init; }
+	public string? IconHash { get; init; }
+	
+	internal FileUrl? IconUrl => Type == null || IconHash == null ? null : DownloadLinkExtractor.ServerIcon(Type.Value, Id, IconHash);
 }

app/Server/Data/ServerType.cs

@@ -3,7 +3,7 @@ namespace DHT.Server.Data;
 public enum ServerType {
 	Server,
 	Group,
-	DirectMessage
+	DirectMessage,
 }
 
 public static class ServerTypes {
@@ -12,7 +12,7 @@ public static class ServerTypes {
 			"SERVER" => ServerType.Server,
 			"GROUP"  => ServerType.Group,
 			"DM"     => ServerType.DirectMessage,
-			_        => null
+			_        => null,
 		};
 	}
 	
@@ -21,7 +21,7 @@ public static class ServerTypes {
 			ServerType.Server        => "SERVER",
 			ServerType.Group         => "GROUP",
 			ServerType.DirectMessage => "DM",
-			_                        => "UNKNOWN"
+			_                        => "UNKNOWN",
 		};
 	}
 	
@@ -30,7 +30,7 @@ public static class ServerTypes {
 			ServerType.Server        => "Server",
 			ServerType.Group         => "Group",
 			ServerType.DirectMessage => "DM",
-			_                        => "Unknown"
+			_                        => "Unknown",
 		};
 	}
 	
@@ -39,7 +39,7 @@ public static class ServerTypes {
 			ServerType.Server        => "server",
 			ServerType.Group         => "group",
 			ServerType.DirectMessage => "user",
-			_                        => "unknown"
+			_                        => "unknown",
 		};
 	}
 }