WIP

.github/FUNDING.yml

@@ -1 +1,3 @@
+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 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/).
+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/).
 
 ### 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 Debian in WSL and open a terminal in the project folder.
+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)
-2. Run the `app/build.wsl.sh` script.
-3. Read the [Distribution](#distribution) section below.
 
-Note: The build script expects `dotnet.exe` to be installed in `C:\Program Files\dotnet`.
+Run the `app/build.bat` script, and read the [Distribution](#distribution) section below.
 
 #### Release – Other Operating Systems
 
-1. Install the `zip` package from your repository.
+1. Install the `zip` package from your repository
-2. Run the `app/build.sh` script.
+
-3. Read the [Distribution](#distribution) section below.
+Run the `app/build.sh` script, and 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 the ASP.NET Core Runtime to be installed.
+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.

app/.editorconfig

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

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

@@ -9,16 +9,15 @@
         <entry key="Desktop/Dialogs/Progress/ProgressDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Dialogs/TextBox/TextBoxDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/AboutWindow.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Controls/DownloadItemFilterPanel.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Controls/AttachmentFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <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/AttachmentsPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DebugPage.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Pages/DownloadsPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/TrackingPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/ViewerPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Screens/MainContentScreen.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="7">
+    <DB2CodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </DB2CodeStyleSettings>
-    <DerbyCodeStyleSettings version="7">
+    <DerbyCodeStyleSettings version="6">
       <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="7">
+    <H2CodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </H2CodeStyleSettings>
-    <HSQLCodeStyleSettings version="7">
+    <HSQLCodeStyleSettings version="6">
       <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="7">
+    <MSSQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </MSSQLCodeStyleSettings>
-    <MySQLCodeStyleSettings version="7">
+    <MySQLCodeStyleSettings version="6">
       <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="7">
+    <OracleCodeStyleSettings version="6">
       <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="7">
+    <PostgresCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </PostgresCodeStyleSettings>
     <Properties>
@@ -143,16 +143,13 @@
       <option name="INDENT_WHEN_CASES" value="true" />
       <option name="CHAIN_CALLS_ALIGNMENT" value="2" />
     </Ruby>
-    <SQLiteCodeStyleSettings version="7">
+    <SQLiteCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </SQLiteCodeStyleSettings>
     <ScssCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </ScssCodeStyleSettings>
-    <Shell_Script>
+    <SqlCodeStyleSettings version="6">
-      <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" />
@@ -176,10 +173,9 @@
       <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="7">
+    <SybaseCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </SybaseCodeStyleSettings>
     <TypeScriptCodeStyleSettings version="0">
@@ -207,11 +203,6 @@
         <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" />
@@ -291,13 +282,6 @@
         <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" />
@@ -358,6 +342,7 @@
       </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" />
@@ -372,7 +357,6 @@
     </codeStyleSettings>
     <codeStyleSettings language="SCSS">
       <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
@@ -383,6 +367,13 @@
         <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" />
@@ -436,9 +427,6 @@
     </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,6 +91,7 @@
     <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" />
@@ -361,7 +362,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-z0-9]*" />
+      <option name="m_regex" value="[a-z][A-Za-z]*" />
       <option name="m_minLength" value="0" />
       <option name="m_maxLength" value="99" />
     </inspection_tool>

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

@@ -0,0 +1,22 @@
+<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,56 +51,9 @@
 
         <Style Selector="Expander">
             <Setter Property="MinHeight" Value="40" />
-            <Setter Property="Padding" Value="12" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
         
-        <Style Selector="TreeViewItem:not(:empty) /template/ Panel#PART_ExpandCollapseChevronContainer">
-            <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Margin" Value="0 0 5 0" />
-        </Style>
-        <Style Selector="TreeViewItem:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
-            <Setter Property="Margin" Value="10 0" />
-        </Style>
-        <Style Selector="TreeViewItem[Level=0]:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="Width" Value="0" />
-        </Style>
-        <Style Selector="TreeViewItem /template/ ToggleButton#PART_ExpandCollapseChevron">
-            <Setter Property="Width" Value="18" />
-            <Setter Property="Height" Value="32" />
-        </Style>
-        <Style Selector="TreeViewItem /template/ ToggleButton#PART_ExpandCollapseChevron > Border">
-            <Setter Property="Padding" Value="2 10 3 10" />
-        </Style>
-
-        <Style Selector="TreeView.noSelection">
-            <Style Selector="^ TreeViewItem /template/ Border#PART_LayoutRoot">
-                <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}" />
-            </Style>
-            <Style Selector="^ TreeViewItem /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
-            </Style>
-            <Style Selector="^ TreeViewItem:disabled /template/ Border#PART_LayoutRoot">
-                <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundDisabled}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushDisabled}" />
-            </Style>
-            <Style Selector="^ TreeViewItem:disabled /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
-            </Style>
-        </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,4 @@
-using System.Collections.Generic;
+using System;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop;
@@ -8,16 +8,15 @@ sealed class Arguments {
 	
 	private const int FirstArgument = 1;
 
-	public static Arguments Empty => new ([]);
+	public static Arguments Empty => new(Array.Empty<string>());
 
 	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) {
+	public Arguments(string[] args) {
-		for (int i = FirstArgument; i < args.Count; i++) {
+		for (int i = FirstArgument; i < args.Length; i++) {
 			string key = args[i];
 
 			switch (key) {
@@ -36,7 +35,7 @@ sealed class Arguments {
 				value = key;
 				key = "-db";
 			}
-			else if (i >= args.Count - 1) {
+			else if (i >= args.Length - 1) {
 				Log.Warn("Missing value for command line argument: " + key);
 				continue;
 			}
@@ -50,11 +49,11 @@ sealed class Arguments {
 					continue;
 
 				case "-port": {
-					if (!ushort.TryParse(value, out ushort port)) {
+					if (ushort.TryParse(value, out var port)) {
-						Log.Warn("Invalid port number: " + value);
+						ServerPort = port;
 					}
 					else {
-						ServerPort = port;
+						Log.Warn("Invalid port number: " + value);
 					}
 
 					continue;
@@ -64,20 +63,6 @@ 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/AvaloniaReflection.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using Avalonia.Interactivity;
-
-namespace DHT.Desktop.Common;
-
-static class AvaloniaReflection {
-	private static FieldInfo InteractiveEventHandlersField { get; } = typeof(Interactive).GetField("_eventHandlers", BindingFlags.Instance | BindingFlags.NonPublic)!;
-	
-	public static void Check() {
-		if (InteractiveEventHandlersField == null) {
-			throw new InvalidOperationException("Missing field: " + nameof(InteractiveEventHandlersField));
-		}
-		
-		if (InteractiveEventHandlersField.FieldType.ToString() != "System.Collections.Generic.Dictionary`2[Avalonia.Interactivity.RoutedEvent,System.Collections.Generic.List`1[Avalonia.Interactivity.Interactive+EventSubscription]]") {
-			throw new InvalidOperationException("Invalid field type: " + nameof(InteractiveEventHandlersField) + " = " + InteractiveEventHandlersField.FieldType);
-		}
-	}
-	
-	public static IList? GetEventHandler(Interactive target, RoutedEvent routedEvent) {
-		IDictionary? eventHandlers = (IDictionary?) InteractiveEventHandlersField.GetValue(target);
-		return (IList?) eventHandlers?[routedEvent];
-	}
-}

app/Desktop/Common/BytesValueConverter.cs

@@ -19,17 +19,17 @@ sealed class BytesValueConverter : IValueConverter {
 		}
 	}
 
-	private static readonly Unit[] Units = [
+	private static readonly Unit[] Units = {
-		new Unit("B", decimalPlaces: 0),
+		new ("B", decimalPlaces: 0),
-		new Unit("kB", decimalPlaces: 0),
+		new ("kB", decimalPlaces: 0),
-		new Unit("MB", decimalPlaces: 1),
+		new ("MB", decimalPlaces: 1),
-		new Unit("GB", decimalPlaces: 1),
+		new ("GB", decimalPlaces: 1),
-		new Unit("TB", decimalPlaces: 1)
+		new ("TB", decimalPlaces: 1)
-	];
+	};
 
 	private const int Scale = 1000;
 
-	public static string Convert(ulong size) {
+	private static string Convert(ulong size) {
 		int power = size == 0L ? 0 : (int) Math.Log(size, Scale);
 		int unit = power >= Units.Length ? Units.Length - 1 : power;
 		return Units[unit].Format(unit == 0 ? size : size / Math.Pow(Scale, unit));

app/Desktop/Common/DatabaseGui.cs

@@ -1,15 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Server.Database.Exceptions;
 using DHT.Server.Database.Sqlite;
-using DHT.Server.Database.Sqlite.Schema;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Common;
@@ -19,16 +20,16 @@ static class DatabaseGui {
 
 	private const string DatabaseFileInitialName = "archive.dht";
 
-	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = [
+	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = new List<FilePickerFileType> {
-		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"]),
+		FileDialogs.CreateFilter("Discord History Tracker Database", new [] { "dht" })
-	];
+	};
 
 	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
 		return await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Database File",
 			FileTypeFilter = DatabaseFileDialogFilter,
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			AllowMultiple = true,
+			AllowMultiple = true
 		});
 	}
 
@@ -38,21 +39,26 @@ static class DatabaseGui {
 			FileTypeChoices = DatabaseFileDialogFilter,
 			SuggestedFileName = DatabaseFileInitialName,
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			ShowOverwritePrompt = false,
+			ShowOverwritePrompt = false
 		});
 	}
 
 	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
+		var prevSynchronizationContext = SynchronizationContext.Current;
+		SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
+		var taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
+		SynchronizationContext.SetSynchronizationContext(prevSynchronizationContext);
+		
 		IDatabaseFile? file = null;
 
 		try {
-			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks);
+			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks, taskScheduler);
 		} catch (InvalidDatabaseVersionException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
 		} catch (DatabaseTooNewException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' was opened in a newer version of DHT (database version " + ex.DatabaseVersion + ", app version " + ex.CurrentVersion + ").");
 		} catch (Exception ex) {
-			Log.Error("Could not open database file: " + path, ex);
+			Log.Error(ex);
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
 		}
 

app/Desktop/Common/SystemUtils.cs

@@ -1,9 +0,0 @@
-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,18 +15,13 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.0" />
+    <PackageReference Include="Avalonia" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
-    <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>
@@ -35,6 +30,10 @@
   
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
+    <Compile Update="Dialogs\TextBox\TextBoxDialog.axaml.cs">
+      <DependentUpon>CheckBoxDialog.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   
   <ItemGroup>
@@ -42,6 +41,11 @@
     <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

@@ -8,8 +8,7 @@
         x:DataType="namespace:CheckBoxDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        MinWidth="425" MinHeight="200"
+        Width="500" SizeToContent="Height" CanResize="False"
-        Width="500" Height="395" CanResize="True"
         WindowStartupLocation="CenterOwner">
 
     <Window.DataContext>
@@ -17,35 +16,47 @@
     </Window.DataContext>
 
     <Window.Styles>
-        <Style Selector="TreeViewItem">
+        <Style Selector="Panel.buttons">
-            <Setter Property="IsExpanded" Value="True" />
+            <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>
 
-    <DockPanel Margin="20 17 20 20">
+    <StackPanel Margin="20">
-        <Panel Classes="buttons" DockPanel.Dock="Bottom">
+        <ScrollViewer MaxHeight="400">
-            <WrapPanel>
+            <ItemsRepeater ItemsSource="{Binding Items}">
-                <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
+                <ItemsRepeater.ItemTemplate>
-                <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
+                    <DataTemplate>
-            </WrapPanel>
+                        <CheckBox IsChecked="{Binding Checked}">
-            <WrapPanel HorizontalAlignment="Right">
-                <Button Click="ClickOk">OK</Button>
-                <Button Click="ClickCancel">Cancel</Button>
-            </WrapPanel>
-        </Panel>
-        <ScrollViewer DockPanel.Dock="Top">
-            <TreeView Name="TreeView" Classes="noSelection" ItemsSource="{Binding RootItems}" ContainerPrepared="TreeViewOnContainerPrepared">
-                <TreeView.ItemTemplate>
-                    <TreeDataTemplate ItemsSource="{Binding Children}">
-                        <CheckBox IsChecked="{Binding IsChecked}">
                             <Label>
                                 <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
                             </Label>
                         </CheckBox>
-                    </TreeDataTemplate>
+                    </DataTemplate>
-                </TreeView.ItemTemplate>
+                </ItemsRepeater.ItemTemplate>
-            </TreeView>
+            </ItemsRepeater>
         </ScrollViewer>
-    </DockPanel>
+        <Panel Classes="buttons">
+            <WrapPanel Classes="left">
+                <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
+                <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
+            </WrapPanel>
+            <WrapPanel Classes="right">
+                <Button Click="ClickOk">OK</Button>
+                <Button Click="ClickCancel">Cancel</Button>
+            </WrapPanel>
+        </Panel>
+    </StackPanel>
 
 </Window>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml.cs

@@ -1,9 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input;
 using Avalonia.Interactivity;
-using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
@@ -14,36 +11,6 @@ public sealed partial class CheckBoxDialog : Window {
 		InitializeComponent();
 	}
 
-	private void TreeViewOnContainerPrepared(object? sender, ContainerPreparedEventArgs e) {
-		foreach (object? item in TreeView.Items) {
-			if (item != null && TreeView.ContainerFromItem(item) is TreeViewItem treeViewItem) {
-				treeViewItem.TemplateApplied += TreeViewItemOnTemplateApplied;
-				treeViewItem.GotFocus += TreeViewItemOnGotFocus;
-				treeViewItem.KeyDown += TreeViewItemOnKeyDown;
-			}
-		}
-	}
-	
-	private void TreeViewItemOnTemplateApplied(object? sender, TemplateAppliedEventArgs e) {
-		if (sender is TreeViewItem { HeaderPresenter: Interactive headerPresenter } ) {
-			// Removes support for double-clicking to expand.
-			AvaloniaReflection.GetEventHandler(headerPresenter, DoubleTappedEvent)?.Clear();
-		}
-	}
-	
-	private void TreeViewItemOnGotFocus(object? sender, GotFocusEventArgs e) {
-		if (e.NavigationMethod == NavigationMethod.Tab && sender is TreeViewItem treeViewItem && TreeView.SelectedItem == null) {
-			TreeView.SelectedItem = TreeView.ItemFromContainer(treeViewItem);
-		}
-	}
-	
-	private void TreeViewItemOnKeyDown(object? sender, KeyEventArgs e) {
-		if (e.Key == Key.Space && TreeView.SelectedItem is ICheckBoxItem item) {
-			item.IsChecked = item.IsChecked == false;
-			e.Handled = true;
-		}
-	}
-	
 	public void ClickOk(object? sender, RoutedEventArgs e) {
 		Close(DialogResult.OkCancel.Ok);
 	}

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -1,73 +1,70 @@
+using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.ComponentModel;
 using System.Linq;
-using PropertyChanged.SourceGenerator;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-partial class CheckBoxDialogModel {
+class CheckBoxDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 
-	private ImmutableArray<ICheckBoxItem> rootItems = [];
+	private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
 
-	public ImmutableArray<ICheckBoxItem> RootItems {
+	public IReadOnlyList<CheckBoxItem> Items {
-		get => rootItems;
+		get => items;
 
 		protected set {
-			foreach (ICheckBoxItem item in ICheckBoxItem.GetAllRecursively(rootItems)) {
+			foreach (var item in items) {
 				item.PropertyChanged -= OnItemPropertyChanged;
 			}
 
-			rootItems = value;
+			items = value;
 
-			foreach (ICheckBoxItem item in ICheckBoxItem.GetAllRecursively(rootItems)) {
+			foreach (var item in items) {
 				item.PropertyChanged += OnItemPropertyChanged;
 			}
 		}
 	}
 
-	protected IEnumerable<ICheckBoxItem> AllItems => ICheckBoxItem.GetAllRecursively(RootItems);
+	private bool pauseCheckEvents = false;
 
-	[DependsOn(nameof(RootItems))]
+	public bool AreAllSelected => Items.All(static item => item.Checked);
-	public bool AreAllSelected => RootItems.All(static item => item.IsChecked == true);
+	public bool AreNoneSelected => Items.All(static item => !item.Checked);
-	
-	[DependsOn(nameof(RootItems))]
-	public bool AreNoneSelected => RootItems.All(static item => item.IsChecked == false);
-	
-	private bool pauseUpdatingBulkButtons = false;
 
 	public void SelectAll() => SetAllChecked(true);
 	public void SelectNone() => SetAllChecked(false);
 
 	private void SetAllChecked(bool isChecked) {
-		pauseUpdatingBulkButtons = true;
+		pauseCheckEvents = true;
 
-		foreach (ICheckBoxItem item in RootItems) {
+		foreach (var item in Items) {
-			item.IsChecked = isChecked;
+			item.Checked = isChecked;
 		}
 
-		pauseUpdatingBulkButtons = false;
+		pauseCheckEvents = false;
 		UpdateBulkButtons();
 	}
 
-	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+	private void UpdateBulkButtons() {
-		if (e.PropertyName == nameof(ICheckBoxItem.IsChecked) && !pauseUpdatingBulkButtons) {
+		OnPropertyChanged(nameof(AreAllSelected));
-			UpdateBulkButtons();
+		OnPropertyChanged(nameof(AreNoneSelected));
-		}
 	}
 
-	private void UpdateBulkButtons() {
+	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(RootItems)));
+		if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.Checked)) {
+			UpdateBulkButtons();
+		}
 	}
 }
 
 sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
-	public IEnumerable<T> SelectedValues => AllItems.OfType<ICheckBoxItem.Leaf<T>>()
+	public new IReadOnlyList<CheckBoxItem<T>> Items { get; }
-	                                                .Where(static item => item.IsChecked == true)
-	                                                .Select(static item => item.Value);
 
-	public CheckBoxDialogModel(ImmutableArray<ICheckBoxItem> items) {
+	public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.Checked);
-		this.RootItems = items;
+
+	public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
+		this.Items = new List<CheckBoxItem<T>>(items);
+		base.Items = this.Items;
 	}
 }

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

@@ -1,110 +1,24 @@
-using System;
+using DHT.Utils.Models;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel;
-using System.Linq;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-partial interface ICheckBoxItem : INotifyPropertyChanged {
+class CheckBoxItem : BaseModel {
-	public string Title { get; }
+	public string Title { get; init; } = "";
-	public bool? IsChecked { get; set; }
+	public object? Item { get; init; } = null;
 
-	public ImmutableArray<ICheckBoxItem> Children { get; }
+	private bool isChecked = false;
 
-	void NotifyIsCheckedChanged();
+	public bool Checked {
-	
+		get => isChecked;
-	public static IEnumerable<ICheckBoxItem> GetAllRecursively(IEnumerable<ICheckBoxItem> items) {
+		set => Change(ref isChecked, value);
-		Stack<ICheckBoxItem> stack = new Stack<ICheckBoxItem>(items);
+	}
-		
+}
-		while (stack.TryPop(out var item)) {
+
-			yield return item;
+sealed class CheckBoxItem<T> : CheckBoxItem {
-			
+	public new T Item { get; }
-			foreach (ICheckBoxItem child in item.Children) {
+
-				stack.Push(child);
+	public CheckBoxItem(T item) {
-			}
+		this.Item = item;
-		}
+		base.Item = item;
-	}
-	
-	sealed class NonLeaf : ICheckBoxItem {
-		public string Title { get; }
-		
-		public bool? IsChecked {
-			get {
-				if (Children.Count(static child => child.IsChecked == true) == Children.Length) {
-					return true;
-				}
-				else if (Children.Count(static child => child.IsChecked == false) == Children.Length) {
-					return false;
-				}
-				else {
-					return null;
-				}
-			}
-			
-			set {
-				foreach (ICheckBoxItem child in Children) {
-					if (child is Leaf leaf) {
-						leaf.SetCheckedFromParent(value);
-					}
-					else {
-						child.IsChecked = value;
-					}
-				}
-				
-				NotifyIsCheckedChanged();
-				parent?.NotifyIsCheckedChanged();
-			}
-		}
-		
-		public ImmutableArray<ICheckBoxItem> Children { get; }
-		
-		public event PropertyChangedEventHandler? PropertyChanged;
-		
-		private readonly ICheckBoxItem? parent;
-		
-		public NonLeaf(string title, ICheckBoxItem? parent, Func<ICheckBoxItem, ImmutableArray<ICheckBoxItem>> children) {
-			this.parent = parent;
-			this.Title = title;
-			this.Children = children(this);
-		}
-		
-		public void NotifyIsCheckedChanged() {
-			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsChecked)));
-		}
-	}
-	
-	partial class Leaf(string title, ICheckBoxItem? parent, bool isChecked) : ICheckBoxItem {
-		public string Title { get; } = title;
-		
-		public ImmutableArray<ICheckBoxItem> Children => ImmutableArray<ICheckBoxItem>.Empty;
-		
-		public readonly ICheckBoxItem? parent = parent;
-		
-		[Notify]
-		private bool? isChecked = isChecked;
-		
-		private bool notifyParent = true;
-		
-		public void SetCheckedFromParent(bool? isChecked) {
-			notifyParent = false;
-			IsChecked = isChecked;
-			notifyParent = true;
-		}
-		
-		private void OnIsCheckedChanged() {
-			if (notifyParent) {
-				parent?.NotifyIsCheckedChanged();
-			}
-		}
-		
-		void ICheckBoxItem.NotifyIsCheckedChanged() {
-			OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsChecked)));
-		}
-	}
-	
-	sealed class Leaf<T>(string title, ICheckBoxItem? parent, T value, bool isChecked) : Leaf(title, parent, isChecked) {
-		public T Value => value;
 	}
 }

app/Desktop/Dialogs/CheckBox/CheckBoxItemList.cs

@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-
-namespace DHT.Desktop.Dialogs.CheckBox;
-
-sealed class CheckBoxItemList<TKey, TValue> where TKey : notnull {
-	private readonly List<INode> rootNodes = [];
-	private readonly Dictionary<TKey, List<INode>> parentNodes = [];
-	
-	public void AddParent(TKey key, string title) {
-		if (!parentNodes.ContainsKey(key)) {
-			List<INode> children = [];
-			rootNodes.Add(new INode.NonLeaf(title, children));
-			parentNodes[key] = children;
-		}
-	}
-	
-	public void Add(TValue value, string title, bool isChecked = false) {
-		rootNodes.Add(new INode.Leaf(title, value, isChecked));
-	}
-	
-	public void Add(TKey key, TValue value, string title, bool isChecked = false) {
-		parentNodes.GetValueOrDefault(key, rootNodes).Add(new INode.Leaf(title, value, isChecked));
-	}
-	
-	public ImmutableArray<ICheckBoxItem> ToCheckBoxItems() {
-		return [..rootNodes.Select(static node => node.ToCheckBoxItem(null))];
-	}
-	
-	private interface INode {
-		ICheckBoxItem ToCheckBoxItem(ICheckBoxItem? parent);
-		
-		sealed record NonLeaf(string Title, List<INode> Children) : INode {
-			public ICheckBoxItem ToCheckBoxItem(ICheckBoxItem? parent) {
-				return new ICheckBoxItem.NonLeaf(Title, parent, self => [..Children.Select(child => child.ToCheckBoxItem(self))]);
-			}
-		}
-		
-		sealed record Leaf(string Title, TValue Value, bool IsChecked) : INode {
-			public ICheckBoxItem ToCheckBoxItem(ICheckBoxItem? parent) {
-				return new ICheckBoxItem.Leaf<TValue>(Title, parent, Value, IsChecked);
-			}
-		}
-	}
-}

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -8,10 +8,6 @@ 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();
 	}
@@ -22,7 +18,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()
 		};
 	}
 
@@ -30,11 +26,11 @@ static class FileDialogs {
 		return suggestedDirectory == null ? Task.FromResult<IStorageFolder?>(null) : window.StorageProvider.TryGetFolderFromPathAsync(suggestedDirectory);
 	}
 
-	private static string ToLocalPath(this IStorageItem itme) {
+	private static string ToLocalPath(this IStorageFile file) {
-		return itme.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
+		return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
 	}
 
-	private static string[] ToLocalPaths(this IReadOnlyList<IStorageItem> items) {
+	private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
-		return items.Select(ToLocalPath).ToArray();
+		return files.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,18 +20,24 @@
             <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}" />
-        <Panel Classes="buttons">
+        <WrapPanel>
-            <WrapPanel HorizontalAlignment="Right">
+            <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
-                <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
+            <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
-                <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
+            <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
-                <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
+            <Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
-                <Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
+        </WrapPanel>
-            </WrapPanel>
-        </Panel>
     </StackPanel>
 
 </Window>

app/Desktop/Dialogs/Progress/DelayedProgressDialog.cs

@@ -1,24 +0,0 @@
-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,6 @@ using System.Threading.Tasks;
 namespace DHT.Desktop.Dialogs.Progress;
 
 interface IProgressCallback {
-	Task Update(string message, long finishedItems, long totalItems);
+	Task Update(string message, int finishedItems, int totalItems);
-	Task UpdateIndeterminate(string message);
 	Task Hide();
 }

app/Desktop/Dialogs/Progress/ProgressDialog.axaml

@@ -40,7 +40,7 @@
                         <TextBlock DockPanel.Dock="Right" Text="{Binding Items}" Classes="items" />
                         <TextBlock DockPanel.Dock="Left" Text="{Binding Message}" />
                     </DockPanel>
-                    <ProgressBar IsIndeterminate="{Binding IsIndeterminate}" Value="{Binding Progress}" />
+                    <ProgressBar Value="{Binding Progress}" />
                 </StackPanel>
             </DataTemplate>
         </ItemsRepeater.ItemTemplate>

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

@@ -7,42 +7,7 @@ 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 dialog = new ProgressDialog();
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => await action(dialog, callbacks[0]));
-		await dialog.ShowProgressDialog(owner);
-	}
-	
-	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 => {
-			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() {
@@ -50,8 +15,6 @@ 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());
@@ -62,14 +25,8 @@ public sealed partial class ProgressDialog : Window {
 		e.Cancel = !isFinished;
 	}
 
-	private async Task OnFinished(Task task) {
+	private void 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

@@ -4,23 +4,23 @@ using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Threading;
 using DHT.Desktop.Common;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
-sealed class ProgressDialogModel {
+sealed class ProgressDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 
-	public IReadOnlyList<ProgressItem> Items { get; } = [];
+	public IReadOnlyList<ProgressItem> Items { get; } = Array.Empty<ProgressItem>();
 
 	private readonly TaskRunner? task;
 
 	[Obsolete("Designer")]
 	public ProgressDialogModel() {}
 
-	public ProgressDialogModel(string title, TaskRunner task, int progressItems = 1) {
+	public ProgressDialogModel(TaskRunner task, int progressItems = 1) {
-		this.Title = title;
+		this.Items = Enumerable.Range(0, progressItems).Select(static _ => new ProgressItem()).ToArray();
 		this.task = task;
-		this.Items = Enumerable.Range(start: 0, progressItems).Select(static _ => new ProgressItem()).ToArray();
 	}
 
 	internal async Task StartTask() {
@@ -38,26 +38,16 @@ sealed class ProgressDialogModel {
 			this.item = item;
 		}
 
-		public async Task Update(string message, long finishedItems, long totalItems) {
+		public async Task Update(string message, int finishedItems, int totalItems) {
 			await Dispatcher.UIThread.InvokeAsync(() => {
 				item.Message = message;
 				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
 				item.Progress = totalItems == 0 ? 0 : 100 * finishedItems / totalItems;
-				item.IsIndeterminate = false;
-			});
-		}
-		
-		public async Task UpdateIndeterminate(string message) {
-			await Dispatcher.UIThread.InvokeAsync(() => {
-				item.Message = message;
-				item.Items = string.Empty;
-				item.Progress = 0;
-				item.IsIndeterminate = true;
 			});
 		}
 
 		public Task Hide() {
-			return Update(string.Empty, finishedItems: 0, totalItems: 0);
+			return Update(string.Empty, 0, 0);
 		}
 	}
 }

app/Desktop/Dialogs/Progress/ProgressItem.cs

@@ -1,23 +1,41 @@
-using PropertyChanged.SourceGenerator;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Dialogs.Progress; 
 
-sealed partial class ProgressItem {
+sealed class ProgressItem : BaseModel {
-	[Notify]
+	private bool isVisible = false;
+
+	public bool IsVisible {
+		get => isVisible;
+		private set {
+			Change(ref isVisible, value);
+			OnPropertyChanged(nameof(Opacity));
+		}
+	}
+	
+	public double Opacity => IsVisible ? 1.0 : 0.0;
+
 	private string message = "";
 
-	[Notify]
+	public string Message {
+		get => message;
+		set {
+			Change(ref message, value);
+			IsVisible = !string.IsNullOrEmpty(value);
+		}
+	}
+
 	private string items = "";
 
-	[Notify]
+	public string Items {
-	private long progress = 0L;
+		get => items;
+		set => Change(ref items, value);
+	}
 
-	[Notify]
+	private int progress = 0;
-	private bool isIndeterminate;
 
-	[DependsOn(nameof(Message))]
+	public int Progress {
-	public bool IsVisible => !string.IsNullOrEmpty(Message);
+		get => progress;
-	
+		set => Change(ref progress, value);
-	[DependsOn(nameof(IsVisible))]
+	}
-	public double Opacity => IsVisible ? 1.0 : 0.0;
 }

app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml

@@ -15,6 +15,19 @@
         <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">
@@ -34,7 +47,7 @@
             </StackPanel>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel HorizontalAlignment="Right">
+            <WrapPanel Classes="right">
                 <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -1,42 +1,42 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using PropertyChanged.SourceGenerator;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Dialogs.TextBox; 
 
-partial class TextBoxDialogModel {
+class TextBoxDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
 
-	private IReadOnlyList<TextBoxItem> items = [];
+	private IReadOnlyList<TextBoxItem> items = Array.Empty<TextBoxItem>();
 
 	public IReadOnlyList<TextBoxItem> Items {
 		get => items;
 
 		protected set {
-			foreach (TextBoxItem item in items) {
+			foreach (var item in items) {
 				item.ErrorsChanged -= OnItemErrorsChanged;
 			}
 
 			items = value;
 
-			foreach (TextBoxItem item in items) {
+			foreach (var 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(new PropertyChangedEventArgs(nameof(Items)));
+		OnPropertyChanged(nameof(HasErrors));
 	}
 }
 
 sealed class TextBoxDialogModel<T> : TextBoxDialogModel {
-	private new IReadOnlyList<TextBoxItem<T>> Items { get; }
+	public new IReadOnlyList<TextBoxItem<T>> Items { get; }
 
 	public IEnumerable<TextBoxItem<T>> ValidItems => Items.Where(static item => item.IsValid);
 

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

@@ -1,22 +1,25 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
-using PropertyChanged.SourceGenerator;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Dialogs.TextBox; 
 
-partial class TextBoxItem : INotifyDataErrorInfo {
+class TextBoxItem : BaseModel, 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;
 
-	private void OnValueChanged() {
+	public string Value {
-		ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
+		get => this.value;
+		set {
+			Change(ref this.value, value);
+			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
+		}
 	}
 
 	public IEnumerable GetErrors(string? propertyName) {

app/Desktop/Discord/DiscordAppSettings.cs

@@ -39,16 +39,16 @@ static class DiscordAppSettings {
 
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-			JsonObject settingsJson = await ReadSettingsJson();
+			return AreDevToolsEnabled(await ReadSettingsJson());
-			return AreDevToolsEnabled(settingsJson);
 		} catch (Exception e) {
-			Log.Error("Could not read settings file.", e);
+			Log.Error("Cannot read settings file.");
+			Log.Error(e);
 			return null;
 		}
 	}
 
 	private static bool AreDevToolsEnabled(JsonObject json) {
-		return json.TryGetPropertyValue(JsonKeyDevTools, out JsonNode? node) && node?.GetValueKind() == JsonValueKind.True;
+		return json.TryGetPropertyValue(JsonKeyDevTools, out var node) && node?.GetValueKind() == JsonValueKind.True;
 	}
 
 	public static async Task<SettingsJsonResult> ConfigureDevTools(bool enable) {
@@ -61,7 +61,7 @@ static class DiscordAppSettings {
 		} catch (JsonException) {
 			return SettingsJsonResult.InvalidJson;
 		} catch (Exception e) {
-			Log.Error("Could not read settings file.", e);
+			Log.Error(e);
 			return SettingsJsonResult.ReadError;
 		}
 
@@ -83,14 +83,16 @@ static class DiscordAppSettings {
 
 			await WriteSettingsJson(json);
 		} catch (Exception e) {
-			Log.Error("Could not write settings file.", e);
+			Log.Error("An error occurred when writing settings file.");
+			Log.Error(e);
 
 			if (File.Exists(JsonBackupFilePath)) {
 				try {
-					File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
+					File.Move(JsonBackupFilePath, JsonFilePath, true);
 					Log.Info("Restored settings file from backup.");
 				} catch (Exception e2) {
-					Log.Error("Could not restore settings file from backup.", e2);
+					Log.Error("Cannot restore settings file from backup.");
+					Log.Error(e2);
 				}
 			}
 
@@ -100,7 +102,8 @@ static class DiscordAppSettings {
 		try {
 			File.Delete(JsonBackupFilePath);
 		} catch (Exception e) {
-			Log.Error("Could not delete backup file.", e);
+			Log.Error("Cannot delete backup file.");
+			Log.Error(e);
 		}
 
 		return SettingsJsonResult.Success;

app/Desktop/Discord/DiscordAppSettingsJsonContext.cs

@@ -5,4 +5,4 @@ namespace DHT.Desktop.Discord;
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, WriteIndented = true)]
 [JsonSerializable(typeof(JsonObject))]
-sealed partial class DiscordAppSettingsJsonContext : JsonSerializerContext;
+sealed partial class DiscordAppSettingsJsonContext : JsonSerializerContext {}

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="510" d:DesignHeight="425"
+        mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
         x:Class="DHT.Desktop.Main.AboutWindow"
         x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="510" Height="425" CanResize="False"
+        Width="480" Height="295" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Design.DataContext>
@@ -16,12 +16,16 @@
     </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 3" />
+            <Setter Property="Margin" Value="0 4" />
             <Setter Property="Padding" Value="8 4" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
@@ -29,55 +33,35 @@
 
     <StackPanel Orientation="Vertical" Margin="20" Spacing="12">
 
-        <StackPanel Orientation="Vertical" Spacing="3">
+        <TextBlock VerticalAlignment="Center">
-            <TextBlock TextWrapping="Wrap">Discord History Tracker was created by chylex.</TextBlock>
+            Discord History Tracker was created by chylex and released under the MIT license.
-            <TextBlock>It is available under the MIT license.</TextBlock>
+        </TextBlock>
+
+        <StackPanel>
+            <Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
+            <Button Command="{Binding ShowSourceCode}">Source Code</Button>
         </StackPanel>
 
-        <StackPanel Orientation="Horizontal" Spacing="8">
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
-            <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</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="0">.NET 8</TextBlock>
             <TextBlock Grid.Row="2" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="2" Grid.Column="2" Command="{Binding OpenThirdPartyNetCore}">GitHub</Button>
+            <Button Grid.Row="2" Grid.Column="2" Command="{Binding ShowLibraryNetCore}">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 OpenThirdPartyAvalonia}">GitHub</Button>
+            <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">NuGet</Button>
 
-            <TextBlock Grid.Row="4" Grid.Column="0">Rx.NET</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="0">SQLite</TextBlock>
-            <TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="1">Public Domain</TextBlock>
-            <Button Grid.Row="4" Grid.Column="2" Command="{Binding OpenThirdPartyRxNet}">GitHub</Button>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</Button>
 
-            <TextBlock Grid.Row="5" Grid.Column="0">SQLite</TextBlock>
+            <TextBlock Grid.Row="5" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
-            <TextBlock Grid.Row="5" Grid.Column="1">Public Domain</TextBlock>
+            <TextBlock Grid.Row="5" Grid.Column="1">Apache-2.0</TextBlock>
-            <Button Grid.Row="5" Grid.Column="2" Command="{Binding OpenThirdPartySqlite}">Website</Button>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</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,45 +1,33 @@
-using DHT.Desktop.Common;
+using System.Diagnostics;
 
 namespace DHT.Desktop.Main;
 
 sealed class AboutWindowModel {
-	public void OpenOfficialWebsite() {
+	public void ShowOfficialWebsite() {
-		SystemUtils.OpenUrl(Program.Website);
+		OpenUrl("https://dht.chylex.com");
 	}
 
-	public void OpenIssueTracker() {
+	public void ShowSourceCode() {
-		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker/issues");
+		OpenUrl("https://github.com/chylex/Discord-History-Tracker");
 	}
 
-	public void OpenSourceCode() {
+	public void ShowLibraryAvalonia() {
-		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker");
+		OpenUrl("https://www.nuget.org/packages/Avalonia");
 	}
 
-	public void OpenThirdPartyNetCore() {
+	public void ShowLibrarySqlite() {
-		SystemUtils.OpenUrl("https://github.com/dotnet/core");
+		OpenUrl("https://www.sqlite.org");
 	}
 
-	public void OpenThirdPartyAvalonia() {
+	public void ShowLibrarySqliteAdoNet() {
-		SystemUtils.OpenUrl("https://github.com/AvaloniaUI/Avalonia");
+		OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
 	}
 
-	public void OpenThirdPartyPropertyChangedSourceGenerator() {
+	public void ShowLibraryNetCore() {
-		SystemUtils.OpenUrl("https://github.com/canton7/PropertyChanged.SourceGenerator");
+		OpenUrl("https://github.com/dotnet/core");
 	}
 
-	public void OpenThirdPartySqlite() {
+	private static void OpenUrl(string url) {
-		SystemUtils.OpenUrl("https://www.sqlite.org");
+		Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
-	}
-	
-	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/AttachmentFilterPanel.axaml

@@ -4,17 +4,21 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.DownloadItemFilterPanel"
+             x:Class="DHT.Desktop.Main.Controls.AttachmentFilterPanel"
-             x:DataType="controls:DownloadItemFilterPanelModel">
+             x:DataType="controls:AttachmentFilterPanelModel">
 
     <Design.DataContext>
-        <controls:DownloadItemFilterPanelModel />
+        <controls:AttachmentFilterPanelModel />
     </Design.DataContext>
 
     <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>
@@ -26,9 +30,9 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Spacing="20">
+    <StackPanel>
         <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel ItemSpacing="40" LineSpacing="20">
+        <WrapPanel>
             <StackPanel>
                 <CheckBox IsChecked="{Binding LimitSize}">Limit Size</CheckBox>
                 <StackPanel Orientation="Horizontal">

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

@@ -4,8 +4,8 @@ using Avalonia.Controls;
 namespace DHT.Desktop.Main.Controls;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class DownloadItemFilterPanel : UserControl {
+public sealed partial class AttachmentFilterPanel : UserControl {
-	public DownloadItemFilterPanel() {
+	public AttachmentFilterPanel() {
 		InitializeComponent();
 	}
 }

app/Desktop/Main/Controls/AttachmentFilterPanelModel.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using DHT.Desktop.Common;
+using DHT.Server.Data.Filters;
+using DHT.Server.Database;
+using DHT.Utils.Models;
+using DHT.Utils.Tasks;
+
+namespace DHT.Desktop.Main.Controls;
+
+sealed class AttachmentFilterPanelModel : BaseModel, IDisposable {
+	public sealed record Unit(string Name, uint Scale);
+
+	private static readonly Unit[] AllUnits = {
+		new ("B", 1),
+		new ("kB", 1024),
+		new ("MB", 1024 * 1024)
+	};
+
+	private static readonly HashSet<string> FilterProperties = new () {
+		nameof(LimitSize),
+		nameof(MaximumSize),
+		nameof(MaximumSizeUnit)
+	};
+
+	public string FilterStatisticsText { get; private set; } = "";
+
+	private bool limitSize = false;
+	private ulong maximumSize = 0L;
+	private Unit maximumSizeUnit = AllUnits[0];
+
+	public bool LimitSize {
+		get => limitSize;
+		set => Change(ref limitSize, value);
+	}
+
+	public ulong MaximumSize {
+		get => maximumSize;
+		set => Change(ref maximumSize, value);
+	}
+
+	public Unit MaximumSizeUnit {
+		get => maximumSizeUnit;
+		set => Change(ref maximumSizeUnit, value);
+	}
+
+	public IEnumerable<Unit> Units => AllUnits;
+
+	private readonly IDatabaseFile db;
+	private readonly string verb;
+
+	private readonly AsyncValueComputer<long> matchingAttachmentCountComputer;
+	private long? matchingAttachmentCount;
+	private long? totalAttachmentCount;
+
+	[Obsolete("Designer")]
+	public AttachmentFilterPanelModel() : this(DummyDatabaseFile.Instance) {}
+
+	public AttachmentFilterPanelModel(IDatabaseFile db, string verb = "Matches") {
+		this.db = db;
+		this.verb = verb;
+
+		this.matchingAttachmentCountComputer = AsyncValueComputer<long>.WithResultProcessor(SetAttachmentCounts).Build();
+
+		UpdateFilterStatistics();
+
+		PropertyChanged += OnPropertyChanged;
+		db.Statistics.PropertyChanged += OnDbStatisticsChanged;
+	}
+
+	public void Dispose() {
+		db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
+	}
+
+	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
+			UpdateFilterStatistics();
+		}
+	}
+
+	private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName == nameof(DatabaseStatistics.TotalAttachments)) {
+			totalAttachmentCount = db.Statistics.TotalAttachments;
+			UpdateFilterStatistics();
+		}
+	}
+
+	private void UpdateFilterStatistics() {
+		var filter = CreateFilter();
+		if (filter.IsEmpty) {
+			matchingAttachmentCountComputer.Cancel();
+			matchingAttachmentCount = totalAttachmentCount;
+			UpdateFilterStatisticsText();
+		}
+		else {
+			matchingAttachmentCount = null;
+			UpdateFilterStatisticsText();
+			matchingAttachmentCountComputer.Compute(() => db.CountAttachments(filter));
+		}
+	}
+
+	private void SetAttachmentCounts(long matchingAttachmentCount) {
+		this.matchingAttachmentCount = matchingAttachmentCount;
+		UpdateFilterStatisticsText();
+	}
+
+	private void UpdateFilterStatisticsText() {
+		var matchingAttachmentCountStr = matchingAttachmentCount?.Format() ?? "(...)";
+		var totalAttachmentCountStr = totalAttachmentCount?.Format() ?? "(...)";
+
+		FilterStatisticsText = verb + " " + matchingAttachmentCountStr + " out of " + totalAttachmentCountStr + " attachment" + (totalAttachmentCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
+	}
+
+	public AttachmentFilter CreateFilter() {
+		AttachmentFilter filter = new();
+
+		if (LimitSize) {
+			try {
+				filter.MaxBytes = maximumSize * maximumSizeUnit.Scale;
+			} catch (ArithmeticException) {
+				// set no size limit, because the overflown size is larger than any file could possibly be
+			}
+		}
+
+		return filter;
+	}
+}

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -1,170 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.ReactiveUI;
-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 : 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", 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),
-	];
-	
-	[Notify(Setter.Private)]
-	private string filterStatisticsText = "";
-	
-	[Notify]
-	private bool limitSize = false;
-	
-	[Notify]
-	private ulong maximumSize = 0UL;
-	
-	[Notify]
-	private Unit maximumSizeUnit = AllUnits[0];
-	
-	public IEnumerable<Unit> Units => AllUnits;
-	
-	private readonly State state;
-	private readonly string verb;
-	
-	private readonly DelayedThrottledTask<FilterSettings> saveFilterSettingsTask;
-	private bool isLoadingFilterSettings;
-	
-	private readonly RestartableTask<long> downloadItemCountTask;
-	private long? matchingItemCount;
-	
-	private readonly IDisposable downloadItemCountSubscription;
-	private long? totalItemCount;
-	
-	[Obsolete("Designer")]
-	public DownloadItemFilterPanelModel() : this(State.Dummy) {}
-	
-	public DownloadItemFilterPanelModel(State state, string verb = "Matches") {
-		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);
-		
-		UpdateFilterStatistics();
-		
-		PropertyChanged += OnPropertyChanged;
-	}
-	
-	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.", e);
-		}
-	}
-	
-	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
-			if (!isLoadingFilterSettings) {
-				saveFilterSettingsTask.Post(new FilterSettings(this));
-			}
-			
-			UpdateFilterStatistics();
-		}
-	}
-	
-	private void OnDownloadItemCountChanged(long newItemCount) {
-		totalItemCount = newItemCount;
-		UpdateFilterStatistics();
-	}
-	
-	
-	private void UpdateFilterStatistics() {
-		DownloadItemFilter filter = CreateFilter();
-		if (filter.IsEmpty) {
-			downloadItemCountTask.Cancel();
-			matchingItemCount = totalItemCount;
-			UpdateFilterStatisticsText();
-		}
-		else {
-			matchingItemCount = null;
-			UpdateFilterStatisticsText();
-			downloadItemCountTask.Restart(cancellationToken => state.Db.Downloads.Count(filter, cancellationToken));
-		}
-	}
-	
-	private void SetMatchingCount(long matchingAttachmentCount) {
-		this.matchingItemCount = matchingAttachmentCount;
-		UpdateFilterStatisticsText();
-	}
-	
-	private void UpdateFilterStatisticsText() {
-		string matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
-		string totalItemCountStr = totalItemCount?.Format() ?? "(...)";
-		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
-	}
-	
-	public DownloadItemFilter CreateFilter() {
-		DownloadItemFilter filter = new ();
-		
-		if (LimitSize) {
-			try {
-				filter.MaxBytes = maximumSize * maximumSizeUnit.Scale;
-			} catch (ArithmeticException) {
-				// set no size limit, because the overflown size is larger than any file could possibly be
-			}
-		}
-		
-		return filter;
-	}
-}

app/Desktop/Main/Controls/MessageFilterPanel.axaml

@@ -13,8 +13,12 @@
 
     <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>
@@ -32,9 +36,9 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Spacing="20">
+    <StackPanel>
         <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel ItemSpacing="40" LineSpacing="20">
+        <WrapPanel>
             <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,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using Avalonia.Controls;
 
 namespace DHT.Desktop.Main.Controls;
@@ -9,8 +8,8 @@ public sealed partial class MessageFilterPanel : UserControl {
 	public MessageFilterPanel() {
 		InitializeComponent();
 
-		CultureInfo culture = Program.Culture;
+		var culture = Program.Culture;
-		foreach (CalendarDatePicker picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
+		foreach (var 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

@@ -1,113 +1,123 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Reactive.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.CheckBox;
 using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
-using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
+using DHT.Server.Database;
+using DHT.Utils.Models;
 using DHT.Utils.Tasks;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class MessageFilterPanelModel : IDisposable {
+sealed class MessageFilterPanelModel : BaseModel, IDisposable {
-	private static readonly HashSet<string> FilterProperties = [
+	private static readonly HashSet<string> FilterProperties = new () {
 		nameof(FilterByDate),
 		nameof(StartDate),
 		nameof(EndDate),
 		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;
 
-	[Notify]
-	private string filterStatisticsText = "";
-	
-	[Notify]
 	private bool filterByDate = false;
-	
-	[Notify]
 	private DateTime? startDate = null;
-	
-	[Notify]
 	private DateTime? endDate = null;
-	
-	[Notify]
 	private bool filterByChannel = false;
-	
-	[Notify]
 	private HashSet<ulong>? includedChannels = null;
-	
-	[Notify]
 	private bool filterByUser = false;
-	
-	[Notify]
 	private HashSet<ulong>? includedUsers = null;
 
-	[Notify]
+	public bool FilterByDate {
+		get => filterByDate;
+		set => Change(ref filterByDate, value);
+	}
+
+	public DateTime? StartDate {
+		get => startDate;
+		set => Change(ref startDate, value);
+	}
+
+	public DateTime? EndDate {
+		get => endDate;
+		set => Change(ref endDate, value);
+	}
+
+	public bool FilterByChannel {
+		get => filterByChannel;
+		set => Change(ref filterByChannel, value);
+	}
+
+	public HashSet<ulong> IncludedChannels {
+		get => includedChannels ?? db.GetAllChannels().Select(static channel => channel.Id).ToHashSet();
+		set => Change(ref includedChannels, value);
+	}
+
+	public bool FilterByUser {
+		get => filterByUser;
+		set => Change(ref filterByUser, value);
+	}
+
+	public HashSet<ulong> IncludedUsers {
+		get => includedUsers ?? db.GetAllUsers().Select(static user => user.Id).ToHashSet();
+		set => Change(ref includedUsers, value);
+	}
+
 	private string channelFilterLabel = "";
 
-	[Notify]
+	public string ChannelFilterLabel {
+		get => channelFilterLabel;
+		set => Change(ref channelFilterLabel, value);
+	}
+
 	private string userFilterLabel = "";
 
+	public string UserFilterLabel {
+		get => userFilterLabel;
+		set => Change(ref userFilterLabel, value);
+	}
+
 	private readonly Window window;
-	private readonly State state;
+	private readonly IDatabaseFile db;
 	private readonly string verb;
 
-	private readonly RestartableTask<long> exportedMessageCountTask;
+	private readonly AsyncValueComputer<long> exportedMessageCountComputer;
 	private long? exportedMessageCount;
-	
-	private readonly IDisposable messageCountSubscription;
 	private long? totalMessageCount;
 
-	private readonly IDisposable channelCountSubscription;
-	private long? totalChannelCount;
-	
-	private readonly IDisposable userCountSubscription;
-	private long? totalUserCount;
-	
 	[Obsolete("Designer")]
-	public MessageFilterPanelModel() : this(null!, State.Dummy) {}
+	public MessageFilterPanelModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-	public MessageFilterPanelModel(Window window, State state, string verb = "Matches") {
+	public MessageFilterPanelModel(Window window, IDatabaseFile db, string verb = "Matches") {
 		this.window = window;
-		this.state = state;
+		this.db = db;
 		this.verb = verb;
 
-		this.exportedMessageCountTask = new RestartableTask<long>(SetExportedMessageCount, TaskScheduler.FromCurrentSynchronizationContext());
+		this.exportedMessageCountComputer = AsyncValueComputer<long>.WithResultProcessor(SetExportedMessageCount).Build();
-		
-		this.messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnMessageCountChanged);
-		this.channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnChannelCountChanged);
-		this.userCountSubscription = state.Db.Users.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnUserCountChanged);
 
 		UpdateFilterStatistics();
 		UpdateChannelFilterLabel();
 		UpdateUserFilterLabel();
 
 		PropertyChanged += OnPropertyChanged;
+		db.Statistics.PropertyChanged += OnDbStatisticsChanged;
 	}
 
 	public void Dispose() {
-		exportedMessageCountTask.Cancel();
+		db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
-		
-		messageCountSubscription.Dispose();
-		channelCountSubscription.Dispose();
-		userCountSubscription.Dispose();
 	}
 
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
@@ -124,54 +134,30 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		}
 	}
 
-	private void OnMessageCountChanged(long newMessageCount) {
+	private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
-		totalMessageCount = newMessageCount;
+		if (e.PropertyName == nameof(DatabaseStatistics.TotalMessages)) {
-		UpdateFilterStatistics();
+			totalMessageCount = db.Statistics.TotalMessages;
-	}
+			UpdateFilterStatistics();
-	
-	private void OnChannelCountChanged(long newChannelCount) {
-		totalChannelCount = newChannelCount;
-		UpdateChannelFilterLabel();
-	}
-	
-	private void OnUserCountChanged(long newUserCount) {
-		totalUserCount = newUserCount;
-		UpdateUserFilterLabel();
-	}
-	
-	private void UpdateChannelFilterLabel() {
-		if (totalChannelCount.HasValue) {
-			long total = totalChannelCount.Value;
-			long included = FilterByChannel && IncludedChannels != null ? IncludedChannels.Count : total;
-			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
 		}
-		else {
+		else if (e.PropertyName == nameof(DatabaseStatistics.TotalChannels)) {
-			ChannelFilterLabel = "Loading...";
+			UpdateChannelFilterLabel();
 		}
-	}
+		else if (e.PropertyName == nameof(DatabaseStatistics.TotalUsers)) {
-	
+			UpdateUserFilterLabel();
-	private void UpdateUserFilterLabel() {
-		if (totalUserCount.HasValue) {
-			long total = totalUserCount.Value;
-			long included = FilterByUser && IncludedUsers != null ? IncludedUsers.Count : total;
-			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
-		}
-		else {
-			UserFilterLabel = "Loading...";
 		}
 	}
 
 	private void UpdateFilterStatistics() {
-		MessageFilter filter = CreateFilter();
+		var filter = CreateFilter();
 		if (filter.IsEmpty) {
-			exportedMessageCountTask.Cancel();
+			exportedMessageCountComputer.Cancel();
 			exportedMessageCount = totalMessageCount;
 			UpdateFilterStatisticsText();
 		}
 		else {
 			exportedMessageCount = null;
 			UpdateFilterStatisticsText();
-			exportedMessageCountTask.Restart(cancellationToken => state.Db.Messages.Count(filter, cancellationToken));
+			exportedMessageCountComputer.Compute(() => db.CountMessages(filter));
 		}
 	}
 
@@ -181,144 +167,119 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 	}
 
 	private void UpdateFilterStatisticsText() {
-		string exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
+		var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
-		string totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+		var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+
 		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 
-	[SuppressMessage("ReSharper", "NotAccessedPositionalProperty.Local")]
+	public async void OpenChannelFilterDialog() {
-	[SuppressMessage("ReSharper", "MemberCanBePrivate.Local")]
+		var servers = db.GetAllServers().ToDictionary(static server => server.Id);
-	private readonly record struct ChannelFilterKey(byte Type, ulong? ServerId, string Title) : IComparable<ChannelFilterKey> {
+		var items = new List<CheckBoxItem<ulong>>();
-		public static ChannelFilterKey DirectMessages { get; } = new (Type: 1, ServerId: null, Title: "Direct Messages");
+		var included = IncludedChannels;
-		public static ChannelFilterKey GroupMessages { get; } = new (Type: 2, ServerId: null, Title: "Group Messages");
-		public static ChannelFilterKey Unknown { get; } = new (Type: 4, ServerId: null, Title: "Unknown");
 
-		public static ChannelFilterKey For(DHT.Server.Data.Server server) {
+		foreach (var channel in db.GetAllChannels()) {
-			return server.Type switch {
+			var channelId = channel.Id;
-				ServerType.Server        => new ChannelFilterKey(Type: 3, server.Id, "Server - " + server.Name),
+			var channelName = channel.Name;
-				ServerType.Group         => GroupMessages,
-				ServerType.DirectMessage => DirectMessages,
-				_                        => Unknown,
-			};
-		}
 
-		public bool Equals(ChannelFilterKey other) {
+			string title;
-			return Type == other.Type && ServerId == other.ServerId;
+			if (servers.TryGetValue(channel.Server, out var server)) {
-		}
+				var titleBuilder = new StringBuilder();
+				var serverType = server.Type;
 
-		public override int GetHashCode() {
+				titleBuilder.Append('[')
-			return HashCode.Combine(Type, ServerId);
+				            .Append(ServerTypes.ToString(serverType))
-		}
+				            .Append("] ");
 
-		public int CompareTo(ChannelFilterKey other) {
+				if (serverType == ServerType.DirectMessage) {
-			int result = Type.CompareTo(other.Type);
+					titleBuilder.Append(channelName);
-			if (result != 0) {
+				}
-				return result;
+				else {
+					titleBuilder.Append(server.Name)
+					            .Append(" - ")
+					            .Append(channelName);
+				}
+
+				title = titleBuilder.ToString();
 			}
 			else {
-				return Title.CompareTo(other.Title);
+				title = channelName;
-			}
-		}
-	}
-	
-	public async Task OpenChannelFilterDialog() {
-		async Task<ImmutableArray<ICheckBoxItem>> PrepareChannelItems(ProgressDialog dialog) {
-			CheckBoxItemList<ChannelFilterKey, ulong> items = new CheckBoxItemList<ChannelFilterKey, ulong>();
-			Dictionary<ulong, DHT.Server.Data.Server> servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
-			
-			foreach (ChannelFilterKey channelFilterKey in servers.Values.Select(ChannelFilterKey.For).Order()) {
-				items.AddParent(channelFilterKey, channelFilterKey.Title);
 			}
 
-			await foreach (Channel channel in state.Db.Channels.Get().OrderBy(static channel => channel.Position ?? int.MinValue).ThenBy(static channel => channel.Name)) {
+			items.Add(new CheckBoxItem<ulong>(channelId) {
-				ChannelFilterKey key = servers.TryGetValue(channel.Server, out var server)
+				Title = title,
-					                       ? ChannelFilterKey.For(server)
+				Checked = included.Contains(channelId)
-					                       : ChannelFilterKey.Unknown;
+			});
-				
-				items.Add(key, channel.Id, channel.Name, isChecked: IncludedChannels == null || IncludedChannels.Contains(channel.Id));
-			}
-			
-			return items.ToCheckBoxItems();
 		}
 
-		const string Title = "Included Channels";
+		var result = await OpenIdFilterDialog(window, "Included Channels", items);
-		
-		ImmutableArray<ICheckBoxItem> items;
-		try {
-			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading channels...", PrepareChannelItems);
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, Title, "Error loading channels: " + e.Message);
-			return;
-		}
-		
-		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
 		if (result != null) {
 			IncludedChannels = result;
 		}
 	}
 
-	public async Task OpenUserFilterDialog() {
+	public async void OpenUserFilterDialog() {
-		async Task<ImmutableArray<ICheckBoxItem>> PrepareUserItems(ProgressDialog dialog) {
+		var items = new List<CheckBoxItem<ulong>>();
-			CheckBoxItemList<ulong, ulong> items = new CheckBoxItemList<ulong, ulong>();
+		var included = IncludedUsers;
 
-			static string GetDisplayName(User user) {
+		foreach (var user in db.GetAllUsers()) {
-				return user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})";
+			var name = user.Name;
-			}
+			var discriminator = user.Discriminator;
 
-			await foreach ((ulong id, string name) in state.Db.Users.Get().Select(static user => (user.Id, GetDisplayName(user))).OrderBy(static pair => pair.Item2)) {
+			items.Add(new CheckBoxItem<ulong>(user.Id) {
-				items.Add(
+				Title = discriminator == null ? name : name + " #" + discriminator,
-					value: id,
+				Checked = included.Contains(user.Id)
-					title: name,
+			});
-					isChecked: IncludedUsers == null || IncludedUsers.Contains(id)
-				);
-			}
-			
-			return items.ToCheckBoxItems();
 		}
 
-		const string Title = "Included Users";
+		var result = await OpenIdFilterDialog(window, "Included Users", items);
-		
-		ImmutableArray<ICheckBoxItem> items;
-		try {
-			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, Title, "Error loading users: " + e.Message);
-			return;
-		}
-		
-		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
 		if (result != null) {
 			IncludedUsers = result;
 		}
 	}
 
-	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, ImmutableArray<ICheckBoxItem> items) {
+	private void UpdateChannelFilterLabel() {
-		var model = new CheckBoxDialogModel<ulong>(items) {
+		long total = db.Statistics.TotalChannels;
-			Title = title,
+		long included = FilterByChannel ? IncludedChannels.Count : total;
-		};
+		ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+	}
 
-		var dialog = new CheckBoxDialog { DataContext = model };
+	private void UpdateUserFilterLabel() {
-		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
+		long total = db.Statistics.TotalUsers;
-		
+		long included = FilterByUser ? IncludedUsers.Count : total;
-		return result == DialogResult.OkCancel.Ok ? model.SelectedValues.ToHashSet() : null;
+		UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
 	}
 
 	public MessageFilter CreateFilter() {
-		MessageFilter filter = new ();
+		MessageFilter filter = new();
 
 		if (FilterByDate) {
 			filter.StartDate = StartDate;
 			filter.EndDate = EndDate?.AddDays(1).AddMilliseconds(-1);
 		}
 
-		if (FilterByChannel && IncludedChannels != null) {
+		if (FilterByChannel) {
 			filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
 		}
 
-		if (FilterByUser && IncludedUsers != null) {
+		if (FilterByUser) {
 			filter.UserIds = new HashSet<ulong>(IncludedUsers);
 		}
 
 		return filter;
 	}
+
+	private static async Task<HashSet<ulong>?> OpenIdFilterDialog(Window window, string title, List<CheckBoxItem<ulong>> items) {
+		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
+
+		var model = new CheckBoxDialogModel<ulong>(items) {
+			Title = title
+		};
+
+		var dialog = new CheckBoxDialog { DataContext = model };
+		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
+
+		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
+	}
 }

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

@@ -16,21 +16,18 @@
             <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 Spacing="10">
+    <StackPanel>
         <Button Command="{Binding OnClickToggleServerButton}" Content="{Binding ToggleServerButtonText}" IsEnabled="{Binding IsToggleServerButtonEnabled}" />
-        <TextBlock TextWrapping="Wrap" Margin="0 5">
+        <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 or connection code again.
+            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>
-        <WrapPanel ItemSpacing="10" LineSpacing="10">
+        <WrapPanel>
             <StackPanel>
                 <Label Target="Port">Port</Label>
                 <TextBox x:Name="Port" Width="70" Text="{Binding InputPort}" />

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -1,95 +1,96 @@
 using System;
-using System.ComponentModel;
-using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Threading;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Server;
-using DHT.Server;
+using DHT.Server.Database;
 using DHT.Server.Service;
-using DHT.Utils.Logging;
+using DHT.Utils.Models;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class ServerConfigurationPanelModel : IDisposable {
+sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
-	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
-	
-	[Notify]
 	private string inputPort;
 
-	[Notify]
+	public string InputPort {
+		get => inputPort;
+		set {
+			Change(ref inputPort, value);
+			OnPropertyChanged(nameof(HasMadeChanges));
+		}
+	}
+
 	private string inputToken;
 
-	[DependsOn(nameof(InputPort), nameof(InputToken))]
+	public string InputToken {
-	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
+		get => inputToken;
+		set {
+			Change(ref inputToken, value);
+			OnPropertyChanged(nameof(HasMadeChanges));
+		}
+	}
+
+	public bool HasMadeChanges => ServerManager.Port.ToString() != InputPort || ServerManager.Token != InputToken;
 
-	[Notify(Setter.Private)]
 	private bool isToggleServerButtonEnabled = true;
 
-	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
+	public bool IsToggleServerButtonEnabled {
+		get => isToggleServerButtonEnabled;
+		set => Change(ref isToggleServerButtonEnabled, value);
+	}
+
+	public string ToggleServerButtonText => serverManager.IsRunning ? "Stop Server" : "Start Server";
+
+	public event EventHandler<StatusBarModel.Status>? ServerStatusChanged;
 
 	private readonly Window window;
-	private readonly ServerManager server;
+	private readonly ServerManager serverManager;
 
 	[Obsolete("Designer")]
-	public ServerConfigurationPanelModel() : this(null!, State.Dummy) {}
+	public ServerConfigurationPanelModel() : this(null!, new ServerManager(DummyDatabaseFile.Instance)) {}
 
-	public ServerConfigurationPanelModel(Window window, State state) {
+	public ServerConfigurationPanelModel(Window window, ServerManager serverManager) {
 		this.window = window;
-		this.server = state.Server;
+		this.serverManager = serverManager;
-		this.inputPort = ServerConfiguration.Port.ToString();
+		this.inputPort = ServerManager.Port.ToString();
-		this.inputToken = ServerConfiguration.Token;
+		this.inputToken = ServerManager.Token;
+	}
 
-		server.StatusChanged += OnServerStatusChanged;
+	public void Initialize() {
+		ServerLauncher.ServerStatusChanged += ServerLauncherOnServerStatusChanged;
 	}
 
 	public void Dispose() {
-		server.StatusChanged -= OnServerStatusChanged;
+		ServerLauncher.ServerStatusChanged -= ServerLauncherOnServerStatusChanged;
 	}
 
-	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
+	private void ServerLauncherOnServerStatusChanged(object? sender, EventArgs e) {
-		Dispatcher.UIThread.InvokeAsync(UpdateServerStatus);
+		ServerStatusChanged?.Invoke(this, serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped);
-	}
+		OnPropertyChanged(nameof(ToggleServerButtonText));
-	
-	private void UpdateServerStatus() {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(ToggleServerButtonText)));
-	}
-	
-	private async Task StartServer() {
-		IsToggleServerButtonEnabled = false;
-		
-		try {
-			await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
-		} catch (Exception e) {
-			Log.Error("Could not start internal server.", e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
 		IsToggleServerButtonEnabled = true;
 	}
 
-	private async Task StopServer() {
+	private void BeforeServerStart() {
 		IsToggleServerButtonEnabled = false;
-		
+		ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Starting);
-		try {
-			await server.Stop();
-		} catch (Exception e) {
-			Log.Error("Could not stop internal server.", e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
-		IsToggleServerButtonEnabled = true;
 	}
 
-	public async Task OnClickToggleServerButton() {
+	private void StartServer() {
-		if (server.IsRunning) {
+		BeforeServerStart();
-			await StopServer();
+		serverManager.Launch();
+	}
+
+	private void StopServer() {
+		IsToggleServerButtonEnabled = false;
+		ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Stopping);
+		serverManager.Stop();
+	}
+
+	public void OnClickToggleServerButton() {
+		if (serverManager.IsRunning) {
+			StopServer();
 		}
 		else {
-			await StartServer();
+			StartServer();
 		}
 	}
 
@@ -97,22 +98,19 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 		InputToken = ServerUtils.GenerateRandomToken(20);
 	}
 
-	public async Task OnClickApplyChanges() {
+	public async void OnClickApplyChanges() {
 		if (!ushort.TryParse(InputPort, out ushort port)) {
 			await Dialog.ShowOk(window, "Invalid Port", "Port must be a number between 0 and 65535.");
 			return;
 		}
 
-		ServerConfiguration.Port = port;
+		BeforeServerStart();
-		ServerConfiguration.Token = inputToken;
+		serverManager.Relaunch(port, InputToken);
-		
+		OnPropertyChanged(nameof(HasMadeChanges));
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(HasMadeChanges)));
-		
-		await StartServer();
 	}
 
 	public void OnClickCancelChanges() {
-		InputPort = ServerConfiguration.Port.ToString();
+		InputPort = ServerManager.Port.ToString();
-		InputToken = ServerConfiguration.Token;
+		InputToken = ServerManager.Token;
 	}
 }

app/Desktop/Main/Controls/StatusBar.axaml

@@ -40,22 +40,22 @@
     <StackPanel Orientation="Horizontal" Margin="6 3">
         <StackPanel Orientation="Vertical" Width="65">
             <TextBlock Classes="label">Status</TextBlock>
-            <TextBlock FontSize="12" Margin="0 3 0 0" Text="{Binding ServerStatusText}" />
+            <TextBlock FontSize="12" Margin="0 3 0 0" Text="{Binding StatusText}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Servers</TextBlock>
-            <TextBlock Classes="value" Text="{Binding ServerCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalServers, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Channels</TextBlock>
-            <TextBlock Classes="value" Text="{Binding ChannelCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalChannels, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Messages</TextBlock>
-            <TextBlock Classes="value" Text="{Binding MessageCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalMessages, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
     </StackPanel>
 

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -1,63 +1,45 @@
 using System;
-using System.Reactive.Linq;
+using DHT.Server.Database;
-using Avalonia.ReactiveUI;
+using DHT.Utils.Models;
-using Avalonia.Threading;
-using DHT.Server;
-using DHT.Server.Service;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class StatusBarModel : IDisposable {
+sealed class StatusBarModel : BaseModel {
-	[Notify(Setter.Private)]
+	public DatabaseStatistics DatabaseStatistics { get; }
-	private long? serverCount;
 
-	[Notify(Setter.Private)]
+	private Status status = Status.Stopped;
-	private long? channelCount;
 
-	[Notify(Setter.Private)]
+	public Status CurrentStatus {
-	private long? messageCount;
+		get => status;
+		set {
+			status = value;
+			OnPropertyChanged(nameof(StatusText));
+		}
+	}
 
-	[Notify(Setter.Private)]
+	public string StatusText {
-	private ServerManager.Status serverStatus;
+		get {
-	
+			return CurrentStatus switch {
-	[DependsOn(nameof(ServerStatus))]
+				Status.Starting => "STARTING",
-	public string ServerStatusText => ServerStatus switch {
+				Status.Ready    => "READY",
-		ServerManager.Status.Starting => "STARTING",
+				Status.Stopping => "STOPPING",
-		ServerManager.Status.Started  => "READY",
+				Status.Stopped  => "STOPPED",
-		ServerManager.Status.Stopping => "STOPPING",
+				_               => ""
-		ServerManager.Status.Stopped  => "STOPPED",
+			};
-		_                             => "",
+		}
-	};
+	}
-	
-	private readonly State state;
-	private readonly IDisposable serverCountSubscription;
-	private readonly IDisposable channelCountSubscription;
-	private readonly IDisposable messageCountSubscription;
 
 	[Obsolete("Designer")]
-	public StatusBarModel() : this(State.Dummy) {}
+	public StatusBarModel() : this(new DatabaseStatistics()) {}
 
-	public StatusBarModel(State state) {
+	public StatusBarModel(DatabaseStatistics databaseStatistics) {
-		this.state = state;
+		this.DatabaseStatistics = databaseStatistics;
-		
-		serverCountSubscription = state.Db.Servers.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newServerCount => ServerCount = newServerCount);
-		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 += OnStateServerStatusChanged;
-		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
 	}
 
-	public void Dispose() {
+	public enum Status {
-		serverCountSubscription.Dispose();
+		Starting,
-		channelCountSubscription.Dispose();
+		Ready,
-		messageCountSubscription.Dispose();
+		Stopping,
-		
+		Stopped
-		state.Server.StatusChanged -= OnStateServerStatusChanged;
-	}
-	
-	private void OnStateServerStatusChanged(object? sender, ServerManager.Status e) {
-		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
 	}
 }

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml

@@ -1,57 +0,0 @@
-<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

@@ -1,22 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -8,10 +8,10 @@
         x:DataType="main:MainWindowModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="820" Height="520"
+        Width="800" Height="500"
         MinWidth="520" MinHeight="300"
         WindowStartupLocation="CenterScreen"
-        Closing="OnClosing">
+        Closed="OnClosed">
 
     <Design.DataContext>
         <main:MainWindowModel />

app/Desktop/Main/MainWindow.axaml.cs

@@ -1,16 +1,14 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
+using System.IO;
 using Avalonia.Controls;
-using DHT.Utils.Logging;
+using DHT.Desktop.Main.Pages;
 using JetBrains.Annotations;
 
 namespace DHT.Desktop.Main;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class MainWindow : Window {
-	private static readonly Log Log = Log.ForType<MainWindow>();
-	
 	[UsedImplicitly]
 	public MainWindow() {
 		InitializeComponent();
@@ -22,23 +20,16 @@ public sealed partial class MainWindow : Window {
 		DataContext = new MainWindowModel(this, args);
 	}
 
-	public async void OnClosing(object? sender, WindowClosingEventArgs e) {
+	public void OnClosed(object? sender, EventArgs e) {
-		e.Cancel = true;
+		if (DataContext is IDisposable disposable) {
-		Closing -= OnClosing;
+			disposable.Dispose();
-		
-		try {
-			await Dispose();
-		} finally {
-			Close();
 		}
-	}
 
-	private async Task Dispose() {
+		foreach (var temporaryFile in ViewerPageModel.TemporaryFiles) {
-		if (DataContext is MainWindowModel model) {
 			try {
-				await model.DisposeAsync();
+				File.Delete(temporaryFile);
-			} catch (Exception ex) {
+			} catch (Exception) {
-				Log.Error("Caught exception while disposing window: " + ex);
+				// ignored
 			}
 		}
 	}

app/Desktop/Main/MainWindowModel.cs

@@ -1,39 +1,33 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 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 DHT.Utils.Models;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main;
 
-sealed partial class MainWindowModel : IAsyncDisposable {
+sealed class MainWindowModel : BaseModel, IDisposable {
 	private const string DefaultTitle = "Discord History Tracker";
 
-	private static readonly Log Log = Log.ForType<MainWindowModel>();
+	public string Title { get; private set; } = DefaultTitle;
 
-	[Notify(Setter.Private)]
+	public UserControl CurrentScreen { get; private set; }
-	private string title = DefaultTitle;
-	
-	[Notify(Setter.Private)]
-	private UserControl currentScreen;
 
 	private readonly WelcomeScreen welcomeScreen;
 	private readonly WelcomeScreenModel welcomeScreenModel;
 
+	private MainContentScreen? mainContentScreen;
 	private MainContentScreenModel? mainContentScreenModel;
 
 	private readonly Window window;
-	private readonly int? concurrentDownloads;
 
-	private State? state;
+	private IDatabaseFile? db;
 
 	[Obsolete("Designer")]
 	public MainWindowModel() : this(null!, Arguments.Empty) {}
@@ -42,12 +36,12 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 		this.window = window;
 
 		welcomeScreenModel = new WelcomeScreenModel(window);
-		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
-		
 		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
-		currentScreen = welcomeScreen;
+		CurrentScreen = welcomeScreen;
 
-		string? dbFile = args.DatabaseFile;
+		welcomeScreenModel.PropertyChanged += WelcomeScreenModelOnPropertyChanged;
+
+		var dbFile = args.DatabaseFile;
 		if (!string.IsNullOrWhiteSpace(dbFile)) {
 			async void OnWindowOpened(object? o, EventArgs eventArgs) {
 				window.Opened -= OnWindowOpened;
@@ -69,76 +63,54 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 		}
 
 		if (args.ServerPort != null) {
-			ServerConfiguration.Port = args.ServerPort.Value;
+			ServerManager.Port = args.ServerPort.Value;
 		}
 
 		if (args.ServerToken != null) {
-			ServerConfiguration.Token = args.ServerToken;
+			ServerManager.Token = args.ServerToken;
-		}
-		
-		concurrentDownloads = args.ConcurrentDownloads;
-	}
-	
-	private async void OnDatabaseSelected(object? sender, IDatabaseFile db) {
-		welcomeScreenModel.DatabaseSelected -= OnDatabaseSelected;
-		
-		await DisposeState();
-		
-		state = new State(db, concurrentDownloads);
-		
-		try {
-			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
-		} catch (Exception ex) {
-			Log.Error("Could not start internal server.", ex);
-			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
-		}
-		
-		try {
-			mainContentScreenModel = new MainContentScreenModel(window, state);
-			mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-			await mainContentScreenModel.Initialize();
-		} catch (Exception ex) {
-			Log.Error("Could not initialize content screen.", ex);
-			await Dialog.ShowOk(window, "Initialization Error", ex.Message);
-			await DisposeContent();
-			await DisposeState();
-			return;
-		}
-		
-		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
-		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
-		
-		window.Focus();
-	}
-	
-	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-		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() {
+	private async void WelcomeScreenModelOnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (state != null) {
+		if (e.PropertyName == nameof(welcomeScreenModel.Db)) {
-			await DelayedProgressDialog.Await(() => state.DisposeAsync().AsTask(), TimeSpan.FromMilliseconds(200), window, "Close Database", "Please wait for the database to close...");
+			if (mainContentScreenModel != null) {
-			state = null;
+				mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
+				mainContentScreenModel.Dispose();
+			}
+
+			db?.Dispose();
+			db = welcomeScreenModel.Db;
+
+			if (db == null) {
+				Title = DefaultTitle;
+				mainContentScreenModel = null;
+				mainContentScreen = null;
+				CurrentScreen = welcomeScreen;
+			}
+			else {
+				Title = Path.GetFileName(db.Path) + " - " + DefaultTitle;
+				mainContentScreenModel = new MainContentScreenModel(window, db);
+				await mainContentScreenModel.Initialize();
+				mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
+				mainContentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
+				CurrentScreen = mainContentScreen;
+			}
+
+			OnPropertyChanged(nameof(CurrentScreen));
+			OnPropertyChanged(nameof(Title));
+
+			window.Focus();
 		}
 	}
 
-	public async ValueTask DisposeAsync() {
+	private void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-		await DisposeContent();
+		welcomeScreenModel.CloseDatabase();
-		await DisposeState();
+	}
+
+	public void Dispose() {
+		welcomeScreenModel.Dispose();
+		mainContentScreenModel?.Dispose();
+		db?.Dispose();
+		db = null;
 	}
 }

app/Desktop/Main/Pages/AdvancedPage.axaml

@@ -16,5 +16,11 @@
         <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,21 +1,39 @@
 using System;
 using Avalonia.Controls;
+using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Controls;
-using DHT.Server;
+using DHT.Desktop.Server;
+using DHT.Server.Database;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed class AdvancedPageModel : IDisposable {
+sealed class AdvancedPageModel : BaseModel, IDisposable {
 	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
 
-	[Obsolete("Designer")]
+	private readonly Window window;
-	public AdvancedPageModel() : this(null!, State.Dummy) {}
+	private readonly IDatabaseFile db;
 
-	public AdvancedPageModel(Window window, State state) {
+	[Obsolete("Designer")]
-		ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
+	public AdvancedPageModel() : this(null!, DummyDatabaseFile.Instance, new ServerManager(DummyDatabaseFile.Instance)) {}
+
+	public AdvancedPageModel(Window window, IDatabaseFile db, ServerManager serverManager) {
+		this.window = window;
+		this.db = db;
+
+		ServerConfigurationModel = new ServerConfigurationPanelModel(window, serverManager);
+	}
+
+	public void Initialize() {
+		ServerConfigurationModel.Initialize();
 	}
 
 	public void Dispose() {
 		ServerConfigurationModel.Dispose();
 	}
+
+	public async void VacuumDatabase() {
+		db.Vacuum();
+		await Dialog.ShowOk(window, "Vacuum Database", "Done.");
+	}
 }

app/Desktop/Main/Pages/AttachmentsPage.axaml

@@ -0,0 +1,55 @@
+<UserControl 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:pages="clr-namespace:DHT.Desktop.Main.Pages"
+             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="DHT.Desktop.Main.Pages.AttachmentsPage"
+             x:DataType="pages:AttachmentsPageModel">
+
+    <Design.DataContext>
+        <pages:AttachmentsPageModel />
+    </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>
+        <Style Selector="DataGridColumnHeader:nth-child(2)">
+            <Setter Property="HorizontalContentAlignment" Value="Right" />
+        </Style>
+        <Style Selector="DataGridColumnHeader:nth-child(3)">
+            <Setter Property="HorizontalContentAlignment" Value="Right" />
+        </Style>
+        <Style Selector="DataGridCell.right">
+            <Setter Property="HorizontalContentAlignment" Value="Right" />
+        </Style>
+    </UserControl.Styles>
+
+    <StackPanel Orientation="Vertical" Spacing="20">
+        <DockPanel>
+            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" DockPanel.Dock="Left" />
+            <TextBlock Text="{Binding DownloadMessage}" Margin="10 0 0 0" VerticalAlignment="Center" DockPanel.Dock="Left" />
+            <ProgressBar Value="{Binding DownloadProgress}" IsVisible="{Binding IsDownloading}" Margin="15 0" VerticalAlignment="Center" DockPanel.Dock="Right" />
+        </DockPanel>
+        <controls:AttachmentFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !IsDownloading, RelativeSource={RelativeSource AncestorType=pages:AttachmentsPageModel}}" />
+        <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}" Width="*" />
+                        <DataGridTextColumn Header="Attachments" Binding="{Binding Items, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
+                        <DataGridTextColumn Header="Size" Binding="{Binding Size, Converter={StaticResource BytesValueConverter}}" Width="*" CellStyleClasses="right" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Expander>
+            <StackPanel Orientation="Horizontal" Spacing="10">
+                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding HasFailedDownloads}">Retry Failed Downloads</Button>
+            </StackPanel>
+        </StackPanel>
+    </StackPanel>
+</UserControl>

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

@@ -4,8 +4,8 @@ using Avalonia.Controls;
 namespace DHT.Desktop.Main.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class DownloadsPage : UserControl {
+public sealed partial class AttachmentsPage : UserControl {
-	public DownloadsPage() {
+	public AttachmentsPage() {
 		InitializeComponent();
 	}
 }

app/Desktop/Main/Pages/AttachmentsPageModel.cs

@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Threading;
+using Avalonia.Threading;
+using DHT.Desktop.Common;
+using DHT.Desktop.Main.Controls;
+using DHT.Server.Data;
+using DHT.Server.Data.Aggregations;
+using DHT.Server.Data.Filters;
+using DHT.Server.Database;
+using DHT.Server.Download;
+using DHT.Utils.Models;
+using DHT.Utils.Tasks;
+
+namespace DHT.Desktop.Main.Pages;
+
+sealed class AttachmentsPageModel : BaseModel, IDisposable {
+	private static readonly DownloadItemFilter EnqueuedItemFilter = new() {
+		IncludeStatuses = new HashSet<DownloadStatus> {
+			DownloadStatus.Enqueued
+		}
+	};
+
+	private bool isThreadDownloadButtonEnabled = true;
+
+	public string ToggleDownloadButtonText => downloadThread == null ? "Start Downloading" : "Stop Downloading";
+
+	public bool IsToggleDownloadButtonEnabled {
+		get => isThreadDownloadButtonEnabled;
+		set => Change(ref isThreadDownloadButtonEnabled, value);
+	}
+
+	public string DownloadMessage { get; set; } = "";
+	public double DownloadProgress => allItemsCount is null or 0 ? 0.0 : 100.0 * doneItemsCount / allItemsCount.Value;
+
+	public AttachmentFilterPanelModel FilterModel { get; }
+
+	private readonly StatisticsRow statisticsEnqueued = new ("Enqueued");
+	private readonly StatisticsRow statisticsDownloaded = new ("Downloaded");
+	private readonly StatisticsRow statisticsFailed = new ("Failed");
+	private readonly StatisticsRow statisticsSkipped = new ("Skipped");
+
+	public List<StatisticsRow> StatisticsRows {
+		get {
+			return new List<StatisticsRow> {
+				statisticsEnqueued,
+				statisticsDownloaded,
+				statisticsFailed,
+				statisticsSkipped
+			};
+		}
+	}
+
+	public bool IsDownloading => downloadThread != null;
+	public bool HasFailedDownloads => statisticsFailed.Items > 0;
+
+	private readonly IDatabaseFile db;
+	private readonly AsyncValueComputer<DownloadStatusStatistics>.Single downloadStatisticsComputer;
+	private BackgroundDownloadThread? downloadThread;
+
+	private int doneItemsCount;
+	private int? allItemsCount;
+
+	public AttachmentsPageModel() : this(DummyDatabaseFile.Instance) {}
+
+	public AttachmentsPageModel(IDatabaseFile db) {
+		this.db = db;
+		this.FilterModel = new AttachmentFilterPanelModel(db);
+
+		this.downloadStatisticsComputer = AsyncValueComputer<DownloadStatusStatistics>.WithResultProcessor(UpdateStatistics).WithOutdatedResults().BuildWithComputer(db.GetDownloadStatusStatistics);
+		this.downloadStatisticsComputer.Recompute();
+
+		db.Statistics.PropertyChanged += OnDbStatisticsChanged;
+	}
+
+	public void Dispose() {
+		db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
+
+		FilterModel.Dispose();
+		DisposeDownloadThread();
+	}
+
+	private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName == nameof(DatabaseStatistics.TotalAttachments)) {
+			if (IsDownloading) {
+				EnqueueDownloadItems();
+			}
+			else {
+				downloadStatisticsComputer.Recompute();
+			}
+		}
+		else if (e.PropertyName == nameof(DatabaseStatistics.TotalDownloads)) {
+			downloadStatisticsComputer.Recompute();
+		}
+	}
+
+	private void EnqueueDownloadItems() {
+		var filter = FilterModel.CreateFilter();
+		filter.DownloadItemRule = AttachmentFilter.DownloadItemRules.OnlyNotPresent;
+		db.EnqueueDownloadItems(filter);
+
+		downloadStatisticsComputer.Recompute();
+	}
+
+	private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
+		var hadFailedDownloads = HasFailedDownloads;
+
+		statisticsEnqueued.Items = statusStatistics.EnqueuedCount;
+		statisticsEnqueued.Size = statusStatistics.EnqueuedSize;
+
+		statisticsDownloaded.Items = statusStatistics.SuccessfulCount;
+		statisticsDownloaded.Size = statusStatistics.SuccessfulSize;
+
+		statisticsFailed.Items = statusStatistics.FailedCount;
+		statisticsFailed.Size = statusStatistics.FailedSize;
+
+		statisticsSkipped.Items = statusStatistics.SkippedCount;
+		statisticsSkipped.Size = statusStatistics.SkippedSize;
+
+		OnPropertyChanged(nameof(StatisticsRows));
+
+		if (hadFailedDownloads != HasFailedDownloads) {
+			OnPropertyChanged(nameof(HasFailedDownloads));
+		}
+
+		allItemsCount = doneItemsCount + statisticsEnqueued.Items;
+		UpdateDownloadMessage();
+	}
+
+	private void UpdateDownloadMessage() {
+		DownloadMessage = IsDownloading ? doneItemsCount.Format() + " / " + (allItemsCount?.Format() ?? "?") : "";
+
+		OnPropertyChanged(nameof(DownloadMessage));
+		OnPropertyChanged(nameof(DownloadProgress));
+	}
+
+	private void DownloadThreadOnOnItemFinished(object? sender, DownloadItem e) {
+		Interlocked.Increment(ref doneItemsCount);
+
+		Dispatcher.UIThread.Invoke(UpdateDownloadMessage);
+		downloadStatisticsComputer.Recompute();
+	}
+
+	private void DownloadThreadOnOnServerStopped(object? sender, EventArgs e) {
+		downloadStatisticsComputer.Recompute();
+		IsToggleDownloadButtonEnabled = true;
+	}
+
+	public void OnClickToggleDownload() {
+		if (downloadThread == null) {
+			EnqueueDownloadItems();
+			downloadThread = new BackgroundDownloadThread(db);
+			downloadThread.OnItemFinished += DownloadThreadOnOnItemFinished;
+			downloadThread.OnServerStopped += DownloadThreadOnOnServerStopped;
+		}
+		else {
+			IsToggleDownloadButtonEnabled = false;
+			DisposeDownloadThread();
+
+			db.RemoveDownloadItems(EnqueuedItemFilter, FilterRemovalMode.RemoveMatching);
+
+			doneItemsCount = 0;
+			allItemsCount = null;
+			UpdateDownloadMessage();
+		}
+
+		OnPropertyChanged(nameof(ToggleDownloadButtonText));
+		OnPropertyChanged(nameof(IsDownloading));
+	}
+
+	public void OnClickRetryFailedDownloads() {
+		var allExceptFailedFilter = new DownloadItemFilter {
+			IncludeStatuses = new HashSet<DownloadStatus> {
+				DownloadStatus.Enqueued,
+				DownloadStatus.Success
+			}
+		};
+
+		db.RemoveDownloadItems(allExceptFailedFilter, FilterRemovalMode.KeepMatching);
+
+		if (IsDownloading) {
+			EnqueueDownloadItems();
+		}
+	}
+
+	private void DisposeDownloadThread() {
+		if (downloadThread != null) {
+			downloadThread.OnItemFinished -= DownloadThreadOnOnItemFinished;
+			downloadThread.StopThread();
+		}
+
+		downloadThread = null;
+	}
+
+	public sealed class StatisticsRow {
+		public string State { get; }
+		public int Items { get; set; }
+		public ulong? Size { get; set; }
+
+		public StatisticsRow(string state) {
+			State = state;
+		}
+	}
+}

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 ItemSpacing="10" LineSpacing="10">
+        <WrapPanel>
             <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

@@ -14,17 +14,16 @@ using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Dialogs.TextBox;
-using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Server.Database.Import;
-using DHT.Server.Database.Sqlite.Schema;
+using DHT.Server.Database.Sqlite;
-using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Pages; 
 
-sealed class DatabasePageModel {
+sealed class DatabasePageModel : BaseModel {
 	private static readonly Log Log = Log.ForType<DatabasePageModel>();
 
 	public IDatabaseFile Db { get; }
@@ -34,14 +33,14 @@ sealed class DatabasePageModel {
 	private readonly Window window;
 
 	[Obsolete("Designer")]
-	public DatabasePageModel() : this(null!, State.Dummy) {}
+	public DatabasePageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-	public DatabasePageModel(Window window, State state) {
+	public DatabasePageModel(Window window, IDatabaseFile db) {
 		this.window = window;
-		this.Db = state.Db;
+		this.Db = db;
 	}
 
-	public async Task OpenDatabaseFolder() {
+	public async void OpenDatabaseFolder() {
 		string file = Db.Path;
 		string? folder = Path.GetDirectoryName(file);
 
@@ -55,11 +54,11 @@ sealed class DatabasePageModel {
 				break;
 
 			case PlatformID.Unix:
-				Process.Start("xdg-open", [ folder ]);
+				Process.Start("xdg-open", new string[] { folder });
 				break;
 
 			case PlatformID.MacOSX:
-				Process.Start("open", [ folder ]);
+				Process.Start("open", new string[] { folder });
 				break;
 
 			default:
@@ -72,30 +71,24 @@ sealed class DatabasePageModel {
 		DatabaseClosed?.Invoke(this, EventArgs.Empty);
 	}
 
-	public async Task MergeWithDatabase() {
+	public async void MergeWithDatabase() {
-		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
 		if (paths.Length == 0) {
 			return;
 		}
 
-		const string Title = "Database Merge";
+		ProgressDialog progressDialog = new ProgressDialog();
+		progressDialog.DataContext = new ProgressDialogModel(async callbacks => await MergeWithDatabaseFromPaths(Db, paths, progressDialog, callbacks[0])) {
+			Title = "Database Merge"
+		};
 
-		ImportResult? result;
+		await progressDialog.ShowProgressDialog(window);
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error("Could not merge databases.", 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<ImportResult?> MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
 		
-		return await PerformImport(target, paths, dialog, callback, "Database Merge", async path => {
+		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
 			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
 
 			if (db == null) {
@@ -103,19 +96,22 @@ sealed class DatabasePageModel {
 			}
 
 			try {
-				await target.AddFrom(db);
+				target.AddFrom(db);
 				return true;
 			} finally {
-				await db.DisposeAsync();
+				db.Dispose();
 			}
 		});
 	}
 
-	private sealed class SchemaUpgradeCallbacks(ProgressDialog dialog, int total) : ISchemaUpgradeCallbacks {
+	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
+		private readonly ProgressDialog dialog;
+		private readonly int total;
 		private bool? decision;
 		
-		public Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
-			return Task.FromResult<InitialDatabaseSettings?>(null);
+			this.total = total;
+			this.dialog = dialog;
 		}
 
 		public async Task<bool> CanUpgrade() {
@@ -143,35 +139,29 @@ sealed class DatabasePageModel {
 		}
 	}
 
-	public async Task ImportLegacyArchive() {
+	public async void ImportLegacyArchive() {
-		string[] paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+		var 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) {
 			return;
 		}
 
-		const string Title = "Legacy Archive Import";
+		ProgressDialog progressDialog = new ProgressDialog();
+		progressDialog.DataContext = new ProgressDialogModel(async callbacks => await ImportLegacyArchiveFromPaths(Db, paths, progressDialog, callbacks[0])) {
+			Title = "Legacy Archive Import"
+		};
 
-		ImportResult? result;
+		await progressDialog.ShowProgressDialog(window);
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error("Could not import legacy archives.", 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<ImportResult?> ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var fakeSnowflake = new FakeSnowflake();
 
-		return await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", async path => {
+		await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
 			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
 				
 			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
@@ -191,16 +181,16 @@ sealed class DatabasePageModel {
 			
 		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
 
-		foreach (DHT.Server.Data.Server server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
+		foreach (var 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 };
@@ -215,9 +205,9 @@ sealed class DatabasePageModel {
 		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
 	}
 
-	private static async Task<ImportResult?> PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string dialogTitle, Func<string, Task<bool>> performImport) {
+	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
 		int total = paths.Length;
-		DatabaseStatistics oldStatistics = await DatabaseStatistics.Take(target);
+		var oldStatistics = target.SnapshotStatistics();
 
 		int successful = 0;
 		int finished = 0;
@@ -227,7 +217,7 @@ sealed class DatabasePageModel {
 			++finished;
 
 			if (!File.Exists(path)) {
-				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
 				continue;
 			}
 
@@ -236,55 +226,35 @@ sealed class DatabasePageModel {
 					++successful;
 				}
 			} catch (Exception ex) {
-				Log.Error("Could not import file: " + path, ex);
+				Log.Error(ex);
-				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
 		}
 
 		await callback.Update("Done", finished, total);
 
 		if (successful == 0) {
-			return null;
+			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
+			return;
 		}
 
-		DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
+		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, target.SnapshotStatistics(), successful, total, itemName));
-		return new ImportResult(oldStatistics, newStatistics, successful, total);
 	}
 
-	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
+	private static string GetImportDialogMessage(DatabaseStatisticsSnapshot oldStatistics, DatabaseStatisticsSnapshot newStatistics, int successfulItems, int totalItems, string itemName) {
-		public static async Task<DatabaseStatistics> Take(IDatabaseFile db) {
+		long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
-			return new DatabaseStatistics(
+		long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
-				await db.Servers.Count(),
+		long newUsers = newStatistics.TotalUsers - oldStatistics.TotalUsers;
-				await db.Channels.Count(),
+		long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
-				await db.Users.Count(),
-				await db.Messages.Count()
-			);
-		}
-	}
 
-	private sealed record ImportResult(DatabaseStatistics OldStatistics, DatabaseStatistics NewStatistics, int SuccessfulItems, int TotalItems);
+		StringBuilder message = new StringBuilder();
-	
-	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;
-		
-		var message = new StringBuilder();
 		message.Append("Processed ");
 
-		if (result.SuccessfulItems == result.TotalItems) {
+		if (successfulItems == totalItems) {
-			message.Append(result.SuccessfulItems.Pluralize(itemName));
+			message.Append(successfulItems.Pluralize(itemName));
 		}
 		else {
-			message.Append(result.SuccessfulItems.Format()).Append(" out of ").Append(result.TotalItems.Pluralize(itemName));
+			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
 		}
 
 		message.Append(" and added:\n\n  \u2022 ");
@@ -295,18 +265,4 @@ 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("Could not vacuum database.", 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,27 +16,24 @@
             <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 ItemSpacing="10" LineSpacing="10">
+            <WrapPanel>
-                <StackPanel Spacing="8">
+                <StackPanel>
                     <Label Target="Channels">Channels</Label>
                     <TextBox x:Name="Channels" Width="100" Text="{Binding GenerateChannels}" />
                 </StackPanel>
-                <StackPanel Spacing="8">
+                <StackPanel>
                     <Label Target="Users">Users</Label>
                     <TextBox x:Name="Users" Width="100" Text="{Binding GenerateUsers}" />
                 </StackPanel>
-                <StackPanel Spacing="8">
+                <StackPanel>
                     <Label Target="Messages">Messages</Label>
                     <TextBox x:Name="Messages" Width="100" Text="{Binding GenerateMessages}" />
                 </StackPanel>
@@ -45,8 +42,5 @@
                 </StackPanel>
             </WrapPanel>
         </Expander>
-        <Expander Header="About" IsExpanded="True">
-            <TextBlock Text="{Binding SqliteVersion, StringFormat=Sqlite Version: {0}}" />
-        </Expander>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -6,179 +6,180 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
-using DHT.Server;
 using DHT.Server.Data;
+using DHT.Server.Database;
 using DHT.Server.Service;
-using PropertyChanged.SourceGenerator;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.Main.Pages {
+	sealed class DebugPageModel : BaseModel {
+		public string GenerateChannels { get; set; } = "0";
+		public string GenerateUsers { get; set; } = "0";
+		public string GenerateMessages { get; set; } = "0";
 
-sealed partial class DebugPageModel {
+		private readonly Window window;
-	public string GenerateChannels { get; set; } = "0";
+		private readonly IDatabaseFile db;
-	public string GenerateUsers { get; set; } = "0";
-	public string GenerateMessages { get; set; } = "0";
 
-	[Notify(Setter.Private)]
+		[Obsolete("Designer")]
-	private string? sqliteVersion = string.Empty;
+		public DebugPageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-	private readonly Window window;
+		public DebugPageModel(Window window, IDatabaseFile db) {
-	private readonly State state;
+			this.window = window;
-	
+			this.db = db;
-	[Obsolete("Designer")]
-	public DebugPageModel() : this(null!, State.Dummy) {}
-	
-	public DebugPageModel(Window window, State state) {
-		this.window = window;
-		this.state = state;
-	}
-	
-	public async Task Initialize() {
-		SqliteVersion = await state.Db.GetVersion() ?? "<unknown>";
-	}
-	
-	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) {
+		public async void OnClickAddRandomDataToDatabase() {
-			await Dialog.ShowOk(window, "Generate Random Data", "Amount of users must be at least 1!");
+			if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
-			return;
+				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;
+			}
+
+			ProgressDialog progressDialog = new ProgressDialog {
+				DataContext = new ProgressDialogModel(async callbacks => await GenerateRandomData(channels, users, messages, callbacks[0])) {
+					Title = "Generating Random Data"
+				}
+			};
+
+			await progressDialog.ShowProgressDialog(window);
 		}
 
-		if (!int.TryParse(GenerateMessages, out int messages) || messages < 1) {
+		private const int BatchSize = 500;
-			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));
+		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);
 
-	private const int BatchSize = 500;
+			var rand = new Random();
+			var server = new DHT.Server.Data.Server {
+				Id = RandomId(rand),
+				Name = RandomName("s"),
+				Type = ServerType.Server,
+			};
 
-	private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
+			var channels = Enumerable.Range(0, channelCount).Select(i => new Channel {
-		int batchCount = (messageCount + BatchSize - 1) / BatchSize;
+				Id = RandomId(rand),
-		await callback.Update("Adding messages in batches of " + BatchSize, finishedItems: 0, totalItems: batchCount);
+				Server = server.Id,
-		
+				Name = RandomName("c"),
-		var rand = new Random();
+				ParentId = null,
-		var server = new DHT.Server.Data.Server {
+				Position = i,
-			Id = RandomId(rand),
+				Topic = RandomText(rand, 10),
-			Name = RandomName("s"),
+				Nsfw = rand.Next(4) == 0,
-			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();
 
-			await state.Db.Messages.Add(messages);
+			var users = Enumerable.Range(0, userCount).Select(_ => new User {
+				Id = RandomId(rand),
+				Name = RandomName("u"),
+				AvatarUrl = null,
+				Discriminator = rand.Next(0, 9999).ToString(),
+			}).ToArray();
 
-			messageCount -= BatchSize;
+			db.AddServer(server);
-			await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
+			db.AddUsers(users);
+
+			foreach (var channel in channels) {
+				db.AddChannel(channel);
+			}
+
+			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 = ImmutableArray<Attachment>.Empty,
+						Embeds = ImmutableArray<Embed>.Empty,
+						Reactions = ImmutableArray<Reaction>.Empty,
+					};
+				}).ToArray();
+
+				db.AddMessages(messages);
+
+				messageCount -= BatchSize;
+				await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
+			}
 		}
-	}
 
-	private static ulong RandomId(Random rand) {
+		private static ulong RandomId(Random rand) {
-		ulong h = unchecked((ulong) rand.Next());
+			ulong h = unchecked((ulong) rand.Next());
-		ulong l = unchecked((ulong) rand.Next());
+			ulong l = unchecked((ulong) rand.Next());
-		return (h << 32) | l;
+			return (h << 32) | l;
-	}
+		}
 
-	private static string RandomName(string prefix) {
+		private static string RandomName(string prefix) {
-		return prefix + "-" + ServerUtils.GenerateRandomToken(5);
+			return prefix + "-" + ServerUtils.GenerateRandomToken(5);
-	}
+		}
 
-	private static T RandomBiasedIndex<T>(Random rand, T[] options) {
+		private static T RandomBiasedIndex<T>(Random rand, T[] options) {
-		return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
+			return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
-	}
+		}
 
-	private static readonly string[] RandomWords = [
+		private static readonly string[] RandomWords = {
-		"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
+			"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
-		"banana", "bean", "beechnut", "beet", "blackberry", "blackcurrant", "blueberry", "boysenberry", "bramble", "broccoli",
+			"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",
+			"cabbage", "cacao", "cantaloupe", "caper", "carambola", "carrot", "cauliflower", "celery", "chard", "cherry", "chokeberry", "citron", "clementine", "coconut", "corn", "crabapple", "cranberry", "cucumber", "currant",
-		"daikon", "date", "dewberry", "durian",
+			"daikon", "date", "dewberry", "durian",
-		"edamame", "eggplant", "elderberry", "endive",
+			"edamame", "eggplant", "elderberry", "endive",
-		"fig",
+			"fig",
-		"garlic", "ginger", "gooseberry", "grape", "grapefruit", "guava",
+			"garlic", "ginger", "gooseberry", "grape", "grapefruit", "guava",
-		"honeysuckle", "horseradish", "huckleberry",
+			"honeysuckle", "horseradish", "huckleberry",
-		"jackfruit", "jicama",
+			"jackfruit", "jicama",
-		"kale", "kiwi", "kohlrabi", "kumquat",
+			"kale", "kiwi", "kohlrabi", "kumquat",
-		"leek", "lemon", "lentil", "lettuce", "lime",
+			"leek", "lemon", "lentil", "lettuce", "lime",
-		"mandarin", "mango", "mushroom", "myrtle",
+			"mandarin", "mango", "mushroom", "myrtle",
-		"nectarine", "nut",
+			"nectarine", "nut",
-		"olive", "okra", "onion", "orange",
+			"olive", "okra", "onion", "orange",
-		"papaya", "parsnip", "pawpaw", "peach", "pear", "pea", "pepper", "persimmon", "pineapple", "plum", "plantain", "pomegranate", "pomelo", "potato", "prune", "pumpkin",
+			"papaya", "parsnip", "pawpaw", "peach", "pear", "pea", "pepper", "persimmon", "pineapple", "plum", "plantain", "pomegranate", "pomelo", "potato", "prune", "pumpkin",
-		"quandong", "quinoa",
+			"quandong", "quinoa",
-		"radicchio", "radish", "raisin", "raspberry", "redcurrant", "rhubarb", "rutabaga",
+			"radicchio", "radish", "raisin", "raspberry", "redcurrant", "rhubarb", "rutabaga",
-		"spinach", "strawberry", "squash",
+			"spinach", "strawberry", "squash",
-		"tamarind", "tangerine", "tomatillo", "tomato", "turnip",
+			"tamarind", "tangerine", "tomatillo", "tomato", "turnip",
-		"vanilla",
+			"vanilla",
-		"watercress", "watermelon",
+			"watercress", "watermelon",
-		"yam",
+			"yam",
-		"zucchini",
+			"zucchini",
-	];
+		};
 
-	private static string RandomText(Random rand, int maxWords) {
+		private static string RandomText(Random rand, int maxWords) {
-		int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), y: 3));
+			int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), 3));
-		return string.Join(separator: ' ', Enumerable.Range(start: 0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
+			return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
+		}
 	}
 }
 #else
-namespace DHT.Desktop.Main.Pages;
+using DHT.Utils.Models;
 
-sealed class DebugPageModel {
+namespace DHT.Desktop.Main.Pages {
-	public string GenerateChannels { get; set; } = "0";
+	sealed class DebugPageModel : BaseModel {
-	public string GenerateUsers { get; set; } = "0";
+		public string GenerateChannels { get; set; } = "0";
-	public string GenerateMessages { get; set; } = "0";
+		public string GenerateUsers { get; set; } = "0";
+		public string GenerateMessages { get; set; } = "0";
 
-	public string SqliteVersion => string.Empty;
+		public void OnClickAddRandomDataToDatabase() {}
-	
+	}
-	public void OnClickAddRandomDataToDatabase() {}
 }
 #endif

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -1,51 +0,0 @@
-<UserControl 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:pages="clr-namespace:DHT.Desktop.Main.Pages"
-             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.DownloadsPage"
-             x:DataType="pages:DownloadsPageModel">
-
-    <Design.DataContext>
-        <pages:DownloadsPageModel />
-    </Design.DataContext>
-
-    <UserControl.Styles>
-        <Style Selector="DataGridColumnHeader">
-            <Setter Property="FontWeight" Value="Medium" />
-        </Style>
-        <Style Selector="DataGridColumnHeader:nth-child(2)">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-        <Style Selector="DataGridColumnHeader:nth-child(3)">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-        <Style Selector="DataGridCell.right">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel Orientation="Vertical" Spacing="20">
-        <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}" />
-        <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,336 +0,0 @@
-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 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 : IAsyncDisposable {
-	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
-	
-	[Notify(Setter.Private)]
-	private bool isToggleDownloadButtonEnabled = true;
-	
-	[DependsOn(nameof(IsDownloading))]
-	public string ToggleDownloadButtonText => IsDownloading ? "Stop Downloading" : "Start Downloading";
-	
-	[Notify(Setter.Private)]
-	private bool isRetryingFailedDownloads = false;
-	
-	[Notify(Setter.Private)]
-	private bool hasSuccessfulDownloads;
-	
-	[Notify(Setter.Private)]
-	private bool hasFailedDownloads;
-	
-	[DependsOn(nameof(IsRetryingFailedDownloads), nameof(HasFailedDownloads))]
-	public bool IsRetryFailedOnDownloadsButtonEnabled => !IsRetryingFailedDownloads && HasFailedDownloads;
-	
-	[Notify(Setter.Private)]
-	private string downloadMessage = "";
-	
-	public DownloadItemFilterPanelModel FilterModel { get; }
-	
-	private readonly StatisticsRow statisticsPending = new ("Pending");
-	private readonly StatisticsRow statisticsDownloaded = new ("Downloaded");
-	private readonly StatisticsRow statisticsFailed = new ("Failed");
-	private readonly StatisticsRow statisticsSkipped = new ("Skipped");
-	
-	public ObservableCollection<StatisticsRow> StatisticsRows { get; }
-	
-	public bool IsDownloading => state.Downloader.IsDownloading;
-	
-	private readonly Window window;
-	private readonly State state;
-	private readonly ThrottledTask<DownloadStatusStatistics> downloadStatisticsTask;
-	private readonly IDisposable downloadItemCountSubscription;
-	
-	private IDisposable? finishedItemsSubscription;
-	private DownloadItemFilter? currentDownloadFilter;
-	
-	public DownloadsPageModel() : this(null!, State.Dummy) {}
-	
-	public DownloadsPageModel(Window window, State state) {
-		this.window = window;
-		this.state = state;
-		
-		FilterModel = new DownloadItemFilterPanelModel(state);
-		
-		StatisticsRows = [
-			statisticsPending,
-			statisticsDownloaded,
-			statisticsFailed,
-			statisticsSkipped,
-		];
-		
-		downloadStatisticsTask = new ThrottledTask<DownloadStatusStatistics>(Log, UpdateStatistics, TaskScheduler.FromCurrentSynchronizationContext());
-		downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadCountChanged);
-		
-		RecomputeDownloadStatistics();
-	}
-	
-	public async Task Initialize() {
-		await FilterModel.Initialize();
-		
-		if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, defaultValue: false)) {
-			try {
-				await StartDownload();
-			} catch (Exception e) {
-				Log.Error("Could not automatically start downloads.", e);
-				await Dialog.ShowOk(window, "Database Error", "Could not automatically start downloads: " + e.Message);
-			}
-		}
-	}
-	
-	public async ValueTask DisposeAsync() {
-		finishedItemsSubscription?.Dispose();
-		
-		downloadItemCountSubscription.Dispose();
-		downloadStatisticsTask.Dispose();
-		
-		await FilterModel.DisposeAsync();
-	}
-	
-	private void OnDownloadCountChanged(long newDownloadCount) {
-		RecomputeDownloadStatistics();
-	}
-	
-	public async Task OnClickToggleDownload() {
-		IsToggleDownloadButtonEnabled = false;
-		try {
-			if (IsDownloading) {
-				await StopDownload();
-			}
-			else {
-				try {
-					await StartDownload();
-				} catch (Exception e) {
-					Log.Error("Could not start downloads.", e);
-					await Dialog.ShowOk(window, "Database Error", "Could not start downloads: " + e.Message);
-					return;
-				}
-			}
-			
-			try {
-				await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
-			} catch (Exception e) {
-				Log.Error("Could not update auto-start setting in database.", e);
-			}
-		} finally {
-			IsToggleDownloadButtonEnabled = true;
-		}
-	}
-	
-	private async Task StartDownload() {
-		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
-		
-		try {
-			currentDownloadFilter = FilterModel.CreateFilter();
-			IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter);
-			finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
-		} catch (Exception) {
-			finishedItemsSubscription?.Dispose();
-			finishedItemsSubscription = null;
-			currentDownloadFilter = null;
-			throw;
-		}
-		
-		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(new PropertyChangedEventArgs(nameof(IsDownloading)));
-	}
-	
-	private void OnItemFinished(DownloadItem item) {
-		RecomputeDownloadStatistics();
-	}
-	
-	public async Task OnClickRetryFailed() {
-		IsRetryingFailedDownloads = true;
-		try {
-			await state.Db.Downloads.RetryFailed();
-			RecomputeDownloadStatistics();
-		} catch (Exception e) {
-			Log.Error("Could not retry failed downloads.", e);
-			await Dialog.ShowOk(window, "Retry Failed", "Could not retry failed downloads: " + e.Message);
-		} finally {
-			IsRetryingFailedDownloads = false;
-		}
-	}
-	
-	private void RecomputeDownloadStatistics() {
-		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("Could not delete orphaned downloads.", 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("Could not export downloaded files.", 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;
-		statisticsPending.HasFilesWithUnknownSize = statusStatistics.PendingWithUnknownSizeCount > 0;
-		
-		statisticsDownloaded.Items = statusStatistics.SuccessfulCount;
-		statisticsDownloaded.Size = statusStatistics.SuccessfulTotalSize;
-		statisticsDownloaded.HasFilesWithUnknownSize = statusStatistics.SuccessfulWithUnknownSizeCount > 0;
-		
-		statisticsFailed.Items = statusStatistics.FailedCount;
-		statisticsFailed.Size = statusStatistics.FailedTotalSize;
-		statisticsFailed.HasFilesWithUnknownSize = statusStatistics.FailedWithUnknownSizeCount > 0;
-		
-		statisticsSkipped.Items = statusStatistics.SkippedCount;
-		statisticsSkipped.Size = statusStatistics.SkippedTotalSize;
-		statisticsSkipped.HasFilesWithUnknownSize = statusStatistics.SkippedWithUnknownSizeCount > 0;
-		
-		HasSuccessfulDownloads = statusStatistics.SuccessfulCount > 0;
-		HasFailedDownloads = statusStatistics.FailedCount > 0;
-	}
-	
-	public sealed partial class StatisticsRow(string state) {
-		public string State { get; } = state;
-		
-		[Notify]
-		private int items;
-		
-		[Notify]
-		private ulong? size;
-		
-		[Notify]
-		private bool hasFilesWithUnknownSize;
-		
-		[DependsOn(nameof(Size), nameof(HasFilesWithUnknownSize))]
-		public string SizeText {
-			get {
-				if (size == null) {
-					return "-";
-				}
-				else if (hasFilesWithUnknownSize) {
-					return "\u2265 " + BytesValueConverter.Convert(size.Value);
-				}
-				else {
-					return BytesValueConverter.Convert(size.Value);
-				}
-			}
-		}
-	}
-}

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -11,44 +11,17 @@
         <pages:TrackingPageModel />
     </Design.DataContext>
 
-    <UserControl.Styles>
+    <StackPanel Spacing="10">
-        <Style Selector="TextBlock">
+        <TextBlock TextWrapping="Wrap">
-            <Setter Property="TextWrapping" Value="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.
-        </Style>
+        </TextBlock>
-    </UserControl.Styles>
+        <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="10">
-
+            <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick">Copy Tracking Script</Button>
-    <StackPanel Spacing="20">
+        </StackPanel>
-        <Expander Header="Method 1: Manual" IsExpanded="True">
+        <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
-            <StackPanel Orientation="Vertical" Spacing="10">
+            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>
+        </TextBlock>
-                    <TextBlock.Text>
+        <Button DockPanel.Dock="Right" Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
-                        <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,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -9,36 +8,24 @@ namespace DHT.Desktop.Main.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class TrackingPage : UserControl {
-	private readonly HashSet<Button> copyingButtons = new (ReferenceEqualityComparer.Instance);
+	private bool isCopyingScript;
 
 	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) {
-			object? originalText = button.Content;
+			var originalText = CopyTrackingScript.Content;
-			button.MinWidth = button.Bounds.Width;
+			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;
 
-			if (await onClick(model) && copyingButtons.Add(button)) {
+			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
-				button.IsEnabled = false;
+				isCopyingScript = true;
-				button.Content = copiedText;
+				CopyTrackingScript.Content = "Script Copied!";
 
-				try {
+				await Task.Delay(TimeSpan.FromSeconds(2));
-					await Task.Delay(TimeSpan.FromSeconds(2));
+				CopyTrackingScript.Content = originalText;
-				} finally {
+				isCopyingScript = false;
-					copyingButtons.Remove(button);
-					button.IsEnabled = true;
-					button.Content = originalText;
-				}
 			}
 		}
 	}

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,43 +1,35 @@
 using System;
-using System.Text.RegularExpressions;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-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 DHT.Utils.Models;
-using PropertyChanged.SourceGenerator;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class TrackingPageModel {
+sealed class TrackingPageModel : BaseModel {
-	private static readonly Log Log = Log.ForType<TrackingPageModel>();
+	private bool areDevToolsEnabled;
 
-	[Notify(Setter.Private)]
+	private bool AreDevToolsEnabled {
-	private bool? areDevToolsEnabled = null;
+		get => areDevToolsEnabled;
+		set {
+			Change(ref areDevToolsEnabled, value);
+			OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
+		}
+	}
 
-	[Notify(Setter.Private)]
+	public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
-	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) {
-				return "Loading...";
-			}
-			
 			if (!IsToggleAppDevToolsButtonEnabled) {
 				return "Unavailable";
 			}
 
-			return (AreDevToolsEnabled.Value ? "Disable" : "Enable") + " " + OpenDevToolsShortcutText;
+			return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
 		}
 	}
 
@@ -48,46 +40,52 @@ sealed partial class TrackingPageModel {
 
 	public TrackingPageModel(Window window) {
 		this.window = window;
-		
-		Task.Factory.StartNew(InitializeDevToolsToggle, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.FromCurrentSynchronizationContext());
 	}
 
-	public async Task<bool> OnClickCopyTrackingScript() {
+	public async Task Initialize() {
-		string url = ServerConfiguration.HttpHost + $"/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
+		bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
-		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
-		return await TryCopy(script, "Copy Tracking Script");
-	}
-	
-	private async Task InitializeDevToolsToggle() {
-		bool? devToolsEnabled = await Task.Run(DiscordAppSettings.AreDevToolsEnabled);
-		
 		if (devToolsEnabled.HasValue) {
 			AreDevToolsEnabled = devToolsEnabled.Value;
-			IsToggleAppDevToolsButtonEnabled = true;
 		}
 		else {
 			IsToggleAppDevToolsButtonEnabled = false;
+			OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
 		}
 	}
 	
-	public async Task OnClickToggleAppDevTools() {
+	public async Task<bool> OnClickCopyTrackingScript() {
-		const string DialogTitle = "Discord App Settings File";
+		string url = $"http://127.0.0.1:{ServerManager.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerManager.Token)}";
+		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
 
-		if (!AreDevToolsEnabled.HasValue) {
+		var clipboard = window.Clipboard;
-			return;
+		if (clipboard == null) {
+			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
+			return false;
 		}
 
-		bool oldState = AreDevToolsEnabled.Value;
+		try {
+			await clipboard.SetTextAsync(script);
+			return true;
+		} catch {
+			await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
+			return false;
+		}
+	}
+
+	public async void OnClickToggleAppDevTools() {
+		const string DialogTitle = "Discord App Settings File";
+
+		bool oldState = AreDevToolsEnabled;
 		bool newState = !oldState;
 
 		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
 			case SettingsJsonResult.Success:
 				AreDevToolsEnabled = newState;
-				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
+				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
 				break;
 
 			case SettingsJsonResult.AlreadySet:
-				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " is already " + (newState ? "enabled." : "disabled."));
+				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
 				AreDevToolsEnabled = newState;
 				break;
 
@@ -111,44 +109,4 @@ sealed partial class TrackingPageModel {
 				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("Could not copy to clipboard.", e);
-			await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
-			return false;
-		}
-	}
 }

app/Desktop/Main/Pages/ViewerPage.axaml

@@ -21,6 +21,7 @@
     <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,43 +1,53 @@
 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 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.Service.Viewer;
+using DHT.Server.Database;
-using DHT.Utils.Logging;
+using DHT.Server.Database.Export;
-using PropertyChanged.SourceGenerator;
+using DHT.Server.Database.Export.Strategy;
+using DHT.Utils.Models;
+using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class ViewerPageModel : IDisposable {
+sealed class ViewerPageModel : BaseModel, IDisposable {
-	private static readonly Log Log = Log.ForType<ViewerPageModel>();
+	public static readonly ConcurrentBag<string> TemporaryFiles = new ();
 
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
-	[Notify]
 	private bool hasFilters = false;
 
+	public bool HasFilters {
+		get => hasFilters;
+		set => Change(ref hasFilters, value);
+	}
+
 	public MessageFilterPanelModel FilterModel { get; }
 
 	private readonly Window window;
-	private readonly State state;
+	private readonly IDatabaseFile db;
 
 	[Obsolete("Designer")]
-	public ViewerPageModel() : this(null!, State.Dummy) {}
+	public ViewerPageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-	public ViewerPageModel(Window window, State state) {
+	public ViewerPageModel(Window window, IDatabaseFile db) {
 		this.window = window;
-		this.state = state;
+		this.db = db;
 
-		FilterModel = new MessageFilterPanelModel(window, state, "Will export");
+		FilterModel = new MessageFilterPanelModel(window, db, "Will export");
 		FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
 	}
 
@@ -49,53 +59,93 @@ sealed partial class ViewerPageModel : IDisposable {
 		HasFilters = FilterModel.HasAnyFilters;
 	}
 
+	private async Task WriteViewerFile(string path, IViewerExportStrategy strategy) {
+		const string ArchiveTag = "/*[ARCHIVE]*/";
+
+		string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
+		string viewerTemplate = indexFile.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
+		                                 .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
+		
+		viewerTemplate = strategy.ProcessViewerTemplate(viewerTemplate);
+
+		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, strategy, 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 void OnClickOpenViewer() {
-		try {
+		string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
-			string serverToken = ServerConfiguration.Token;
+		string filenameBase = Path.GetFileNameWithoutExtension(db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
-			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
+		string fullPath = Path.Combine(rootPath, filenameBase + ".html");
-			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
+		int counter = 0;
-		} catch (Exception e) {
+
-			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
+		while (File.Exists(fullPath)) {
+			++counter;
+			fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
 		}
+
+		TemporaryFiles.Add(fullPath);
+
+		Directory.CreateDirectory(rootPath);
+		await WriteViewerFile(fullPath, new LiveViewerExportStrategy(ServerManager.Port, ServerManager.Token));
+
+		Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
 	}
 
-	public async Task OnClickApplyFiltersToDatabase() {
+	private static readonly FilePickerFileType[] ViewerFileTypes = {
-		try {
+		FileDialogs.CreateFilter("Discord History Viewer", new string[] { "html" }),
-			MessageFilter filter = FilterModel.CreateFilter();
+	};
-			long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
 	
-			if (DatabaseToolFilterModeKeep) {
+	public async void OnClickSaveViewer() {
-				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?")) {
+		string? path = await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
-					await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
+			Title = "Save Viewer",
-				}
+			FileTypeChoices = ViewerFileTypes,
-			}
+			SuggestedFileName = Path.GetFileNameWithoutExtension(db.Path) + ".html",
-			else if (DatabaseToolFilterModeRemove) {
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(db.Path)),
-				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("Could not apply filters.", e);
-			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
-		}
-	}
-	
-	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode 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());
 		});
+
+		if (path != null) {
+			await WriteViewerFile(path, StandaloneViewerExportStrategy.Instance);
+		}
+	}
+
+	public async void OnClickApplyFiltersToDatabase() {
+		var filter = FilterModel.CreateFilter();
+
+		if (DatabaseToolFilterModeKeep) {
+			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
+				db.RemoveMessages(filter, FilterRemovalMode.KeepMatching);
+			}
+		}
+		else if (DatabaseToolFilterModeRemove) {
+			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
+				db.RemoveMessages(filter, FilterRemovalMode.RemoveMatching);
+			}
+		}
 	}
 }

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 /template/ ContentPresenter">
+        <Style Selector="TabItem:pointerover > TextBlock">
             <Setter Property="Foreground" Value="#E9E9E9" />
         </Style>
         <Style Selector="TabItem:selected:pointerover /template/ Border">
             <Setter Property="Background" Value="#FFFFFF" />
         </Style>
-        <Style Selector="TabItem:selected:pointerover /template/ ContentPresenter">
+        <Style Selector="TabItem:selected:pointerover > TextBlock">
             <Setter Property="Foreground" Value="#1A2234" />
         </Style>
         <Style Selector="TabItem:selected">
@@ -56,11 +56,9 @@
         <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
             <Setter Property="IsVisible" Value="False" />
         </Style>
-        <Style Selector="TabItem:disabled /template/ ContentPresenter">
+        <Style Selector="TabItem:disabled > TextBlock">
             <Setter Property="Foreground" Value="#B2B2B2" />
-        </Style>
+            <Setter Property="TextDecorations" Value="Strikethrough" />
-        <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" />
@@ -76,7 +74,7 @@
     <DockPanel>
         <Border Classes="statusBar" DockPanel.Dock="Bottom">
             <DockPanel>
-                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Downloads</TextBlock>
+                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Attachments</TextBlock>
                 <controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Right" />
             </DockPanel>
         </Border>
@@ -96,9 +94,9 @@
                     <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabDownloads" Header="Downloads" Grid.Row="2">
+            <TabItem x:Name="TabAttachments" Header="Attachments" Grid.Row="2">
                 <ScrollViewer>
-                    <ContentPresenter Content="{Binding DownloadsPage}" Classes="page" />
+                    <ContentPresenter Content="{Binding AttachmentsPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
             <TabItem x:Name="TabViewer" Header="Viewer" Grid.Row="3">

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -1,21 +1,27 @@
 using System;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Main.Pages;
-using DHT.Server;
+using DHT.Desktop.Server;
+using DHT.Server.Database;
+using DHT.Server.Service;
+using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed class MainContentScreenModel : IAsyncDisposable {
+sealed class MainContentScreenModel : IDisposable {
+	private static readonly Log Log = Log.ForType<MainContentScreenModel>();
+
 	public DatabasePage DatabasePage { get; }
 	private DatabasePageModel DatabasePageModel { get; }
 
 	public TrackingPage TrackingPage { get; }
 	private TrackingPageModel TrackingPageModel { get; }
 
-	public DownloadsPage DownloadsPage { get; }
+	public AttachmentsPage AttachmentsPage { get; }
-	private DownloadsPageModel DownloadsPageModel { get; }
+	private AttachmentsPageModel AttachmentsPageModel { get; }
 
 	public ViewerPage ViewerPage { get; }
 	private ViewerPageModel ViewerPageModel { get; }
@@ -29,57 +35,85 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 	public bool HasDebugPage => true;
 	private DebugPageModel DebugPageModel { get; }
 	#else
-	public bool HasDebugPage => false;
+		public bool HasDebugPage => false;
 	#endif
 
 	public StatusBarModel StatusBarModel { get; }
 
 	public event EventHandler? DatabaseClosed {
-		add => DatabasePageModel.DatabaseClosed += value;
+		add {
-		remove => DatabasePageModel.DatabaseClosed -= value;
+			DatabasePageModel.DatabaseClosed += value;
+		}
+		remove {
+			DatabasePageModel.DatabaseClosed -= value;
+		}
 	}
 
-	[Obsolete("Designer")]
+	private readonly Window window;
-	public MainContentScreenModel() : this(null!, State.Dummy) {}
+	private readonly ServerManager serverManager;
 
-	public MainContentScreenModel(Window window, State state) {
+	[Obsolete("Designer")]
-		DatabasePageModel = new DatabasePageModel(window, state);
+	public MainContentScreenModel() : this(null!, DummyDatabaseFile.Instance) {}
+
+	public MainContentScreenModel(Window window, IDatabaseFile db) {
+		this.window = window;
+		this.serverManager = new ServerManager(db);
+
+		ServerLauncher.ServerManagementExceptionCaught += ServerLauncherOnServerManagementExceptionCaught;
+
+		DatabasePageModel = new DatabasePageModel(window, db);
 		DatabasePage = new DatabasePage { DataContext = DatabasePageModel };
 
 		TrackingPageModel = new TrackingPageModel(window);
 		TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
 
-		DownloadsPageModel = new DownloadsPageModel(window, state);
+		AttachmentsPageModel = new AttachmentsPageModel(db);
-		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
+		AttachmentsPage = new AttachmentsPage { DataContext = AttachmentsPageModel };
 
-		ViewerPageModel = new ViewerPageModel(window, state);
+		ViewerPageModel = new ViewerPageModel(window, db);
 		ViewerPage = new ViewerPage { DataContext = ViewerPageModel };
 
-		AdvancedPageModel = new AdvancedPageModel(window, state);
+		AdvancedPageModel = new AdvancedPageModel(window, db, serverManager);
 		AdvancedPage = new AdvancedPage { DataContext = AdvancedPageModel };
 
 		#if DEBUG
-		DebugPageModel = new DebugPageModel(window, state);
+		DebugPageModel = new DebugPageModel(window, db);
 		DebugPage = new DebugPage { DataContext = DebugPageModel };
 		#else
-		DebugPage = null;
+			DebugPage = null;
 		#endif
 
-		StatusBarModel = new StatusBarModel(state);
+		StatusBarModel = new StatusBarModel(db.Statistics);
+
+		AdvancedPageModel.ServerConfigurationModel.ServerStatusChanged += OnServerStatusChanged;
+		DatabaseClosed += OnDatabaseClosed;
+
+		StatusBarModel.CurrentStatus = serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped;
 	}
 
 	public async Task Initialize() {
-		await DownloadsPageModel.Initialize();
+		await TrackingPageModel.Initialize();
-		
+		AdvancedPageModel.Initialize();
-		#if DEBUG
+		serverManager.Launch();
-		await DebugPageModel.Initialize();
-		#endif
 	}
 
-	public async ValueTask DisposeAsync() {
+	public void Dispose() {
-		await DownloadsPageModel.DisposeAsync();
+		ServerLauncher.ServerManagementExceptionCaught -= ServerLauncherOnServerManagementExceptionCaught;
+		AttachmentsPageModel.Dispose();
 		ViewerPageModel.Dispose();
-		AdvancedPageModel.Dispose();
+		serverManager.Dispose();
-		StatusBarModel.Dispose();
+	}
+
+	private void OnServerStatusChanged(object? sender, StatusBarModel.Status e) {
+		StatusBarModel.CurrentStatus = e;
+	}
+
+	private void OnDatabaseClosed(object? sender, EventArgs e) {
+		serverManager.Stop();
+	}
+
+	private async void ServerLauncherOnServerManagementExceptionCaught(object? sender, Exception ex) {
+		Log.Error(ex);
+		await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
 	}
 }

app/Desktop/Main/Screens/WelcomeScreen.axaml

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

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -1,31 +1,22 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 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;
-using DHT.Server.Database.Sqlite.Utils;
+using DHT.Utils.Models;
-using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed partial class WelcomeScreenModel {
+sealed class WelcomeScreenModel : BaseModel, IDisposable {
-	private static readonly Log Log = Log.ForType<WelcomeScreenModel>();
-	
 	public string Version => Program.Version;
 
-	[Notify(Setter.Private)]
+	public IDatabaseFile? Db { get; private set; }
-	private bool isOpenOrCreateDatabaseButtonEnabled = true;
+	public bool HasDatabase => Db != null;
-	
-	public event EventHandler<IDatabaseFile>? DatabaseSelected;
 
 	private readonly Window window;
 
@@ -38,35 +29,30 @@ sealed partial class WelcomeScreenModel {
 		this.window = window;
 	}
 
-	public async Task OpenOrCreateDatabase() {
+	public async void OpenOrCreateDatabase() {
-		IsOpenOrCreateDatabaseButtonEnabled = false;
+		var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
-		try {
+		if (path != null) {
-			string? path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
+			await OpenOrCreateDatabaseFromPath(path);
-			if (path != null) {
-				await OpenOrCreateDatabaseFromPath(path);
-			}
-		} finally {
-			IsOpenOrCreateDatabaseButtonEnabled = true;
 		}
 	}
 
 	public async Task OpenOrCreateDatabaseFromPath(string path) {
-		dbFilePath = path;
+		if (Db != null) {
-		
+			Db = null;
-		IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
-		if (db != null) {
-			DatabaseSelected?.Invoke(this, db);
 		}
+
+		dbFilePath = path;
+		Db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
+
+		OnPropertyChanged(nameof(Db));
+		OnPropertyChanged(nameof(HasDatabase));
 	}
 
-	private sealed class SchemaUpgradeCallbacks(Window window) : ISchemaUpgradeCallbacks {
+	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
-		public async Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+		private readonly Window window;
-			var model = new NewDatabaseSettingsDialogModel();
 		
-			var dialog = new NewDatabaseSettingsDialog { DataContext = model };
+		public SchemaUpgradeCallbacks(Window window) {
-			await dialog.ShowDialog(window);
+			this.window = window;
-			
-			return new InitialDatabaseSettings(model.SeparateFileForDownloads, model.DownloadsAutoStart);
 		}
 
 		public async Task<bool> CanUpgrade() {
@@ -82,12 +68,24 @@ sealed partial class WelcomeScreenModel {
 				await Task.Delay(TimeSpan.FromMilliseconds(600));
 			}
 
-			await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
+			await new ProgressDialog {
+				DataContext = new ProgressDialogModel(StartUpgrade, progressItems: 3) {
+					Title = "Upgrading Database"
+				}
+			}.ShowProgressDialog(window);
 		}
 
-		private sealed class ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) : ISchemaUpgradeCallbacks.IProgressReporter {
+		private sealed class ProgressReporter : ISchemaUpgradeCallbacks.IProgressReporter {
+			private readonly IReadOnlyList<IProgressCallback> callbacks;
+			
+			private readonly int versionSteps;
 			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);
@@ -111,52 +109,22 @@ sealed partial class WelcomeScreenModel {
 		}
 	}
 
-	public async Task CheckUpdates() {
+	public void CloseDatabase() {
-		string response;
+		Dispose();
-		try {
+		OnPropertyChanged(nameof(Db));
-			response = await ProgressDialog.ShowIndeterminate<string>(window, "Check Updates", "Checking for updates...", static async _ => {
+		OnPropertyChanged(nameof(HasDatabase));
-				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("Could not check for updates.", 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() {
+	public async void ShowAboutDialog() {
-		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
+		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(this.window);
 	}
 
 	public void Exit() {
 		window.Close();
 	}
+
+	public void Dispose() {
+		Db?.Dispose();
+		Db = null;
+	}
 }

app/Desktop/Program.cs

@@ -2,7 +2,6 @@
 using System.Globalization;
 using System.Reflection;
 using Avalonia;
-using DHT.Desktop.Common;
 using DHT.Utils.Logging;
 using DHT.Utils.Resources;
 
@@ -10,18 +9,17 @@ 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();
 
-		AssemblyVersion = assembly.GetName().Version ?? new Version(major: 0, minor: 0, build: 0, revision: 0);
+		Version = assembly.GetName().Version?.ToString() ?? "";
-		Version = VersionToString(AssemblyVersion);
+		while (Version.EndsWith(".0")) {
+			Version = Version[..^2];
+		}
 
 		Culture = CultureInfo.CurrentCulture;
 		CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
@@ -33,16 +31,6 @@ 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();
@@ -58,8 +46,6 @@ static class Program {
 	}
 
 	private static AppBuilder BuildAvaloniaApp() {
-		AvaloniaReflection.Check();
-		
 		return AppBuilder.Configure<App>()
 		                 .UsePlatformDetect()
 		                 .WithInterFont()

app/Desktop/Server/ServerConfiguration.cs

@@ -1,10 +0,0 @@
-using DHT.Server.Service;
-
-namespace DHT.Desktop.Server;
-
-static class ServerConfiguration {
-	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/Desktop/Server/ServerManager.cs

@@ -0,0 +1,50 @@
+using System;
+using DHT.Server.Database;
+using DHT.Server.Service;
+
+namespace DHT.Desktop.Server;
+
+sealed class ServerManager : IDisposable {
+	public static ushort Port { get; set; } = ServerUtils.FindAvailablePort(50000, 60000);
+	public static string Token { get; set; } = ServerUtils.GenerateRandomToken(20);
+
+	private static ServerManager? instance;
+
+	public bool IsRunning => ServerLauncher.IsRunning;
+
+	private readonly IDatabaseFile db;
+
+	public ServerManager(IDatabaseFile db) {
+		if (db != DummyDatabaseFile.Instance) {
+			if (instance != null) {
+				throw new InvalidOperationException("Only one instance of ServerManager can exist at the same time!");
+			}
+
+			instance = this;
+		}
+
+		this.db = db;
+	}
+
+	public void Launch() {
+		ServerLauncher.Relaunch(Port, Token, db);
+	}
+
+	public void Relaunch(ushort port, string token) {
+		Port = port;
+		Token = token;
+		Launch();
+	}
+
+	public void Stop() {
+		ServerLauncher.Stop();
+	}
+
+	public void Dispose() {
+		Stop();
+
+		if (instance == this) {
+			instance = null;
+		}
+	}
+}

app/Directory.Build.props

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

app/NuGet.Config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="chylex's repository" value="https://nuget.chylex.com/feed/index.json" />
-  </packageSources>
-</configuration>

app/Resources/Schemas/track-users.yml

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

app/Resources/Tracker/bootstrap.js

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

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

@@ -1,273 +0,0 @@
-// ==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,26 +4,11 @@ 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
@@ -33,74 +18,6 @@ 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", [ "isLoadingMessages" ]);
-	
-	/**
-	 * @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");
 	}
@@ -109,6 +26,14 @@ 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();
 		
@@ -117,43 +42,26 @@ 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 = force => {
+		const onMessageElementsChanged = function() {
-			const messages = this.getMessagesFromSelectedChannel();
+			const messages = DISCORD.getMessages();
-			if (!messages || !messages.ready || messages.loadingMore) {
+			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !DISCORD.hasMoreMessages();
-				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 false;
+				return;
 			}
 			
 			previousMessages.clear();
-			for (const message of messages._array) {
+			for (const message of messages) {
 				previousMessages.add(message.id);
 			}
 			
-			const server = this.#guildStore.getGuild(channel.guild_id);
+			callback(messages);
-			
-			callback(server, channel, messages._array, messages.hasMoreBefore);
-			return true;
 		};
 		
 		let debounceTimer;
@@ -166,7 +74,7 @@ class DISCORD {
 			debounceTimer = window.setTimeout(onMessageElementsChanged, 100);
 		};
 		
-		const observer = new MutationObserver(function() {
+		const observer = new MutationObserver(function () {
 			onMessageElementsChangedLater();
 		});
 		
@@ -204,54 +112,216 @@ class DISCORD {
 			observedElement = null;
 			window.clearInterval(observerTimer);
 		});
+	}
 	
-		return () => onMessageElementsChanged(true);
+	/**
+	 * 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;
+		}
 	}
 	
 	/**
 	 * Selects the next text channel and returns true, otherwise returns false if there are no more channels.
 	 */
 	static selectNextTextChannel() {
-		const currentChannel = this.#channelStore.getChannel(this.#getCurrentlySelectedChannelId());
+		const dms = DOM.queryReactClass("privateChannels");
-		if (!currentChannel) {
-			return false;
-		}
 		
-		if (this.CHANNEL_TYPE.isPrivate(currentChannel.type)) {
+		if (dms) {
-			const privateChannel = this.#channelStore.getSortedPrivateChannels();
+			const currentChannel = DOM.queryReactClass("selected", dms);
-			const currentIndex = privateChannel.findIndex(channel => channel.id === currentChannel.id);
+			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel_']");
+			const nextChannel = currentChannelContainer && currentChannelContainer.nextElementSibling;
 			
-			if (currentIndex === -1 || currentIndex === privateChannel.length - 1) {
+			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel_")) {
 				return false;
 			}
 			
-			this.#selectPrivateChannel(privateChannel[currentIndex + 1].id);
+			const nextChannelLink = nextChannel.querySelector("a[href*='/@me/']");
+			if (!nextChannelLink) {
+				return false;
+			}
+			
+			nextChannelLink.click();
+			nextChannelLink.scrollIntoView(true);
 			return true;
 		}
 		else {
-			const guildId = currentChannel.guild_id;
+			const channelListEle = document.getElementById("channels");
-			
+			if (!channelListEle) {
-			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;
 			}
 			
-			this.#transitionToGuildSync(guildId, {}, guildChannels[currentIndex + 1].id);
+			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);
 			return true;
 		}
 	}

app/Resources/Tracker/scripts/dom.js

@@ -1,8 +1,6 @@
 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) {
@@ -11,9 +9,6 @@ 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}_"]`);
@@ -60,4 +55,31 @@ 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,17 +2,14 @@
 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);
 		}
@@ -57,7 +54,6 @@ 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;
@@ -88,7 +84,6 @@ 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")}
@@ -98,7 +93,8 @@ ${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")}`;
+${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>`;
 			
 			settings = {
 				styles: DOM.createStyle(`/*[CSS-SETTINGS]*/`),
@@ -111,10 +107,9 @@ ${radio("asm", "switch", "Switch to Next Channel")}`;
 			});
 			
 			settings.ui = {
-				/** @type {HTMLInputElement} */ cbAutoscroll: DOM.id("dht-cfg-autoscroll"),
+				cbAutoscroll: DOM.id("dht-cfg-autoscroll"),
-				/** @type {HTMLInputElement} */ cbHidePreviewsWhileAutoscrolling: DOM.id("dht-cfg-hide-previews-while-autoscrolling"),
+				optsAfterFirstMsg: {},
-				/** @type {Object.<number, HTMLInputElement>} */ optsAfterFirstMsg: {},
+				optsAfterSavedMsg: {}
-				/** @type {Object.<number, HTMLInputElement>} */ optsAfterSavedMsg: {}
 			};
 			
 			settings.ui.optsAfterFirstMsg[CONSTANTS.AUTOSCROLL_ACTION_NOTHING] = DOM.id("dht-cfg-afm-nothing");
@@ -129,10 +124,6 @@ ${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;
@@ -161,29 +152,6 @@ ${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,28 +35,17 @@ 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 = defaults;
+		loaded = {
+			"_autoscroll": true,
+			"_afterFirstMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
+			"_afterSavedMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE
+		};
+		
 		IS_FIRST_RUN = true;
 	}
-	else {
-		for (const property in defaults) {
-			if (!(property in loaded)) {
-				loaded[property] = defaults[property];
-				hasChanged = true;
-			}
-		}
-	}
 	
 	const root = {
 		onSettingsChanged(callback) {
@@ -65,11 +54,10 @@ 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 || hasChanged) {
+	if (IS_FIRST_RUN) {
 		saveSettings();
 	}
 	

app/Resources/Tracker/scripts/state.js

@@ -48,49 +48,69 @@ 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;
@@ -121,59 +141,32 @@ const STATE = (function() {
 			}
 		},
 		
-		/**
-		 * @param {?DiscordGuild} serverInfo
-		 * @param {DiscordChannel} channelInfo
-		 */
 		async addDiscordChannel(serverInfo, channelInfo) {
 			if (addedChannels.has(channelInfo.id)) {
 				return;
 			}
 			
 			const server = {
-				type: getChannelTypeName(channelInfo.type)
+				id: serverInfo.id,
+				name: serverInfo.name,
+				type: serverInfo.type
 			};
 			
 			const channel = {
 				id: channelInfo.id,
-				extra: {}
+				name: channelInfo.name
 			};
 			
-			if (DISCORD.CHANNEL_TYPE.isPrivate(channelInfo.type)) {
+			if ("extra" in channelInfo) {
-				server.id = channelInfo.id;
+				const extra = channelInfo.extra;
-				server.name = channel.name = getPrivateChannelName(channelInfo);
 				
-				if (channelInfo.icon) {
+				if ("parent" in extra) {
-					server.icon = channelInfo.icon;
+					channel.parent = extra.parent;
 				}
-			}
-			else if (serverInfo) {
-				server.id = serverInfo.id;
-				server.name = serverInfo.name;
-				channel.name = channelInfo.name;
 				
-				if (serverInfo.icon) {
+				channel.position = extra.position;
-					server.icon = serverInfo.icon;
+				channel.topic = extra.topic;
-				}
+				channel.nsfw = extra.nsfw;
-			}
-			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 });
@@ -202,10 +195,6 @@ const STATE = (function() {
 						name: user.username
 					};
 					
-					if (user.globalName) {
-						obj.displayName = user.globalName;
-					}
-					
 					if (user.avatar) {
 						obj.avatar = user.avatar;
 					}
@@ -234,12 +223,12 @@ const STATE = (function() {
 					sender: msg.author.id,
 					channel: msg.channel_id,
 					text: msg.content,
-					timestamp: getDate(msg.timestamp).getTime()
+					timestamp: msg.timestamp.toDate().getTime()
 				};
 				
 				if (msg.editedTimestamp !== null) {
 					// noinspection JSUnusedGlobalSymbols
-					obj.editTimestamp = getDate(msg.editedTimestamp).getTime();
+					obj.editTimestamp = msg.editedTimestamp.toDate().getTime();
 				}
 				
 				if (msg.messageReference !== null) {
@@ -294,7 +283,7 @@ const STATE = (function() {
 				}
 				
 				if (msg.reactions.length > 0) {
-					obj.reactions = msg.reactions.filter(reaction => reaction.count > 0).map(reaction => {
+					obj.reactions = msg.reactions.map(reaction => {
 						const emoji = reaction.emoji;
 						
 						const mapped = {

app/Resources/Tracker/scripts/types.js

@@ -1,84 +0,0 @@
-/**
- * @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

@@ -1,100 +0,0 @@
-/**
- * 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, modules);
-		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,13 +18,11 @@
   height: 262px;
   margin-left: -400px;
   margin-top: -131px;
-  line-height: 120%;
   padding: 8px;
   background-color: #fff;
   z-index: 1000002;
 }
 
-#dht-cfg label {
+#dht-cfg-note {
-  display: inline-block;
+  margin-top: 22px;
-  margin: 1px 0;
 }

app/Resources/Viewer/index.html

@@ -2,32 +2,22 @@
 <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">
-		const query = new URLSearchParams(location.search);
+		window.DHT_EMBEDDED = "/*[ARCHIVE]*/";
-		window.DHT_SERVER_TOKEN = query.get("token");
+		window.DHT_SERVER_URL = "/*[SERVER_URL]*/";
-		window.DHT_SERVER_SESSION = query.get("session");
+    window.DHT_SERVER_TOKEN = "/*[SERVER_TOKEN]*/";
+		/*[JS]*/
     </script>
-    <script type="module" src="scripts/bootstrap.mjs"></script>
+    <style>
+      /*[CSS]*/
+    </style>
   </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>
@@ -76,10 +66,7 @@
     </div>
     
     <div id="app">
-      <div id="servers"></div>
+      <div id="channels"></div>
-      <div id="channels">
-        <div class="loading"></div>
-      </div>
       <div id="messages"></div>
     </div>
     

app/Resources/Viewer/scripts/bootstrap.js

@@ -0,0 +1,39 @@
+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

@@ -1,114 +0,0 @@
-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.js

@@ -1,10 +1,4 @@
-import discord from "./discord.mjs";
+const DISCORD = (function() {
-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,
@@ -41,24 +35,10 @@ export default (function() {
 	let templateReaction;
 	let templateReactionCustom;
 	
-	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);
-	
-	const getEmoji = function(name, id, extension) {
-		const tag = ":" + name + ":";
-		return "<img src='" + fileUrlProcessor("https://cdn.discordapp.com/emojis/" + id + "." + extension) + "' alt='" + tag + "' title='" + tag + "' class='emoji'>";
-	};
-	
 	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
@@ -74,33 +54,29 @@ export default (function() {
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		
-		const animatedEmojiExtension = settings.enableAnimatedEmoji ? "gif" : "webp";
+		const animatedEmojiExtension = SETTINGS.enableAnimatedEmoji ? "gif" : "png";
 		
 		// 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.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.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (STATE.getUserTag(match) || "????") + "'>@" + STATE.getUserName(match) + "</span>")
-			.replace(regex.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
+			.replace(regex.customEmojiStatic, "<img src='https://cdn.discordapp.com/emojis/$2.png' alt=':$1:' title=':$1:' class='emoji'>")
-			.replace(regex.customEmojiAnimated, (full, m1, m2) => getEmoji(m1, m2, animatedEmojiExtension));
+			.replace(regex.customEmojiAnimated, "<img src='https://cdn.discordapp.com/emojis/$2." + animatedEmojiExtension + "' alt=':$1:' title=':$1:' class='emoji'>");
 		
 		return "<p>" + processed + "</p>";
 	};
 	
-	const getAvatarUrlObject = function(avatar) {
-		return { url: fileUrlProcessor("https://cdn.discordapp.com/avatars/" + avatar.id + "/" + avatar.path + ".webp") };
-	};
-	
 	const getImageEmbed = function(url, image) {
-		if (!settings.enableImagePreviews) {
+		if (!SETTINGS.enableImagePreviews) {
 			return "";
 		}
 		
 		if (image.width && image.height) {
-			return templateEmbedImageWithSize.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url), width: image.width, height: image.height });
+			return templateEmbedImageWithSize.apply({ url, src: image.url, width: image.width, height: image.height });
 		}
 		else {
-			return templateEmbedImage.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url) });
+			return templateEmbedImage.apply({ url, src: image.url });
 		}
 	};
 	
@@ -112,37 +88,36 @@ export default (function() {
 	
 	return {
 		setup() {
-			templateChannelServer = new template([
+			templateChannelServer = new TEMPLATE([
-				"<div class='channel ServerChannel' data-channel='{id}' server-id='{serverId}' server-name='{server.name}' server-type='{server.type}'>",
+				"<div data-channel='{id}'>",
 				"<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([
+			templateChannelPrivate = new TEMPLATE([
-				"<div class='channel UserChannel' data-channel='{id}' server-id='0' server-name='{server.name}' server-type='{server.type}'>",
+				"<div data-channel='{id}'>",
-				"<div class='avatar'>{icon}</div>",
 				"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
-				"<!--<span class='server'>{server.name} ({server.type})</span>-->",
+				"<span class='server'>({server.type})</span>",
 				"</div>"
 			].join(""));
 			
-			templateMessageNoAvatar = new template([
+			templateMessageNoAvatar = new TEMPLATE([
 				"<div>",
 				"<div class='reply-message'>{reply}</div>",
-				"<h2><strong class='username' title='{user.name}'>{user.displayName}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
+				"<h2><strong class='username' title='#{user.tag}'>{user.name}</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.name}'>{user.displayName}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
+				"<h2><strong class='username' title='#{user.tag}'>{user.name}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
 				"<div class='message'>{contents}{embeds}{attachments}</div>",
 				"{reactions}",
 				"</div>",
@@ -150,52 +125,50 @@ export default (function() {
 				"</div>"
 			].join(""));
 			
-			// noinspection HtmlUnknownTarget
+			templateUserAvatar = new TEMPLATE([
-			templateUserAvatar = new template([
+				"<img src='https://cdn.discordapp.com/avatars/{id}/{path}.webp?size=128' alt=''>"
-				"<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([
+			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>"
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedImageWithSize = new template([
+			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>"
+				"<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>"
 			].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='https://cdn.discordapp.com/emojis/{id}.{ext}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
-				"<span class='reaction-wrapper'><img src='{url}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
 			].join(""));
 		},
 		
@@ -211,7 +184,7 @@ export default (function() {
 		},
 		
 		isImageAttachment(attachment) {
-			const url = dom.tryParseUrl(attachment.url);
+			const url = DOM.tryParseUrl(attachment.url);
 			return url != null && isImageUrl(url);
 		},
 		
@@ -224,15 +197,15 @@ export default (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)) : "";
+					return value ? templateUserAvatar.apply(value) : "";
 				}
-				else if (property === "user.displayName") {
+				else if (property === "user.tag") {
-					return value ? value : message.user.name;
+					return value ? value : "????";
 				}
 				else if (property === "timestamp") {
-					return dom.getHumanReadableTime(value);
+					return DOM.getHumanReadableTime(value);
 				}
 				else if (property === "contents") {
 					return value && value.length > 0 ? processMessageContents(value) : "";
@@ -269,47 +242,44 @@ export default (function() {
 					}
 					
 					return value.map(attachment => {
-						const url = fileUrlProcessor(attachment.url);
+						if (!DISCORD.isImageAttachment(attachment) || !SETTINGS.enableImagePreviews) {
-						
+							return templateAttachmentDownload.apply(attachment);
-						if (!discord.isImageAttachment(attachment) || !settings.enableImagePreviews) {
-							return templateAttachmentDownload.apply({ url, name: attachment.name });
 						}
 						else if ("width" in attachment && "height" in attachment) {
-							return templateEmbedImageWithSize.apply({ url, src: url, width: attachment.width, height: attachment.height });
+							return templateEmbedImageWithSize.apply({ url: attachment.url, src: attachment.url, width: attachment.width, height: attachment.height });
 						}
 						else {
-							return templateEmbedImage.apply({ url, src: url });
+							return templateEmbedImage.apply({ url: attachment.url, src: attachment.url });
 						}
 					}).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.name + "'>" + (value.user.displayName ?? value.user.name) + "</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 avatar = SETTINGS.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(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") {
+				else if (property === "reactions"){
-					if (!value) {
+					if (!value){
 						return "";
 					}
 					
 					return "<div class='reactions'>" + value.map(reaction => {
-						if ("id" in reaction) {
+						if ("id" in reaction){
-							const ext = reaction.a && settings.enableAnimatedEmoji ? "gif" : "webp";
+							// noinspection JSUnusedGlobalSymbols, JSUnresolvedVariable
-							const url = fileUrlProcessor("https://cdn.discordapp.com/emojis/" + reaction.id + "." + ext);
+							reaction.ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "png";
-							// noinspection JSUnusedGlobalSymbols
+							return templateReactionCustom.apply(reaction);
-							return templateReactionCustom.apply({ url, n: reaction.n, c: reaction.c });
 						}
 						else {
 							return templateReaction.apply(reaction);

app/Resources/Viewer/scripts/dom.js

@@ -8,12 +8,9 @@ const HTML_ENTITY_MAP = {
 
 const HTML_ENTITY_REGEX = /[&<>"']/g;
 
-export default class {
+class DOM {
 	/**
 	 * 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);
@@ -21,9 +18,6 @@ export default class {
 	
 	/**
 	 * 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));
@@ -31,9 +25,6 @@ export default class {
 	
 	/**
 	 * 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));
@@ -41,9 +32,6 @@ export default class {
 	
 	/**
 	 * 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.js

@@ -1,16 +1,10 @@
-import dom from "./dom.mjs";
+const GUI = (function() {
-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() {
-		/** @type HTMLSelectElement */
+		const active = DOM.fcls("active", DOM.id("opt-filter-list"));
-		const active = dom.fcls("active", dom.id("opt-filter-list"));
 		
 		return active && active.value !== "" ? {
 			"type": active.getAttribute("data-filter-type"),
@@ -23,12 +17,12 @@ export default (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;
 	};
 	
@@ -44,9 +38,9 @@ export default (function() {
 <label><input id='dht-cfg-animemoji' type='checkbox'> Animated Emoji</label><br>`);
 		
 		const setupCheckBox = function(id, settingName) {
-			const ele = dom.id(id);
+			const ele = DOM.id(id);
-			ele.checked = settings[settingName];
+			ele.checked = SETTINGS[settingName];
-			ele.addEventListener("change", () => settings[settingName] = ele.checked);
+			ele.addEventListener("change", () => SETTINGS[settingName] = ele.checked);
 		};
 		
 		setupCheckBox("dht-cfg-imgpreviews", "enableImagePreviews");
@@ -71,20 +65,20 @@ export default (function() {
 		// ---------
 		
 		setup() {
-			const inputMessageFilter = dom.id("opt-messages-filter");
+			const inputMessageFilter = DOM.id("opt-messages-filter");
-			const containerFilterList = dom.id("opt-filter-list");
+			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");
@@ -97,11 +91,11 @@ export default (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", () => {
@@ -109,34 +103,34 @@ export default (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("overlay").addEventListener("click", () => {
-				dom.id("modal").classList.remove("visible");
+				DOM.id("modal").classList.remove("visible");
-				dom.id("dialog").innerHTML = "";
+				DOM.id("dialog").innerHTML = "";
 			});
 		},
 		
@@ -174,19 +168,19 @@ export default (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-current").innerHTML = currentPage;
-			dom.id("nav-page-total").innerHTML = totalPages || "?";
+			DOM.id("nav-page-total").innerHTML = totalPages || "?";
 			
-			dom.id("nav-first").disabled = currentPage === 1;
+			DOM.id("nav-first").disabled = currentPage === 1;
-			dom.id("nav-prev").disabled = currentPage === 1;
+			DOM.id("nav-prev").disabled = currentPage === 1;
-			dom.id("nav-pick").disabled = (totalPages || 0) <= 1;
+			DOM.id("nav-pick").disabled = (totalPages || 0) <= 1;
-			dom.id("nav-next").disabled = currentPage === (totalPages || 1);
+			DOM.id("nav-next").disabled = currentPage === (totalPages || 1);
-			dom.id("nav-last").disabled = currentPage === (totalPages || 1);
+			DOM.id("nav-last").disabled = currentPage === (totalPages || 1);
 		},
 		
 		// --------------
@@ -197,7 +191,7 @@ export default (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 = "";
@@ -207,11 +201,11 @@ export default (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");
@@ -230,12 +224,12 @@ export default (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);
@@ -243,11 +237,10 @@ export default (function() {
 			
 			const options = [];
 			
-			for (const id of Object.keys(users)) {
+			for (const key of Object.keys(users)) {
-				const user = users[id];
 				const option = document.createElement("option");
-				option.value = id;
+				option.value = key;
-				option.text = user.displayName ? `${user.displayName} (${user.name})` : user.name;
+				option.text = users[key].name;
 				options.push(option);
 			}
 			
@@ -256,7 +249,7 @@ export default (function() {
 		},
 		
 		scrollMessagesToTop() {
-			dom.id("messages").scrollTop = 0;
+			DOM.id("messages").scrollTop = 0;
 		}
 	};
 })();

app/Resources/Viewer/scripts/polyfills.mjs

@@ -1,35 +0,0 @@
-// 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.js

@@ -1,16 +1,16 @@
-import discord from "./discord.mjs";
+const PROCESSOR = {};
 
 // ------------------------
 // Global filter generators
 // ------------------------
 
-const filter = {
+PROCESSOR.FILTER = {
-	byUser: ((user) => message => message.u === user),
+	byUser: ((userindex) => message => message.u === userindex),
 	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))),
+	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))),
+	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 @@ const filter = {
 // Global sorters
 // --------------
 
-const sorter = {
+PROCESSOR.SORTER = {
 	oldestToNewest: (key1, key2) => {
 		if (key1.length === key2.length) {
 			return key1 > key2 ? 1 : key1 < key2 ? -1 : 0;
@@ -39,8 +39,3 @@ const sorter = {
 		}
 	}
 };
-
-export default {
-	FILTER: filter,
-	SORTER: sorter
-};

app/Resources/Viewer/scripts/servers.mjs

@@ -1,109 +0,0 @@
-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.js

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