WIP

.github/FUNDING.yml

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

README.md

@@ -16,9 +16,10 @@ 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 9 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
+To start editing source code for the desktop app, install the [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
 
 ### Building
 
@@ -28,18 +29,27 @@ To build a `Release` version of the desktop app, follow the instructions for you
 
 #### Release – Windows (64-bit)
 
-1. Install Debian in WSL and open a terminal in the project folder.
+1. Install [Python 3](https://www.python.org/downloads), and ensure the `python` executable is in your `PATH`
-2. Run the `app/build.wsl.sh` script.
+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)
-3. Read the [Distribution](#distribution) section below.
 
-Note: The build script expects `dotnet.exe` to be installed in `C:\Program Files\dotnet`.
+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
-2. Run the `app/build.sh` script.
+   - On Debian and derivatives, you can install `python-is-python3`
-3. Read the [Distribution](#distribution) section below.
+   - 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.
 
 #### Distribution
 
-The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires the ASP.NET Core Runtime to be installed.
+The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires .NET 8 to be installed.
+
+Note that when building on Windows, the generated `.zip` files for Linux and Mac will not have correct file permissions, so it will not be possible to run them by double-clicking `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/.editorconfig

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

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

@@ -1,29 +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/Dialogs/NewDatabaseSettingsDialog.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
-        <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>
 
@@ -51,56 +50,9 @@
 
         <Style Selector="Expander">
             <Setter Property="MinHeight" Value="40" />
-            <Setter Property="Padding" Value="12" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
         
-        <Style Selector="TreeViewItem:not(:empty) /template/ Panel#PART_ExpandCollapseChevronContainer">
-            <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Margin" Value="0 0 5 0" />
-        </Style>
-        <Style Selector="TreeViewItem:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
-            <Setter Property="Margin" Value="10 0" />
-        </Style>
-        <Style Selector="TreeViewItem[Level=0]:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="Width" Value="0" />
-        </Style>
-        <Style Selector="TreeViewItem /template/ ToggleButton#PART_ExpandCollapseChevron">
-            <Setter Property="Width" Value="18" />
-            <Setter Property="Height" Value="32" />
-        </Style>
-        <Style Selector="TreeViewItem /template/ ToggleButton#PART_ExpandCollapseChevron > Border">
-            <Setter Property="Padding" Value="2 10 3 10" />
-        </Style>
-
-        <Style Selector="TreeView.noSelection">
-            <Style Selector="^ TreeViewItem /template/ Border#PART_LayoutRoot">
-                <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}" />
-            </Style>
-            <Style Selector="^ TreeViewItem /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
-            </Style>
-            <Style Selector="^ TreeViewItem:disabled /template/ Border#PART_LayoutRoot">
-                <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundDisabled}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushDisabled}" />
-            </Style>
-            <Style Selector="^ TreeViewItem:disabled /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
-                <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
-            </Style>
-        </Style>
-
-        <Style Selector="Panel.buttons">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel">
-            <Setter Property="ItemSpacing" Value="8" />
-        </Style>
-        <Style Selector="Panel.buttons Button">
-            <Setter Property="MinWidth" Value="80" />
-        </Style>
-
     </Application.Styles>
 
     <Application.Resources>

app/Desktop/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,31 +4,30 @@ 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 {
 			Title = "Open Database File",
 			FileTypeFilter = DatabaseFileDialogFilter,
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			AllowMultiple = true,
+			AllowMultiple = true
 		});
 	}
 
@@ -38,21 +37,21 @@ static class DatabaseGui {
 			FileTypeChoices = DatabaseFileDialogFilter,
 			SuggestedFileName = DatabaseFileInitialName,
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			ShowOverwritePrompt = false,
+			ShowOverwritePrompt = false
 		});
 	}
 
-	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
+	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) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' was opened in a newer version of DHT (database version " + ex.DatabaseVersion + ", app version " + ex.CurrentVersion + ").");
 		} catch (Exception ex) {
-			Log.Error("Could not open database file: " + path, ex);
+			Log.Error(ex);
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
 		}
 

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

app/Desktop/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

@@ -0,0 +1,61 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:checkBox="clr-namespace:DHT.Desktop.App.Dialogs.CheckBox"
+        mc:Ignorable="d" d:DesignWidth="500"
+        x:Class="DHT.Desktop.App.Dialogs.CheckBox.CheckBoxDialog"
+        Title="{Binding Title}"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Width="500" SizeToContent="Height" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Window.DataContext>
+        <checkBox:CheckBoxDialogModel />
+    </Window.DataContext>
+
+    <Window.Styles>
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+        <Style Selector="Panel.buttons Button">
+            <Setter Property="MinWidth" Value="80" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.left Button">
+            <Setter Property="Margin" Value="0 0 8 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right Button">
+            <Setter Property="Margin" Value="8 0 0 0" />
+        </Style>
+    </Window.Styles>
+
+    <StackPanel Margin="20">
+        <ScrollViewer MaxHeight="400">
+            <ItemsRepeater ItemsSource="{Binding Items}">
+                <ItemsRepeater.ItemTemplate>
+                    <DataTemplate>
+                        <CheckBox IsChecked="{Binding Checked}">
+                            <Label>
+                                <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
+                            </Label>
+                        </CheckBox>
+                    </DataTemplate>
+                </ItemsRepeater.ItemTemplate>
+            </ItemsRepeater>
+        </ScrollViewer>
+        <Panel Classes="buttons">
+            <WrapPanel Classes="left">
+                <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
+                <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
+            </WrapPanel>
+            <WrapPanel Classes="right">
+                <Button Click="ClickOk">OK</Button>
+                <Button Click="ClickCancel">Cancel</Button>
+            </WrapPanel>
+        </Panel>
+    </StackPanel>
+
+</Window>

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

@@ -0,0 +1,21 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using DHT.Desktop.App.Dialogs.Message;
+
+namespace DHT.Desktop.App.Dialogs.CheckBox;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class CheckBoxDialog : Window {
+	public CheckBoxDialog() {
+		InitializeComponent();
+	}
+
+	public void ClickOk(object? sender, RoutedEventArgs e) {
+		Close(DialogResult.OkCancel.Ok);
+	}
+
+	public void ClickCancel(object? sender, RoutedEventArgs e) {
+		Close(DialogResult.OkCancel.Cancel);
+	}
+}

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

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

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

@@ -0,0 +1,24 @@
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Dialogs.CheckBox;
+
+class CheckBoxItem : BaseModel {
+	public string Title { get; init; } = "";
+	public object? Item { get; init; } = null;
+
+	private bool isChecked = false;
+
+	public bool Checked {
+		get => isChecked;
+		set => Change(ref isChecked, value);
+	}
+}
+
+sealed class CheckBoxItem<T> : CheckBoxItem {
+	public new T Item { get; }
+
+	public CheckBoxItem(T item) {
+		this.Item = item;
+		base.Item = item;
+	}
+}

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

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

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

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

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

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

@@ -0,0 +1,42 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:message="clr-namespace:DHT.Desktop.App.Dialogs.Message"
+        mc:Ignorable="d" d:DesignWidth="500"
+        x:Class="DHT.Desktop.App.Dialogs.Message.MessageDialog"
+        Title="{Binding Title}"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Width="500" SizeToContent="Height" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Window.DataContext>
+        <message:MessageDialogModel />
+    </Window.DataContext>
+
+    <Window.Styles>
+        <Style Selector="TextBlock">
+            <Setter Property="FontSize" Value="15" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+        </Style>
+        <Style Selector="WrapPanel">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="Margin" Value="0 8 0 0" />
+        </Style>
+        <Style Selector="Button">
+            <Setter Property="Margin" Value="8 0 0 0" />
+            <Setter Property="MinWidth" Value="80" />
+        </Style>
+    </Window.Styles>
+
+    <StackPanel Margin="20">
+        <TextBlock Text="{Binding Message}" />
+        <WrapPanel>
+            <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
+            <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
+            <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
+            <Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
+        </WrapPanel>
+    </StackPanel>
+
+</Window>

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

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

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>
+        <DockPanel>
-            <DataTemplate>
+            <TextBlock DockPanel.Dock="Right" Text="{Binding Items}" Classes="items" />
-                <StackPanel Margin="20 10" IsHitTestVisible="{Binding IsVisible}" Opacity="{Binding Opacity}">
+            <TextBlock DockPanel.Dock="Left" Text="{Binding Message}" />
-                    <DockPanel>
+        </DockPanel>
-                        <TextBlock DockPanel.Dock="Right" Text="{Binding Items}" Classes="items" />
+        <ProgressBar Value="{Binding Progress}" />
-                        <TextBlock DockPanel.Dock="Left" Text="{Binding Message}" />
+    </StackPanel>
-                    </DockPanel>
-                    <ProgressBar IsIndeterminate="{Binding IsIndeterminate}" 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,19 +2,31 @@
         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>
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+        <Style Selector="Panel.buttons Button">
+            <Setter Property="MinWidth" Value="80" />
+            <Setter Property="Margin" Value="8 0 0 0" />
+        </Style>
+    </Window.Styles>
+
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
             <StackPanel Spacing="10">
@@ -34,7 +46,7 @@
             </StackPanel>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel HorizontalAlignment="Right">
+            <WrapPanel Classes="right">
                 <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

app/Desktop/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

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

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

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

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

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

app/Desktop/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

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

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

@@ -0,0 +1,32 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+
+namespace DHT.Desktop.App.Pages;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class TrackingPage : UserControl {
+	private bool isCopyingScript;
+
+	public TrackingPage() {
+		InitializeComponent();
+	}
+
+	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+		if (DataContext is TrackingPageModel model) {
+			var originalText = CopyTrackingScript.Content;
+			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;
+
+			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
+				isCopyingScript = true;
+				CopyTrackingScript.Content = "Script Copied!";
+
+				await Task.Delay(TimeSpan.FromSeconds(2));
+				CopyTrackingScript.Content = originalText;
+				isCopyingScript = false;
+			}
+		}
+	}
+}

app/Desktop/App/Pages/TrackingPageModel.cs

@@ -0,0 +1,115 @@
+using System;
+using System.Threading.Tasks;
+using System.Web;
+using Avalonia.Controls;
+using DHT.Desktop.App.Dialogs.Message;
+using DHT.Desktop.Discord;
+using DHT.Desktop.Server;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.App.Pages;
+
+sealed class TrackingPageModel : BaseModel {
+	private bool areDevToolsEnabled;
+
+	private bool AreDevToolsEnabled {
+		get => areDevToolsEnabled;
+		set {
+			Change(ref areDevToolsEnabled, value);
+			OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
+		}
+	}
+
+	public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
+
+	public string ToggleAppDevToolsButtonText {
+		get {
+			if (!IsToggleAppDevToolsButtonEnabled) {
+				return "Unavailable";
+			}
+
+			return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+		}
+	}
+
+	private readonly Window window;
+
+	[Obsolete("Designer")]
+	public TrackingPageModel() : this(null!) {}
+
+	public TrackingPageModel(Window window) {
+		this.window = window;
+	}
+
+	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() {
+		string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
+		string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerManager.Port + ";")
+		                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(ServerManager.Token))
+		                         .Replace("/*[IMPORTS]*/", await Resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
+		                         .Replace("/*[CSS-CONTROLLER]*/", await Resources.ReadTextAsync("Tracker/styles/controller.css"))
+		                         .Replace("/*[CSS-SETTINGS]*/", await Resources.ReadTextAsync("Tracker/styles/settings.css"));
+
+		var clipboard = window.Clipboard;
+		if (clipboard == null) {
+			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
+			return false;
+		}
+
+		try {
+			await clipboard.SetTextAsync(script);
+			return true;
+		} catch {
+			await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
+			return false;
+		}
+	}
+
+	public async void OnClickToggleAppDevTools() {
+		const string DialogTitle = "Discord App Settings File";
+
+		bool oldState = AreDevToolsEnabled;
+		bool newState = !oldState;
+
+		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
+			case SettingsJsonResult.Success:
+				AreDevToolsEnabled = newState;
+				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
+				break;
+
+			case SettingsJsonResult.AlreadySet:
+				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
+				AreDevToolsEnabled = newState;
+				break;
+
+			case SettingsJsonResult.FileNotFound:
+				await Dialog.ShowOk(window, DialogTitle, "Cannot find the settings file:\n" + DiscordAppSettings.JsonFilePath);
+				break;
+
+			case SettingsJsonResult.ReadError:
+				await Dialog.ShowOk(window, DialogTitle, "Cannot read the settings file:\n" + DiscordAppSettings.JsonFilePath);
+				break;
+
+			case SettingsJsonResult.InvalidJson:
+				await Dialog.ShowOk(window, DialogTitle, "Unknown format of the settings file:\n" + DiscordAppSettings.JsonFilePath);
+				break;
+
+			case SettingsJsonResult.WriteError:
+				await Dialog.ShowOk(window, DialogTitle, "Cannot save the settings file:\n" + DiscordAppSettings.JsonFilePath);
+				break;
+
+			default:
+				throw new ArgumentOutOfRangeException();
+		}
+	}
+}

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

@@ -0,0 +1,40 @@
+<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:screens="clr-namespace:DHT.Desktop.App.Screens"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="DHT.Desktop.App.Screens.WelcomeScreen">
+
+    <Design.DataContext>
+        <screens:WelcomeScreenModel />
+    </Design.DataContext>
+
+    <UserControl.Background>
+        <SolidColorBrush>#546A9F</SolidColorBrush>
+    </UserControl.Background>
+
+    <UserControl.Styles>
+        <Style Selector="Panel#RootPanel">
+            <Setter Property="Background" Value="#FFFFFF" />
+            <Setter Property="Margin" Value="20" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style Selector="Button">
+            <Setter Property="Margin" Value="5 0" />
+        </Style>
+    </UserControl.Styles>
+
+    <Panel Name="RootPanel">
+        <StackPanel Margin="42">
+            <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
+
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <Button Command="{Binding OpenOrCreateDatabase}">Open or Create Database</Button>
+                <Button Command="{Binding ShowAboutDialog}">About</Button>
+                <Button Command="{Binding Exit}">Exit</Button>
+            </StackPanel>
+        </StackPanel>
+    </Panel>
+</UserControl>

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

@@ -0,0 +1,67 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:windows="clr-namespace:DHT.Desktop.App.Windows"
+        mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
+        x:Class="DHT.Desktop.App.Windows.AboutWindow"
+        Title="About Discord History Tracker"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Width="480" Height="295" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Design.DataContext>
+        <windows:AboutWindowModel />
+    </Design.DataContext>
+
+    <Window.Styles>
+        <Style Selector="StackPanel">
+            <Setter Property="Orientation" Value="Horizontal" />
+            <Setter Property="Spacing" Value="5" />
+        </Style>
+        <Style Selector="TextBlock">
+            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style Selector="Grid > Button">
+            <Setter Property="Margin" Value="0 4" />
+            <Setter Property="Padding" Value="8 4" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+        </Style>
+    </Window.Styles>
+
+    <StackPanel Orientation="Vertical" Margin="20" Spacing="12">
+
+        <TextBlock VerticalAlignment="Center">
+            Discord History Tracker was created by chylex and released under the MIT license.
+        </TextBlock>
+
+        <StackPanel>
+            <Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
+            <Button Command="{Binding ShowSourceCode}">Source Code</Button>
+        </StackPanel>
+
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
+            <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Third-Party Software</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
+
+            <TextBlock Grid.Row="2" Grid.Column="0">.NET 8</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="1">MIT</TextBlock>
+            <Button Grid.Row="2" Grid.Column="2" Command="{Binding ShowLibraryNetCore}">GitHub</Button>
+
+            <TextBlock Grid.Row="3" Grid.Column="0">Avalonia</TextBlock>
+            <TextBlock Grid.Row="3" Grid.Column="1">MIT</TextBlock>
+            <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">NuGet</Button>
+
+            <TextBlock Grid.Row="4" Grid.Column="0">SQLite</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="1">Public Domain</TextBlock>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</Button>
+
+            <TextBlock Grid.Row="5" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
+            <TextBlock Grid.Row="5" Grid.Column="1">Apache-2.0</TextBlock>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
+        </Grid>
+
+    </StackPanel>
+</Window>

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

@@ -0,0 +1,33 @@
+using System.Diagnostics;
+
+namespace DHT.Desktop.App.Windows;
+
+sealed class AboutWindowModel {
+	public void ShowOfficialWebsite() {
+		OpenUrl("https://dht.chylex.com");
+	}
+
+	public void ShowSourceCode() {
+		OpenUrl("https://github.com/chylex/Discord-History-Tracker");
+	}
+
+	public void ShowLibraryAvalonia() {
+		OpenUrl("https://www.nuget.org/packages/Avalonia");
+	}
+
+	public void ShowLibrarySqlite() {
+		OpenUrl("https://www.sqlite.org");
+	}
+
+	public void ShowLibrarySqliteAdoNet() {
+		OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
+	}
+
+	public void ShowLibraryNetCore() {
+		OpenUrl("https://github.com/dotnet/core");
+	}
+
+	private static void OpenUrl(string url) {
+		Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
+	}
+}

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,4 +1,4 @@
-using System.Collections.Generic;
+using System;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop;
@@ -6,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 ([]);
-	
-	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;
 			}
@@ -50,11 +42,11 @@ sealed class Arguments {
 					continue;
 
 				case "-port": {
-					if (!ushort.TryParse(value, out ushort port)) {
+					if (ushort.TryParse(value, out var port)) {
-						Log.Warn("Invalid port number: " + value);
+						ServerPort = port;
 					}
 					else {
-						ServerPort = port;
+						Log.Warn("Invalid port number: " + value);
 					}
 
 					continue;
@@ -64,20 +56,6 @@ sealed class Arguments {
 					ServerToken = value;
 					continue;
 
-				case "-concurrentdownloads":
-					if (!ulong.TryParse(value, out ulong concurrentDownloads) || concurrentDownloads == 0) {
-						Log.Warn("Invalid concurrent downloads count: " + value);
-					}
-					else if (concurrentDownloads > 10) {
-						Log.Warn("Limiting concurrent downloads to 10.");
-						ConcurrentDownloads = 10;
-					}
-					else {
-						ConcurrentDownloads = (byte) concurrentDownloads;
-					}
-					
-					continue;
-				
 				default:
 					Log.Warn("Unknown command line argument: " + key);
 					break;

app/Desktop/Common/AvaloniaReflection.cs

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

app/Desktop/Common/SystemUtils.cs

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

app/Desktop/Desktop.csproj

@@ -1,47 +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.3.0" />
+    <PackageReference Include="Avalonia" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
-    <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
-  
   <ItemGroup>
     <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/CheckBox/CheckBoxDialog.axaml

@@ -1,51 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.CheckBox"
-        mc:Ignorable="d" d:DesignWidth="500"
-        x:Class="DHT.Desktop.Dialogs.CheckBox.CheckBoxDialog"
-        x:DataType="namespace:CheckBoxDialogModel"
-        Title="{Binding Title}"
-        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        MinWidth="425" MinHeight="200"
-        Width="500" Height="395" CanResize="True"
-        WindowStartupLocation="CenterOwner">
-
-    <Window.DataContext>
-        <namespace:CheckBoxDialogModel />
-    </Window.DataContext>
-
-    <Window.Styles>
-        <Style Selector="TreeViewItem">
-            <Setter Property="IsExpanded" Value="True" />
-        </Style>
-    </Window.Styles>
-
-    <DockPanel Margin="20 17 20 20">
-        <Panel Classes="buttons" DockPanel.Dock="Bottom">
-            <WrapPanel>
-                <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
-                <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
-            </WrapPanel>
-            <WrapPanel HorizontalAlignment="Right">
-                <Button Click="ClickOk">OK</Button>
-                <Button Click="ClickCancel">Cancel</Button>
-            </WrapPanel>
-        </Panel>
-        <ScrollViewer DockPanel.Dock="Top">
-            <TreeView Name="TreeView" Classes="noSelection" ItemsSource="{Binding RootItems}" ContainerPrepared="TreeViewOnContainerPrepared">
-                <TreeView.ItemTemplate>
-                    <TreeDataTemplate ItemsSource="{Binding Children}">
-                        <CheckBox IsChecked="{Binding IsChecked}">
-                            <Label>
-                                <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
-                            </Label>
-                        </CheckBox>
-                    </TreeDataTemplate>
-                </TreeView.ItemTemplate>
-            </TreeView>
-        </ScrollViewer>
-    </DockPanel>
-
-</Window>

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

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

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

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

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

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

app/Desktop/Dialogs/CheckBox/CheckBoxItemList.cs

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

app/Desktop/Dialogs/Message/MessageDialog.axaml

@@ -1,37 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.Message"
-        mc:Ignorable="d" d:DesignWidth="500"
-        x:Class="DHT.Desktop.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 />
-    </Window.DataContext>
-
-    <Window.Styles>
-        <Style Selector="TextBlock">
-            <Setter Property="FontSize" Value="15" />
-            <Setter Property="TextWrapping" Value="Wrap" />
-        </Style>
-    </Window.Styles>
-
-    <StackPanel Margin="20">
-        <TextBlock Text="{Binding Message}" />
-        <Panel Classes="buttons">
-            <WrapPanel HorizontalAlignment="Right">
-                <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
-                <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
-                <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>
-                <Button Click="ClickCancel" IsVisible="{Binding IsCancelVisible}">Cancel</Button>
-            </WrapPanel>
-        </Panel>
-    </StackPanel>
-
-</Window>

app/Desktop/Dialogs/Progress/DelayedProgressDialog.cs

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

app/Desktop/Dialogs/Progress/IProgressCallback.cs

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

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

@@ -1,80 +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 {
-	private static readonly TimeSpan MinimumShowDuration = TimeSpan.FromMilliseconds(500);
-	
-	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
-		var dialog = new ProgressDialog();
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => await action(dialog, callbacks[0]));
-		await dialog.ShowProgressDialog(owner);
-	}
-	
-	internal static async Task<T> Show<T>(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task<T>> action) {
-		var taskCompletionSource = new TaskCompletionSource<T>();
-		var dialog = new ProgressDialog();
-		
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			taskCompletionSource.SetResult(await action(dialog, callbacks[0]));
-		});
-		
-		await dialog.ShowProgressDialog(owner);
-		return await taskCompletionSource.Task;
-	}
-	
-	internal static Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
-		return Show(owner, title, async (dialog, callback) => {
-			await callback.UpdateIndeterminate(message);
-			await action(dialog);
-		});
-	}
-	
-	internal static Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
-		return Show<T>(owner, title, async (dialog, callback) => {
-			await callback.UpdateIndeterminate(message);
-			return await action(dialog);
-		});
-	}
-	
-	private bool isFinished = false;
-	private DateTime startTime = DateTime.Now;
-	private Task progressTask = Task.CompletedTask;
-	
-	public ProgressDialog() {
-		InitializeComponent();
-	}
-	
-	public void OnOpened(object? sender, EventArgs e) {
-		startTime = DateTime.Now;
-		
-		if (DataContext is ProgressDialogModel model) {
-			progressTask = Task.Run(model.StartTask);
-			progressTask.ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
-		}
-	}
-	
-	public void OnClosing(object? sender, WindowClosingEventArgs e) {
-		e.Cancel = !isFinished;
-	}
-	
-	private async Task OnFinished(Task task) {
-		isFinished = true;
-		
-		TimeSpan elapsedTime = DateTime.Now - startTime;
-		if (elapsedTime < MinimumShowDuration) {
-			await Task.Delay(MinimumShowDuration - elapsedTime);
-		}
-		
-		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; } = [];
-	
-	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(start: 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, long finishedItems, long totalItems) {
-			await Dispatcher.UIThread.InvokeAsync(() => {
-				item.Message = message;
-				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
-				item.Progress = totalItems == 0 ? 0 : 100 * finishedItems / totalItems;
-				item.IsIndeterminate = false;
-			});
-		}
-		
-		public async Task UpdateIndeterminate(string message) {
-			await Dispatcher.UIThread.InvokeAsync(() => {
-				item.Message = message;
-				item.Items = string.Empty;
-				item.Progress = 0;
-				item.IsIndeterminate = true;
-			});
-		}
-		
-		public Task Hide() {
-			return Update(string.Empty, finishedItems: 0, totalItems: 0);
-		}
-	}
-}

app/Desktop/Dialogs/Progress/ProgressItem.cs

@@ -1,23 +0,0 @@
-using PropertyChanged.SourceGenerator;
-
-namespace DHT.Desktop.Dialogs.Progress;
-
-sealed partial class ProgressItem {
-	[Notify]
-	private string message = "";
-	
-	[Notify]
-	private string items = "";
-	
-	[Notify]
-	private long progress = 0L;
-	
-	[Notify]
-	private bool isIndeterminate;
-	
-	[DependsOn(nameof(Message))]
-	public bool IsVisible => !string.IsNullOrEmpty(Message);
-	
-	[DependsOn(nameof(IsVisible))]
-	public double Opacity => IsVisible ? 1.0 : 0.0;
-}

app/Desktop/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,20 +39,18 @@ static class DiscordAppSettings {
 
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-			JsonObject settingsJson = await ReadSettingsJson();
+			return AreDevToolsEnabled(await ReadSettingsJson());
-			return AreDevToolsEnabled(settingsJson);
+		} catch (Exception) {
-		} catch (Exception e) {
-			Log.Error("Could not read settings file.", e);
 			return null;
 		}
 	}
 
-	private static bool AreDevToolsEnabled(JsonObject json) {
+	private static bool AreDevToolsEnabled(Dictionary<string, object?> json) {
-		return json.TryGetPropertyValue(JsonKeyDevTools, out JsonNode? 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();
@@ -61,7 +59,7 @@ static class DiscordAppSettings {
 		} catch (JsonException) {
 			return SettingsJsonResult.InvalidJson;
 		} catch (Exception e) {
-			Log.Error("Could not read settings file.", e);
+			Log.Error(e);
 			return SettingsJsonResult.ReadError;
 		}
 
@@ -83,14 +81,16 @@ static class DiscordAppSettings {
 
 			await WriteSettingsJson(json);
 		} catch (Exception e) {
-			Log.Error("Could not write settings file.", e);
+			Log.Error("An error occurred when writing settings file.");
+			Log.Error(e);
 
 			if (File.Exists(JsonBackupFilePath)) {
 				try {
-					File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
+					File.Move(JsonBackupFilePath, JsonFilePath, true);
 					Log.Info("Restored settings file from backup.");
 				} catch (Exception e2) {
-					Log.Error("Could not restore settings file from backup.", e2);
+					Log.Error("Cannot restore settings file from backup.");
+					Log.Error(e2);
 				}
 			}
 
@@ -100,19 +100,20 @@ static class DiscordAppSettings {
 		try {
 			File.Delete(JsonBackupFilePath);
 		} catch (Exception e) {
-			Log.Error("Could not delete backup file.", e);
+			Log.Error("Cannot delete backup file.");
+			Log.Error(e);
 		}
 
 		return SettingsJsonResult.Success;
 	}
 
-	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/Discord/SettingsJsonResult.cs

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

app/Desktop/Main/AboutWindow.axaml

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

app/Desktop/Main/AboutWindowModel.cs

@@ -1,45 +0,0 @@
-using DHT.Desktop.Common;
-
-namespace DHT.Desktop.Main;
-
-sealed class AboutWindowModel {
-	public void OpenOfficialWebsite() {
-		SystemUtils.OpenUrl(Program.Website);
-	}
-	
-	public void OpenIssueTracker() {
-		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker/issues");
-	}
-	
-	public void OpenSourceCode() {
-		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker");
-	}
-	
-	public void OpenThirdPartyNetCore() {
-		SystemUtils.OpenUrl("https://github.com/dotnet/core");
-	}
-	
-	public void OpenThirdPartyAvalonia() {
-		SystemUtils.OpenUrl("https://github.com/AvaloniaUI/Avalonia");
-	}
-	
-	public void OpenThirdPartyPropertyChangedSourceGenerator() {
-		SystemUtils.OpenUrl("https://github.com/canton7/PropertyChanged.SourceGenerator");
-	}
-	
-	public void OpenThirdPartySqlite() {
-		SystemUtils.OpenUrl("https://www.sqlite.org");
-	}
-	
-	public void OpenThirdPartyMicrosoftDataSqlite() {
-		SystemUtils.OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
-	}
-	
-	public void OpenThirdPartyRxNet() {
-		SystemUtils.OpenUrl("https://github.com/dotnet/reactive");
-	}
-	
-	public void OpenThirdPartyBetterDiscord() {
-		SystemUtils.OpenUrl("https://github.com/BetterDiscord/BetterDiscord");
-	}
-}

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

@@ -1,48 +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="Spacing" Value="4" />
-        </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 Spacing="20">
-        <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel ItemSpacing="40" LineSpacing="20">
-            <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,170 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.ReactiveUI;
-using DHT.Desktop.Common;
-using DHT.Server;
-using DHT.Server.Data.Filters;
-using DHT.Server.Data.Settings;
-using DHT.Utils.Logging;
-using DHT.Utils.Tasks;
-using PropertyChanged.SourceGenerator;
-
-namespace DHT.Desktop.Main.Controls;
-
-sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
-	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
-	
-	public sealed record Unit(string Name, uint Scale);
-	
-	private static readonly Unit[] AllUnits = [
-		new Unit("B", Scale: 1),
-		new Unit("kB", Scale: 1024),
-		new Unit("MB", Scale: 1024 * 1024)
-	];
-	
-	private static readonly HashSet<string> FilterProperties = [
-		nameof(LimitSize),
-		nameof(MaximumSize),
-		nameof(MaximumSizeUnit),
-	];
-	
-	[Notify(Setter.Private)]
-	private string filterStatisticsText = "";
-	
-	[Notify]
-	private bool limitSize = false;
-	
-	[Notify]
-	private ulong maximumSize = 0UL;
-	
-	[Notify]
-	private Unit maximumSizeUnit = AllUnits[0];
-	
-	public IEnumerable<Unit> Units => AllUnits;
-	
-	private readonly State state;
-	private readonly string verb;
-	
-	private readonly DelayedThrottledTask<FilterSettings> saveFilterSettingsTask;
-	private bool isLoadingFilterSettings;
-	
-	private readonly RestartableTask<long> downloadItemCountTask;
-	private long? matchingItemCount;
-	
-	private readonly IDisposable downloadItemCountSubscription;
-	private long? totalItemCount;
-	
-	[Obsolete("Designer")]
-	public DownloadItemFilterPanelModel() : this(State.Dummy) {}
-	
-	public DownloadItemFilterPanelModel(State state, string verb = "Matches") {
-		this.state = state;
-		this.verb = verb;
-		
-		this.saveFilterSettingsTask = new DelayedThrottledTask<FilterSettings>(Log, TimeSpan.FromSeconds(5), SaveFilterSettings);
-		
-		this.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
-		this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
-		
-		UpdateFilterStatistics();
-		
-		PropertyChanged += OnPropertyChanged;
-	}
-	
-	public async Task Initialize() {
-		isLoadingFilterSettings = true;
-		
-		LimitSize = await state.Db.Settings.Get(SettingsKey.DownloadsLimitSize, LimitSize);
-		MaximumSize = await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSize, MaximumSize);
-		
-		if (await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSizeUnit, defaultValue: null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
-			MaximumSizeUnit = unitValue;
-		}
-		
-		isLoadingFilterSettings = false;
-	}
-	
-	public async ValueTask DisposeAsync() {
-		saveFilterSettingsTask.Dispose();
-		
-		downloadItemCountTask.Cancel();
-		downloadItemCountSubscription.Dispose();
-		
-		await SaveFilterSettings(new FilterSettings(this));
-	}
-	
-	private sealed record FilterSettings(bool LimitSize, ulong MaximumSize, Unit MaximumSizeUnit) {
-		public FilterSettings(DownloadItemFilterPanelModel model) : this(model.LimitSize, model.MaximumSize, model.MaximumSizeUnit) {}
-	}
-	
-	private async Task SaveFilterSettings(FilterSettings settings) {
-		try {
-			await state.Db.Settings.Set(async setter => {
-				await setter.Set(SettingsKey.DownloadsLimitSize, settings.LimitSize);
-				await setter.Set(SettingsKey.DownloadsMaximumSize, settings.MaximumSize);
-				await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
-			});
-		} catch (Exception e) {
-			Log.Error("Could not save download filter settings.", e);
-		}
-	}
-	
-	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
-			if (!isLoadingFilterSettings) {
-				saveFilterSettingsTask.Post(new FilterSettings(this));
-			}
-			
-			UpdateFilterStatistics();
-		}
-	}
-	
-	private void OnDownloadItemCountChanged(long newItemCount) {
-		totalItemCount = newItemCount;
-		UpdateFilterStatistics();
-	}
-	
-	
-	private void UpdateFilterStatistics() {
-		DownloadItemFilter filter = CreateFilter();
-		if (filter.IsEmpty) {
-			downloadItemCountTask.Cancel();
-			matchingItemCount = totalItemCount;
-			UpdateFilterStatisticsText();
-		}
-		else {
-			matchingItemCount = null;
-			UpdateFilterStatisticsText();
-			downloadItemCountTask.Restart(cancellationToken => state.Db.Downloads.Count(filter, cancellationToken));
-		}
-	}
-	
-	private void SetMatchingCount(long matchingAttachmentCount) {
-		this.matchingItemCount = matchingAttachmentCount;
-		UpdateFilterStatisticsText();
-	}
-	
-	private void UpdateFilterStatisticsText() {
-		string matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
-		string totalItemCountStr = totalItemCount?.Format() ?? "(...)";
-		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
-	}
-	
-	public DownloadItemFilter CreateFilter() {
-		DownloadItemFilter filter = new ();
-		
-		if (LimitSize) {
-			try {
-				filter.MaxBytes = maximumSize * maximumSizeUnit.Scale;
-			} catch (ArithmeticException) {
-				// set no size limit, because the overflown size is larger than any file could possibly be
-			}
-		}
-		
-		return filter;
-	}
-}

app/Desktop/Main/Controls/MessageFilterPanel.axaml

@@ -1,60 +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="Spacing" Value="4" />
-        </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 Spacing="20">
-        <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel ItemSpacing="40" LineSpacing="20">
-            <StackPanel>
-                <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
-                <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">
-                    <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,27 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using Avalonia.Controls;
-
-namespace DHT.Desktop.Main.Controls;
-
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class MessageFilterPanel : UserControl {
-	public MessageFilterPanel() {
-		InitializeComponent();
-		
-		CultureInfo culture = Program.Culture;
-		foreach (CalendarDatePicker picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
-			picker.FirstDayOfWeek = culture.DateTimeFormat.FirstDayOfWeek;
-			picker.SelectedDateFormat = CalendarDatePickerFormat.Custom;
-			picker.CustomDateFormatString = culture.DateTimeFormat.ShortDatePattern;
-			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,324 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.ReactiveUI;
-using DHT.Desktop.Common;
-using DHT.Desktop.Dialogs.CheckBox;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
-using DHT.Server;
-using DHT.Server.Data;
-using DHT.Server.Data.Filters;
-using DHT.Utils.Tasks;
-using PropertyChanged.SourceGenerator;
-
-namespace DHT.Desktop.Main.Controls;
-
-sealed partial class MessageFilterPanelModel : IDisposable {
-	private static readonly HashSet<string> FilterProperties = [
-		nameof(FilterByDate),
-		nameof(StartDate),
-		nameof(EndDate),
-		nameof(FilterByChannel),
-		nameof(IncludedChannels),
-		nameof(FilterByUser),
-		nameof(IncludedUsers),
-	];
-	
-	public event PropertyChangedEventHandler? FilterPropertyChanged;
-	
-	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
-	
-	[Notify]
-	private string filterStatisticsText = "";
-	
-	[Notify]
-	private bool filterByDate = false;
-	
-	[Notify]
-	private DateTime? startDate = null;
-	
-	[Notify]
-	private DateTime? endDate = null;
-	
-	[Notify]
-	private bool filterByChannel = false;
-	
-	[Notify]
-	private HashSet<ulong>? includedChannels = null;
-	
-	[Notify]
-	private bool filterByUser = false;
-	
-	[Notify]
-	private HashSet<ulong>? includedUsers = null;
-	
-	[Notify]
-	private string channelFilterLabel = "";
-	
-	[Notify]
-	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() {
-		MessageFilter 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() {
-		string exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
-		string totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
-		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
-	}
-	
-	[SuppressMessage("ReSharper", "NotAccessedPositionalProperty.Local")]
-	[SuppressMessage("ReSharper", "MemberCanBePrivate.Local")]
-	private readonly record struct ChannelFilterKey(byte Type, ulong? ServerId, string Title) : IComparable<ChannelFilterKey> {
-		public static ChannelFilterKey DirectMessages { get; } = new (Type: 1, ServerId: null, Title: "Direct Messages");
-		public static ChannelFilterKey GroupMessages { get; } = new (Type: 2, ServerId: null, Title: "Group Messages");
-		public static ChannelFilterKey Unknown { get; } = new (Type: 4, ServerId: null, Title: "Unknown");
-		
-		public static ChannelFilterKey For(DHT.Server.Data.Server server) {
-			return server.Type switch {
-				ServerType.Server        => new ChannelFilterKey(Type: 3, server.Id, "Server - " + server.Name),
-				ServerType.Group         => GroupMessages,
-				ServerType.DirectMessage => DirectMessages,
-				_                        => Unknown,
-			};
-		}
-		
-		public bool Equals(ChannelFilterKey other) {
-			return Type == other.Type && ServerId == other.ServerId;
-		}
-		
-		public override int GetHashCode() {
-			return HashCode.Combine(Type, ServerId);
-		}
-		
-		public int CompareTo(ChannelFilterKey other) {
-			int result = Type.CompareTo(other.Type);
-			if (result != 0) {
-				return result;
-			}
-			else {
-				return Title.CompareTo(other.Title);
-			}
-		}
-	}
-	
-	public async Task OpenChannelFilterDialog() {
-		async Task<ImmutableArray<ICheckBoxItem>> PrepareChannelItems(ProgressDialog dialog) {
-			CheckBoxItemList<ChannelFilterKey, ulong> items = new CheckBoxItemList<ChannelFilterKey, ulong>();
-			Dictionary<ulong, DHT.Server.Data.Server> servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
-			
-			foreach (ChannelFilterKey channelFilterKey in servers.Values.Select(ChannelFilterKey.For).Order()) {
-				items.AddParent(channelFilterKey, channelFilterKey.Title);
-			}
-			
-			await foreach (Channel channel in state.Db.Channels.Get().OrderBy(static channel => channel.Position ?? int.MinValue).ThenBy(static channel => channel.Name)) {
-				ChannelFilterKey key = servers.TryGetValue(channel.Server, out var server)
-					                       ? ChannelFilterKey.For(server)
-					                       : ChannelFilterKey.Unknown;
-				
-				items.Add(key, channel.Id, channel.Name, isChecked: IncludedChannels == null || IncludedChannels.Contains(channel.Id));
-			}
-			
-			return items.ToCheckBoxItems();
-		}
-		
-		const string Title = "Included Channels";
-		
-		ImmutableArray<ICheckBoxItem> items;
-		try {
-			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading channels...", PrepareChannelItems);
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, Title, "Error loading channels: " + e.Message);
-			return;
-		}
-		
-		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
-		if (result != null) {
-			IncludedChannels = result;
-		}
-	}
-	
-	public async Task OpenUserFilterDialog() {
-		async Task<ImmutableArray<ICheckBoxItem>> PrepareUserItems(ProgressDialog dialog) {
-			CheckBoxItemList<ulong, ulong> items = new CheckBoxItemList<ulong, ulong>();
-			
-			static string GetDisplayName(User user) {
-				return user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})";
-			}
-			
-			await foreach ((ulong id, string name) in state.Db.Users.Get().Select(static user => (user.Id, GetDisplayName(user))).OrderBy(static pair => pair.Item2)) {
-				items.Add(
-					value: id,
-					title: name,
-					isChecked: IncludedUsers == null || IncludedUsers.Contains(id)
-				);
-			}
-			
-			return items.ToCheckBoxItems();
-		}
-		
-		const string Title = "Included Users";
-		
-		ImmutableArray<ICheckBoxItem> items;
-		try {
-			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, Title, "Error loading users: " + e.Message);
-			return;
-		}
-		
-		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
-		if (result != null) {
-			IncludedUsers = result;
-		}
-	}
-	
-	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, ImmutableArray<ICheckBoxItem> items) {
-		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.SelectedValues.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.ComponentModel;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Threading;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Server;
-using DHT.Server;
-using DHT.Server.Service;
-using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
-
-namespace DHT.Desktop.Main.Controls;
-
-sealed partial class ServerConfigurationPanelModel : IDisposable {
-	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
-	
-	[Notify]
-	private string inputPort;
-	
-	[Notify]
-	private string inputToken;
-	
-	[DependsOn(nameof(InputPort), nameof(InputToken))]
-	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
-	
-	[Notify(Setter.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(new PropertyChangedEventArgs(nameof(ToggleServerButtonText)));
-	}
-	
-	private async Task StartServer() {
-		IsToggleServerButtonEnabled = false;
-		
-		try {
-			await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
-		} catch (Exception e) {
-			Log.Error("Could not start internal server.", e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
-		IsToggleServerButtonEnabled = true;
-	}
-	
-	private async Task StopServer() {
-		IsToggleServerButtonEnabled = false;
-		
-		try {
-			await server.Stop();
-		} catch (Exception e) {
-			Log.Error("Could not stop internal server.", e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
-		IsToggleServerButtonEnabled = true;
-	}
-	
-	public async Task OnClickToggleServerButton() {
-		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(new PropertyChangedEventArgs(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 DHT.Server;
-using DHT.Server.Service;
-using PropertyChanged.SourceGenerator;
-
-namespace DHT.Desktop.Main.Controls;
-
-sealed partial class StatusBarModel : IDisposable {
-	[Notify(Setter.Private)]
-	private long? serverCount;
-	
-	[Notify(Setter.Private)]
-	private long? channelCount;
-	
-	[Notify(Setter.Private)]
-	private long? messageCount;
-	
-	[Notify(Setter.Private)]
-	private ServerManager.Status serverStatus;
-	
-	[DependsOn(nameof(ServerStatus))]
-	public string ServerStatusText => ServerStatus switch {
-		ServerManager.Status.Starting => "STARTING",
-		ServerManager.Status.Started  => "READY",
-		ServerManager.Status.Stopping => "STOPPING",
-		ServerManager.Status.Stopped  => "STOPPED",
-		_                             => "",
-	};
-	
-	private readonly State state;
-	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 += OnStateServerStatusChanged;
-		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
-	}
-	
-	public void Dispose() {
-		serverCountSubscription.Dispose();
-		channelCountSubscription.Dispose();
-		messageCountSubscription.Dispose();
-		
-		state.Server.StatusChanged -= OnStateServerStatusChanged;
-	}
-	
-	private void OnStateServerStatusChanged(object? sender, ServerManager.Status e) {
-		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
-	}
-}

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml

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

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

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

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialogModel.cs

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

app/Desktop/Main/MainWindow.axaml.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,144 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
-using DHT.Desktop.Main.Screens;
-using DHT.Desktop.Server;
-using DHT.Server;
-using DHT.Server.Database;
-using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
-
-namespace DHT.Desktop.Main;
-
-sealed partial class MainWindowModel : IAsyncDisposable {
-	private const string DefaultTitle = "Discord History Tracker";
-	
-	private static readonly Log Log = Log.ForType<MainWindowModel>();
-	
-	[Notify(Setter.Private)]
-	private string title = DefaultTitle;
-	
-	[Notify(Setter.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;
-		
-		string? 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("Could not start internal server.", ex);
-			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
-		}
-		
-		try {
-			mainContentScreenModel = new MainContentScreenModel(window, state);
-			mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-			await mainContentScreenModel.Initialize();
-		} catch (Exception ex) {
-			Log.Error("Could not initialize content screen.", ex);
-			await Dialog.ShowOk(window, "Initialization Error", ex.Message);
-			await DisposeContent();
-			await DisposeState();
-			return;
-		}
-		
-		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
-		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
-		
-		window.Focus();
-	}
-	
-	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-		await DisposeContent();
-		
-		Title = DefaultTitle;
-		CurrentScreen = welcomeScreen;
-		
-		await DisposeState();
-		
-		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
-	}
-	
-	private async Task DisposeContent() {
-		if (mainContentScreenModel != null) {
-			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
-			await mainContentScreenModel.DisposeAsync();
-			mainContentScreenModel = null;
-		}
-	}
-	
-	private async Task DisposeState() {
-		if (state != null) {
-			await DelayedProgressDialog.Await(() => state.DisposeAsync().AsTask(), TimeSpan.FromMilliseconds(200), window, "Close Database", "Please wait for the database to close...");
-			state = null;
-		}
-	}
-	
-	public async ValueTask DisposeAsync() {
-		await DisposeContent();
-		await DisposeState();
-	}
-}

app/Desktop/Main/Pages/AdvancedPageModel.cs

@@ -1,21 +0,0 @@
-using System;
-using Avalonia.Controls;
-using DHT.Desktop.Main.Controls;
-using DHT.Server;
-
-namespace DHT.Desktop.Main.Pages;
-
-sealed class AdvancedPageModel : IDisposable {
-	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
-	
-	[Obsolete("Designer")]
-	public AdvancedPageModel() : this(null!, State.Dummy) {}
-	
-	public AdvancedPageModel(Window window, State state) {
-		ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
-	}
-	
-	public void Dispose() {
-		ServerConfigurationModel.Dispose();
-	}
-}

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -1,312 +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.Server.Database.Sqlite.Utils;
-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", [ folder ]);
-				break;
-			
-			case PlatformID.MacOSX:
-				Process.Start("open", [ 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() {
-		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
-		if (paths.Length == 0) {
-			return;
-		}
-		
-		const string Title = "Database Merge";
-		
-		ImportResult? result;
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error("Could not merge databases.", e);
-			await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "database file"));
-	}
-	
-	private static async Task<ImportResult?> MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
-		
-		return await PerformImport(target, paths, dialog, callback, "Database Merge", 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(ProgressDialog dialog, int total) : ISchemaUpgradeCallbacks {
-		private bool? decision;
-		
-		public Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
-			return Task.FromResult<InitialDatabaseSettings?>(null);
-		}
-		
-		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() {
-		string[] 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) {
-			return;
-		}
-		
-		const string Title = "Legacy Archive Import";
-		
-		ImportResult? result;
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error("Could not import legacy archives.", e);
-			await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "archive file"));
-	}
-	
-	private static async Task<ImportResult?> ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-		var fakeSnowflake = new FakeSnowflake();
-		
-		return await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", async path => {
-			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
-			
-			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
-				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 (DHT.Server.Data.Server server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
-			items.Add(new TextBoxItem<DHT.Server.Data.Server>(server) {
-				Title = server.Name + " (" + ServerTypes.ToNiceString(server.Type) + ")",
-				ValidityCheck = IsValidSnowflake,
-			});
-		}
-		
-		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<ImportResult?> PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string dialogTitle, Func<string, Task<bool>> performImport) {
-		int total = paths.Length;
-		DatabaseStatistics 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, dialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
-				continue;
-			}
-			
-			try {
-				if (await performImport(path)) {
-					++successful;
-				}
-			} catch (Exception ex) {
-				Log.Error("Could not import file: " + path, ex);
-				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
-			}
-		}
-		
-		await callback.Update("Done", finished, total);
-		
-		if (successful == 0) {
-			return null;
-		}
-		
-		DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
-		return new ImportResult(oldStatistics, newStatistics, successful, total);
-	}
-	
-	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
-		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 sealed record ImportResult(DatabaseStatistics OldStatistics, DatabaseStatistics NewStatistics, int SuccessfulItems, int TotalItems);
-	
-	private static string GetImportDialogMessage(ImportResult? result, string itemName) {
-		if (result == null) {
-			return "Nothing was imported.";
-		}
-		
-		var oldStatistics = result.OldStatistics;
-		var newStatistics = result.NewStatistics;
-		
-		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
-		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
-		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
-		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
-		
-		var message = new StringBuilder();
-		message.Append("Processed ");
-		
-		if (result.SuccessfulItems == result.TotalItems) {
-			message.Append(result.SuccessfulItems.Pluralize(itemName));
-		}
-		else {
-			message.Append(result.SuccessfulItems.Format()).Append(" out of ").Append(result.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();
-	}
-	
-	public async Task VacuumDatabase() {
-		const string Title = "Vacuum Database";
-		
-		try {
-			await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
-		} catch (Exception e) {
-			Log.Error("Could not vacuum database.", e);
-			await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, "Done.");
-	}
-}

app/Desktop/Main/Pages/DebugPage.axaml

@@ -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: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="Label">
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="Padding" Value="0" />
-        </Style>
-        <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Orientation" Value="Vertical" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel Orientation="Vertical" Spacing="10">
-        <Expander Header="Generate Random Data" IsExpanded="True">
-            <WrapPanel ItemSpacing="10" LineSpacing="10">
-                <StackPanel Spacing="8">
-                    <Label Target="Channels">Channels</Label>
-                    <TextBox x:Name="Channels" Width="100" Text="{Binding GenerateChannels}" />
-                </StackPanel>
-                <StackPanel Spacing="8">
-                    <Label Target="Users">Users</Label>
-                    <TextBox x:Name="Users" Width="100" Text="{Binding GenerateUsers}" />
-                </StackPanel>
-                <StackPanel Spacing="8">
-                    <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>
-        <Expander Header="About" IsExpanded="True">
-            <TextBlock Text="{Binding SqliteVersion, StringFormat=Sqlite Version: {0}}" />
-        </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,184 +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;
-using PropertyChanged.SourceGenerator;
-
-namespace DHT.Desktop.Main.Pages;
-
-sealed partial class DebugPageModel {
-	public string GenerateChannels { get; set; } = "0";
-	public string GenerateUsers { get; set; } = "0";
-	public string GenerateMessages { get; set; } = "0";
-	
-	[Notify(Setter.Private)]
-	private string? sqliteVersion = string.Empty;
-	
-	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 Task Initialize() {
-		SqliteVersion = await state.Db.GetVersion() ?? "<unknown>";
-	}
-	
-	public async void OnClickAddRandomDataToDatabase() {
-		if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
-			await Dialog.ShowOk(window, "Generate Random Data", "Amount of channels must be at least 1!");
-			return;
-		}
-		
-		if (!int.TryParse(GenerateUsers, out int users) || users < 1) {
-			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, finishedItems: 0, totalItems: batchCount);
-		
-		var rand = new Random();
-		var server = new DHT.Server.Data.Server {
-			Id = RandomId(rand),
-			Name = RandomName("s"),
-			Type = ServerType.Server,
-		};
-		
-		Channel[] channels = Enumerable.Range(start: 0, channelCount).Select(i => new Channel {
-			Id = RandomId(rand),
-			Server = server.Id,
-			Name = RandomName("c"),
-			ParentId = null,
-			Position = i,
-			Topic = RandomText(rand, maxWords: 10),
-			Nsfw = rand.Next(4) == 0,
-		}).ToArray();
-		
-		User[] users = Enumerable.Range(start: 0, userCount).Select(_ => new User {
-			Id = RandomId(rand),
-			Name = RandomName("u"),
-			DisplayName = RandomName("u"),
-			AvatarHash = null,
-			Discriminator = rand.Next(minValue: 0, maxValue: 9999).ToString(),
-		}).ToArray();
-		
-		await state.Db.Users.Add(users);
-		await state.Db.Servers.Add([server]);
-		await state.Db.Channels.Add(channels);
-		
-		DateTimeOffset now = DateTimeOffset.Now;
-		int batchIndex = 0;
-		
-		while (messageCount > 0) {
-			int hourOffset = batchIndex;
-			
-			Message[] messages = Enumerable.Range(start: 0, Math.Min(messageCount, BatchSize)).Select(i => {
-				DateTimeOffset time = now.AddHours(hourOffset).AddMinutes(i * 60.0 / BatchSize);
-				DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(minValue: 1, maxValue: 60)) : null;
-				
-				long timeMillis = time.ToUnixTimeMilliseconds();
-				long? editMillis = edit?.ToUnixTimeMilliseconds();
-				
-				return new Message {
-					Id = (ulong) timeMillis,
-					Sender = RandomBiasedIndex(rand, users).Id,
-					Channel = RandomBiasedIndex(rand, channels).Id,
-					Text = RandomText(rand, maxWords: 100),
-					Timestamp = timeMillis,
-					EditTimestamp = editMillis,
-					RepliedToId = null,
-					Attachments = ImmutableList<Attachment>.Empty,
-					Embeds = ImmutableList<Embed>.Empty,
-					Reactions = ImmutableList<Reaction>.Empty,
-				};
-			}).ToArray();
-			
-			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(), y: 3));
-		return string.Join(separator: ' ', Enumerable.Range(start: 0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
-	}
-}
-#else
-namespace DHT.Desktop.Main.Pages;
-
-sealed class DebugPageModel {
-	public string GenerateChannels { get; set; } = "0";
-	public string GenerateUsers { get; set; } = "0";
-	public string GenerateMessages { get; set; } = "0";
-
-	public string SqliteVersion => string.Empty;
-	
-	public void OnClickAddRandomDataToDatabase() {}
-}
-#endif

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -1,51 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
-             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.DownloadsPage"
-             x:DataType="pages:DownloadsPageModel">
-
-    <Design.DataContext>
-        <pages:DownloadsPageModel />
-    </Design.DataContext>
-
-    <UserControl.Styles>
-        <Style Selector="DataGridColumnHeader">
-            <Setter Property="FontWeight" Value="Medium" />
-        </Style>
-        <Style Selector="DataGridColumnHeader:nth-child(2)">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-        <Style Selector="DataGridColumnHeader:nth-child(3)">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-        <Style Selector="DataGridCell.right">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel Orientation="Vertical" Spacing="20">
-        <WrapPanel Orientation="Horizontal" ItemSpacing="10" LineSpacing="10">
-            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-            <Button Command="{Binding OnClickRetryFailed}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed</Button>
-            <Button Command="{Binding OnClickDeleteOrphaned}">Delete Orphaned</Button>
-            <Button Command="{Binding OnClickExportAll}" IsEnabled="{Binding HasSuccessfulDownloads}">Export All...</Button>
-        </WrapPanel>
-        <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
-        <TextBlock TextWrapping="Wrap">
-            Downloading state and filter settings are remembered per-database.
-        </TextBlock>
-        <Expander Header="Download Status" IsExpanded="True">
-            <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="State" Binding="{Binding State, Mode=OneWay}" Width="*" />
-                    <DataGridTextColumn Header="Files" Binding="{Binding Items, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
-                    <DataGridTextColumn Header="Size" Binding="{Binding SizeText, Mode=OneWay}" Width="*" CellStyleClasses="right" />
-                </DataGrid.Columns>
-            </DataGrid>
-        </Expander>
-    </StackPanel>
-</UserControl>

app/Desktop/Main/Pages/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();
-	}
-}