WIP

README.md

@@ -16,6 +16,7 @@ Fork the repository and clone it to your computer (if you've never used git, you
 
 Folder organization:
 * `app/` contains a Visual Studio solution for the desktop app
+* `lib/` contains utilities required to build the project
 * `web/` contains source code of the [official website](https://dht.chylex.com), which can be used as a template when making your own website
 
 To start editing source code for the desktop app, install the [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
@@ -28,13 +29,22 @@ To build a `Release` version of the desktop app, follow the instructions for you
 
 #### Release – Windows (64-bit)
 
-1. Install [Powershell 5](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) or newer (on Windows 10, the included version of Powershell should be enough)
+1. Install [Python 3](https://www.python.org/downloads), and ensure the `python` executable is in your `PATH`
+2. 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)
+
+The `lib/` folder contains an installation of [Node](https://nodejs.org/en) and [uglify-js](https://www.npmjs.com/package/uglify-js), which are used to minify the tracking script. This installation will only work on 64-bit Windows; building on 32-bit Windows is not supported, but you can try.
 
 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 [Python 3](https://www.python.org/downloads), and ensure the `python` executable exists and launches Python 3
+   - On Debian and derivatives, you can install `python-is-python3`
+   - On other distributions, you can create a link manually, for ex. `ln -s /usr/bin/python3 /usr/bin/python`
+   - If you don't want `python` to mean Python 3, then edit `Desktop.csproj` and change `python` to `python3`
+2. Install [Node + npm](https://nodejs.org/en)
+3. Install [uglify-js](https://www.npmjs.com/package/uglify-js) globally (`npm install -g uglify-js`)
+4. Install the `zip` package from your repository
 
 Run the `app/build.sh` script, and read the [Distribution](#distribution) section below.
 
@@ -42,4 +52,4 @@ Run the `app/build.sh` script, and read the [Distribution](#distribution) sectio
 
 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.
+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 `DiscordHistoryTracker`. I tried using Python to re-create the archives with correct file permissions, but found that Linux `zip` tools could not see them. The only working solution is building the Windows + portable version on Windows, and Linux + Mac version on Linux.

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AvaloniaProject">
-    <option name="projectPerEditor">
-      <map>
-        <entry key="Desktop/App.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Dialogs/Message/MessageDialog.axaml" value="Desktop/Desktop.csproj" />
-        <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/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/MainWindow.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
-        <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" />
-        <entry key="Desktop/Main/Screens/WelcomeScreen.axaml" value="Desktop/Desktop.csproj" />
-      </map>
-    </option>
-  </component>
-</project>

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,13 @@
       <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">
+    <H2CodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </H2CodeStyleSettings>
+    <HSQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </HSQLCodeStyleSettings>
     <HTMLCodeStyleSettings>
@@ -85,10 +88,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 +101,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 +119,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 +146,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 +176,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 +206,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 +285,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 +345,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 +360,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 +370,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 +430,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/.idea/.idea.DiscordHistoryTracker/.idea/runConfigurations/Desktop.xml

@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Desktop" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Desktop/debug/DiscordHistoryTracker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Desktop/bin/Debug/net5.0/DiscordHistoryTracker.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.artifacts/bin/Desktop/debug" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Desktop/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
     <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
+    <option name="PROJECT_TFM" value="net5.0" />
     <method v="2">
       <option name="Build" />
     </method>

app/.idea/.idea.DiscordHistoryTracker/.idea/runConfigurations/Minify.xml

@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Minify" type="PythonConfigurationType" factoryName="Python">
+    <module name="rider.module" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="false" />
+    <option name="ADD_SOURCE_ROOTS" value="false" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/minify.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

app/Desktop/App/App.axaml

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

app/Desktop/App/App.axaml.cs

@@ -1,9 +1,10 @@
+using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
-using DHT.Desktop.Main;
+using DHT.Desktop.App.Windows;
 
-namespace DHT.Desktop;
+namespace DHT.Desktop.App;
 
 sealed class App : Application {
 	public override void Initialize() {
@@ -12,7 +13,7 @@ sealed class App : Application {
 
 	public override void OnFrameworkInitializationCompleted() {
 		if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
-			desktop.MainWindow = new MainWindow(Program.Arguments);
+			desktop.MainWindow = new MainWindow(new Arguments(desktop.Args ?? Array.Empty<string>()));
 		}
 
 		base.OnFrameworkInitializationCompleted();

app/Desktop/App/Common/BytesValueConverter.cs

@@ -2,7 +2,7 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace DHT.Desktop.Common;
+namespace DHT.Desktop.App.Common;
 
 sealed class BytesValueConverter : IValueConverter {
 	private sealed class Unit {
@@ -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/App/Common/DatabaseGui.cs

@@ -4,24 +4,23 @@ using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
-using DHT.Desktop.Dialogs.File;
+using DHT.Desktop.App.Dialogs.File;
-using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.App.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;
+namespace DHT.Desktop.App.Common;
 
 static class DatabaseGui {
 	private static readonly Log Log = Log.ForType(typeof(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 {
@@ -42,11 +41,11 @@ static class DatabaseGui {
 		});
 	}
 
-	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
+	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, Func<Task<bool>> checkCanUpgradeDatabase) {
 		IDatabaseFile? file = null;
 
 		try {
-			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks);
+			file = await SqliteDatabaseFile.OpenOrCreate(path, checkCanUpgradeDatabase);
 		} catch (InvalidDatabaseVersionException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
 		} catch (DatabaseTooNewException ex) {

app/Desktop/App/Common/NumberValueConverter.cs

@@ -2,7 +2,7 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace DHT.Desktop.Common;
+namespace DHT.Desktop.App.Common;
 
 sealed class NumberValueConverter : IValueConverter {
 	public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {

app/Desktop/App/Common/TextFormat.cs

@@ -1,4 +1,4 @@
-namespace DHT.Desktop.Common;
+namespace DHT.Desktop.App.Common;
 
 static class TextFormat {
 	public static string Format(this int number) {

app/Desktop/App/Controls/ServerConfigurationPanel.axaml

@@ -2,10 +2,9 @@
              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:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             xmlns:controls="clr-namespace:DHT.Desktop.App.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.ServerConfigurationPanel"
+             x:Class="DHT.Desktop.App.Controls.ServerConfigurationPanel">
-             x:DataType="controls:ServerConfigurationPanelModel">
 
     <Design.DataContext>
         <controls:ServerConfigurationPanelModel />

app/Desktop/App/Controls/ServerConfigurationPanel.axaml.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 
-namespace DHT.Desktop.Main.Controls;
+namespace DHT.Desktop.App.Controls;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class ServerConfigurationPanel : UserControl {

app/Desktop/App/Controls/ServerConfigurationPanelModel.cs

@@ -0,0 +1,116 @@
+using System;
+using Avalonia.Controls;
+using DHT.Desktop.App.Dialogs.Message;
+using DHT.Desktop.Server;
+using DHT.Server.Database;
+using DHT.Server.Service;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Controls;
+
+sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
+	private string inputPort;
+
+	public string InputPort {
+		get => inputPort;
+		set {
+			Change(ref inputPort, value);
+			OnPropertyChanged(nameof(HasMadeChanges));
+		}
+	}
+
+	private string inputToken;
+
+	public string InputToken {
+		get => inputToken;
+		set {
+			Change(ref inputToken, value);
+			OnPropertyChanged(nameof(HasMadeChanges));
+		}
+	}
+
+	public bool HasMadeChanges => ServerManager.Port.ToString() != InputPort || ServerManager.Token != InputToken;
+
+	private bool isToggleServerButtonEnabled = true;
+
+	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 serverManager;
+
+	[Obsolete("Designer")]
+	public ServerConfigurationPanelModel() : this(null!, new ServerManager(DummyDatabaseFile.Instance)) {}
+
+	public ServerConfigurationPanelModel(Window window, ServerManager serverManager) {
+		this.window = window;
+		this.serverManager = serverManager;
+		this.inputPort = ServerManager.Port.ToString();
+		this.inputToken = ServerManager.Token;
+	}
+
+	public void Initialize() {
+		ServerLauncher.ServerStatusChanged += ServerLauncherOnServerStatusChanged;
+	}
+
+	public void Dispose() {
+		ServerLauncher.ServerStatusChanged -= ServerLauncherOnServerStatusChanged;
+	}
+
+	private void ServerLauncherOnServerStatusChanged(object? sender, EventArgs e) {
+		ServerStatusChanged?.Invoke(this, serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped);
+		OnPropertyChanged(nameof(ToggleServerButtonText));
+		IsToggleServerButtonEnabled = true;
+	}
+
+	private void BeforeServerStart() {
+		IsToggleServerButtonEnabled = false;
+		ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Starting);
+	}
+
+	private void StartServer() {
+		BeforeServerStart();
+		serverManager.Launch();
+	}
+
+	private void StopServer() {
+		IsToggleServerButtonEnabled = false;
+		ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Stopping);
+		serverManager.Stop();
+	}
+
+	public void OnClickToggleServerButton() {
+		if (serverManager.IsRunning) {
+			StopServer();
+		}
+		else {
+			StartServer();
+		}
+	}
+
+	public void OnClickRandomizeToken() {
+		InputToken = ServerUtils.GenerateRandomToken(20);
+	}
+
+	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;
+		}
+
+		BeforeServerStart();
+		serverManager.Relaunch(port, InputToken);
+		OnPropertyChanged(nameof(HasMadeChanges));
+	}
+
+	public void OnClickCancelChanges() {
+		InputPort = ServerManager.Port.ToString();
+		InputToken = ServerManager.Token;
+	}
+}

app/Desktop/App/Controls/StatusBar.axaml

@@ -2,10 +2,9 @@
              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:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             xmlns:controls="clr-namespace:DHT.Desktop.App.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.StatusBar"
+             x:Class="DHT.Desktop.App.Controls.StatusBar">
-             x:DataType="controls:StatusBarModel">
 
     <Design.DataContext>
         <controls:StatusBarModel />
@@ -40,22 +39,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/App/Controls/StatusBar.axaml.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 
-namespace DHT.Desktop.Main.Controls;
+namespace DHT.Desktop.App.Controls;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class StatusBar : UserControl {

app/Desktop/App/Controls/StatusBarModel.cs

@@ -0,0 +1,34 @@
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Controls;
+
+sealed class StatusBarModel : BaseModel {
+	private Status status = Status.Stopped;
+
+	public Status CurrentStatus {
+		get => status;
+		set {
+			status = value;
+			OnPropertyChanged(nameof(StatusText));
+		}
+	}
+
+	public string StatusText {
+		get {
+			return CurrentStatus switch {
+				Status.Starting => "STARTING",
+				Status.Ready    => "READY",
+				Status.Stopping => "STOPPING",
+				Status.Stopped  => "STOPPED",
+				_               => ""
+			};
+		}
+	}
+
+	public enum Status {
+		Starting,
+		Ready,
+		Stopping,
+		Stopped
+	}
+}

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

@@ -2,17 +2,16 @@
         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.Dialogs.CheckBox"
+        xmlns:checkBox="clr-namespace:DHT.Desktop.App.Dialogs.CheckBox"
         mc:Ignorable="d" d:DesignWidth="500"
-        x:Class="DHT.Desktop.Dialogs.CheckBox.CheckBoxDialog"
+        x:Class="DHT.Desktop.App.Dialogs.CheckBox.CheckBoxDialog"
-        x:DataType="namespace:CheckBoxDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="500" SizeToContent="Height" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Window.DataContext>
-        <namespace:CheckBoxDialogModel />
+        <checkBox:CheckBoxDialogModel />
     </Window.DataContext>
 
     <Window.Styles>
@@ -38,7 +37,7 @@
             <ItemsRepeater ItemsSource="{Binding Items}">
                 <ItemsRepeater.ItemTemplate>
                     <DataTemplate>
-                        <CheckBox IsChecked="{Binding IsChecked}">
+                        <CheckBox IsChecked="{Binding Checked}">
                             <Label>
                                 <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
                             </Label>

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

@@ -1,9 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.App.Dialogs.Message;
 
-namespace DHT.Desktop.Dialogs.CheckBox;
+namespace DHT.Desktop.App.Dialogs.CheckBox;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class CheckBoxDialog : Window {

app/Desktop/App/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -2,11 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Dialogs.CheckBox;
+namespace DHT.Desktop.App.Dialogs.CheckBox;
 
-class CheckBoxDialogModel : ObservableObject {
+class CheckBoxDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 
 	private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
@@ -29,8 +29,8 @@ class CheckBoxDialogModel : ObservableObject {
 
 	private bool pauseCheckEvents = false;
 
-	public bool AreAllSelected => Items.All(static item => item.IsChecked);
+	public bool AreAllSelected => Items.All(static item => item.Checked);
-	public bool AreNoneSelected => Items.All(static item => !item.IsChecked);
+	public bool AreNoneSelected => Items.All(static item => !item.Checked);
 
 	public void SelectAll() => SetAllChecked(true);
 	public void SelectNone() => SetAllChecked(false);
@@ -39,7 +39,7 @@ class CheckBoxDialogModel : ObservableObject {
 		pauseCheckEvents = true;
 
 		foreach (var item in Items) {
-			item.IsChecked = isChecked;
+			item.Checked = isChecked;
 		}
 
 		pauseCheckEvents = false;
@@ -52,16 +52,16 @@ class CheckBoxDialogModel : ObservableObject {
 	}
 
 	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.IsChecked)) {
+		if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.Checked)) {
 			UpdateBulkButtons();
 		}
 	}
 }
 
 sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
-	private new IReadOnlyList<CheckBoxItem<T>> Items { get; }
+	public new IReadOnlyList<CheckBoxItem<T>> Items { get; }
 
-	public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.IsChecked);
+	public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.Checked);
 
 	public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
 		this.Items = new List<CheckBoxItem<T>>(items);

app/Desktop/App/Dialogs/CheckBox/CheckBoxItem.cs

@@ -1,13 +1,17 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Dialogs.CheckBox;
+namespace DHT.Desktop.App.Dialogs.CheckBox;
 
-partial class CheckBoxItem : ObservableObject {
+class CheckBoxItem : BaseModel {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 
-	[ObservableProperty]
 	private bool isChecked = false;
+
+	public bool Checked {
+		get => isChecked;
+		set => Change(ref isChecked, value);
+	}
 }
 
 sealed class CheckBoxItem<T> : CheckBoxItem {

app/Desktop/App/Dialogs/File/FileDialogs.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
 
-namespace DHT.Desktop.Dialogs.File;
+namespace DHT.Desktop.App.Dialogs.File;
 
 static class FileDialogs {
 	public static async Task<string[]> OpenFiles(this IStorageProvider storageProvider, FilePickerOpenOptions options) {

app/Desktop/App/Dialogs/Message/Dialog.cs

@@ -2,7 +2,7 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;
 
-namespace DHT.Desktop.Dialogs.Message;
+namespace DHT.Desktop.App.Dialogs.Message;
 
 static class Dialog {
 	public static async Task ShowOk(Window owner, string title, string message) {

app/Desktop/App/Dialogs/Message/DialogResult.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace DHT.Desktop.Dialogs.Message;
+namespace DHT.Desktop.App.Dialogs.Message;
 
 static class DialogResult {
 	public enum All {

app/Desktop/App/Dialogs/Message/MessageDialog.axaml

@@ -2,17 +2,16 @@
         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.Dialogs.Message"
+        xmlns:message="clr-namespace:DHT.Desktop.App.Dialogs.Message"
         mc:Ignorable="d" d:DesignWidth="500"
-        x:Class="DHT.Desktop.Dialogs.Message.MessageDialog"
+        x:Class="DHT.Desktop.App.Dialogs.Message.MessageDialog"
-        x:DataType="namespace:MessageDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="500" SizeToContent="Height" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Window.DataContext>
-        <namespace:MessageDialogModel />
+        <message:MessageDialogModel />
     </Window.DataContext>
 
     <Window.Styles>

app/Desktop/App/Dialogs/Message/MessageDialog.axaml.cs

@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 
-namespace DHT.Desktop.Dialogs.Message;
+namespace DHT.Desktop.App.Dialogs.Message;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class MessageDialog : Window {

app/Desktop/App/Dialogs/Message/MessageDialogModel.cs

@@ -1,4 +1,4 @@
-namespace DHT.Desktop.Dialogs.Message;
+namespace DHT.Desktop.App.Dialogs.Message;
 
 sealed class MessageDialogModel {
 	public string Title { get; init; } = "";

app/Desktop/App/Dialogs/Progress/IProgressCallback.cs

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

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

@@ -2,10 +2,9 @@
         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.Dialogs.Progress"
+        xmlns:progress="clr-namespace:DHT.Desktop.App.Dialogs.Progress"
         mc:Ignorable="d" d:DesignWidth="500"
-        x:Class="DHT.Desktop.Dialogs.Progress.ProgressDialog"
+        x:Class="DHT.Desktop.App.Dialogs.Progress.ProgressDialog"
-        x:DataType="namespace:ProgressDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Opened="OnOpened"
@@ -14,7 +13,7 @@
         WindowStartupLocation="CenterOwner">
 
     <Window.DataContext>
-        <namespace:ProgressDialogModel />
+        <progress:ProgressDialogModel />
     </Window.DataContext>
 
     <Window.Styles>
@@ -32,18 +31,12 @@
         </Style>
     </Window.Styles>
 
-    <ItemsRepeater ItemsSource="{Binding Items}" Margin="0 10">
+    <StackPanel Margin="20">
-        <ItemsRepeater.ItemTemplate>
-            <DataTemplate>
-                <StackPanel Margin="20 10" IsHitTestVisible="{Binding IsVisible}" Opacity="{Binding Opacity}">
         <DockPanel>
             <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>
-    </ItemsRepeater>
 
 </Window>

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

@@ -0,0 +1,30 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+
+namespace DHT.Desktop.App.Dialogs.Progress;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class ProgressDialog : Window {
+	private bool isFinished = false;
+
+	public ProgressDialog() {
+		InitializeComponent();
+	}
+
+	public void OnOpened(object? sender, EventArgs e) {
+		if (DataContext is ProgressDialogModel model) {
+			Task.Run(model.StartTask).ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
+		}
+	}
+
+	public void OnClosing(object? sender, WindowClosingEventArgs e) {
+		e.Cancel = !isFinished;
+	}
+
+	private void OnFinished(Task task) {
+		isFinished = true;
+		Close();
+	}
+}

app/Desktop/App/Dialogs/Progress/ProgressDialogModel.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Threading;
+using DHT.Desktop.App.Common;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Dialogs.Progress;
+
+sealed class ProgressDialogModel : BaseModel {
+	public string Title { get; init; } = "";
+
+	private string message = "";
+
+	public string Message {
+		get => message;
+		private set => Change(ref message, value);
+	}
+
+	private string items = "";
+
+	public string Items {
+		get => items;
+		private set => Change(ref items, value);
+	}
+
+	private int progress = 0;
+
+	public int Progress {
+		get => progress;
+		private set => Change(ref progress, value);
+	}
+
+	private readonly TaskRunner? task;
+
+	[Obsolete("Designer")]
+	public ProgressDialogModel() {}
+
+	public ProgressDialogModel(TaskRunner task) {
+		this.task = task;
+	}
+
+	internal async Task StartTask() {
+		if (task != null) {
+			await task(new Callback(this));
+		}
+	}
+
+	public delegate Task TaskRunner(IProgressCallback callback);
+
+	private sealed class Callback : IProgressCallback {
+		private readonly ProgressDialogModel model;
+
+		public Callback(ProgressDialogModel model) {
+			this.model = model;
+		}
+
+		async Task IProgressCallback.Update(string message, int finishedItems, int totalItems) {
+			await Dispatcher.UIThread.InvokeAsync(() => {
+				model.Message = message;
+				model.Items = finishedItems.Format() + " / " + totalItems.Format();
+				model.Progress = 100 * finishedItems / totalItems;
+			});
+		}
+	}
+}

app/Desktop/App/Dialogs/TextBox/TextBoxDialog.axaml

@@ -2,17 +2,16 @@
         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.Dialogs.TextBox"
+        xmlns:textBox="clr-namespace:DHT.Desktop.App.Dialogs.TextBox"
         mc:Ignorable="d" d:DesignWidth="500"
-        x:Class="DHT.Desktop.Dialogs.TextBox.TextBoxDialog"
+        x:Class="DHT.Desktop.App.Dialogs.TextBox.TextBoxDialog"
-        x:DataType="namespace:TextBoxDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="500" SizeToContent="Height" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Window.DataContext>
-        <namespace:TextBoxDialogModel />
+        <textBox:TextBoxDialogModel />
     </Window.DataContext>
 
     <Window.Styles>

app/Desktop/App/Dialogs/TextBox/TextBoxDialog.axaml.cs

@@ -1,9 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.App.Dialogs.Message;
 
-namespace DHT.Desktop.Dialogs.TextBox;
+namespace DHT.Desktop.App.Dialogs.TextBox; 
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class TextBoxDialog : Window {

app/Desktop/App/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -2,11 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Dialogs.TextBox;
+namespace DHT.Desktop.App.Dialogs.TextBox; 
 
-class TextBoxDialogModel : ObservableObject {
+class TextBoxDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
 
@@ -36,7 +36,7 @@ class TextBoxDialogModel : ObservableObject {
 }
 
 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/App/Dialogs/TextBox/TextBoxItem.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
-using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Dialogs.TextBox;
+namespace DHT.Desktop.App.Dialogs.TextBox; 
 
-class TextBoxItem : ObservableObject, INotifyDataErrorInfo {
+class TextBoxItem : BaseModel, INotifyDataErrorInfo {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 		
@@ -17,7 +17,7 @@ class TextBoxItem : ObservableObject, INotifyDataErrorInfo {
 	public string Value {
 		get => this.value;
 		set {
-			SetProperty(ref this.value, value);
+			Change(ref this.value, value);
 			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
 		}
 	}

app/Desktop/App/Pages/AdvancedPage.axaml

@@ -2,11 +2,10 @@
              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:pages="clr-namespace:DHT.Desktop.App.Pages"
-             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             xmlns:controls="clr-namespace:DHT.Desktop.App.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.AdvancedPage"
+             x:Class="DHT.Desktop.App.Pages.AdvancedPage">
-             x:DataType="pages:AdvancedPageModel">
 
     <Design.DataContext>
         <pages:AdvancedPageModel />

app/Desktop/App/Pages/AdvancedPage.axaml.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.App.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class AdvancedPage : UserControl {

app/Desktop/App/Pages/AdvancedPageModel.cs

@@ -0,0 +1,39 @@
+using System;
+using Avalonia.Controls;
+using DHT.Desktop.App.Controls;
+using DHT.Desktop.App.Dialogs.Message;
+using DHT.Desktop.Server;
+using DHT.Server.Database;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Pages;
+
+sealed class AdvancedPageModel : BaseModel, IDisposable {
+	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
+
+	private readonly Window window;
+	private readonly IDatabaseFile db;
+
+	[Obsolete("Designer")]
+	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/App/Pages/DatabasePage.axaml

@@ -2,10 +2,9 @@
              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:pages="clr-namespace:DHT.Desktop.App.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.DatabasePage"
+             x:Class="DHT.Desktop.App.Pages.DatabasePage">
-             x:DataType="pages:DatabasePageModel">
 
     <Design.DataContext>
         <pages:DatabasePageModel />
@@ -24,8 +23,6 @@
         </DockPanel>
         <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>
     </StackPanel>
 

app/Desktop/App/Pages/DatabasePage.axaml.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.App.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class DatabasePage : UserControl {

app/Desktop/App/Pages/DatabasePageModel.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using Avalonia.Controls;
+using DHT.Desktop.App.Dialogs.Message;
+using DHT.Server.Database;
+using DHT.Utils.Logging;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Pages; 
+
+sealed class DatabasePageModel : BaseModel {
+	private static readonly Log Log = Log.ForType<DatabasePageModel>();
+
+	public IDatabaseFile Db { get; }
+
+	public event EventHandler? DatabaseClosed;
+
+	private readonly Window window;
+
+	[Obsolete("Designer")]
+	public DatabasePageModel() : this(null!, DummyDatabaseFile.Instance) {}
+
+	public DatabasePageModel(Window window, IDatabaseFile db) {
+		this.window = window;
+		this.Db = db;
+	}
+
+	public async void OpenDatabaseFolder() {
+		string file = Db.Path;
+		string? folder = Path.GetDirectoryName(file);
+
+		if (folder == null) {
+			return;
+		}
+
+		switch (Environment.OSVersion.Platform) {
+			case PlatformID.Win32NT:
+				Process.Start("explorer.exe", "/select,\"" + file + "\"");
+				break;
+
+			case PlatformID.Unix:
+				Process.Start("xdg-open", new string[] { folder });
+				break;
+
+			case PlatformID.MacOSX:
+				Process.Start("open", new string[] { folder });
+				break;
+
+			default:
+				await Dialog.ShowOk(window, "Feature Not Supported", "This feature is not supported for your operating system.");
+				break;
+		}
+	}
+
+	public void CloseDatabase() {
+		DatabaseClosed?.Invoke(this, EventArgs.Empty);
+	}
+}

app/Desktop/App/Pages/TrackingPage.axaml

@@ -2,10 +2,9 @@
              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:pages="clr-namespace:DHT.Desktop.App.Pages"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.TrackingPage"
+             x:Class="DHT.Desktop.App.Pages.TrackingPage">
-             x:DataType="pages:TrackingPageModel">
 
     <Design.DataContext>
         <pages:TrackingPageModel />
@@ -16,7 +15,7 @@
             To start tracking messages, copy the tracking script and paste it into the console of either the Discord app, or your browser. The console is usually opened by pressing Ctrl+Shift+I.
         </TextBlock>
         <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="10">
-            <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick" IsEnabled="{Binding IsCopyTrackingScriptButtonEnabled}">Copy Tracking Script</Button>
+            <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick">Copy Tracking Script</Button>
         </StackPanel>
         <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
             By default, the Discord app does not allow opening the console. The button below will change a hidden setting in the Discord app that controls whether the Ctrl+Shift+I shortcut is enabled.

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

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.App.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class TrackingPage : UserControl {

app/Desktop/App/Pages/TrackingPageModel.cs

@@ -1,39 +1,34 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Desktop.App.Dialogs.Message;
-using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
-using static DHT.Desktop.Program;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.App.Pages;
 
-sealed partial class TrackingPageModel : ObservableObject {
+sealed class TrackingPageModel : BaseModel {
-	[ObservableProperty(Setter = Access.Private)]
+	private bool areDevToolsEnabled;
-	private bool isCopyTrackingScriptButtonEnabled = true;
 
-	[ObservableProperty(Setter = Access.Private)]
+	private bool AreDevToolsEnabled {
-	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
+		get => areDevToolsEnabled;
-	private bool? areDevToolsEnabled = null;
+		set {
+			Change(ref areDevToolsEnabled, value);
+			OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
+		}
+	}
 
-	[ObservableProperty(Setter = Access.Private)]
+	public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
-	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
-	private bool isToggleAppDevToolsButtonEnabled = false;
 
 	public string ToggleAppDevToolsButtonText {
 		get {
-			if (!AreDevToolsEnabled.HasValue) {
-				return "Loading...";
-			}
-
 			if (!IsToggleAppDevToolsButtonEnabled) {
 				return "Unavailable";
 			}
 
-			return AreDevToolsEnabled.Value ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+			return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
 		}
 	}
 
@@ -44,23 +39,26 @@ sealed partial class TrackingPageModel : ObservableObject {
 
 	public TrackingPageModel(Window window) {
 		this.window = window;
+	}
 
-		Task.Factory.StartNew(InitializeDevToolsToggle, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.FromCurrentSynchronizationContext());
+	public async Task Initialize() {
+		bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
+		if (devToolsEnabled.HasValue) {
+			AreDevToolsEnabled = devToolsEnabled.Value;
+		}
+		else {
+			IsToggleAppDevToolsButtonEnabled = false;
+			OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
+		}
 	}
 
 	public async Task<bool> OnClickCopyTrackingScript() {
-		IsCopyTrackingScriptButtonEnabled = false;
+		string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
-
+		string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerManager.Port + ";")
-		try {
+		                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(ServerManager.Token))
-			return await CopyTrackingScript();
+		                         .Replace("/*[IMPORTS]*/", await Resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
-		} finally {
+		                         .Replace("/*[CSS-CONTROLLER]*/", await Resources.ReadTextAsync("Tracker/styles/controller.css"))
-			IsCopyTrackingScriptButtonEnabled = true;
+		                         .Replace("/*[CSS-SETTINGS]*/", await Resources.ReadTextAsync("Tracker/styles/settings.css"));
-		}
-	}
-
-	private async Task<bool> CopyTrackingScript() {
-		string url = $"http://127.0.0.1:{ServerConfiguration.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
-		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
 
 		var clipboard = window.Clipboard;
 		if (clipboard == null) {
@@ -77,26 +75,10 @@ sealed partial class TrackingPageModel : ObservableObject {
 		}
 	}
 
-	private async Task InitializeDevToolsToggle() {
+	public async void OnClickToggleAppDevTools() {
-		bool? devToolsEnabled = await Task.Run(DiscordAppSettings.AreDevToolsEnabled);
-
-		if (devToolsEnabled.HasValue) {
-			AreDevToolsEnabled = devToolsEnabled.Value;
-			IsToggleAppDevToolsButtonEnabled = true;
-		}
-		else {
-			IsToggleAppDevToolsButtonEnabled = false;
-		}
-	}
-
-	public async Task OnClickToggleAppDevTools() {
 		const string DialogTitle = "Discord App Settings File";
 
-		if (!AreDevToolsEnabled.HasValue) {
+		bool oldState = AreDevToolsEnabled;
-			return;
-		}
-
-		bool oldState = AreDevToolsEnabled.Value;
 		bool newState = !oldState;
 
 		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {

app/Desktop/App/Screens/MainContentScreen.axaml

@@ -2,11 +2,10 @@
              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:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             xmlns:screens="clr-namespace:DHT.Desktop.App.Screens"
-             xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
+             xmlns:controls="clr-namespace:DHT.Desktop.App.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Screens.MainContentScreen"
+             x:Class="DHT.Desktop.App.Screens.MainContentScreen">
-             x:DataType="screens:MainContentScreenModel">
 
     <Design.DataContext>
         <screens:MainContentScreenModel />
@@ -74,14 +73,14 @@
     <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>
         <TabControl x:Name="TabControl" TabStripPlacement="Left" DockPanel.Dock="Top">
             <TabControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto" />
+                    <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto,*,Auto" />
                 </ItemsPanelTemplate>
             </TabControl.ItemsPanel>
             <TabItem x:Name="TabDatabase" Header="Database" Classes="first" Grid.Row="0">
@@ -94,26 +93,11 @@
                     <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabDownloads" Header="Downloads" Grid.Row="2">
+            <TabItem x:Name="TabAdvanced" Header="Advanced" Grid.Row="3">
-                <ScrollViewer>
-                    <ContentPresenter Content="{Binding DownloadsPage}" Classes="page" />
-                </ScrollViewer>
-            </TabItem>
-            <TabItem x:Name="TabViewer" Header="Viewer" Grid.Row="3">
-                <ScrollViewer>
-                    <ContentPresenter Content="{Binding ViewerPage}" Classes="page" />
-                </ScrollViewer>
-            </TabItem>
-            <TabItem x:Name="TabAdvanced" Header="Advanced" Grid.Row="5">
                 <ScrollViewer>
                     <ContentPresenter Content="{Binding AdvancedPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabDebug" Header="Debug" Grid.Row="6" IsVisible="{Binding HasDebugPage}">
-                <ScrollViewer>
-                    <ContentPresenter Content="{Binding DebugPage}" Classes="page" />
-                </ScrollViewer>
-            </TabItem>
         </TabControl>
     </DockPanel>
 

app/Desktop/App/Screens/MainContentScreen.axaml.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 
-namespace DHT.Desktop.Main.Screens;
+namespace DHT.Desktop.App.Screens;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class MainContentScreen : UserControl {

app/Desktop/App/Screens/MainContentScreenModel.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using DHT.Desktop.App.Controls;
+using DHT.Desktop.App.Dialogs.Message;
+using DHT.Desktop.App.Pages;
+using DHT.Desktop.Server;
+using DHT.Server.Database;
+using DHT.Utils.Logging;
+
+namespace DHT.Desktop.App.Screens;
+
+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 AdvancedPage AdvancedPage { get; }
+	private AdvancedPageModel AdvancedPageModel { get; }
+
+	public StatusBarModel StatusBarModel { get; }
+
+	public event EventHandler? DatabaseClosed {
+		add {
+			DatabasePageModel.DatabaseClosed += value;
+		}
+		remove {
+			DatabasePageModel.DatabaseClosed -= value;
+		}
+	}
+
+	private readonly Window window;
+	private readonly ServerManager serverManager;
+
+	[Obsolete("Designer")]
+	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 };
+
+		AdvancedPageModel = new AdvancedPageModel(window, db, serverManager);
+		AdvancedPage = new AdvancedPage { DataContext = AdvancedPageModel };
+
+		StatusBarModel = new StatusBarModel();
+
+		AdvancedPageModel.ServerConfigurationModel.ServerStatusChanged += OnServerStatusChanged;
+		DatabaseClosed += OnDatabaseClosed;
+
+		StatusBarModel.CurrentStatus = serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped;
+	}
+
+	public async Task Initialize() {
+		await TrackingPageModel.Initialize();
+		AdvancedPageModel.Initialize();
+		serverManager.Launch();
+	}
+
+	public void Dispose() {
+		ServerLauncher.ServerManagementExceptionCaught -= ServerLauncherOnServerManagementExceptionCaught;
+		serverManager.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/App/Screens/WelcomeScreen.axaml

@@ -2,10 +2,9 @@
              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:screens="clr-namespace:DHT.Desktop.Main.Screens"
+             xmlns:screens="clr-namespace:DHT.Desktop.App.Screens"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Screens.WelcomeScreen"
+             x:Class="DHT.Desktop.App.Screens.WelcomeScreen">
-             x:DataType="screens:WelcomeScreenModel">
 
     <Design.DataContext>
         <screens:WelcomeScreenModel />
@@ -32,7 +31,7 @@
             <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
+                <Button Command="{Binding OpenOrCreateDatabase}">Open or Create Database</Button>
                 <Button Command="{Binding ShowAboutDialog}">About</Button>
                 <Button Command="{Binding Exit}">Exit</Button>
             </StackPanel>

app/Desktop/App/Screens/WelcomeScreen.axaml.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 
-namespace DHT.Desktop.Main.Screens;
+namespace DHT.Desktop.App.Screens;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class WelcomeScreen : UserControl {

app/Desktop/App/Screens/WelcomeScreenModel.cs

@@ -0,0 +1,71 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using DHT.Desktop.App.Common;
+using DHT.Desktop.App.Dialogs.Message;
+using DHT.Desktop.App.Windows;
+using DHT.Server.Database;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Screens;
+
+sealed class WelcomeScreenModel : BaseModel, IDisposable {
+	public string Version => Program.Version;
+
+	public IDatabaseFile? Db { get; private set; }
+	public bool HasDatabase => Db != null;
+
+	private readonly Window window;
+
+	private string? dbFilePath;
+
+	[Obsolete("Designer")]
+	public WelcomeScreenModel() : this(null!) {}
+
+	public WelcomeScreenModel(Window window) {
+		this.window = window;
+	}
+
+	public async void OpenOrCreateDatabase() {
+		var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
+		if (path != null) {
+			await OpenOrCreateDatabaseFromPath(path);
+		}
+	}
+
+	public async Task OpenOrCreateDatabaseFromPath(string path) {
+		if (Db != null) {
+			Db = null;
+		}
+
+		dbFilePath = path;
+		Db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, CheckCanUpgradeDatabase);
+
+		OnPropertyChanged(nameof(Db));
+		OnPropertyChanged(nameof(HasDatabase));
+	}
+
+	private async Task<bool> CheckCanUpgradeDatabase() {
+		return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
+	}
+
+	public void CloseDatabase() {
+		Dispose();
+		OnPropertyChanged(nameof(Db));
+		OnPropertyChanged(nameof(HasDatabase));
+	}
+
+	public async void ShowAboutDialog() {
+		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(this.window);
+	}
+
+	public void Exit() {
+		window.Close();
+	}
+
+	public void Dispose() {
+		Db?.Dispose();
+		Db = null;
+	}
+}

app/Desktop/App/Windows/AboutWindow.axaml

@@ -2,17 +2,16 @@
         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:main="clr-namespace:DHT.Desktop.Main"
+        xmlns:windows="clr-namespace:DHT.Desktop.App.Windows"
         mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
-        x:Class="DHT.Desktop.Main.AboutWindow"
+        x:Class="DHT.Desktop.App.Windows.AboutWindow"
-        x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="480" Height="295" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Design.DataContext>
-        <main:AboutWindowModel />
+        <windows:AboutWindowModel />
     </Design.DataContext>
 
     <Window.Styles>

app/Desktop/App/Windows/AboutWindow.axaml.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 
-namespace DHT.Desktop.Main;
+namespace DHT.Desktop.App.Windows;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class AboutWindow : Window {

app/Desktop/App/Windows/AboutWindowModel.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace DHT.Desktop.Main;
+namespace DHT.Desktop.App.Windows;
 
 sealed class AboutWindowModel {
 	public void ShowOfficialWebsite() {

app/Desktop/App/Windows/MainWindow.axaml

@@ -2,19 +2,18 @@
         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:main="clr-namespace:DHT.Desktop.Main"
+        xmlns:windows="clr-namespace:DHT.Desktop.App.Windows"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="DHT.Desktop.Main.MainWindow"
+        x:Class="DHT.Desktop.App.Windows.MainWindow"
-        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 />
+        <windows:MainWindowModel />
     </Design.DataContext>
 
     <Panel>

app/Desktop/App/Windows/MainWindow.axaml.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls;
+using JetBrains.Annotations;
+
+namespace DHT.Desktop.App.Windows;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class MainWindow : Window {
+	[UsedImplicitly]
+	public MainWindow() {
+		InitializeComponent();
+		DataContext = new MainWindowModel(this, Arguments.Empty);
+	}
+
+	internal MainWindow(Arguments args) {
+		InitializeComponent();
+		DataContext = new MainWindowModel(this, args);
+	}
+
+	public void OnClosed(object? sender, EventArgs e) {
+		if (DataContext is IDisposable disposable) {
+			disposable.Dispose();
+		}
+	}
+}

app/Desktop/App/Windows/MainWindowModel.cs

@@ -0,0 +1,116 @@
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using DHT.Desktop.App.Dialogs.Message;
+using DHT.Desktop.App.Screens;
+using DHT.Desktop.Server;
+using DHT.Server.Database;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Windows;
+
+sealed class MainWindowModel : BaseModel, IDisposable {
+	private const string DefaultTitle = "Discord History Tracker";
+
+	public string Title { get; private set; } = DefaultTitle;
+
+	public UserControl CurrentScreen { get; private set; }
+
+	private readonly WelcomeScreen welcomeScreen;
+	private readonly WelcomeScreenModel welcomeScreenModel;
+
+	private MainContentScreen? mainContentScreen;
+	private MainContentScreenModel? mainContentScreenModel;
+
+	private readonly Window window;
+
+	private IDatabaseFile? db;
+
+	[Obsolete("Designer")]
+	public MainWindowModel() : this(null!, Arguments.Empty) {}
+
+	public MainWindowModel(Window window, Arguments args) {
+		this.window = window;
+
+		welcomeScreenModel = new WelcomeScreenModel(window);
+		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
+		CurrentScreen = welcomeScreen;
+
+		welcomeScreenModel.PropertyChanged += WelcomeScreenModelOnPropertyChanged;
+
+		var dbFile = args.DatabaseFile;
+		if (!string.IsNullOrWhiteSpace(dbFile)) {
+			async void OnWindowOpened(object? o, EventArgs eventArgs) {
+				window.Opened -= OnWindowOpened;
+
+				// https://github.com/AvaloniaUI/Avalonia/issues/3071
+				if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+					await Task.Delay(500);
+				}
+
+				if (File.Exists(dbFile)) {
+					await welcomeScreenModel.OpenOrCreateDatabaseFromPath(dbFile);
+				}
+				else {
+					await Dialog.ShowOk(window, "Database Error", "Database file not found:\n" + dbFile);
+				}
+			}
+
+			window.Opened += OnWindowOpened;
+		}
+
+		if (args.ServerPort != null) {
+			ServerManager.Port = args.ServerPort.Value;
+		}
+
+		if (args.ServerToken != null) {
+			ServerManager.Token = args.ServerToken;
+		}
+	}
+
+	private async void WelcomeScreenModelOnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName == nameof(welcomeScreenModel.Db)) {
+			if (mainContentScreenModel != 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();
+		}
+	}
+
+	private void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
+		welcomeScreenModel.CloseDatabase();
+	}
+
+	public void Dispose() {
+		welcomeScreenModel.Dispose();
+		mainContentScreenModel?.Dispose();
+		db?.Dispose();
+		db = null;
+	}
+}

app/Desktop/Arguments.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop;
@@ -7,37 +6,29 @@ namespace DHT.Desktop;
 sealed class Arguments {
 	private static readonly Log Log = Log.ForType<Arguments>();
 
-	private const int FirstArgument = 1;
+	public static Arguments Empty => new(Array.Empty<string>());
 
-	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 = 0; i < args.Length; i++) {
 			string key = args[i];
 
 			switch (key) {
 				case "-debug":
 					Log.IsDebugEnabled = true;
 					continue;
-
-				case "-console":
-					Console = true;
-					continue;
 			}
 
 			string value;
 
-			if (i == FirstArgument && !key.StartsWith('-')) {
+			if (i == 0 && !key.StartsWith('-')) {
 				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;
 			}
@@ -51,11 +42,11 @@ sealed class Arguments {
 					continue;
 
 				case "-port": {
-					if (!ushort.TryParse(value, out var 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;
@@ -65,20 +56,6 @@ sealed class Arguments {
 					ServerToken = value;
 					continue;
 
-				case "-concurrentdownloads":
-					if (!ulong.TryParse(value, out var 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/Desktop.csproj

@@ -1,44 +1,107 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <RootNamespace>DHT.Desktop</RootNamespace>
-    <AssemblyName>DiscordHistoryTracker</AssemblyName>
-    <PackageId>DiscordHistoryTracker</PackageId>
-  </PropertyGroup>
-  
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
+    <Nullable>enable</Nullable>
+    <AssemblyName>DiscordHistoryTracker</AssemblyName>
+    <RootNamespace>DHT.Desktop</RootNamespace>
+    <PackageId>DiscordHistoryTracker</PackageId>
+    <Authors>chylex</Authors>
+    <Company>DiscordHistoryTracker</Company>
+    <Product>DiscordHistoryTracker</Product>
     <ApplicationIcon>./Resources/icon.ico</ApplicationIcon>
-    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>none</DebugType>
   </PropertyGroup>
-  
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.11" />
+    <PackageReference Include="Avalonia" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.11" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
   </ItemGroup>
-  
   <ItemGroup>
     <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
-  
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
+    <Compile Update="App\App.axaml.cs">
+      <DependentUpon>App.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="App\Windows\AboutWindow.axaml.cs">
+      <DependentUpon>AboutWindow.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="App\Windows\MainWindow.axaml.cs">
+      <DependentUpon>MainWindow.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
-  
   <ItemGroup>
     <AvaloniaResource Include="Resources/icon.ico" />
-    <EmbeddedResource Include="Resources/tracker-loader.js">
+    <EmbeddedResource Include="../Resources/Tracker/bootstrap.js">
-      <LogicalName>tracker-loader.js</LogicalName>
+      <LogicalName>Tracker\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Tracker/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Tracker/scripts/**" Condition=" '$(Configuration)' == 'Debug' ">
+      <LogicalName>Tracker\scripts\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Tracker/scripts/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Tracker/styles/**">
+      <LogicalName>Tracker\styles\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Tracker/styles/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Viewer/**">
+      <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
     </EmbeddedResource>
   </ItemGroup>
-  
+  <ItemGroup>
+    <AdditionalFiles Include="App\Controls\ServerConfigurationPanel.axaml" />
+    <AdditionalFiles Include="App\Controls\StatusBar.axaml" />
+    <AdditionalFiles Include="App\Dialogs\CheckBox\CheckBoxDialog.axaml" />
+    <AdditionalFiles Include="App\Dialogs\Message\MessageDialog.axaml" />
+    <AdditionalFiles Include="App\Dialogs\Progress\ProgressDialog.axaml" />
+    <AdditionalFiles Include="App\Dialogs\TextBox\TextBoxDialog.axaml" />
+    <AdditionalFiles Include="App\Pages\AdvancedPage.axaml" />
+    <AdditionalFiles Include="App\Pages\DatabasePage.axaml" />
+    <AdditionalFiles Include="App\Pages\TrackingPage.axaml" />
+    <AdditionalFiles Include="App\Screens\MainContentScreen.axaml" />
+    <AdditionalFiles Include="App\Screens\WelcomeScreen.axaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <UpToDateCheckInput Remove="Main\Pages\AdvancedPage.axaml" />
+    <UpToDateCheckInput Remove="Main\Pages\DatabasePage.axaml" />
+    <UpToDateCheckInput Remove="Main\Pages\TrackingPage.axaml" />
+    <UpToDateCheckInput Remove="Main\Screens\MainContentScreen.axaml" />
+    <UpToDateCheckInput Remove="Main\Screens\WelcomeScreen.axaml" />
+  </ItemGroup>
+  <Target Name="MinifyResources" BeforeTargets="PrepareForBuild" Condition=" '$(Configuration)' == 'Release' ">
+    <PropertyGroup>
+      <MinifiedResourceDir>$(ProjectDir)bin/.res/scripts</MinifiedResourceDir>
+    </PropertyGroup>
+    <ItemGroup>
+      <UpToDateCheckInput Include="$(ProjectDir)../Resources/Tracker/scripts/**" Visible="false" />
+      <EmbeddedResource Include="$(MinifiedResourceDir)/discord.js" LogicalName="Tracker\scripts\discord.js" Visible="false" />
+      <EmbeddedResource Include="$(MinifiedResourceDir)/dom.js" LogicalName="Tracker\scripts\dom.js" Visible="false" />
+      <EmbeddedResource Include="$(MinifiedResourceDir)/gui.js" LogicalName="Tracker\scripts\gui.js" Visible="false" />
+      <EmbeddedResource Include="$(MinifiedResourceDir)/settings.js" LogicalName="Tracker\scripts\settings.js" Visible="false" />
+      <EmbeddedResource Include="$(MinifiedResourceDir)/state.js" LogicalName="Tracker\scripts\state.js" Visible="false" />
+    </ItemGroup>
+    <RemoveDir Directories="$(ProjectDir)bin/.res/scripts" />
+    <Exec Command="python $(ProjectDir)../Resources/minify.py" WorkingDirectory="$(ProjectDir)../Resources" IgnoreExitCode="false" />
+  </Target>
 </Project>

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

@@ -1,89 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-
-namespace DHT.Desktop.Dialogs.Progress;
-
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class ProgressDialog : Window {
-	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
-		var taskCompletionSource = new TaskCompletionSource();
-		var dialog = new ProgressDialog();
-		
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			try {
-				await action(dialog, callbacks[0]);
-				taskCompletionSource.SetResult();
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
-		await dialog.ShowProgressDialog(owner);
-		await taskCompletionSource.Task;
-	}
-	
-	internal static async Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
-		var taskCompletionSource = new TaskCompletionSource();
-		var dialog = new ProgressDialog();
-		
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			await callbacks[0].UpdateIndeterminate(message);
-			try {
-				await action(dialog);
-				taskCompletionSource.SetResult();
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
-		await dialog.ShowProgressDialog(owner);
-		await taskCompletionSource.Task;
-	}
-	
-	internal static async Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
-		var taskCompletionSource = new TaskCompletionSource<T>();
-		var dialog = new ProgressDialog();
-
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			await callbacks[0].UpdateIndeterminate(message);
-			try {
-				taskCompletionSource.SetResult(await action(dialog));
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
-		await dialog.ShowProgressDialog(owner);
-		return await taskCompletionSource.Task;
-	}
-
-	private bool isFinished = false;
-	private Task progressTask = Task.CompletedTask;
-
-	public ProgressDialog() {
-		InitializeComponent();
-	}
-
-	public void OnOpened(object? sender, EventArgs e) {
-		if (DataContext is ProgressDialogModel model) {
-			progressTask = Task.Run(model.StartTask);
-			progressTask.ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
-		}
-	}
-
-	public void OnClosing(object? sender, WindowClosingEventArgs e) {
-		e.Cancel = !isFinished;
-	}
-
-	private void OnFinished(Task task) {
-		isFinished = true;
-		Close();
-	}
-
-	public async Task ShowProgressDialog(Window owner) {
-		await ShowDialog(owner);
-		await progressTask;
-	}
-}

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Threading;
-using DHT.Desktop.Common;
-
-namespace DHT.Desktop.Dialogs.Progress;
-
-sealed class ProgressDialogModel {
-	public string Title { get; init; } = "";
-
-	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) {
-		this.Title = title;
-		this.task = task;
-		this.Items = Enumerable.Range(0, progressItems).Select(static _ => new ProgressItem()).ToArray();
-	}
-
-	internal async Task StartTask() {
-		if (task != null) {
-			await task(Items.Select(static item => new Callback(item)).ToArray());
-		}
-	}
-
-	public delegate Task TaskRunner(IReadOnlyList<IProgressCallback> callbacks);
-
-	private sealed class Callback : IProgressCallback {
-		private readonly ProgressItem item;
-
-		public Callback(ProgressItem item) {
-			this.item = item;
-		}
-
-		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, 0, 0);
-		}
-	}
-}

app/Desktop/Dialogs/Progress/ProgressItem.cs

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

app/Desktop/Discord/DiscordAppSettings.cs

@@ -1,9 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.Json;
-using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using DHT.Utils.Logging;
 using static System.Environment.SpecialFolder;
@@ -39,21 +39,18 @@ static class DiscordAppSettings {
 
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-			var settingsJson = await ReadSettingsJson();
+			return AreDevToolsEnabled(await ReadSettingsJson());
-			return AreDevToolsEnabled(settingsJson);
+		} catch (Exception) {
-		} catch (Exception e) {
-			Log.Error("Cannot read settings file.");
-			Log.Error(e);
 			return null;
 		}
 	}
 
-	private static bool AreDevToolsEnabled(JsonObject json) {
+	private static bool AreDevToolsEnabled(Dictionary<string, object?> json) {
-		return json.TryGetPropertyValue(JsonKeyDevTools, out var node) && node?.GetValueKind() == JsonValueKind.True;
+		return json.TryGetValue(JsonKeyDevTools, out var value) && value is JsonElement { ValueKind: JsonValueKind.True };
 	}
 
 	public static async Task<SettingsJsonResult> ConfigureDevTools(bool enable) {
-		JsonObject json;
+		Dictionary<string, object?> json;
 
 		try {
 			json = await ReadSettingsJson();
@@ -110,13 +107,13 @@ static class DiscordAppSettings {
 		return SettingsJsonResult.Success;
 	}
 
-	private static async Task<JsonObject> ReadSettingsJson() {
+	private static async Task<Dictionary<string, object?>> ReadSettingsJson() {
 		await using var stream = new FileStream(JsonFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
-		return await JsonSerializer.DeserializeAsync(stream, DiscordAppSettingsJsonContext.Default.JsonObject) ?? throw new JsonException();
+		return await JsonSerializer.DeserializeAsync<Dictionary<string, object?>?>(stream) ?? throw new JsonException();
 	}
 
-	private static async Task WriteSettingsJson(JsonObject json) {
+	private static async Task WriteSettingsJson(Dictionary<string, object?> json) {
 		await using var stream = new FileStream(JsonFilePath, FileMode.Truncate, FileAccess.Write, FileShare.None);
-		await JsonSerializer.SerializeAsync(stream, json, DiscordAppSettingsJsonContext.Default.JsonObject);
+		await JsonSerializer.SerializeAsync(stream, json, new JsonSerializerOptions { WriteIndented = true });
 	}
 }

app/Desktop/Discord/DiscordAppSettingsJsonContext.cs

@@ -1,8 +0,0 @@
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-
-namespace DHT.Desktop.Discord;
-
-[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, WriteIndented = true)]
-[JsonSerializable(typeof(JsonObject))]
-sealed partial class DiscordAppSettingsJsonContext : JsonSerializerContext;

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

@@ -1,52 +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:controls="clr-namespace:DHT.Desktop.Main.Controls"
-             mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.DownloadItemFilterPanel"
-             x:DataType="controls:DownloadItemFilterPanelModel">
-
-    <Design.DataContext>
-        <controls:DownloadItemFilterPanelModel />
-    </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>
-        <Style Selector="ComboBox">
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
-        <Style Selector="Button">
-            <Setter Property="Margin" Value="0 0 0 8" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel>
-        <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel>
-            <StackPanel>
-                <CheckBox IsChecked="{Binding LimitSize}">Limit Size</CheckBox>
-                <StackPanel Orientation="Horizontal">
-                    <TextBox Text="{Binding MaximumSize}" IsEnabled="{Binding LimitSize}" HorizontalContentAlignment="Right" />
-                    <ComboBox IsEnabled="{Binding LimitSize}" ItemsSource="{Binding Units}" SelectedItem="{Binding MaximumSizeUnit}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding Name}" />
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </StackPanel>
-            </StackPanel>
-        </WrapPanel>
-    </StackPanel>
-
-</UserControl>

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

@@ -1,11 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Avalonia.Controls;
-
-namespace DHT.Desktop.Main.Controls;
-
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class DownloadItemFilterPanel : UserControl {
-	public DownloadItemFilterPanel() {
-		InitializeComponent();
-	}
-}

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -1,172 +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 CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Desktop.Common;
-using DHT.Server;
-using DHT.Server.Data.Filters;
-using DHT.Server.Data.Settings;
-using DHT.Utils.Logging;
-using DHT.Utils.Tasks;
-
-namespace DHT.Desktop.Main.Controls;
-
-sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisposable {
-	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
-	
-	public sealed record Unit(string Name, uint Scale);
-	
-	private static readonly Unit[] AllUnits = [
-		new Unit("B", 1),
-		new Unit("kB", 1024),
-		new Unit("MB", 1024 * 1024)
-	];
-
-	private static readonly HashSet<string> FilterProperties = [
-		nameof(LimitSize),
-		nameof(MaximumSize),
-		nameof(MaximumSizeUnit)
-	];
-
-	public string FilterStatisticsText { get; private set; } = "";
-
-	[ObservableProperty]
-	private bool limitSize = false;
-	
-	[ObservableProperty]
-	private ulong maximumSize = 0UL;
-	
-	[ObservableProperty]
-	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, null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
-			MaximumSizeUnit = unitValue;
-		}
-		
-		isLoadingFilterSettings = false;
-	}
-
-	public async ValueTask DisposeAsync() {
-		saveFilterSettingsTask.Dispose();
-		
-		downloadItemCountTask.Cancel();
-		downloadItemCountSubscription.Dispose();
-		
-		await SaveFilterSettings(new FilterSettings(this));
-	}
-	
-	private sealed record FilterSettings(bool LimitSize, ulong MaximumSize, Unit MaximumSizeUnit) {
-		public FilterSettings(DownloadItemFilterPanelModel model) : this(model.LimitSize, model.MaximumSize, model.MaximumSizeUnit) {}
-	}
-	
-	private async Task SaveFilterSettings(FilterSettings settings) {
-		try {
-			await state.Db.Settings.Set(async setter => {
-				await setter.Set(SettingsKey.DownloadsLimitSize, settings.LimitSize);
-				await setter.Set(SettingsKey.DownloadsMaximumSize, settings.MaximumSize);
-				await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
-			});
-		} catch (Exception e) {
-			Log.Error("Could not save download filter settings");
-			Log.Error(e);
-		}
-	}
-
-	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
-			if (!isLoadingFilterSettings) {
-				saveFilterSettingsTask.Post(new FilterSettings(this));
-			}
-			
-			UpdateFilterStatistics();
-		}
-	}
-	
-	private void OnDownloadItemCountChanged(long newItemCount) {
-		totalItemCount = newItemCount;
-		UpdateFilterStatistics();
-	}
-	
-
-	private void UpdateFilterStatistics() {
-		var 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() {
-		var matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
-		var totalItemCountStr = totalItemCount?.Format() ?? "(...)";
-
-		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
-		OnPropertyChanged(nameof(FilterStatisticsText));
-	}
-
-	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

@@ -1,64 +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:controls="clr-namespace:DHT.Desktop.Main.Controls"
-             mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.MessageFilterPanel"
-             x:DataType="controls:MessageFilterPanelModel">
-
-    <Design.DataContext>
-        <controls:MessageFilterPanelModel />
-    </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>
-        <Style Selector="Grid > CalendarDatePicker">
-            <Setter Property="CornerRadius" Value="0" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="IsTodayHighlighted" Value="True" />
-            <Setter Property="SelectedDateFormat" Value="Short" />
-        </Style>
-        <Style Selector="Button">
-            <Setter Property="Margin" Value="0 0 0 8" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel>
-        <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel>
-            <StackPanel>
-                <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
-                <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">
-                    <Label Grid.Row="0" Grid.Column="0">From:</Label>
-                    <CalendarDatePicker Grid.Row="0" Grid.Column="2" x:Name="StartDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
-                    <Label Grid.Row="2" Grid.Column="0">To:</Label>
-                    <CalendarDatePicker Grid.Row="2" Grid.Column="2" x:Name="EndDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
-                </Grid>
-            </StackPanel>
-            <StackPanel>
-                <CheckBox IsChecked="{Binding FilterByChannel}">Filter by Channel</CheckBox>
-                <Button Command="{Binding OpenChannelFilterDialog}" IsEnabled="{Binding FilterByChannel}">Select Channels...</Button>
-                <TextBlock Text="{Binding ChannelFilterLabel}" />
-            </StackPanel>
-            <StackPanel>
-                <CheckBox IsChecked="{Binding FilterByUser}">Filter by User</CheckBox>
-                <Button Command="{Binding OpenUserFilterDialog}" IsEnabled="{Binding FilterByUser}">Select Users...</Button>
-                <TextBlock Text="{Binding UserFilterLabel}" />
-            </StackPanel>
-        </WrapPanel>
-    </StackPanel>
-
-</UserControl>

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

@@ -1,26 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Avalonia.Controls;
-
-namespace DHT.Desktop.Main.Controls;
-
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class MessageFilterPanel : UserControl {
-	public MessageFilterPanel() {
-		InitializeComponent();
-
-		var culture = Program.Culture;
-		foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
-			picker.FirstDayOfWeek = culture.DateTimeFormat.FirstDayOfWeek;
-			picker.SelectedDateFormat = CalendarDatePickerFormat.Custom;
-			picker.CustomDateFormatString = culture.DateTimeFormat.ShortDatePattern;
-			picker.Watermark = culture.DateTimeFormat.ShortDatePattern;
-		}
-	}
-
-	public void CalendarDatePicker_OnSelectedDateChanged(object? sender, SelectionChangedEventArgs e) {
-		if (DataContext is MessageFilterPanelModel model) {
-			model.StartDate = StartDatePicker.SelectedDate;
-			model.EndDate = EndDatePicker.SelectedDate;
-		}
-	}
-}

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -1,308 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.ReactiveUI;
-using CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Desktop.Common;
-using DHT.Desktop.Dialogs.CheckBox;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
-using DHT.Server;
-using DHT.Server.Data;
-using DHT.Server.Data.Filters;
-using DHT.Utils.Tasks;
-
-namespace DHT.Desktop.Main.Controls;
-
-sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
-	private static readonly HashSet<string> FilterProperties = [
-		nameof(FilterByDate),
-		nameof(StartDate),
-		nameof(EndDate),
-		nameof(FilterByChannel),
-		nameof(IncludedChannels),
-		nameof(FilterByUser),
-		nameof(IncludedUsers)
-	];
-
-	public string FilterStatisticsText { get; private set; } = "";
-
-	public event PropertyChangedEventHandler? FilterPropertyChanged;
-
-	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
-
-	[ObservableProperty]
-	private bool filterByDate = false;
-
-	[ObservableProperty]
-	private DateTime? startDate = null;
-
-	[ObservableProperty]
-	private DateTime? endDate = null;
-
-	[ObservableProperty]
-	private bool filterByChannel = false;
-
-	[ObservableProperty]
-	private HashSet<ulong>? includedChannels = null;
-
-	[ObservableProperty]
-	private bool filterByUser = false;
-
-	[ObservableProperty]
-	private HashSet<ulong>? includedUsers = null;
-
-	[ObservableProperty]
-	private string channelFilterLabel = "";
-
-	[ObservableProperty]
-	private string userFilterLabel = "";
-
-	private readonly Window window;
-	private readonly State state;
-	private readonly string verb;
-
-	private readonly RestartableTask<long> exportedMessageCountTask;
-	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(Window window, State state, string verb = "Matches") {
-		this.window = window;
-		this.state = state;
-		this.verb = verb;
-
-		this.exportedMessageCountTask = new RestartableTask<long>(SetExportedMessageCount, TaskScheduler.FromCurrentSynchronizationContext());
-		
-		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;
-	}
-
-	public void Dispose() {
-		exportedMessageCountTask.Cancel();
-		
-		messageCountSubscription.Dispose();
-		channelCountSubscription.Dispose();
-		userCountSubscription.Dispose();
-	}
-
-	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
-			UpdateFilterStatistics();
-			FilterPropertyChanged?.Invoke(sender, e);
-		}
-
-		if (e.PropertyName is nameof(FilterByChannel) or nameof(IncludedChannels)) {
-			UpdateChannelFilterLabel();
-		}
-		else if (e.PropertyName is nameof(FilterByUser) or nameof(IncludedUsers)) {
-			UpdateUserFilterLabel();
-		}
-	}
-
-	private void OnMessageCountChanged(long newMessageCount) {
-		totalMessageCount = newMessageCount;
-		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 {
-			ChannelFilterLabel = "Loading...";
-		}
-	}
-
-	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() {
-		var filter = CreateFilter();
-		if (filter.IsEmpty) {
-			exportedMessageCountTask.Cancel();
-			exportedMessageCount = totalMessageCount;
-			UpdateFilterStatisticsText();
-		}
-		else {
-			exportedMessageCount = null;
-			UpdateFilterStatisticsText();
-			exportedMessageCountTask.Restart(cancellationToken => state.Db.Messages.Count(filter, cancellationToken));
-		}
-	}
-
-	private void SetExportedMessageCount(long exportedMessageCount) {
-		this.exportedMessageCount = exportedMessageCount;
-		UpdateFilterStatisticsText();
-	}
-
-	private void UpdateFilterStatisticsText() {
-		var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
-		var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
-
-		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
-		OnPropertyChanged(nameof(FilterStatisticsText));
-	}
-
-	public async Task OpenChannelFilterDialog() {
-		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
-			var items = new List<CheckBoxItem<ulong>>();
-			var servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
-
-			await foreach (var channel in state.Db.Channels.Get()) {
-				var channelId = channel.Id;
-				var channelName = channel.Name;
-
-				string title;
-				if (servers.TryGetValue(channel.Server, out var server)) {
-					var titleBuilder = new StringBuilder();
-					var serverType = server.Type;
-
-					titleBuilder.Append('[')
-					            .Append(ServerTypes.ToString(serverType))
-					            .Append("] ");
-
-					if (serverType == ServerType.DirectMessage) {
-						titleBuilder.Append(channelName);
-					}
-					else {
-						titleBuilder.Append(server.Name)
-						            .Append(" - ")
-						            .Append(channelName);
-					}
-
-					title = titleBuilder.ToString();
-				}
-				else {
-					title = channelName;
-				}
-
-				items.Add(new CheckBoxItem<ulong>(channelId) {
-					Title = title,
-					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId)
-				});
-			}
-
-			return items;
-		}
-
-		const string Title = "Included Channels";
-
-		List<CheckBoxItem<ulong>> 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;
-		}
-
-		var result = await OpenIdFilterDialog(Title, items);
-		if (result != null) {
-			IncludedChannels = result;
-		}
-	}
-
-	public async Task OpenUserFilterDialog() {
-		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
-			var checkBoxItems = new List<CheckBoxItem<ulong>>();
-
-			await foreach (var user in state.Db.Users.Get()) {
-				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
-					Title = user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})",
-					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
-				});
-			}
-
-			return checkBoxItems;
-		}
-
-		const string Title = "Included Users";
-
-		List<CheckBoxItem<ulong>> 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;
-		}
-
-		var result = await OpenIdFilterDialog(Title, items);
-		if (result != null) {
-			IncludedUsers = result;
-		}
-	}
-
-	private async Task<HashSet<ulong>?> OpenIdFilterDialog(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;
-	}
-
-	public MessageFilter CreateFilter() {
-		MessageFilter filter = new ();
-
-		if (FilterByDate) {
-			filter.StartDate = StartDate;
-			filter.EndDate = EndDate?.AddDays(1).AddMilliseconds(-1);
-		}
-
-		if (FilterByChannel && IncludedChannels != null) {
-			filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
-		}
-
-		if (FilterByUser && IncludedUsers != null) {
-			filter.UserIds = new HashSet<ulong>(IncludedUsers);
-		}
-
-		return filter;
-	}
-}

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -1,118 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Server;
-using DHT.Server;
-using DHT.Server.Service;
-using DHT.Utils.Logging;
-
-namespace DHT.Desktop.Main.Controls;
-
-sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
-	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
-	
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
-	private string inputPort;
-
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
-	private string inputToken;
-
-	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
-
-	[ObservableProperty(Setter = Access.Private)]
-	private bool isToggleServerButtonEnabled = true;
-
-	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
-
-	private readonly Window window;
-	private readonly ServerManager server;
-
-	[Obsolete("Designer")]
-	public ServerConfigurationPanelModel() : this(null!, State.Dummy) {}
-
-	public ServerConfigurationPanelModel(Window window, State state) {
-		this.window = window;
-		this.server = state.Server;
-		this.inputPort = ServerConfiguration.Port.ToString();
-		this.inputToken = ServerConfiguration.Token;
-		
-		server.StatusChanged += OnServerStatusChanged;
-	}
-
-	public void Dispose() {
-		server.StatusChanged -= OnServerStatusChanged;
-	}
-
-	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
-		Dispatcher.UIThread.InvokeAsync(UpdateServerStatus);
-	}
-
-	private void UpdateServerStatus() {
-		OnPropertyChanged(nameof(ToggleServerButtonText));
-	}
-
-	private async Task StartServer() {
-		IsToggleServerButtonEnabled = false;
-		
-		try {
-			await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
-		IsToggleServerButtonEnabled = true;
-	}
-
-	private async Task StopServer() {
-		IsToggleServerButtonEnabled = false;
-		
-		try {
-			await server.Stop();
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
-		IsToggleServerButtonEnabled = true;
-	}
-
-	public async Task OnClickToggleServerButton() {
-		if (server.IsRunning) {
-			await StopServer();
-		}
-		else {
-			await StartServer();
-		}
-	}
-
-	public void OnClickRandomizeToken() {
-		InputToken = ServerUtils.GenerateRandomToken(20);
-	}
-
-	public async Task 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;
-		ServerConfiguration.Token = inputToken;
-		
-		OnPropertyChanged(nameof(HasMadeChanges));
-		
-		await StartServer();
-	}
-
-	public void OnClickCancelChanges() {
-		InputPort = ServerConfiguration.Port.ToString();
-		InputToken = ServerConfiguration.Token;
-	}
-}

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Reactive.Linq;
-using Avalonia.ReactiveUI;
-using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Server;
-using DHT.Server.Service;
-
-namespace DHT.Desktop.Main.Controls;
-
-sealed partial class StatusBarModel : ObservableObject, IDisposable {
-	[ObservableProperty(Setter = Access.Private)]
-	private long? serverCount;
-	
-	[ObservableProperty(Setter = Access.Private)]
-	private long? channelCount;
-	
-	[ObservableProperty(Setter = Access.Private)]
-	private long? messageCount;
-
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
-	private ServerManager.Status serverStatus;
-
-	public string ServerStatusText => serverStatus switch {
-		ServerManager.Status.Starting => "STARTING",
-		ServerManager.Status.Started  => "READY",
-		ServerManager.Status.Stopping => "STOPPING",
-		ServerManager.Status.Stopped  => "STOPPED",
-		_                             => ""
-	};
-
-	private readonly State state;
-	private readonly IDisposable serverCountSubscription;
-	private readonly IDisposable channelCountSubscription;
-	private readonly IDisposable messageCountSubscription;
-
-	[Obsolete("Designer")]
-	public StatusBarModel() : this(State.Dummy) {}
-
-	public StatusBarModel(State state) {
-		this.state = state;
-		
-		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 += OnServerStatusChanged;
-		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
-	}
-
-	public void Dispose() {
-		serverCountSubscription.Dispose();
-		channelCountSubscription.Dispose();
-		messageCountSubscription.Dispose();
-		
-		state.Server.StatusChanged -= OnServerStatusChanged;
-	}
-
-	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
-		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
-	}
-}

app/Desktop/Main/MainWindow.axaml.cs

@@ -1,45 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using DHT.Utils.Logging;
-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();
-		DataContext = new MainWindowModel(this, Arguments.Empty);
-	}
-
-	internal MainWindow(Arguments args) {
-		InitializeComponent();
-		DataContext = new MainWindowModel(this, args);
-	}
-
-	public async void OnClosing(object? sender, WindowClosingEventArgs e) {
-		e.Cancel = true;
-		Closing -= OnClosing;
-
-		try {
-			await Dispose();
-		} finally {
-			Close();
-		}
-	}
-
-	private async Task Dispose() {
-		if (DataContext is MainWindowModel model) {
-			try {
-				await model.DisposeAsync();
-			} catch (Exception ex) {
-				Log.Error("Caught exception while disposing window: " + ex);
-			}
-		}
-	}
-}

app/Desktop/Main/MainWindowModel.cs

@@ -1,135 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Main.Screens;
-using DHT.Desktop.Server;
-using DHT.Server;
-using DHT.Server.Database;
-using DHT.Utils.Logging;
-
-namespace DHT.Desktop.Main;
-
-sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
-	private const string DefaultTitle = "Discord History Tracker";
-
-	private static readonly Log Log = Log.ForType<MainWindowModel>();
-
-	[ObservableProperty(Setter = Access.Private)]
-	private string title = DefaultTitle;
-
-	[ObservableProperty(Setter = Access.Private)]
-	private UserControl currentScreen;
-
-	private readonly WelcomeScreen welcomeScreen;
-	private readonly WelcomeScreenModel welcomeScreenModel;
-
-	private MainContentScreenModel? mainContentScreenModel;
-
-	private readonly Window window;
-	private readonly int? concurrentDownloads;
-
-	private State? state;
-
-	[Obsolete("Designer")]
-	public MainWindowModel() : this(null!, Arguments.Empty) {}
-
-	public MainWindowModel(Window window, Arguments args) {
-		this.window = window;
-
-		welcomeScreenModel = new WelcomeScreenModel(window);
-		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
-
-		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
-		currentScreen = welcomeScreen;
-
-		var dbFile = args.DatabaseFile;
-		if (!string.IsNullOrWhiteSpace(dbFile)) {
-			async void OnWindowOpened(object? o, EventArgs eventArgs) {
-				window.Opened -= OnWindowOpened;
-
-				// https://github.com/AvaloniaUI/Avalonia/issues/3071
-				if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-					await Task.Delay(500);
-				}
-
-				if (File.Exists(dbFile)) {
-					await welcomeScreenModel.OpenOrCreateDatabaseFromPath(dbFile);
-				}
-				else {
-					await Dialog.ShowOk(window, "Database Error", "Database file not found:\n" + dbFile);
-				}
-			}
-
-			window.Opened += OnWindowOpened;
-		}
-
-		if (args.ServerPort != null) {
-			ServerConfiguration.Port = args.ServerPort.Value;
-		}
-
-		if (args.ServerToken != null) {
-			ServerConfiguration.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(ex);
-			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
-		}
-
-		mainContentScreenModel = new MainContentScreenModel(window, state);
-		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-		
-		await mainContentScreenModel.Initialize();
-		
-		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
-		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
-
-		window.Focus();
-	}
-
-	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-		if (mainContentScreenModel != null) {
-			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
-			await mainContentScreenModel.DisposeAsync();
-			mainContentScreenModel = null;
-		}
-
-		await DisposeState();
-
-		Title = DefaultTitle;
-		CurrentScreen = welcomeScreen;
-
-		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
-	}
-
-	private async Task DisposeState() {
-		if (state != null) {
-			await state.DisposeAsync();
-			state = null;
-		}
-	}
-
-	public async ValueTask DisposeAsync() {
-		if (mainContentScreenModel != null) {
-			await mainContentScreenModel.DisposeAsync();
-		}
-		
-		await DisposeState();
-	}
-}

app/Desktop/Main/Pages/AdvancedPageModel.cs

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

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -1,266 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using DHT.Desktop.Common;
-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.Utils.Logging;
-
-namespace DHT.Desktop.Main.Pages;
-
-sealed class DatabasePageModel {
-	private static readonly Log Log = Log.ForType<DatabasePageModel>();
-
-	public IDatabaseFile Db { get; }
-
-	public event EventHandler? DatabaseClosed;
-
-	private readonly Window window;
-
-	[Obsolete("Designer")]
-	public DatabasePageModel() : this(null!, State.Dummy) {}
-
-	public DatabasePageModel(Window window, State state) {
-		this.window = window;
-		this.Db = state.Db;
-	}
-
-	public async Task OpenDatabaseFolder() {
-		string file = Db.Path;
-		string? folder = Path.GetDirectoryName(file);
-
-		if (folder == null) {
-			return;
-		}
-
-		switch (Environment.OSVersion.Platform) {
-			case PlatformID.Win32NT:
-				Process.Start("explorer.exe", "/select,\"" + file + "\"");
-				break;
-
-			case PlatformID.Unix:
-				Process.Start("xdg-open", new string[] { folder });
-				break;
-
-			case PlatformID.MacOSX:
-				Process.Start("open", new string[] { folder });
-				break;
-
-			default:
-				await Dialog.ShowOk(window, "Feature Not Supported", "This feature is not supported for your operating system.");
-				break;
-		}
-	}
-
-	public void CloseDatabase() {
-		DatabaseClosed?.Invoke(this, EventArgs.Empty);
-	}
-
-	public async Task MergeWithDatabase() {
-		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
-		if (paths.Length > 0) {
-			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
-		}
-	}
-
-	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
-
-		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
-			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
-
-			if (db == null) {
-				return false;
-			}
-
-			try {
-				await target.AddFrom(db);
-				return true;
-			} finally {
-				await db.DisposeAsync();
-			}
-		});
-	}
-
-	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
-		private readonly ProgressDialog dialog;
-		private readonly int total;
-		private bool? decision;
-
-		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
-			this.total = total;
-			this.dialog = dialog;
-		}
-
-		public async Task<bool> CanUpgrade() {
-			return decision ??= (total > 1
-				                     ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
-				                     : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog)) == DialogResult.YesNo.Yes;
-		}
-
-		public Task Start(int versionSteps, Func<ISchemaUpgradeCallbacks.IProgressReporter, Task> doUpgrade) {
-			return doUpgrade(new NullReporter());
-		}
-
-		private sealed class NullReporter : ISchemaUpgradeCallbacks.IProgressReporter {
-			public Task NextVersion() {
-				return Task.CompletedTask;
-			}
-
-			public Task MainWork(string message, int finishedItems, int totalItems) {
-				return Task.CompletedTask;
-			}
-
-			public Task SubWork(string message, int finishedItems, int totalItems) {
-				return Task.CompletedTask;
-			}
-		}
-	}
-
-	public async Task ImportLegacyArchive() {
-		var paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
-			Title = "Open Legacy DHT Archive",
-			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
-			AllowMultiple = true
-		});
-
-		if (paths.Length > 0) {
-			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
-		}
-	}
-
-	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-		var fakeSnowflake = new FakeSnowflake();
-
-		await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
-			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
-
-			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
-				SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
-				SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
-				Dictionary<DHT.Server.Data.Server, ulong>? result = await Dispatcher.UIThread.InvokeAsync(() => AskForServerIds(dialog, servers));
-				SynchronizationContext.SetSynchronizationContext(prevSyncContext);
-				return result;
-			});
-		});
-	}
-
-	private static async Task<Dictionary<DHT.Server.Data.Server, ulong>?> AskForServerIds(Window window, DHT.Server.Data.Server[] servers) {
-		static bool IsValidSnowflake(string value) {
-			return string.IsNullOrEmpty(value) || ulong.TryParse(value, out _);
-		}
-
-		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
-
-		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
-			});
-		}
-
-		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."
-		};
-
-		var dialog = new TextBoxDialog { DataContext = model };
-		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
-
-		if (result != DialogResult.OkCancel.Ok) {
-			return null;
-		}
-
-		return model.ValidItems
-		            .Where(static item => !string.IsNullOrEmpty(item.Value))
-		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
-	}
-
-	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
-		int total = paths.Length;
-		var oldStatistics = await DatabaseStatistics.Take(target);
-
-		int successful = 0;
-		int finished = 0;
-
-		foreach (string path in paths) {
-			await callback.Update(Path.GetFileName(path), finished, total);
-			++finished;
-
-			if (!File.Exists(path)) {
-				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
-				continue;
-			}
-
-			try {
-				if (await performImport(path)) {
-					++successful;
-				}
-			} catch (Exception ex) {
-				Log.Error(ex);
-				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
-			}
-		}
-
-		await callback.Update("Done", finished, total);
-
-		if (successful == 0) {
-			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
-			return;
-		}
-
-		var newStatistics = await DatabaseStatistics.Take(target);
-		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
-	}
-
-	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
-		public static async Task<DatabaseStatistics> Take(IDatabaseFile db) {
-			return new DatabaseStatistics(
-				await db.Servers.Count(),
-				await db.Channels.Count(),
-				await db.Users.Count(),
-				await db.Messages.Count()
-			);
-		}
-	}
-
-	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
-		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
-		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
-		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
-		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
-
-		StringBuilder message = new StringBuilder();
-		message.Append("Processed ");
-
-		if (successfulItems == totalItems) {
-			message.Append(successfulItems.Pluralize(itemName));
-		}
-		else {
-			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
-		}
-
-		message.Append(" and added:\n\n  \u2022 ");
-		message.Append(newServers.Pluralize("server")).Append("\n  \u2022 ");
-		message.Append(newChannels.Pluralize("channel")).Append("\n  \u2022 ");
-		message.Append(newUsers.Pluralize("user")).Append("\n  \u2022 ");
-		message.Append(newMessages.Pluralize("message"));
-
-		return message.ToString();
-	}
-}

app/Desktop/Main/Pages/DebugPage.axaml

@@ -1,46 +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"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.DebugPage"
-             x:DataType="pages:DebugPageModel">
-    
-    <Design.DataContext>
-        <pages:DebugPageModel />
-    </Design.DataContext>
-
-    <UserControl.Styles>
-        <Style Selector="TextBox">
-            <Setter Property="FontFamily" Value="Consolas,Courier" />
-            <Setter Property="FontSize" Value="15" />
-        </Style>
-        <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Orientation" Value="Vertical" />
-            <Setter Property="Margin" Value="0 0 10 10" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel Orientation="Vertical" Spacing="10">
-        <Expander Header="Generate Random Data" IsExpanded="True">
-            <WrapPanel>
-                <StackPanel>
-                    <Label Target="Channels">Channels</Label>
-                    <TextBox x:Name="Channels" Width="100" Text="{Binding GenerateChannels}" />
-                </StackPanel>
-                <StackPanel>
-                    <Label Target="Users">Users</Label>
-                    <TextBox x:Name="Users" Width="100" Text="{Binding GenerateUsers}" />
-                </StackPanel>
-                <StackPanel>
-                    <Label Target="Messages">Messages</Label>
-                    <TextBox x:Name="Messages" Width="100" Text="{Binding GenerateMessages}" />
-                </StackPanel>
-                <StackPanel VerticalAlignment="Bottom">
-                    <Button Command="{Binding OnClickAddRandomDataToDatabase}">Add to Database</Button>
-                </StackPanel>
-            </WrapPanel>
-        </Expander>
-    </StackPanel>
-</UserControl>

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

@@ -1,11 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Avalonia.Controls;
-
-namespace DHT.Desktop.Main.Pages;
-
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class DebugPage : UserControl {
-	public DebugPage() {
-		InitializeComponent();
-	}
-}

app/Desktop/Main/Pages/DebugPageModel.cs

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

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -1,54 +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="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">
-        <StackPanel Orientation="Horizontal" Spacing="10">
-            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-            <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
-        </StackPanel>
-        <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>
-        <StackPanel Orientation="Vertical" Spacing="12">
-            <Expander Header="Download Status" IsExpanded="True">
-                <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="State" Binding="{Binding State, Mode=OneWay}" Width="*" />
-                        <DataGridTextColumn Header="Files" Binding="{Binding Items, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
-                        <DataGridTextColumn Header="Size" Binding="{Binding SizeText, Mode=OneWay}" Width="*" CellStyleClasses="right" />
-                    </DataGrid.Columns>
-                </DataGrid>
-            </Expander>
-        </StackPanel>
-    </StackPanel>
-</UserControl>

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

@@ -1,11 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Avalonia.Controls;
-
-namespace DHT.Desktop.Main.Pages;
-
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class DownloadsPage : UserControl {
-	public DownloadsPage() {
-		InitializeComponent();
-	}
-}

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -1,210 +0,0 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.ReactiveUI;
-using CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Desktop.Common;
-using DHT.Desktop.Main.Controls;
-using DHT.Server;
-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;
-
-namespace DHT.Desktop.Main.Pages;
-
-sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
-	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
-
-	[ObservableProperty(Setter = Access.Private)]
-	private bool isToggleDownloadButtonEnabled = true;
-
-	public string ToggleDownloadButtonText => IsDownloading ? "Stop Downloading" : "Start Downloading";
-
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
-	private bool isRetryingFailedDownloads = false;
-
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
-	private bool hasFailedDownloads;
-
-	public bool IsRetryFailedOnDownloadsButtonEnabled => !IsRetryingFailedDownloads && HasFailedDownloads;
-
-	[ObservableProperty(Setter = Access.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 State state;
-	private readonly ThrottledTask<DownloadStatusStatistics> downloadStatisticsTask;
-	private readonly IDisposable downloadItemCountSubscription;
-	
-	private IDisposable? finishedItemsSubscription;
-	private DownloadItemFilter? currentDownloadFilter;
-
-	public DownloadsPageModel() : this(State.Dummy) {}
-
-	public DownloadsPageModel(State state) {
-		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, false)) {
-			await StartDownload();
-		}
-	}
-
-	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;
-
-		if (IsDownloading) {
-			await StopDownload();
-		}
-		else {
-			await StartDownload();
-		}
-
-		await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
-		IsToggleDownloadButtonEnabled = true;
-	}
-
-	private async Task StartDownload() {
-		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
-		
-		var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
-		finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
-		
-		OnDownloadStateChanged();
-	}
-
-	private async Task StopDownload() {
-		await state.Downloader.Stop();
-		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
-
-		finishedItemsSubscription?.Dispose();
-		finishedItemsSubscription = null;
-			
-		currentDownloadFilter = null;
-		OnDownloadStateChanged();
-	}
-
-	private void OnDownloadStateChanged() {
-		RecomputeDownloadStatistics();
-
-		OnPropertyChanged(nameof(ToggleDownloadButtonText));
-		OnPropertyChanged(nameof(IsDownloading));
-	}
-
-	private void OnItemFinished(DownloadItem item) {
-		RecomputeDownloadStatistics();
-	}
-
-	public async Task OnClickRetryFailedDownloads() {
-		IsRetryingFailedDownloads = true;
-
-		try {
-			await state.Db.Downloads.RetryFailed();
-			RecomputeDownloadStatistics();
-		} catch (Exception e) {
-			Log.Error(e);
-		} finally {
-			IsRetryingFailedDownloads = false;
-		}
-	}
-
-	private void RecomputeDownloadStatistics() {
-		downloadStatisticsTask.Post(cancellationToken => state.Db.Downloads.GetStatistics(currentDownloadFilter ?? new DownloadItemFilter(), cancellationToken));
-	}
-
-	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;
-
-		HasFailedDownloads = statusStatistics.FailedCount > 0;
-	}
-
-	[ObservableObject]
-	public sealed partial class StatisticsRow(string state) {
-		public string State { get; } = state;
-
-		[ObservableProperty]
-		private int items;
-
-		[ObservableProperty]
-		[NotifyPropertyChangedFor(nameof(SizeText))]
-		private ulong? size;
-		
-		[ObservableProperty]
-		[NotifyPropertyChangedFor(nameof(SizeText))]
-		private bool 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/ViewerPage.axaml

@@ -1,37 +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.ViewerPage"
-             x:DataType="pages:ViewerPageModel">
-
-    <Design.DataContext>
-        <pages:ViewerPageModel />
-    </Design.DataContext>
-
-    <UserControl.Styles>
-        <Style Selector="Expander">
-            <Setter Property="Margin" Value="0 5 0 0" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel Orientation="Vertical" Spacing="20">
-        <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
-            <Button Command="{Binding OnClickOpenViewer}" Margin="0 0 5 0">Open Viewer</Button>
-        </StackPanel>
-        <controls:MessageFilterPanel DataContext="{Binding FilterModel}" />
-        <Expander Header="Database Tools">
-            <StackPanel Orientation="Vertical" Spacing="10">
-                <StackPanel Orientation="Vertical" Spacing="4">
-                    <RadioButton GroupName="DatabaseToolFilterMode" IsEnabled="{Binding HasFilters}" IsChecked="{Binding DatabaseToolFilterModeKeep}">Keep Only Messages Matching Filters</RadioButton>
-                    <RadioButton GroupName="DatabaseToolFilterMode" IsEnabled="{Binding HasFilters}" IsChecked="{Binding DatabaseToolFilterModeRemove}">Remove Messages Matching Filters</RadioButton>
-                </StackPanel>
-                <Button IsEnabled="{Binding HasFilters}" Command="{Binding OnClickApplyFiltersToDatabase}">Apply Filters to Database</Button>
-            </StackPanel>
-        </Expander>
-    </StackPanel>
-
-</UserControl>

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

@@ -1,11 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Avalonia.Controls;
-
-namespace DHT.Desktop.Main.Pages;
-
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class ViewerPage : UserControl {
-	public ViewerPage() {
-		InitializeComponent();
-	}
-}

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,83 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using System.Web;
-using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Desktop.Common;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
-using DHT.Desktop.Main.Controls;
-using DHT.Desktop.Server;
-using DHT.Server;
-using DHT.Server.Data.Filters;
-using DHT.Server.Service.Viewer;
-
-namespace DHT.Desktop.Main.Pages;
-
-sealed partial class ViewerPageModel : ObservableObject, IDisposable {
-	public bool DatabaseToolFilterModeKeep { get; set; } = true;
-	public bool DatabaseToolFilterModeRemove { get; set; } = false;
-
-	[ObservableProperty]
-	private bool hasFilters = false;
-
-	public MessageFilterPanelModel FilterModel { get; }
-
-	private readonly Window window;
-	private readonly State state;
-
-	[Obsolete("Designer")]
-	public ViewerPageModel() : this(null!, State.Dummy) {}
-
-	public ViewerPageModel(Window window, State state) {
-		this.window = window;
-		this.state = state;
-
-		FilterModel = new MessageFilterPanelModel(window, state, "Will export");
-		FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
-	}
-
-	public void Dispose() {
-		FilterModel.Dispose();
-	}
-
-	private void OnFilterPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		HasFilters = FilterModel.HasAnyFilters;
-	}
-
-	public async void OnClickOpenViewer() {
-		try {
-			string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
-			string serverToken = ServerConfiguration.Token;
-			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
-			
-			Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId)) {
-				UseShellExecute = true
-			});
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
-		}
-	}
-
-	public async Task OnClickApplyFiltersToDatabase() {
-		var filter = FilterModel.CreateFilter();
-		var messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
-
-		if (DatabaseToolFilterModeKeep) {
-			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
-				await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
-			}
-		}
-		else if (DatabaseToolFilterModeRemove) {
-			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
-				await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
-			}
-		}
-	}
-
-	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {
-		await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Removing messages...", _ => state.Db.Messages.Remove(filter, removalMode));
-	}
-}

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using DHT.Desktop.Main.Controls;
-using DHT.Desktop.Main.Pages;
-using DHT.Server;
-
-namespace DHT.Desktop.Main.Screens;
-
-sealed class MainContentScreenModel : IAsyncDisposable {
-	public DatabasePage DatabasePage { get; }
-	private DatabasePageModel DatabasePageModel { get; }
-
-	public TrackingPage TrackingPage { get; }
-	private TrackingPageModel TrackingPageModel { get; }
-
-	public DownloadsPage DownloadsPage { get; }
-	private DownloadsPageModel DownloadsPageModel { get; }
-
-	public ViewerPage ViewerPage { get; }
-	private ViewerPageModel ViewerPageModel { get; }
-
-	public AdvancedPage AdvancedPage { get; }
-	private AdvancedPageModel AdvancedPageModel { get; }
-
-	public DebugPage? DebugPage { get; }
-
-	#if DEBUG
-	public bool HasDebugPage => true;
-	private DebugPageModel DebugPageModel { get; }
-	#else
-	public bool HasDebugPage => false;
-	#endif
-
-	public StatusBarModel StatusBarModel { get; }
-
-	public event EventHandler? DatabaseClosed {
-		add {
-			DatabasePageModel.DatabaseClosed += value;
-		}
-		remove {
-			DatabasePageModel.DatabaseClosed -= value;
-		}
-	}
-
-	[Obsolete("Designer")]
-	public MainContentScreenModel() : this(null!, State.Dummy) {}
-
-	public MainContentScreenModel(Window window, State state) {
-		DatabasePageModel = new DatabasePageModel(window, state);
-		DatabasePage = new DatabasePage { DataContext = DatabasePageModel };
-
-		TrackingPageModel = new TrackingPageModel(window);
-		TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
-
-		DownloadsPageModel = new DownloadsPageModel(state);
-		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
-
-		ViewerPageModel = new ViewerPageModel(window, state);
-		ViewerPage = new ViewerPage { DataContext = ViewerPageModel };
-
-		AdvancedPageModel = new AdvancedPageModel(window, state);
-		AdvancedPage = new AdvancedPage { DataContext = AdvancedPageModel };
-
-		#if DEBUG
-		DebugPageModel = new DebugPageModel(window, state);
-		DebugPage = new DebugPage { DataContext = DebugPageModel };
-		#else
-		DebugPage = null;
-		#endif
-
-		StatusBarModel = new StatusBarModel(state);
-	}
-	
-	public async Task Initialize() {
-		await DownloadsPageModel.Initialize();
-	}
-
-	public async ValueTask DisposeAsync() {
-		await DownloadsPageModel.DisposeAsync();
-		ViewerPageModel.Dispose();
-		AdvancedPageModel.Dispose();
-		StatusBarModel.Dispose();
-	}
-}

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Desktop.Common;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
-using DHT.Server.Data.Settings;
-using DHT.Server.Database;
-using DHT.Server.Database.Sqlite.Schema;
-
-namespace DHT.Desktop.Main.Screens;
-
-sealed partial class WelcomeScreenModel : ObservableObject {
-	public string Version => Program.Version;
-	
-	[ObservableProperty(Setter = Access.Private)]
-	private bool isOpenOrCreateDatabaseButtonEnabled = true;
-	
-	public event EventHandler<IDatabaseFile>? DatabaseSelected; 
-	
-	private readonly Window window;
-
-	private string? dbFilePath;
-
-	[Obsolete("Designer")]
-	public WelcomeScreenModel() : this(null!) {}
-
-	public WelcomeScreenModel(Window window) {
-		this.window = window;
-	}
-
-	public async Task OpenOrCreateDatabase() {
-		IsOpenOrCreateDatabaseButtonEnabled = false;
-		try {
-			var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
-			if (path != null) {
-				await OpenOrCreateDatabaseFromPath(path);
-			}
-		} finally {
-			IsOpenOrCreateDatabaseButtonEnabled = true;
-		}
-	}
-
-	public async Task OpenOrCreateDatabaseFromPath(string path) {
-		dbFilePath = path;
-		
-		bool isNew = !File.Exists(path);
-		
-		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
-		if (db == null) {
-			return;
-		}
-		
-		if (isNew && await Dialog.ShowYesNo(window, "Automatic Downloads", "Do you want to automatically download files hosted on Discord? You can change this later in the Downloads tab.") == DialogResult.YesNo.Yes) {
-			await db.Settings.Set(SettingsKey.DownloadsAutoStart, true);
-		}
-		
-		DatabaseSelected?.Invoke(this, db);
-	}
-
-	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
-		private readonly Window window;
-		
-		public SchemaUpgradeCallbacks(Window window) {
-			this.window = window;
-		}
-
-		public async Task<bool> CanUpgrade() {
-			return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
-		}
-
-		public async Task Start(int versionSteps, Func<ISchemaUpgradeCallbacks.IProgressReporter, Task> doUpgrade) {
-			async Task StartUpgrade(IReadOnlyList<IProgressCallback> callbacks) {
-				var reporter = new ProgressReporter(versionSteps, callbacks);
-				await reporter.NextVersion();
-				await Task.Delay(TimeSpan.FromMilliseconds(800));
-				await doUpgrade(reporter);
-				await Task.Delay(TimeSpan.FromMilliseconds(600));
-			}
-			
-			await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
-		}
-
-		private sealed class ProgressReporter : ISchemaUpgradeCallbacks.IProgressReporter {
-			private readonly IReadOnlyList<IProgressCallback> callbacks;
-			
-			private readonly int versionSteps;
-			private 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);
-			}
-
-			public async Task MainWork(string message, int finishedItems, int totalItems) {
-				await callbacks[1].Update(message, finishedItems, totalItems);
-				await HideChildren(1);
-			}
-
-			public async Task SubWork(string message, int finishedItems, int totalItems) {
-				await callbacks[2].Update(message, finishedItems, totalItems);
-				await HideChildren(2);
-			}
-
-			private async Task HideChildren(int parentIndex) {
-				for (int i = parentIndex + 1; i < callbacks.Count; i++) {
-					await callbacks[i].Hide();
-				}
-			}
-		}
-	}
-
-	public async Task ShowAboutDialog() {
-		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
-	}
-
-	public void Exit() {
-		window.Close();
-	}
-}

app/Desktop/Program.cs

@@ -1,9 +1,7 @@
-using System;
+using System.Globalization;
-using System.Globalization;
 using System.Reflection;
 using Avalonia;
-using DHT.Utils.Logging;
+using DHT.Desktop.Resources;
-using DHT.Utils.Resources;
 
 namespace DHT.Desktop;
 
@@ -11,7 +9,6 @@ static class Program {
 	public static string Version { get; }
 	public static CultureInfo Culture { get; }
 	public static ResourceLoader Resources { get; }
-	public static Arguments Arguments { get; }
 
 	static Program() {
 		var assembly = Assembly.GetExecutingAssembly();
@@ -28,25 +25,14 @@ static class Program {
 		CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
 
 		Resources = new ResourceLoader(assembly);
-		Arguments = new Arguments(Environment.GetCommandLineArgs());
 	}
 
 	public static void Main(string[] args) {
-		if (Arguments.Console && OperatingSystem.IsWindows()) {
-			WindowsConsole.AllocConsole();
-		}
-
-		try {
 		BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-		} finally {
-			if (Arguments.Console && OperatingSystem.IsWindows()) {
-				WindowsConsole.FreeConsole();
-			}
-		}
 	}
 
 	private static AppBuilder BuildAvaloniaApp() {
-		return AppBuilder.Configure<App>()
+		return AppBuilder.Configure<App.App>()
 		                 .UsePlatformDetect()
 		                 .WithInterFont()
 		                 .LogToTrace();

app/Desktop/Resources/ResourceLoader.cs

@@ -4,12 +4,17 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DHT.Utils.Resources;
+namespace DHT.Desktop.Resources;
 
-public sealed class ResourceLoader(Assembly assembly) {
+public sealed class ResourceLoader {
-	private Stream? TryGetEmbeddedStream(string filename) {
+	private readonly Assembly assembly;
+
+	public ResourceLoader(Assembly assembly) {
+		this.assembly = assembly;
+	}
+
+	private Stream GetEmbeddedStream(string filename) {
 		Stream? stream = null;
-		
 		foreach (var embeddedName in assembly.GetManifestResourceNames()) {
 			if (embeddedName.Replace('\\', '/') == filename) {
 				stream = assembly.GetManifestResourceStream(embeddedName);
@@ -17,11 +22,7 @@ public sealed class ResourceLoader(Assembly assembly) {
 			}
 		}
 
-		return stream;
+		return stream ?? throw new ArgumentException("Missing embedded resource: " + filename);
-	}
-	
-	private Stream GetEmbeddedStream(string filename) {
-		return TryGetEmbeddedStream(filename) ?? throw new ArgumentException("Missing embedded resource: " + filename);
 	}
 
 	private async Task<string> ReadTextAsync(Stream stream) {
@@ -29,22 +30,12 @@ public sealed class ResourceLoader(Assembly assembly) {
 		return await reader.ReadToEndAsync();
 	}
 
-	private async Task<byte[]> ReadBytesAsync(Stream stream) {
-		using var memoryStream = new MemoryStream();
-		await stream.CopyToAsync(memoryStream);
-		return memoryStream.ToArray();
-	}
-
 	public async Task<string> ReadTextAsync(string filename) {
 		return await ReadTextAsync(GetEmbeddedStream(filename));
 	}
 
-	public async Task<byte[]?> ReadBytesAsyncIfExists(string filename) {
-		return TryGetEmbeddedStream(filename) is {} stream ? await ReadBytesAsync(stream) : null;
-	}
-
 	public async Task<string> ReadJoinedAsync(string path, char separator) {
-		StringBuilder joined = new ();
+		StringBuilder joined = new();
 
 		foreach (var embeddedName in assembly.GetManifestResourceNames()) {
 			if (embeddedName.Replace('\\', '/').StartsWith(path)) {

app/Desktop/Resources/tracker-loader.js

@@ -1 +0,0 @@
-fetch("{url}").then(r => r.ok ? (r.headers.get("X-DHT") === "1" ? r.text() : Promise.reject("Invalid response")) : Promise.reject(r.status + " " + r.statusText)).then(s => eval(s)).catch(e => alert("Could not load tracking script:\n" + e));

app/Desktop/Server/ServerConfiguration.cs

@@ -1,8 +0,0 @@
-using DHT.Server.Service;
-
-namespace DHT.Desktop.Server;
-
-static class ServerConfiguration {
-	public static ushort Port { get; set; } = ServerUtils.FindAvailablePort(50000, 60000);
-	public static string Token { get; set; } = ServerUtils.GenerateRandomToken(20);
-}

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,49 +0,0 @@
-<Project>
-  
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <Authors>chylex</Authors>
-    <Company>DiscordHistoryTracker</Company>
-    <Product>DiscordHistoryTracker</Product>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
-    <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>partial</TrimMode>
-    <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
-    <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
-    <EventSourceSupport>false</EventSourceSupport>
-    <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
-    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>false</PublishReadyToRun>
-    <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
-    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>false</DebugSymbols>
-    <DebugType>none</DebugType>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <UseArtifactsOutput>true</UseArtifactsOutput>
-    <ArtifactsPath>$(MSBuildThisFileDirectory).artifacts</ArtifactsPath>
-  </PropertyGroup>
-  
-</Project>

app/Directory.build.props

@@ -0,0 +1,8 @@
+<Project>
+  
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>11</LangVersion>
+  </PropertyGroup>
+  
+</Project>

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

@@ -64,11 +64,9 @@
 			let action = null;
 			
 			if (!DISCORD.hasMoreMessages()) {
-				console.debug("[DHT] Reached first message.");
 				action = SETTINGS.afterFirstMsg;
 			}
 			if (isNoAction(action) && !anyNewMessages) {
-				console.debug("[DHT] No new messages.");
 				action = SETTINGS.afterSavedMsg;
 			}
 			
@@ -123,7 +121,7 @@
 				onTrackingContinued(false);
 			}
 			else {
-				const anyNewMessages = await STATE.addDiscordMessages(messages);
+				const anyNewMessages = await STATE.addDiscordMessages(info.id, messages);
 				onTrackingContinued(anyNewMessages);
 			}
 		} catch (e) {
@@ -158,4 +156,3 @@
 		GUI.showSettings();
 	}
 })();
-/*[DEBUGGER]*/

app/Resources/Tracker/scripts/discord.js

@@ -1,23 +1,5 @@
 // noinspection JSUnresolvedVariable
-// noinspection LocalVariableNamingConventionJS
 class DISCORD {
-	
-	// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
-	static CHANNEL_TYPE = {
-		DM: 1,
-		GROUP_DM: 3,
-		ANNOUNCEMENT_THREAD: 10,
-		PUBLIC_THREAD: 11,
-		PRIVATE_THREAD: 12
-	};
-	
-	// https://discord.com/developers/docs/resources/channel#message-object-message-types
-	static MESSAGE_TYPE = {
-		DEFAULT: 0,
-		REPLY: 19,
-		THREAD_STARTER: 21
-	};
-	
 	static getMessageOuterElement() {
 		return DOM.queryReactClass("messagesWrapper");
 	}
@@ -27,7 +9,7 @@ class DISCORD {
 	}
 	
 	static getMessageElements() {
-		return this.getMessageOuterElement().querySelectorAll("[class*='message_']");
+		return this.getMessageOuterElement().querySelectorAll("[class*='message-']");
 	}
 	
 	static hasMoreMessages() {
@@ -46,11 +28,46 @@ class DISCORD {
 	 * Calls the provided function with a list of messages whenever the currently loaded messages change.
 	 */
 	static setupMessageCallback(callback) {
+		let skipsLeft = 0;
+		let waitForCleanup = false;
 		const previousMessages = new Set();
 		
-		const onMessageElementsChanged = function() {
+		const timer = window.setInterval(() => {
-			const messages = DISCORD.getMessages();
+			if (skipsLeft > 0) {
-			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !DISCORD.hasMoreMessages();
+				--skipsLeft;
+				return;
+			}
+			
+			const view = this.getMessageOuterElement();
+			
+			if (!view) {
+				skipsLeft = 2;
+				return;
+			}
+			
+			const anyMessage = DOM.queryReactClass("message", this.getMessageOuterElement());
+			const messageCount = anyMessage ? anyMessage.parentElement.children.length : 0;
+			
+			if (messageCount > 300) {
+				if (waitForCleanup) {
+					return;
+				}
+				
+				skipsLeft = 3;
+				waitForCleanup = true;
+				
+				window.setTimeout(() => {
+					const view = this.getMessageScrollerElement();
+					// noinspection JSUnusedGlobalSymbols
+					view.scrollTop = view.scrollHeight / 2;
+				}, 1);
+			}
+			else {
+				waitForCleanup = false;
+			}
+			
+			const messages = this.getMessages();
+			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !this.hasMoreMessages();
 			
 			if (!hasChanged) {
 				return;
@@ -62,74 +79,24 @@ class DISCORD {
 			}
 			
 			callback(messages);
-		};
+		}, 200);
 		
-		let debounceTimer;
+		window.DHT_ON_UNLOAD.push(() => window.clearInterval(timer));
-		
-		/**
-		 * Do not trigger the callback too often due to autoscrolling.
-		 */
-		const onMessageElementsChangedLater = function() {
-			window.clearTimeout(debounceTimer);
-			debounceTimer = window.setTimeout(onMessageElementsChanged, 100);
-		};
-		
-		const observer = new MutationObserver(function () {
-			onMessageElementsChangedLater();
-		});
-		
-		let skipsLeft = 0;
-		let observedElement = null;
-		
-		const observerTimer = window.setInterval(() => {
-			if (skipsLeft > 0) {
-				--skipsLeft;
-				return;
-			}
-			
-			const view = this.getMessageOuterElement();
-			
-			if (!view) {
-				skipsLeft = 1;
-				return;
-			}
-			
-			if (observedElement !== null && observedElement.isConnected) {
-				return;
-			}
-			
-			observedElement = view.querySelector("[data-list-id='chat-messages']");
-			
-			if (observedElement) {
-				console.debug("[DHT] Observed message container.");
-				observer.observe(observedElement, { childList: true });
-				onMessageElementsChangedLater();
-			}
-		}, 400);
-		
-		window.DHT_ON_UNLOAD.push(() => {
-			observer.disconnect();
-			observedElement = null;
-			window.clearInterval(observerTimer);
-		});
 	}
 	
 	/**
-	 * Returns the message from a message element.
+	 * Returns the property object of a message element.
-	 * @returns { null | DiscordMessage } }
+	 * @returns { null | { message: DiscordMessage, channel: Object } }
 	 */
-	static getMessageFromElement(ele) {
+	static getMessageElementProps(ele) {
 		const props = DOM.getReactProps(ele);
 		
-		if (props && Array.isArray(props.children)) {
+		if (props.children && props.children.length) {
-			for (const child of props.children) {
+			for (let i = 3; i < props.children.length; i++) {
-				if (!(child instanceof Object)) {
+				const childProps = props.children[i].props;
-					continue;
-				}
 				
-				const childProps = child.props;
+				if (childProps && "message" in childProps && "channel" in childProps) {
-				if (childProps instanceof Object && "message" in childProps) {
+					return childProps;
-					return childProps.message;
 				}
 			}
 		}
@@ -146,10 +113,10 @@ class DISCORD {
 			
 			for (const ele of this.getMessageElements()) {
 				try {
-					const message = this.getMessageFromElement(ele);
+					const props = this.getMessageElementProps(ele);
 					
-					if (message != null) {
+					if (props != null) {
-						messages.push(message);
+						messages.push(props.message);
 					}
 				} catch (e) {
 					console.error("[DHT] Error extracing message data, skipping it.", e, ele, DOM.tryGetReactProps(ele));
@@ -170,7 +137,7 @@ class DISCORD {
 	 */
 	static getSelectedChannel() {
 		try {
-			let obj = null;
+			let obj;
 			
 			try {
 				for (const child of DOM.getReactProps(DOM.queryReactClass("chatContent")).children) {
@@ -181,6 +148,15 @@ class DISCORD {
 				}
 			} catch (e) {
 				console.error("[DHT] Error retrieving selected channel from 'chatContent' element.", e);
+				
+				for (const ele of this.getMessageElements()) {
+					const props = this.getMessageElementProps(ele);
+					
+					if (props != null) {
+						obj = props.channel;
+						break;
+					}
+				}
 			}
 			
 			if (!obj || typeof obj.id !== "string") {
@@ -192,7 +168,7 @@ class DISCORD {
 			if (dms) {
 				let name;
 				
-				for (const ele of dms.querySelectorAll("[class*='channel_'] [class*='selected_'] [class^='name_'] *")) {
+				for (const ele of dms.querySelectorAll("[class*='channel-'] [class*='selected-'] [class^='name-'] *, [class*='channel-'][class*='selected-'] [class^='name-'] *")) {
 					const node = Array.prototype.find.call(ele.childNodes, node => node.nodeType === Node.TEXT_NODE);
 					
 					if (node) {
@@ -209,8 +185,8 @@ class DISCORD {
 				
 				// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 				switch (obj.type) {
-					case DISCORD.CHANNEL_TYPE.DM: type = "DM"; break;
+					case 1: type = "DM"; break;
-					case DISCORD.CHANNEL_TYPE.GROUP_DM: type = "GROUP"; break;
+					case 3: type = "GROUP"; break;
 					default: return null;
 				}
 				
@@ -223,7 +199,7 @@ class DISCORD {
 			else if (obj.guild_id) {
 				let guild;
 				
-				for (const child of DOM.getReactProps(document.querySelector("nav header [class*='headerContent_']")).children) {
+				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;
@@ -248,7 +224,7 @@ class DISCORD {
 					}
 				};
 				
-				if (obj.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
+				if (obj.parent_id) {
 					channel["extra"]["parent"] = obj.parent_id;
 				}
 				else {
@@ -275,10 +251,10 @@ class DISCORD {
 		
 		if (dms) {
 			const currentChannel = DOM.queryReactClass("selected", dms);
-			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel_']");
+			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel-']");
 			const nextChannel = currentChannelContainer && currentChannelContainer.nextElementSibling;
 			
-			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel_")) {
+			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel-")) {
 				return false;
 			}
 			
@@ -305,7 +281,7 @@ class DISCORD {
 			let nextChannel = null;
 			
 			for (let index = 0; index < allTextChannels.length - 1; index++) {
-				if (allTextChannels[index].className.includes("selected_")) {
+				if (allTextChannels[index].className.includes("selected-")) {
 					nextChannel = allTextChannels[index + 1];
 					break;
 				}

app/Resources/Tracker/scripts/dom.js

@@ -11,7 +11,7 @@ class DOM {
 	 * Returns the first child element containing the specified obfuscated class. Parent defaults to the entire document.
 	 */
 	static queryReactClass(cls, parent) {
-		return (parent || document).querySelector(`[class*="${cls}_"]`);
+		return (parent || document).querySelector(`[class*="${cls}-"]`);
 	}
 	
 	/**