[WIP] Experimental Brotli compressing of raw message data

.github/FUNDING.yml

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

.idea/Discord-History-Tracker.iml

@@ -8,7 +8,6 @@
       <excludeFolder url="file://$MODULE_DIR$/.vscode" />
       <excludeFolder url="file://$MODULE_DIR$/bld" />
       <excludeFolder url="file://$MODULE_DIR$/lib" />
-      <excludeFolder url="file://$MODULE_DIR$/app" />
     </content>
     <orderEntry type="jdk" jdkName="Python 3.8" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

.vscode/tasks.json

@@ -0,0 +1,52 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build Raw",
+            "type": "shell",
+            "command": "python ./build.py --nominify --copytracker",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "shared",
+                "echo": true,
+                "focus": false,
+                "showReuseMessage": false
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Build Minified",
+            "type": "shell",
+            "command": "python ./build.py --copytracker",
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "panel": "shared",
+                "echo": true,
+                "focus": false,
+                "showReuseMessage": false
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Build Website",
+            "type": "shell",
+            "command": "python ./build.py --website",
+            "group": "build",
+            "presentation": {
+                "reveal": "always",
+                "panel": "shared",
+                "echo": true,
+                "focus": false,
+                "showReuseMessage": false
+            },
+            "problemMatcher": []
+        }
+    ]
+}

README.md

@@ -1,45 +1,48 @@
 # Welcome
 
-For instructions on how to **use Discord History Tracker**, visit the [official website](https://dht.chylex.com).
+All you need to **use Discord History Tracker** is either an up-to-date browser, or the [Discord desktop client](https://discord.com/download). Visit the [official website](https://dht.chylex.com) for instructions.
 
 To **report an issue or suggestion**, first please see the [issues](https://github.com/chylex/Discord-History-Tracker/issues) page and make sure someone else hasn't already created a similar issue report. If you do find an existing issue, comment on it or add a reaction. Otherwise, either click [New Issue](https://github.com/chylex/Discord-History-Tracker/issues/new), or contact me via email [contact@chylex.com](mailto:contact@chylex.com) or Twitter [@chylexmc](https://twitter.com/chylexmc).
 
-If you are interested in **building from source code**, continue reading the [build instructions](#Build-Instructions) below.
+If you are interested in **creating your own version** from the source code, continue reading the [build instructions](#Build-Instructions) below.
-
-This branch is dedicated to the Discord History Tracker desktop app. If you are looking for the older browser-only version, visit the [master-browser-only](https://github.com/chylex/Discord-History-Tracker/tree/master-browser-only) branch.
 
 # Build Instructions
 
+Follow the steps below to create your own version of Discord History Tracker.
+
 ### Setup
 
 Fork the repository and clone it to your computer (if you've never used git, you can download the [GitHub Desktop](https://desktop.github.com) client to get started quickly).
 
-Folder organization:
+Now you can modify the source code:
-* `app/` contains a Visual Studio solution for the desktop app
+* `src/tracker/` contains JS files that are automatically combined into the **tracker bookmark/script**
+* `src/viewer/` contains HTML, CSS, JS files that are then combined into the **offline viewer page**
+* `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/).
-
 ### Building
 
-To build a `Debug` version of the desktop app, there are no additional requirements.
+After you've done changes to the source code, you will need to build it. Before that, download and install:
+* (**required**) [Python 3](https://www.python.org/downloads)
+  * Use to run the build script
+* (optional) [Node + npm](https://nodejs.org/en) & command line [uglify-js](https://www.npmjs.com/package/uglify-js)
+  * Not required on Windows
+  * Only required for optional [JS minification](#Minification) on Linux/Mac
 
-To build a `Release` version of the desktop app, follow the instructions for your operating system.
+Now open the folder that contains `build.py` in a command line, and run `python build.py` to create a build with default settings. The following files will be created:
+* `bld/track.js` is the raw tracker script that can be pasted into a browser console
+* `bld/track.html` is the tracker script but sanitized for inclusion in HTML (see `web/index.php` for examples)
+* `bld/viewer.html` is the complete offline viewer
 
-#### Release – Windows (64-bit)
+You can tweak the build process using the following flags:
+* `python build.py --nominify` to disable [minification](#Minification)
 
-1. Install Debian in WSL and open a terminal in the project folder.
+### Minification
-2. Run the `app/build.wsl.sh` script.
-3. Read the [Distribution](#distribution) section below.
 
-Note: The build script expects `dotnet.exe` to be installed in `C:\Program Files\dotnet`.
+The build process automatically minifies JS using `UglifyJS@3`, and CSS using a custom minifier.
 
-#### Release – Other Operating Systems
+* If the `--nominify` flag is used, minification will be completely disabled
-
+* If `uglify-js` is not available from the command line, JS minification will be skipped
-1. Install the `zip` package from your repository.
+  * When building on Windows 64-bit, the build script will use the included Node runner and packages
-2. Run the `app/build.sh` script.
+  * When building on Windows 32-bit, you will need to download [Node 32-bit](https://nodejs.org/en/download) and replace the included one in `lib/`
-3. Read the [Distribution](#distribution) section below.
+  * When building on Linux/Mac, the build script will attempt to find `uglifyjs` in the command line
-
-#### 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.

app/.editorconfig

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

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

@@ -7,22 +7,15 @@
         <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/FilterPanel.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/MainContentScreen.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/WelcomeScreen.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Screens/WelcomeScreen.axaml" value="Desktop/Desktop.csproj" />
       </map>
     </option>
   </component>

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>
@@ -454,4 +445,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>

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/.idea/.idea.DiscordHistoryTracker/.idea/watcherTasks.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectTasksOptions">
+    <enabled-global>
+      <option value="UglifyJS (Tracker)" />
+    </enabled-global>
+  </component>
+</project>

app/Desktop/App.axaml

@@ -1,68 +1,112 @@
 <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">
-             x:Class="DHT.Desktop.App"
-             RequestedThemeVariant="Light">
 
     <Application.Styles>
 
-        <FluentTheme />
+        <FluentTheme Mode="Light" />
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml" />
-
-        <Style Selector="Button, CheckBox, RadioButton, Expander /template/ ToggleButton#ExpanderHeader">
-            <Setter Property="Cursor" Value="Hand" />
-        </Style>
 
         <Style Selector="Button">
             <Setter Property="Padding" Value="10 7 10 6" />
+            <Setter Property="Background" Value="#DDDDDD" />
+            <Setter Property="BorderBrush" Value="#999999" />
             <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="0" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
+        <Style Selector="Button /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="TextBlock.Foreground" Value="#060606" />
+            <Setter Property="Background" Value="#DDDDDD" />
+            <Setter Property="BorderBrush" Value="#999999" />
+        </Style>
+        <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="#E7E7E7" />
+            <Setter Property="BorderBrush" Value="#A2A2A2" />
+            <Setter Property="CornerRadius" Value="0" />
+        </Style>
         <Style Selector="Button:pressed">
             <Setter Property="RenderTransform" Value="none" />
         </Style>
+        <Style Selector="Button:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="#EBEBEB" />
+            <Setter Property="BorderBrush" Value="#A5A5A5" />
+            <Setter Property="CornerRadius" Value="0" />
+        </Style>
+        <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="TextBlock.Foreground" Value="#7A7A7A" />
+            <Setter Property="Background" Value="#E9E9E9" />
+            <Setter Property="BorderBrush" Value="#BFBFBF" />
+        </Style>
 
         <Style Selector="TextBox">
+            <Setter Property="BorderBrush" Value="#999999" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="0" />
+            <Setter Property="SelectionBrush" Value="#72C0FF" />
+            <Setter Property="Background" Value="#F4F4F4" />
             <Setter Property="Padding" Value="6 0" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
+        <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
+            <Setter Property="BorderBrush" Value="#999999" />
+            <Setter Property="Background" Value="#F8F8F8" />
+        </Style>
+        <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
+            <Setter Property="BorderBrush" Value="#546A9F" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Background" Value="#FBFBFB" />
+        </Style>
+        <Style Selector="TextBox:disabled /template/ Border#PART_BorderElement">
+            <Setter Property="BorderBrush" Value="#999999" />
+            <Setter Property="Background" Value="#BBBBBB" />
+        </Style>
         <Style Selector="TextBox /template/ TextBlock#PART_Watermark">
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
-        <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
-            <Setter Property="BorderThickness" Value="1" />
-        </Style>
-        <Style Selector="TextBox:error DataValidationErrors">
-            <Style.Resources>
-                <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
-                    <ContentPresenter Name="PART_ContentPresenter"
-                                      Padding="{TemplateBinding Padding}"
-                                      Background="{TemplateBinding Background}"
-                                      BorderThickness="{TemplateBinding BorderThickness}"
-                                      CornerRadius="{TemplateBinding CornerRadius}"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}" />
-                </ControlTemplate>
-            </Style.Resources>
-            <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
-        </Style>
 
         <Style Selector="Expander">
-            <Setter Property="MinHeight" Value="40" />
+            <Setter Property="CornerRadius" Value="0" />
-            <Setter Property="Padding" Value="12" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
-
+        <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
-        <Style Selector="Panel.buttons">
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="Margin" Value="0 20 0 0" />
+            <Setter Property="Template">
-        </Style>
+                <ControlTemplate>
-        <Style Selector="Panel.buttons > WrapPanel">
+                    <Border x:Name="ToggleButtonBackground">
-            <Setter Property="ItemSpacing" Value="8" />
+                        <Grid ColumnDefinitions="Auto,*" RowDefinitions="35">
-        </Style>
+                            <Border x:Name="ExpandCollapseChevronBorder"
-        <Style Selector="Panel.buttons Button">
+                                    Grid.Column="0"
-            <Setter Property="MinWidth" Value="80" />
+                                    Width="35"
+                                    Height="35"
+                                    Margin="2,0"
+                                    RenderTransformOrigin="50%,50%">
+                                <Path x:Name="ExpandCollapseChevron"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      RenderTransformOrigin="50%,50%"
+                                      Stretch="None"
+                                      Stroke="{DynamicResource ExpanderChevronForeground}"
+                                      StrokeThickness="1" />
+                                <Border.RenderTransform>
+                                    <RotateTransform />
+                                </Border.RenderTransform>
+                            </Border>
+                            <ContentPresenter x:Name="PART_ContentPresenter"
+                                              Grid.Column="1"
+                                              Margin="0"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="Center"
+                                              Background="Transparent"
+                                              BorderBrush="Transparent"
+                                              BorderThickness="0"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              TextBlock.Foreground="{DynamicResource ExpanderForeground}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
         </Style>
 
     </Application.Styles>
@@ -70,77 +114,10 @@
     <Application.Resources>
 
         <common:NumberValueConverter x:Key="NumberValueConverter" />
-        <common:BytesValueConverter x:Key="BytesValueConverter" />
-
-        <system:Double x:Key="ControlContentThemeFontSize">14</system:Double>
-        <CornerRadius x:Key="ControlCornerRadius">0</CornerRadius>
-
-        <Color x:Key="SystemAccentColor">#3C5F95</Color>
-        <Color x:Key="SystemAccentColorDark1">#3C5F95</Color>
-        <Color x:Key="SystemAccentColorDark2">#3C5F95</Color>
-        <Color x:Key="SystemAccentColorDark3">#3C5F95</Color>
-        <Color x:Key="SystemAccentColorLight1">#3C5F95</Color>
-        <Color x:Key="SystemAccentColorLight2">#3C5F95</Color>
-        <Color x:Key="SystemAccentColorLight3">#3C5F95</Color>
-
-        <system:Double x:Key="ScrollBarSize">14</system:Double>
-        <TransformOperations x:Key="VerticalSmallScrollThumbScaleTransform">scaleX(0.5) translateX(-3px)</TransformOperations>
-        <TransformOperations x:Key="HorizontalSmallScrollThumbScaleTransform">scaleY(0.5) translateY(-3px)</TransformOperations>
-        <SolidColorBrush x:Key="ScrollBarPanningThumbBackground" Color="#8F8F8F" />
-
-        <SolidColorBrush x:Key="ButtonBorderBrush" Color="#3C5F95" />
-        <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="#0E2B59" />
-        <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="#061742" />
-        <SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="#9B9B9B" />
-        <SolidColorBrush x:Key="ButtonBackground" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#F6F9FD" />
-        <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#EDF3FD" />
-        <SolidColorBrush x:Key="ButtonBackgroundDisabled" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ButtonForeground" Color="#112961" />
-        <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="#050E41" />
-        <SolidColorBrush x:Key="ButtonForegroundPressed" Color="#010320" />
-        <SolidColorBrush x:Key="ButtonForegroundDisabled" Color="#8C8C8C" />
-
-        <SolidColorBrush x:Key="TextControlBorderBrush" Color="#515151" />
-        <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#000000" />
-        <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#3C5F95" />
-        <SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="#9B9B9B" />
-        <SolidColorBrush x:Key="TextControlBackground" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#F8FCFF" />
-        <SolidColorBrush x:Key="TextControlBackgroundDisabled" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="TextControlForeground" Color="#000000" />
-        <SolidColorBrush x:Key="TextControlForegroundPointerOver" Color="#000000" />
-        <SolidColorBrush x:Key="TextControlForegroundFocused" Color="#000000" />
-        <SolidColorBrush x:Key="TextControlForegroundDisabled" Color="#8C8C8C" />
-        <SolidColorBrush x:Key="TextControlSelectionHighlightColor" Color="#DEE9F8" />
-        <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#AAAAAA" />
-        <SolidColorBrush x:Key="TextControlPlaceholderForegroundPointerOver" Color="#AAAAAA" />
-        <SolidColorBrush x:Key="TextControlPlaceholderForegroundFocused" Color="#AAAAAA" />
-        <SolidColorBrush x:Key="TextControlPlaceholderForegroundDisabled" Color="#AAAAAA" />
 
         <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
-        <Thickness x:Key="ExpanderContentPadding">12</Thickness>
+        <Thickness x:Key="ExpanderContentPadding">15</Thickness>
-        <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="#FCFCFC" />
-        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPressed" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushDisabled" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="#536794" />
-        <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed" Color="#47587F" />
-        <SolidColorBrush x:Key="ExpanderHeaderBackgroundDisabled" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderHeaderForegroundPointerOver" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderHeaderForegroundPressed" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderHeaderForegroundDisabled" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent" />
-        <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="#536794" />
-        <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="#47587F" />
-        <SolidColorBrush x:Key="ExpanderChevronBackgroundDisabled" Color="Transparent" />
-        <SolidColorBrush x:Key="ExpanderChevronForeground" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderChevronForegroundPointerOver" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderChevronForegroundPressed" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderChevronForegroundDisabled" Color="#FFFFFF" />
 
     </Application.Resources>
 

app/Desktop/App.axaml.cs

@@ -3,18 +3,18 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main;
 
-namespace DHT.Desktop;
+namespace DHT.Desktop {
-
+	sealed class App : Application {
-sealed class App : Application {
+		public override void Initialize() {
-	public override void Initialize() {
+			AvaloniaXamlLoader.Load(this);
-		AvaloniaXamlLoader.Load(this);
+		}
-	}
+
-	
+		public override void OnFrameworkInitializationCompleted() {
-	public override void OnFrameworkInitializationCompleted() {
+			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
-		if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
+				desktop.MainWindow = new MainWindow(new Arguments(desktop.Args));
-			desktop.MainWindow = new MainWindow(Program.Arguments);
+			}
+
+			base.OnFrameworkInitializationCompleted();
 		}
-		
-		base.OnFrameworkInitializationCompleted();
 	}
 }

app/Desktop/Arguments.cs

@@ -1,86 +1,51 @@
-using System.Collections.Generic;
+using System;
 using DHT.Utils.Logging;
 
-namespace DHT.Desktop;
+namespace DHT.Desktop {
+	sealed class Arguments {
+		private static readonly Log Log = Log.ForType<Arguments>();
 
-sealed class Arguments {
+		public static Arguments Empty => new(Array.Empty<string>());
-	private static readonly Log Log = Log.ForType<Arguments>();
+
-	
+		public string? DatabaseFile { get; }
-	private const int FirstArgument = 1;
+		public ushort? ServerPort { get; }
-	
+		public string? ServerToken { get; }
-	public static Arguments Empty => new ([]);
+
-	
+		public Arguments(string[] args) {
-	public bool Console { get; }
+			for (int i = 0; i < args.Length; i++) {
-	public string? DatabaseFile { get; }
+				string key = args[i];
-	public ushort? ServerPort { get; }
+
-	public string? ServerToken { get; }
+				if (i >= args.Length - 1) {
-	public byte? ConcurrentDownloads { get; }
+					Log.Warn("Missing value for command line argument: " + key);
-	
-	public Arguments(IReadOnlyList<string> args) {
-		for (int i = FirstArgument; i < args.Count; 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('-')) {
-				value = key;
-				key = "-db";
-			}
-			else if (i >= args.Count - 1) {
-				Log.Warn("Missing value for command line argument: " + key);
-				continue;
-			}
-			else {
-				value = args[++i];
-			}
-			
-			switch (key) {
-				case "-db":
-					DatabaseFile = value;
-					continue;
-				
-				case "-port": {
-					if (!ushort.TryParse(value, out ushort port)) {
-						Log.Warn("Invalid port number: " + value);
-					}
-					else {
-						ServerPort = port;
-					}
-					
 					continue;
 				}
-				
+
-				case "-token":
+				string value = args[++i];
-					ServerToken = value;
+
-					continue;
+				switch (key) {
-				
+					case "-db":
-				case "-concurrentdownloads":
+						DatabaseFile = value;
-					if (!ulong.TryParse(value, out ulong concurrentDownloads) || concurrentDownloads == 0) {
+						continue;
-						Log.Warn("Invalid concurrent downloads count: " + value);
+
+					case "-port": {
+						if (ushort.TryParse(value, out var port)) {
+							ServerPort = port;
+						}
+						else {
+							Log.Warn("Invalid port number: " + value);
+						}
+
+						continue;
 					}
-					else if (concurrentDownloads > 10) {
+
-						Log.Warn("Limiting concurrent downloads to 10");
+					case "-token":
-						ConcurrentDownloads = 10;
+						ServerToken = value;
-					}
+						continue;
-					else {
+
-						ConcurrentDownloads = (byte) concurrentDownloads;
+					default:
-					}
+						Log.Warn("Unknown command line argument: " + key);
-					
+						break;
-					continue;
+				}
-				
-				default:
-					Log.Warn("Unknown command line argument: " + key);
-					break;
 			}
 		}
 	}

app/Desktop/Common/BytesValueConverter.cs

@@ -1,53 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia.Data.Converters;
-
-namespace DHT.Desktop.Common;
-
-sealed class BytesValueConverter : IValueConverter {
-	private sealed class Unit {
-		private readonly string label;
-		private readonly string numberFormat;
-		
-		public Unit(string label, int decimalPlaces) {
-			this.label = label;
-			this.numberFormat = "{0:n" + decimalPlaces + "}";
-		}
-		
-		public string Format(double size) {
-			return string.Format(Program.Culture, numberFormat, size) + " " + label;
-		}
-	}
-	
-	private static readonly Unit[] Units = [
-		new Unit("B", decimalPlaces: 0),
-		new Unit("kB", decimalPlaces: 0),
-		new Unit("MB", decimalPlaces: 1),
-		new Unit("GB", decimalPlaces: 1),
-		new Unit("TB", decimalPlaces: 1)
-	];
-	
-	private const int Scale = 1000;
-	
-	public 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));
-	}
-	
-	public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
-		if (value is long size and >= 0L) {
-			return Convert((ulong) size);
-		}
-		else if (value is ulong usize) {
-			return Convert(usize);
-		}
-		else {
-			return "-";
-		}
-	}
-	
-	public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
-		throw new NotSupportedException();
-	}
-}

app/Desktop/Common/DatabaseGui.cs

@@ -3,67 +3,64 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Platform.Storage;
-using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Server.Database.Exceptions;
 using DHT.Server.Database.Sqlite;
-using DHT.Server.Database.Sqlite.Schema;
 using DHT.Utils.Logging;
 
-namespace DHT.Desktop.Common;
+namespace DHT.Desktop.Common {
+	static class DatabaseGui {
+		private static readonly Log Log = Log.ForType(typeof(DatabaseGui));
 
-static class DatabaseGui {
+		private const string DatabaseFileInitialName = "archive.dht";
-	private static readonly Log Log = Log.ForType(typeof(DatabaseGui));
+
-	
+		private static readonly List<FileDialogFilter> DatabaseFileDialogFilter = new() {
-	private const string DatabaseFileInitialName = "archive.dht";
+			new FileDialogFilter {
-	
+				Name = "Discord History Tracker Database",
-	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = [
+				Extensions = { "dht" }
-		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"]),
+			}
-	];
+		};
-	
+
-	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
+		public static OpenFileDialog NewOpenDatabaseFileDialog() {
-		return await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+			return new OpenFileDialog {
-			Title = "Open Database File",
+				Title = "Open Database File",
-			FileTypeFilter = DatabaseFileDialogFilter,
+				InitialFileName = DatabaseFileInitialName,
-			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
+				Filters = DatabaseFileDialogFilter
-			AllowMultiple = true,
+			};
-		});
+		}
-	}
+
-	
+		public static SaveFileDialog NewOpenOrCreateDatabaseFileDialog() {
-	public static async Task<string?> NewOpenOrCreateDatabaseFileDialog(Window window, string? suggestedDirectory) {
+			return new SaveFileDialog {
-		return await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
+				Title = "Open or Create Database File",
-			Title = "Open or Create Database File",
+				InitialFileName = DatabaseFileInitialName,
-			FileTypeChoices = DatabaseFileDialogFilter,
+				Filters = DatabaseFileDialogFilter
-			SuggestedFileName = DatabaseFileInitialName,
+			};
-			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
+		}
-			ShowOverwritePrompt = false,
+
-		});
+		public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, Func<Task<bool>> checkCanUpgradeDatabase) {
-	}
+			IDatabaseFile? file = null;
-	
+
-	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
+			try {
-		IDatabaseFile? file = null;
+				file = await SqliteDatabaseFile.OpenOrCreate(path, checkCanUpgradeDatabase);
-		
+			} catch (InvalidDatabaseVersionException ex) {
-		try {
+				await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
-			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks);
+			} catch (DatabaseTooNewException ex) {
-		} catch (InvalidDatabaseVersionException 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 + ").");
-			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
+			} catch (Exception ex) {
-		} catch (DatabaseTooNewException ex) {
+				Log.Error(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 + ").");
+				await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
-		} catch (Exception ex) {
+			}
-			Log.Error(ex);
+
-			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
+			return file;
+		}
+
+		public static async Task<DialogResult.YesNo> ShowCanUpgradeDatabaseDialog(Window window) {
+			return await Dialog.ShowYesNo(window, "Database Upgrade", "This database was created with an older version of DHT. If you proceed, the database will be upgraded and will no longer open in previous versions of DHT. Do you want to proceed with the upgrade?");
+		}
+
+		public static async Task<DialogResult.YesNo> ShowCanUpgradeMultipleDatabaseDialog(Window window) {
+			return await Dialog.ShowYesNo(window, "Database Upgrade", "One or more databases were created with an older version of DHT. If you proceed, these databases will be upgraded and will no longer open in previous versions of DHT. Otherwise, these databases will be skipped. Do you want to proceed with the upgrade?");
 		}
-		
-		return file;
-	}
-	
-	public static async Task<DialogResult.YesNo> ShowCanUpgradeDatabaseDialog(Window window) {
-		return await Dialog.ShowYesNo(window, "Database Upgrade", "This database was created with an older version of DHT. If you proceed, the database will be upgraded and will no longer open in previous versions of DHT.\n\nPlease ensure you have a backup of the database. Do you want to proceed with the upgrade?");
-	}
-	
-	public static async Task<DialogResult.YesNo> ShowCanUpgradeMultipleDatabaseDialog(Window window) {
-		return await Dialog.ShowYesNo(window, "Database Upgrade", "One or more databases were created with an older version of DHT. If you proceed, these databases will be upgraded and will no longer open in previous versions of DHT. Otherwise, these databases will be skipped.\n\nPlease ensure you have a backup of the databases. Do you want to proceed with the upgrade?");
 	}
 }

app/Desktop/Common/NumberValueConverter.cs

@@ -2,14 +2,14 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace DHT.Desktop.Common;
+namespace DHT.Desktop.Common {
+	sealed class NumberValueConverter : IValueConverter {
+		public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
+			return string.Format(Program.Culture, "{0:n0}", value);
+		}
 
-sealed class NumberValueConverter : IValueConverter {
+		public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
-	public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
+			throw new NotSupportedException();
-		return value == null ? "-" : string.Format(Program.Culture, "{0:n0}", value);
+		}
-	}
-	
-	public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
-		throw new NotSupportedException();
 	}
 }

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/Common/TextFormat.cs

@@ -1,19 +1,19 @@
-namespace DHT.Desktop.Common;
+namespace DHT.Desktop.Common {
+	static class TextFormat {
+		public static string Format(this int number) {
+			return number.ToString("N0", Program.Culture);
+		}
 
-static class TextFormat {
+		public static string Format(this long number) {
-	public static string Format(this int number) {
+			return number.ToString("N0", Program.Culture);
-		return number.ToString("N0", Program.Culture);
+		}
-	}
+
-	
+		public static string Pluralize(this int number, string singular) {
-	public static string Format(this long number) {
+			return number.Format() + "\u00A0" + (number == 1 ? singular : singular + "s");
-		return number.ToString("N0", Program.Culture);
+		}
-	}
+
-	
+		public static string Pluralize(this long number, string singular) {
-	public static string Pluralize(this int number, string singular) {
+			return number.Format() + "\u00A0" + (number == 1 ? singular : singular + "s");
-		return number.Format() + "\u00A0" + (number == 1 ? singular : singular + "s");
+		}
-	}
-	
-	public static string Pluralize(this long number, string singular) {
-		return number.Format() + "\u00A0" + (number == 1 ? singular : singular + "s");
 	}
 }

app/Desktop/Desktop.csproj

@@ -1,47 +1,76 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
-  <PropertyGroup>
-    <RootNamespace>DHT.Desktop</RootNamespace>
-    <AssemblyName>DiscordHistoryTracker</AssemblyName>
-    <PackageId>DiscordHistoryTracker</PackageId>
-  </PropertyGroup>
-  
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <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>
+    <AssemblyName>DiscordHistoryTracker</AssemblyName>
+    <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.Controls.DataGrid" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
-    <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  
   <ItemGroup>
+    <PackageReference Include="Avalonia" Version="0.10.12" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
     <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
-  
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
   </ItemGroup>
-  
   <ItemGroup>
-    <AvaloniaResource Include="Resources/icon.ico" />
+    <Compile Update="Windows\MainWindow.axaml.cs">
-    <EmbeddedResource Include="Resources/tracker-loader.js">
+      <DependentUpon>MainWindow.axaml</DependentUpon>
-      <LogicalName>tracker-loader.js</LogicalName>
+      <SubType>Code</SubType>
-    </EmbeddedResource>
+    </Compile>
+    <Compile Update="Dialogs\CheckBox\CheckBoxDialog.axaml.cs">
+      <DependentUpon>CheckBoxDialog.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Dialogs\Progress\ProgressDialog.axaml.cs">
+      <DependentUpon>ProgressDialog.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Dialogs\Message\MessageDialog.axaml.cs">
+      <DependentUpon>MessageDialog.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <UpToDateCheckInput Remove="Pages\DatabasePage.axaml" />
+    <UpToDateCheckInput Remove="Pages\TrackingPage.axaml" />
+    <UpToDateCheckInput Remove="Pages\ViewerPage.axaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="../Resources/Tracker/bootstrap.js">
+      <LogicalName>Tracker\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Tracker/%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Tracker/scripts.min/**">
+      <LogicalName>Tracker\scripts\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Tracker/scripts/%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Tracker/styles/**">
+      <LogicalName>Tracker\styles\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Tracker/styles/%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Viewer/**">
+      <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </EmbeddedResource>
+    <AvaloniaResource Include="Resources/icon.ico" />
   </ItemGroup>
-
 </Project>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -5,7 +5,6 @@
         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"
         Width="500" SizeToContent="Height" CanResize="False"
@@ -15,26 +14,44 @@
         <namespace:CheckBoxDialogModel />
     </Window.DataContext>
 
+    <Window.Styles>
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+        <Style Selector="Panel.buttons Button">
+            <Setter Property="MinWidth" Value="80" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.left Button">
+            <Setter Property="Margin" Value="0 0 8 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right Button">
+            <Setter Property="Margin" Value="8 0 0 0" />
+        </Style>
+    </Window.Styles>
+
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
-            <ItemsRepeater ItemsSource="{Binding Items}">
+            <ItemsControl Items="{Binding Items}">
-                <ItemsRepeater.ItemTemplate>
+                <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <CheckBox IsChecked="{Binding IsChecked}">
+                        <CheckBox IsChecked="{Binding Checked}">
                             <Label>
                                 <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
                             </Label>
                         </CheckBox>
                     </DataTemplate>
-                </ItemsRepeater.ItemTemplate>
+                </ItemsControl.ItemTemplate>
-            </ItemsRepeater>
+            </ItemsControl>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel>
+            <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 HorizontalAlignment="Right">
+            <WrapPanel Classes="right">
                 <Button Click="ClickOk">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

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

@@ -1,21 +1,31 @@
 using System.Diagnostics.CodeAnalysis;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
 using DHT.Desktop.Dialogs.Message;
 
-namespace DHT.Desktop.Dialogs.CheckBox;
+namespace DHT.Desktop.Dialogs.CheckBox {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class CheckBoxDialog : Window {
+		public CheckBoxDialog() {
+			InitializeComponent();
+			#if DEBUG
+			this.AttachDevTools();
+			#endif
+		}
 
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+		private void InitializeComponent() {
-public sealed partial class CheckBoxDialog : Window {
+			AvaloniaXamlLoader.Load(this);
-	public CheckBoxDialog() {
+		}
-		InitializeComponent();
+
-	}
+		public void ClickOk(object? sender, RoutedEventArgs e) {
-	
+			Close(DialogResult.OkCancel.Ok);
-	public void ClickOk(object? sender, RoutedEventArgs e) {
+		}
-		Close(DialogResult.OkCancel.Ok);
+
-	}
+		public void ClickCancel(object? sender, RoutedEventArgs e) {
-	
+			Close(DialogResult.OkCancel.Cancel);
-	public void ClickCancel(object? sender, RoutedEventArgs e) {
+		}
-		Close(DialogResult.OkCancel.Cancel);
 	}
 }
+

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

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

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

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.Platform.Storage;
-
-namespace DHT.Desktop.Dialogs.File;
-
-static class FileDialogs {
-	public static async Task<string[]> OpenFolders(this IStorageProvider storageProvider, FolderPickerOpenOptions options) {
-		return (await storageProvider.OpenFolderPickerAsync(options)).ToLocalPaths();
-	}
-	
-	public static async Task<string[]> OpenFiles(this IStorageProvider storageProvider, FilePickerOpenOptions options) {
-		return (await storageProvider.OpenFilePickerAsync(options)).ToLocalPaths();
-	}
-	
-	public static async Task<string?> SaveFile(this IStorageProvider storageProvider, FilePickerSaveOptions options) {
-		return (await storageProvider.SaveFilePickerAsync(options))?.ToLocalPath();
-	}
-	
-	public static FilePickerFileType CreateFilter(string name, string[] extensions) {
-		return new FilePickerFileType(name) {
-			Patterns = extensions.Select(static ext => "*." + ext).ToArray(),
-		};
-	}
-	
-	public static Task<IStorageFolder?> GetSuggestedStartLocation(Window window, string? suggestedDirectory) {
-		return suggestedDirectory == null ? Task.FromResult<IStorageFolder?>(null) : window.StorageProvider.TryGetFolderFromPathAsync(suggestedDirectory);
-	}
-	
-	private static string ToLocalPath(this IStorageItem itme) {
-		return itme.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
-	}
-	
-	private static string[] ToLocalPaths(this IReadOnlyList<IStorageItem> items) {
-		return items.Select(ToLocalPath).ToArray();
-	}
-}

app/Desktop/Dialogs/Message/Dialog.cs

@@ -2,73 +2,73 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;
 
-namespace DHT.Desktop.Dialogs.Message;
+namespace DHT.Desktop.Dialogs.Message {
+	static class Dialog {
+		public static async Task ShowOk(Window owner, string title, string message) {
+			if (!Dispatcher.UIThread.CheckAccess()) {
+				await Dispatcher.UIThread.InvokeAsync(() => ShowOk(owner, title, message));
+				return;
+			}
 
-static class Dialog {
+			await new MessageDialog {
-	public static async Task ShowOk(Window owner, string title, string message) {
+				DataContext = new MessageDialogModel {
-		if (!Dispatcher.UIThread.CheckAccess()) {
+					Title = title,
-			await Dispatcher.UIThread.InvokeAsync(() => ShowOk(owner, title, message));
+					Message = message,
-			return;
+					IsOkVisible = true
+				}
+			}.ShowDialog<DialogResult.All>(owner);
 		}
-		
+
-		await new MessageDialog {
+		public static async Task<DialogResult.OkCancel> ShowOkCancel(Window owner, string title, string message) {
-			DataContext = new MessageDialogModel {
+			if (!Dispatcher.UIThread.CheckAccess()) {
-				Title = title,
+				return await Dispatcher.UIThread.InvokeAsync(() => ShowOkCancel(owner, title, message));
-				Message = message,
+			}
-				IsOkVisible = true,
+
-			},
+			var result = await new MessageDialog {
-		}.ShowDialog<DialogResult.All>(owner);
+				DataContext = new MessageDialogModel {
-	}
+					Title = title,
-	
+					Message = message,
-	public static async Task<DialogResult.OkCancel> ShowOkCancel(Window owner, string title, string message) {
+					IsOkVisible = true,
-		if (!Dispatcher.UIThread.CheckAccess()) {
+					IsCancelVisible = true
-			return await Dispatcher.UIThread.InvokeAsync(() => ShowOkCancel(owner, title, message));
+				}
+			}.ShowDialog<DialogResult.All?>(owner);
+
+			return result.ToOkCancel();
 		}
-		
+
-		var result = await new MessageDialog {
+		public static async Task<DialogResult.YesNo> ShowYesNo(Window owner, string title, string message) {
-			DataContext = new MessageDialogModel {
+			if (!Dispatcher.UIThread.CheckAccess()) {
-				Title = title,
+				return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNo(owner, title, message));
-				Message = message,
+			}
-				IsOkVisible = true,
+
-				IsCancelVisible = true,
+			var result = await new MessageDialog {
-			},
+				DataContext = new MessageDialogModel {
-		}.ShowDialog<DialogResult.All?>(owner);
+					Title = title,
-		
+					Message = message,
-		return result.ToOkCancel();
+					IsYesVisible = true,
-	}
+					IsNoVisible = true
-	
+				}
-	public static async Task<DialogResult.YesNo> ShowYesNo(Window owner, string title, string message) {
+			}.ShowDialog<DialogResult.All?>(owner);
-		if (!Dispatcher.UIThread.CheckAccess()) {
+
-			return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNo(owner, title, message));
+			return result.ToYesNo();
 		}
-		
+
-		var result = await new MessageDialog {
+		public static async Task<DialogResult.YesNoCancel> ShowYesNoCancel(Window owner, string title, string message) {
-			DataContext = new MessageDialogModel {
+			if (!Dispatcher.UIThread.CheckAccess()) {
-				Title = title,
+				return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNoCancel(owner, title, message));
-				Message = message,
+			}
-				IsYesVisible = true,
+
-				IsNoVisible = true,
+			var result = await new MessageDialog {
-			},
+				DataContext = new MessageDialogModel {
-		}.ShowDialog<DialogResult.All?>(owner);
+					Title = title,
-		
+					Message = message,
-		return result.ToYesNo();
+					IsYesVisible = true,
-	}
+					IsNoVisible = true,
-	
+					IsCancelVisible = true
-	public static async Task<DialogResult.YesNoCancel> ShowYesNoCancel(Window owner, string title, string message) {
+				}
-		if (!Dispatcher.UIThread.CheckAccess()) {
+			}.ShowDialog<DialogResult.All?>(owner);
-			return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNoCancel(owner, title, message));
+
+			return result.ToYesNoCancel();
 		}
-		
-		var result = await new MessageDialog {
-			DataContext = new MessageDialogModel {
-				Title = title,
-				Message = message,
-				IsYesVisible = true,
-				IsNoVisible = true,
-				IsCancelVisible = true,
-			},
-		}.ShowDialog<DialogResult.All?>(owner);
-		
-		return result.ToYesNoCancel();
 	}
 }

app/Desktop/Dialogs/Message/DialogResult.cs

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

app/Desktop/Dialogs/Message/MessageDialog.axaml

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

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

@@ -1,28 +1,37 @@
 using System.Diagnostics.CodeAnalysis;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Dialogs.Message;
+namespace DHT.Desktop.Dialogs.Message {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class MessageDialog : Window {
+		public MessageDialog() {
+			InitializeComponent();
+			#if DEBUG
+			this.AttachDevTools();
+			#endif
+		}
 
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+		private void InitializeComponent() {
-public sealed partial class MessageDialog : Window {
+			AvaloniaXamlLoader.Load(this);
-	public MessageDialog() {
+		}
-		InitializeComponent();
+
-	}
+		public void ClickOk(object? sender, RoutedEventArgs e) {
-	
+			Close(DialogResult.All.Ok);
-	public void ClickOk(object? sender, RoutedEventArgs e) {
+		}
-		Close(DialogResult.All.Ok);
+
-	}
+		public void ClickYes(object? sender, RoutedEventArgs e) {
-	
+			Close(DialogResult.All.Yes);
-	public void ClickYes(object? sender, RoutedEventArgs e) {
+		}
-		Close(DialogResult.All.Yes);
+
-	}
+		public void ClickNo(object? sender, RoutedEventArgs e) {
-	
+			Close(DialogResult.All.No);
-	public void ClickNo(object? sender, RoutedEventArgs e) {
+		}
-		Close(DialogResult.All.No);
+
-	}
+		public void ClickCancel(object? sender, RoutedEventArgs e) {
-	
+			Close(DialogResult.All.Cancel);
-	public void ClickCancel(object? sender, RoutedEventArgs e) {
+		}
-		Close(DialogResult.All.Cancel);
 	}
 }

app/Desktop/Dialogs/Message/MessageDialogModel.cs

@@ -1,11 +1,11 @@
-namespace DHT.Desktop.Dialogs.Message;
+namespace DHT.Desktop.Dialogs.Message {
+	sealed class MessageDialogModel {
+		public string Title { get; init; } = "";
+		public string Message { get; init; } = "";
 
-sealed class MessageDialogModel {
+		public bool IsOkVisible { get; init; } = false;
-	public string Title { get; init; } = "";
+		public bool IsYesVisible { get; init; } = false;
-	public string Message { get; init; } = "";
+		public bool IsNoVisible { get; init; } = false;
-	
+		public bool IsCancelVisible { get; init; } = false;
-	public bool IsOkVisible { get; init; } = false;
+	}
-	public bool IsYesVisible { get; init; } = false;
-	public bool IsNoVisible { get; init; } = false;
-	public bool IsCancelVisible { get; init; } = false;
 }

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

app/Desktop/Dialogs/Progress/ProgressDialog.axaml

@@ -5,10 +5,9 @@
         xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.Progress"
         mc:Ignorable="d" d:DesignWidth="500"
         x:Class="DHT.Desktop.Dialogs.Progress.ProgressDialog"
-        x:DataType="namespace:ProgressDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Opened="OnOpened"
+        Opened="Loaded"
         Closing="OnClosing"
         Width="500" SizeToContent="Height" CanResize="False"
         WindowStartupLocation="CenterOwner">
@@ -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/Dialogs/Progress/ProgressDialog.axaml.cs

@@ -1,80 +1,40 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Dialogs.Progress;
+namespace DHT.Desktop.Dialogs.Progress {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class ProgressDialog : Window {
+		private bool isFinished = false;
 
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+		public ProgressDialog() {
-public sealed partial class ProgressDialog : Window {
+			InitializeComponent();
-	private static readonly TimeSpan MinimumShowDuration = TimeSpan.FromMilliseconds(500);
+			#if DEBUG
-	
+			this.AttachDevTools();
-	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
+			#endif
-		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());
 		}
-	}
+
-	
+		private void InitializeComponent() {
-	public void OnClosing(object? sender, WindowClosingEventArgs e) {
+			AvaloniaXamlLoader.Load(this);
-		e.Cancel = !isFinished;
+		}
-	}
+
-	
+		public void OnClosing(object? sender, CancelEventArgs e) {
-	private async Task OnFinished(Task task) {
+			e.Cancel = !isFinished;
-		isFinished = true;
+		}
-		
+
-		TimeSpan elapsedTime = DateTime.Now - startTime;
+		public void Loaded(object? sender, EventArgs e) {
-		if (elapsedTime < MinimumShowDuration) {
+			if (DataContext is ProgressDialogModel model) {
-			await Task.Delay(MinimumShowDuration - elapsedTime);
+				Task.Run(model.StartTask).ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
+			}
+		}
+
+		private void OnFinished(Task task) {
+			isFinished = true;
+			Close();
 		}
-		
-		Close();
-	}
-	
-	public async Task ShowProgressDialog(Window owner) {
-		await ShowDialog(owner);
-		await progressTask;
 	}
 }

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -1,63 +1,65 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Threading;
 using DHT.Desktop.Common;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Dialogs.Progress;
+namespace DHT.Desktop.Dialogs.Progress {
+	sealed class ProgressDialogModel : BaseModel {
+		public string Title { get; init; } = "";
 
-sealed class ProgressDialogModel {
+		private string message = "";
-	public string Title { get; init; } = "";
+
-	
+		public string Message {
-	public IReadOnlyList<ProgressItem> Items { get; } = [];
+			get => message;
-	
+			private set => Change(ref message, value);
-	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());
 		}
-	}
+
-	
+		private string items = "";
-	public delegate Task TaskRunner(IReadOnlyList<IProgressCallback> callbacks);
+
-	
+		public string Items {
-	private sealed class Callback : IProgressCallback {
+			get => items;
-		private readonly ProgressItem item;
+			private set => Change(ref items, value);
-		
-		public Callback(ProgressItem item) {
-			this.item = item;
 		}
-		
+
-		public async Task Update(string message, long finishedItems, long totalItems) {
+		private int progress = 0;
-			await Dispatcher.UIThread.InvokeAsync(() => {
+
-				item.Message = message;
+		public int Progress {
-				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
+			get => progress;
-				item.Progress = totalItems == 0 ? 0 : 100 * finishedItems / totalItems;
+			private set => Change(ref progress, value);
-				item.IsIndeterminate = false;
-			});
 		}
-		
+
-		public async Task UpdateIndeterminate(string message) {
+		private readonly TaskRunner? task;
-			await Dispatcher.UIThread.InvokeAsync(() => {
+
-				item.Message = message;
+		[Obsolete("Designer")]
-				item.Items = string.Empty;
+		public ProgressDialogModel() {}
-				item.Progress = 0;
+
-				item.IsIndeterminate = true;
+		public ProgressDialogModel(TaskRunner task) {
-			});
+			this.task = task;
 		}
-		
+
-		public Task Hide() {
+		internal async Task StartTask() {
-			return Update(string.Empty, finishedItems: 0, totalItems: 0);
+			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/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/Dialogs/TextBox/TextBoxDialog.axaml

@@ -1,44 +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.TextBox"
-        mc:Ignorable="d" d:DesignWidth="500"
-        x:Class="DHT.Desktop.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 />
-    </Window.DataContext>
-
-    <StackPanel Margin="20">
-        <ScrollViewer MaxHeight="400">
-            <StackPanel Spacing="10">
-                <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
-                <ItemsRepeater ItemsSource="{Binding Items}">
-                    <ItemsRepeater.ItemTemplate>
-                        <DataTemplate>
-                            <DockPanel Margin="0 5 25 0">
-                                <TextBox Name="Input" Text="{Binding Value}" Width="180" VerticalAlignment="Top" DockPanel.Dock="Right" />
-                                <Label Target="Input" VerticalAlignment="Center" DockPanel.Dock="Left">
-                                    <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
-                                </Label>
-                            </DockPanel>
-                        </DataTemplate>
-                    </ItemsRepeater.ItemTemplate>
-                </ItemsRepeater>
-            </StackPanel>
-        </ScrollViewer>
-        <Panel Classes="buttons">
-            <WrapPanel HorizontalAlignment="Right">
-                <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
-                <Button Click="ClickCancel">Cancel</Button>
-            </WrapPanel>
-        </Panel>
-    </StackPanel>
-
-</Window>

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

@@ -1,21 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using DHT.Desktop.Dialogs.Message;
-
-namespace DHT.Desktop.Dialogs.TextBox;
-
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class TextBoxDialog : Window {
-	public TextBoxDialog() {
-		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/Dialogs/TextBox/TextBoxDialogModel.cs

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

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using PropertyChanged.SourceGenerator;
-
-namespace DHT.Desktop.Dialogs.TextBox;
-
-partial class TextBoxItem : INotifyDataErrorInfo {
-	public string Title { get; init; } = "";
-	public object? Item { get; init; } = null;
-	
-	public Func<string, bool> ValidityCheck { get; init; } = static _ => true;
-	public bool IsValid => ValidityCheck(Value);
-	
-	[Notify]
-	private string value = string.Empty;
-	
-	private void OnValueChanged() {
-		ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
-	}
-	
-	public IEnumerable GetErrors(string? propertyName) {
-		if (propertyName == nameof(Value) && !IsValid) {
-			yield return string.Empty;
-		}
-	}
-	
-	public bool HasErrors => !IsValid;
-	public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
-}
-
-sealed class TextBoxItem<T> : TextBoxItem {
-	public new T Item { get; }
-	
-	public TextBoxItem(T item) {
-		this.Item = item;
-		base.Item = item;
-	}
-}

app/Desktop/Discord/DiscordAppSettings.cs

@@ -1,122 +1,119 @@
 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;
 using static System.Environment.SpecialFolderOption;
 
-namespace DHT.Desktop.Discord;
+namespace DHT.Desktop.Discord {
+	static class DiscordAppSettings {
+		private static readonly Log Log = Log.ForType(typeof(DiscordAppSettings));
 
-static class DiscordAppSettings {
+		private const string JsonKeyDevTools = "DANGEROUS_ENABLE_DEVTOOLS_ONLY_ENABLE_IF_YOU_KNOW_WHAT_YOURE_DOING";
-	private static readonly Log Log = Log.ForType(typeof(DiscordAppSettings));
+
-	
+		public static string JsonFilePath { get; }
-	private const string JsonKeyDevTools = "DANGEROUS_ENABLE_DEVTOOLS_ONLY_ENABLE_IF_YOU_KNOW_WHAT_YOURE_DOING";
+		private static string JsonBackupFilePath { get; }
-	
+
-	public static string JsonFilePath { get; }
+		[SuppressMessage("ReSharper", "ConvertIfStatementToConditionalTernaryExpression")]
-	private static string JsonBackupFilePath { get; }
+		static DiscordAppSettings() {
-	
+			string rootFolder;
-	[SuppressMessage("ReSharper", "ConvertIfStatementToConditionalTernaryExpression")]
+
-	static DiscordAppSettings() {
+			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-		string rootFolder;
+				rootFolder = Path.Combine(Environment.GetFolderPath(ApplicationData, DoNotVerify), "Discord");
-		
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-			rootFolder = Path.Combine(Environment.GetFolderPath(ApplicationData, DoNotVerify), "Discord");
-		}
-		else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
-			rootFolder = Path.Combine(Environment.GetFolderPath(UserProfile, DoNotVerify), "Library", "Application Support", "Discord");
-		}
-		else {
-			rootFolder = Path.Combine(Environment.GetFolderPath(ApplicationData, DoNotVerify), "discord");
-		}
-		
-		JsonFilePath = Path.Combine(rootFolder, "settings.json");
-		JsonBackupFilePath = JsonFilePath + ".bak";
-	}
-	
-	public static async Task<bool?> AreDevToolsEnabled() {
-		try {
-			JsonObject settingsJson = await ReadSettingsJson();
-			return AreDevToolsEnabled(settingsJson);
-		} catch (Exception e) {
-			Log.Error("Cannot read settings file.");
-			Log.Error(e);
-			return null;
-		}
-	}
-	
-	private static bool AreDevToolsEnabled(JsonObject json) {
-		return json.TryGetPropertyValue(JsonKeyDevTools, out JsonNode? node) && node?.GetValueKind() == JsonValueKind.True;
-	}
-	
-	public static async Task<SettingsJsonResult> ConfigureDevTools(bool enable) {
-		JsonObject json;
-		
-		try {
-			json = await ReadSettingsJson();
-		} catch (FileNotFoundException) {
-			return SettingsJsonResult.FileNotFound;
-		} catch (JsonException) {
-			return SettingsJsonResult.InvalidJson;
-		} catch (Exception e) {
-			Log.Error(e);
-			return SettingsJsonResult.ReadError;
-		}
-		
-		if (enable == AreDevToolsEnabled(json)) {
-			return SettingsJsonResult.AlreadySet;
-		}
-		
-		if (enable) {
-			json[JsonKeyDevTools] = true;
-		}
-		else {
-			json.Remove(JsonKeyDevTools);
-		}
-		
-		try {
-			if (!File.Exists(JsonBackupFilePath)) {
-				File.Copy(JsonFilePath, JsonBackupFilePath);
 			}
-			
+			else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
-			await WriteSettingsJson(json);
+				rootFolder = Path.Combine(Environment.GetFolderPath(UserProfile, DoNotVerify), "Library", "Application Support", "Discord");
-		} catch (Exception e) {
+			}
-			Log.Error("An error occurred when writing settings file.");
+			else {
-			Log.Error(e);
+				rootFolder = Path.Combine(Environment.GetFolderPath(ApplicationData, DoNotVerify), "discord");
-			
+			}
-			if (File.Exists(JsonBackupFilePath)) {
+
-				try {
+			JsonFilePath = Path.Combine(rootFolder, "settings.json");
-					File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
+			JsonBackupFilePath = JsonFilePath + ".bak";
-					Log.Info("Restored settings file from backup.");
+		}
-				} catch (Exception e2) {
+
-					Log.Error("Cannot restore settings file from backup.");
+		public static async Task<bool?> AreDevToolsEnabled() {
-					Log.Error(e2);
+			try {
+				return AreDevToolsEnabled(await ReadSettingsJson());
+			} catch (Exception) {
+				return null;
+			}
+		}
+
+		private static bool AreDevToolsEnabled(Dictionary<string, object?> json) {
+			return json.TryGetValue(JsonKeyDevTools, out var value) && value is JsonElement { ValueKind: JsonValueKind.True };
+		}
+
+		public static async Task<SettingsJsonResult> ConfigureDevTools(bool enable) {
+			Dictionary<string, object?> json;
+
+			try {
+				json = await ReadSettingsJson();
+			} catch (FileNotFoundException) {
+				return SettingsJsonResult.FileNotFound;
+			} catch (JsonException) {
+				return SettingsJsonResult.InvalidJson;
+			} catch (Exception e) {
+				Log.Error(e);
+				return SettingsJsonResult.ReadError;
+			}
+
+			if (enable == AreDevToolsEnabled(json)) {
+				return SettingsJsonResult.AlreadySet;
+			}
+
+			if (enable) {
+				json[JsonKeyDevTools] = true;
+			}
+			else {
+				json.Remove(JsonKeyDevTools);
+			}
+
+			try {
+				if (!File.Exists(JsonBackupFilePath)) {
+					File.Copy(JsonFilePath, JsonBackupFilePath);
 				}
+
+				await WriteSettingsJson(json);
+			} catch (Exception e) {
+				Log.Error("An error occurred when writing settings file.");
+				Log.Error(e);
+
+				if (File.Exists(JsonBackupFilePath)) {
+					try {
+						File.Move(JsonBackupFilePath, JsonFilePath, true);
+						Log.Info("Restored settings file from backup.");
+					} catch (Exception e2) {
+						Log.Error("Cannot restore settings file from backup.");
+						Log.Error(e2);
+					}
+				}
+
+				return SettingsJsonResult.WriteError;
 			}
-			
+
-			return SettingsJsonResult.WriteError;
+			try {
+				File.Delete(JsonBackupFilePath);
+			} catch (Exception e) {
+				Log.Error("Cannot delete backup file.");
+				Log.Error(e);
+			}
+
+			return SettingsJsonResult.Success;
 		}
-		
+
-		try {
+		private static async Task<Dictionary<string, object?>> ReadSettingsJson() {
-			File.Delete(JsonBackupFilePath);
+			await using var stream = new FileStream(JsonFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
-		} catch (Exception e) {
+			return await JsonSerializer.DeserializeAsync<Dictionary<string, object?>?>(stream) ?? throw new JsonException();
-			Log.Error("Cannot delete backup file.");
+		}
-			Log.Error(e);
+
+		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, new JsonSerializerOptions { WriteIndented = true });
 		}
-		
-		return SettingsJsonResult.Success;
-	}
-	
-	private static async Task<JsonObject> 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();
-	}
-	
-	private static async Task WriteSettingsJson(JsonObject json) {
-		await using var stream = new FileStream(JsonFilePath, FileMode.Truncate, FileAccess.Write, FileShare.None);
-		await JsonSerializer.SerializeAsync(stream, json, DiscordAppSettingsJsonContext.Default.JsonObject);
 	}
 }

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

@@ -1,10 +1,10 @@
-namespace DHT.Desktop.Discord;
+namespace DHT.Desktop.Discord {
-
+	enum SettingsJsonResult {
-enum SettingsJsonResult {
+		Success,
-	Success,
+		AlreadySet,
-	AlreadySet,
+		FileNotFound,
-	FileNotFound,
+		ReadError,
-	ReadError,
+		InvalidJson,
-	InvalidJson,
+		WriteError
-	WriteError,
+	}
 }

app/Desktop/Main/AboutWindow.axaml

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

app/Desktop/Main/AboutWindow.axaml.cs

@@ -1,11 +1,20 @@
 using System.Diagnostics.CodeAnalysis;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main;
+namespace DHT.Desktop.Main {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class AboutWindow : Window {
+		public AboutWindow() {
+			InitializeComponent();
+			#if DEBUG
+			this.AttachDevTools();
+			#endif
+		}
 
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+		private void InitializeComponent() {
-public sealed partial class AboutWindow : Window {
+			AvaloniaXamlLoader.Load(this);
-	public AboutWindow() {
+		}
-		InitializeComponent();
 	}
 }

app/Desktop/Main/AboutWindowModel.cs

@@ -1,45 +1,33 @@
-using DHT.Desktop.Common;
+using System.Diagnostics;
 
-namespace DHT.Desktop.Main;
+namespace DHT.Desktop.Main {
+	sealed class AboutWindowModel {
+		public void ShowOfficialWebsite() {
+			OpenUrl("https://dht.chylex.com");
+		}
 
-sealed class AboutWindowModel {
+		public void ShowSourceCode() {
-	public void OpenOfficialWebsite() {
+			OpenUrl("https://github.com/chylex/Discord-History-Tracker");
-		SystemUtils.OpenUrl(Program.Website);
+		}
-	}
+
-	
+		public void ShowLibraryAvalonia() {
-	public void OpenIssueTracker() {
+			OpenUrl("https://www.nuget.org/packages/Avalonia");
-		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker/issues");
+		}
-	}
+
-	
+		public void ShowLibrarySqlite() {
-	public void OpenSourceCode() {
+			OpenUrl("https://www.sqlite.org");
-		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker");
+		}
-	}
+
-	
+		public void ShowLibrarySqliteAdoNet() {
-	public void OpenThirdPartyNetCore() {
+			OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
-		SystemUtils.OpenUrl("https://github.com/dotnet/core");
+		}
-	}
+
-	
+		public void ShowLibraryNetCore() {
-	public void OpenThirdPartyAvalonia() {
+			OpenUrl("https://github.com/dotnet/core");
-		SystemUtils.OpenUrl("https://github.com/AvaloniaUI/Avalonia");
+		}
-	}
+
-	
+		private static void OpenUrl(string url) {
-	public void OpenThirdPartyPropertyChangedSourceGenerator() {
+			Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
-		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,171 +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");
-			Log.Error(e);
-		}
-	}
-	
-	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
-			if (!isLoadingFilterSettings) {
-				saveFilterSettingsTask.Post(new FilterSettings(this));
-			}
-			
-			UpdateFilterStatistics();
-		}
-	}
-	
-	private void OnDownloadItemCountChanged(long newItemCount) {
-		totalItemCount = newItemCount;
-		UpdateFilterStatistics();
-	}
-	
-	
-	private void UpdateFilterStatistics() {
-		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/FilterPanel.axaml

@@ -0,0 +1,57 @@
+<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.FilterPanel">
+
+    <Design.DataContext>
+        <controls:FilterPanelModel />
+    </Design.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="WrapPanel > StackPanel">
+            <Setter Property="Margin" Value="0 20 40 0" />
+            <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>
+
+    <WrapPanel>
+        <StackPanel>
+            <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
+            <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">
+                <Label Grid.Row="0" Grid.Column="0">From:</Label>
+                <CalendarDatePicker Grid.Row="0" Grid.Column="2" x:Name="StartDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
+                <Label Grid.Row="2" Grid.Column="0">To:</Label>
+                <CalendarDatePicker Grid.Row="2" Grid.Column="2" x:Name="EndDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
+            </Grid>
+        </StackPanel>
+        <StackPanel>
+            <CheckBox IsChecked="{Binding FilterByChannel}">Filter by Channel</CheckBox>
+            <Button Command="{Binding OpenChannelFilterDialog}" IsEnabled="{Binding FilterByChannel}">Select Channels...</Button>
+            <TextBlock Text="{Binding ChannelFilterLabel}" />
+        </StackPanel>
+        <StackPanel>
+            <CheckBox IsChecked="{Binding FilterByUser}">Filter by User</CheckBox>
+            <Button Command="{Binding OpenUserFilterDialog}" IsEnabled="{Binding FilterByUser}">Select Users...</Button>
+            <TextBlock Text="{Binding UserFilterLabel}" />
+        </StackPanel>
+    </WrapPanel>
+
+</UserControl>

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

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

app/Desktop/Main/Controls/FilterPanelModel.cs

@@ -0,0 +1,237 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.CheckBox;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Server.Data;
+using DHT.Server.Data.Filters;
+using DHT.Server.Database;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.Main.Controls {
+	sealed class FilterPanelModel : BaseModel {
+		private static readonly HashSet<string> FilterProperties = new () {
+			nameof(FilterByDate),
+			nameof(StartDate),
+			nameof(EndDate),
+			nameof(FilterByChannel),
+			nameof(IncludedChannels),
+			nameof(FilterByUser),
+			nameof(IncludedUsers)
+		};
+
+		public event PropertyChangedEventHandler? FilterPropertyChanged;
+
+		public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
+
+		private bool filterByDate = false;
+		private DateTime? startDate = null;
+		private DateTime? endDate = null;
+		private bool filterByChannel = false;
+		private HashSet<ulong>? includedChannels = null;
+		private bool filterByUser = false;
+		private HashSet<ulong>? includedUsers = null;
+
+		public bool FilterByDate {
+			get => filterByDate;
+			set => Change(ref filterByDate, value);
+		}
+
+		public DateTime? StartDate {
+			get => startDate;
+			set => Change(ref startDate, value);
+		}
+
+		public DateTime? EndDate {
+			get => endDate;
+			set => Change(ref endDate, value);
+		}
+
+		public bool FilterByChannel {
+			get => filterByChannel;
+			set => Change(ref filterByChannel, value);
+		}
+
+		public HashSet<ulong> IncludedChannels {
+			get => includedChannels ?? db.GetAllChannels().Select(static channel => channel.Id).ToHashSet();
+			set => Change(ref includedChannels, value);
+		}
+
+		public bool FilterByUser {
+			get => filterByUser;
+			set => Change(ref filterByUser, value);
+		}
+
+		public HashSet<ulong> IncludedUsers {
+			get => includedUsers ?? db.GetAllUsers().Select(static user => user.Id).ToHashSet();
+			set => Change(ref includedUsers, value);
+		}
+
+		private string channelFilterLabel = "";
+
+		public string ChannelFilterLabel {
+			get => channelFilterLabel;
+			set => Change(ref channelFilterLabel, value);
+		}
+
+		private string userFilterLabel = "";
+
+		public string UserFilterLabel {
+			get => userFilterLabel;
+			set => Change(ref userFilterLabel, value);
+		}
+
+		private readonly Window window;
+		private readonly IDatabaseFile db;
+
+		[Obsolete("Designer")]
+		public FilterPanelModel() : this(null!, DummyDatabaseFile.Instance) {}
+
+		public FilterPanelModel(Window window, IDatabaseFile db) {
+			this.window = window;
+			this.db = db;
+
+			UpdateChannelFilterLabel();
+			UpdateUserFilterLabel();
+
+			PropertyChanged += OnPropertyChanged;
+			db.Statistics.PropertyChanged += OnDbStatisticsChanged;
+		}
+
+		private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+			if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
+				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 OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+			if (e.PropertyName == nameof(DatabaseStatistics.TotalChannels)) {
+				UpdateChannelFilterLabel();
+			}
+			else if (e.PropertyName == nameof(DatabaseStatistics.TotalUsers)) {
+				UpdateUserFilterLabel();
+			}
+		}
+
+		public async void OpenChannelFilterDialog() {
+			var servers = db.GetAllServers().ToDictionary(static server => server.Id);
+			var items = new List<CheckBoxItem<ulong>>();
+			var included = IncludedChannels;
+
+			foreach (var channel in db.GetAllChannels()) {
+				var channelId = channel.Id;
+				var channelName = channel.Name;
+
+				string title;
+				if (servers.TryGetValue(channel.Server, out var server)) {
+					var titleBuilder = new StringBuilder();
+					var serverType = server.Type;
+
+					titleBuilder.Append('[')
+					            .Append(ServerTypes.ToString(serverType))
+					            .Append("] ");
+
+					if (serverType == ServerType.DirectMessage) {
+						titleBuilder.Append(channelName);
+					}
+					else {
+						titleBuilder.Append(server.Name)
+						            .Append(" - ")
+						            .Append(channelName);
+					}
+
+					title = titleBuilder.ToString();
+				}
+				else {
+					title = channelName;
+				}
+
+				items.Add(new CheckBoxItem<ulong>(channelId) {
+					Title = title,
+					Checked = included.Contains(channelId)
+				});
+			}
+
+			var result = await OpenIdFilterDialog(window, "Included Channels", items);
+			if (result != null) {
+				IncludedChannels = result;
+			}
+		}
+
+		public async void OpenUserFilterDialog() {
+			var items = new List<CheckBoxItem<ulong>>();
+			var included = IncludedUsers;
+
+			foreach (var user in db.GetAllUsers()) {
+				var name = user.Name;
+				var discriminator = user.Discriminator;
+
+				items.Add(new CheckBoxItem<ulong>(user.Id) {
+					Title = discriminator == null ? name : name + " #" + discriminator,
+					Checked = included.Contains(user.Id)
+				});
+			}
+
+			var result = await OpenIdFilterDialog(window, "Included Users", items);
+			if (result != null) {
+				IncludedUsers = result;
+			}
+		}
+
+		private void UpdateChannelFilterLabel() {
+			long total = db.Statistics.TotalChannels;
+			long included = FilterByChannel ? IncludedChannels.Count : total;
+			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+		}
+
+		private void UpdateUserFilterLabel() {
+			long total = db.Statistics.TotalUsers;
+			long included = FilterByUser ? IncludedUsers.Count : total;
+			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
+		}
+
+		public MessageFilter CreateFilter() {
+			MessageFilter filter = new();
+
+			if (FilterByDate) {
+				filter.StartDate = StartDate;
+				filter.EndDate = EndDate;
+			}
+
+			if (FilterByChannel) {
+				filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
+			}
+
+			if (FilterByUser) {
+				filter.UserIds = new HashSet<ulong>(IncludedUsers);
+			}
+
+			return filter;
+		}
+
+		private static async Task<HashSet<ulong>?> OpenIdFilterDialog(Window window, string title, List<CheckBoxItem<ulong>> items) {
+			items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
+
+			var model = new CheckBoxDialogModel<ulong>(items) {
+				Title = title
+			};
+
+			var dialog = new CheckBoxDialog { DataContext = model };
+			var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
+
+			return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
+		}
+	}
+}

app/Desktop/Main/Controls/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,307 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using Avalonia.ReactiveUI;
-using 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.");
-	}
-	
-	public async Task OpenChannelFilterDialog() {
-		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
-			var items = new List<CheckBoxItem<ulong>>();
-			Dictionary<ulong, DHT.Server.Data.Server> servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
-			
-			await foreach (Channel channel in state.Db.Channels.Get()) {
-				ulong channelId = channel.Id;
-				string channelName = channel.Name;
-				
-				string title;
-				if (servers.TryGetValue(channel.Server, out var server)) {
-					var titleBuilder = new StringBuilder();
-					ServerType? serverType = server.Type;
-					
-					titleBuilder.Append('[')
-					            .Append(ServerTypes.ToString(serverType))
-					            .Append("] ");
-					
-					if (serverType == ServerType.DirectMessage) {
-						titleBuilder.Append(channelName);
-					}
-					else {
-						titleBuilder.Append(server.Name)
-						            .Append(" - ")
-						            .Append(channelName);
-					}
-					
-					title = titleBuilder.ToString();
-				}
-				else {
-					title = channelName;
-				}
-				
-				items.Add(new CheckBoxItem<ulong>(channelId) {
-					Title = title,
-					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId),
-				});
-			}
-			
-			return items;
-		}
-		
-		const string Title = "Included Channels";
-		
-		List<CheckBoxItem<ulong>> items;
-		try {
-			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading channels...", PrepareChannelItems);
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, Title, "Error loading channels: " + e.Message);
-			return;
-		}
-		
-		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
-		if (result != null) {
-			IncludedChannels = result;
-		}
-	}
-	
-	public async Task OpenUserFilterDialog() {
-		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
-			var checkBoxItems = new List<CheckBoxItem<ulong>>();
-			
-			await foreach (User user in state.Db.Users.Get()) {
-				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
-					Title = user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})",
-					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id),
-				});
-			}
-			
-			return checkBoxItems;
-		}
-		
-		const string Title = "Included Users";
-		
-		List<CheckBoxItem<ulong>> items;
-		try {
-			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, Title, "Error loading users: " + e.Message);
-			return;
-		}
-		
-		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
-		if (result != null) {
-			IncludedUsers = result;
-		}
-	}
-	
-	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, List<CheckBoxItem<ulong>> items) {
-		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
-		
-		var model = new CheckBoxDialogModel<ulong>(items) {
-			Title = title,
-		};
-		
-		var dialog = new CheckBoxDialog { DataContext = model };
-		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
-		
-		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
-	}
-	
-	public MessageFilter CreateFilter() {
-		MessageFilter filter = new ();
-		
-		if (FilterByDate) {
-			filter.StartDate = StartDate;
-			filter.EndDate = EndDate?.AddDays(1).AddMilliseconds(-1);
-		}
-		
-		if (FilterByChannel && IncludedChannels != null) {
-			filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
-		}
-		
-		if (FilterByUser && IncludedUsers != null) {
-			filter.UserIds = new HashSet<ulong>(IncludedUsers);
-		}
-		
-		return filter;
-	}
-}

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

@@ -1,52 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
-             mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.ServerConfigurationPanel"
-             x:DataType="controls:ServerConfigurationPanelModel">
-
-    <Design.DataContext>
-        <controls:ServerConfigurationPanelModel />
-    </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 5" />
-            <Setter Property="Padding" Value="0" />
-        </Style>
-        <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Orientation" Value="Vertical" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel Spacing="10">
-        <Button Command="{Binding OnClickToggleServerButton}" Content="{Binding ToggleServerButtonText}" IsEnabled="{Binding IsToggleServerButtonEnabled}" />
-        <TextBlock TextWrapping="Wrap" Margin="0 5">
-            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script or connection code again.
-        </TextBlock>
-        <WrapPanel ItemSpacing="10" LineSpacing="10">
-            <StackPanel>
-                <Label Target="Port">Port</Label>
-                <TextBox x:Name="Port" Width="70" Text="{Binding InputPort}" />
-            </StackPanel>
-            <StackPanel>
-                <Label Target="Token">Token</Label>
-                <TextBox x:Name="Token" Width="200" Text="{Binding InputToken}" />
-            </StackPanel>
-            <StackPanel VerticalAlignment="Bottom">
-                <Button Command="{Binding OnClickRandomizeToken}">Randomize Token</Button>
-            </StackPanel>
-        </WrapPanel>
-        <StackPanel Orientation="Horizontal" Spacing="10">
-            <Button IsEnabled="{Binding HasMadeChanges}" Command="{Binding OnClickApplyChanges}">Apply &amp; Restart</Button>
-            <Button IsEnabled="{Binding HasMadeChanges}" Command="{Binding OnClickCancelChanges}">Cancel</Button>
-        </StackPanel>
-    </StackPanel>
-
-</UserControl>

app/Desktop/Main/Controls/ServerConfigurationPanel.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 ServerConfigurationPanel : UserControl {
-	public ServerConfigurationPanel() {
-		InitializeComponent();
-	}
-}

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(e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
-		IsToggleServerButtonEnabled = true;
-	}
-	
-	private async Task StopServer() {
-		IsToggleServerButtonEnabled = false;
-		
-		try {
-			await server.Stop();
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
-		IsToggleServerButtonEnabled = true;
-	}
-	
-	public async Task OnClickToggleServerButton() {
-		if (server.IsRunning) {
-			await StopServer();
-		}
-		else {
-			await StartServer();
-		}
-	}
-	
-	public void OnClickRandomizeToken() {
-		InputToken = ServerUtils.GenerateRandomToken(20);
-	}
-	
-	public async Task OnClickApplyChanges() {
-		if (!ushort.TryParse(InputPort, out ushort port)) {
-			await Dialog.ShowOk(window, "Invalid Port", "Port must be a number between 0 and 65535.");
-			return;
-		}
-		
-		ServerConfiguration.Port = port;
-		ServerConfiguration.Token = inputToken;
-		
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(HasMadeChanges)));
-		
-		await StartServer();
-	}
-	
-	public void OnClickCancelChanges() {
-		InputPort = ServerConfiguration.Port.ToString();
-		InputToken = ServerConfiguration.Token;
-	}
-}

app/Desktop/Main/Controls/StatusBar.axaml

@@ -4,58 +4,54 @@
              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.StatusBar"
+             x:Class="DHT.Desktop.Main.Controls.StatusBar">
-             x:DataType="controls:StatusBarModel">
 
     <Design.DataContext>
         <controls:StatusBarModel />
     </Design.DataContext>
 
     <UserControl.Background>
-        <SolidColorBrush>#3C4F79</SolidColorBrush>
+        <SolidColorBrush>#546A9F</SolidColorBrush>
     </UserControl.Background>
 
     <UserControl.Styles>
         <Style Selector="StackPanel > TextBlock">
-            <Setter Property="Foreground" Value="#E7E7E7" />
+            <Setter Property="Foreground" Value="#E0E0E0" />
         </Style>
         <Style Selector="StackPanel > TextBlock.label">
             <Setter Property="FontSize" Value="15" />
-            <Setter Property="FontWeight" Value="SemiLight" />
         </Style>
         <Style Selector="StackPanel > TextBlock.value">
             <Setter Property="FontSize" Value="16" />
-            <Setter Property="FontWeight" Value="SemiLight" />
             <Setter Property="TextAlignment" Value="Right" />
-            <Setter Property="Margin" Value="0 1" />
         </Style>
         <Style Selector="StackPanel > Rectangle">
-            <Setter Property="Margin" Value="14 1" />
+            <Setter Property="Margin" Value="14 0" />
-            <Setter Property="Stroke" Value="#697899" />
+            <Setter Property="Stroke" Value="#3B5287" />
             <Setter Property="StrokeThickness" Value="2" />
             <Setter Property="VerticalAlignment" Value="Stretch" />
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Orientation="Horizontal" Margin="6 3">
+    <StackPanel Orientation="Horizontal" Margin="4 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 2 0 0" Text="{Binding StatusText}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Servers</TextBlock>
-            <TextBlock Classes="value" Text="{Binding ServerCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalServers, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Channels</TextBlock>
-            <TextBlock Classes="value" Text="{Binding ChannelCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalChannels, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Messages</TextBlock>
-            <TextBlock Classes="value" Text="{Binding MessageCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalMessages, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
     </StackPanel>
 

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

@@ -1,11 +1,16 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main.Controls;
+namespace DHT.Desktop.Main.Controls {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class StatusBar : UserControl {
+		public StatusBar() {
+			InitializeComponent();
+		}
 
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+		private void InitializeComponent() {
-public sealed partial class StatusBar : UserControl {
+			AvaloniaXamlLoader.Load(this);
-	public StatusBar() {
+		}
-		InitializeComponent();
 	}
 }

app/Desktop/Main/Controls/StatusBarModel.cs

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

@@ -0,0 +1,91 @@
+<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:main="clr-namespace:DHT.Desktop.Main"
+             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="DHT.Desktop.Main.MainContentScreen">
+
+    <Design.DataContext>
+        <main:MainContentScreenModel />
+    </Design.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="TabControl ItemsPresenter > WrapPanel">
+            <Setter Property="Background" Value="#546A9F" />
+        </Style>
+        <Style Selector="TabItem">
+            <Setter Property="Foreground" Value="#E9E9E9" />
+            <Setter Property="FontSize" Value="20" />
+        </Style>
+        <Style Selector="TabItem[TabStripPlacement=Left] /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Margin" Value="5 0" />
+        </Style>
+        <Style Selector="TabItem:pointerover">
+            <Setter Property="Background" Value="#1F2E45" />
+        </Style>
+        <Style Selector="TabItem:pointerover /template/ Border">
+            <Setter Property="Background" Value="#1F2E45" />
+        </Style>
+        <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 > TextBlock">
+            <Setter Property="Foreground" Value="#1A2234" />
+        </Style>
+        <Style Selector="TabItem:selected">
+            <Setter Property="Foreground" Value="#1A2234" />
+            <Setter Property="Background" Value="#FFFFFF" />
+        </Style>
+        <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="TabItem:disabled > TextBlock">
+            <Setter Property="Foreground" Value="#B2B2B2" />
+            <Setter Property="TextDecorations" Value="Strikethrough" />
+        </Style>
+        <Style Selector="TabItem.first">
+            <Setter Property="Margin" Value="0 13 0 0" />
+        </Style>
+        <Style Selector="TabControl">
+            <Setter Property="Padding" Value="0" />
+        </Style>
+        <Style Selector="ContentPresenter.page">
+            <Setter Property="Margin" Value="15 21" />
+        </Style>
+    </UserControl.Styles>
+
+    <DockPanel>
+        <TabControl x:Name="TabControl" TabStripPlacement="Left">
+            <TabItem x:Name="TabDatabase" Header="Database" Classes="first">
+                <DockPanel>
+                    <controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Bottom" />
+                    <ScrollViewer>
+                        <ContentPresenter Content="{Binding DatabasePage}" Classes="page" />
+                    </ScrollViewer>
+                </DockPanel>
+            </TabItem>
+            <TabItem x:Name="TabTracking" Header="Tracking">
+                <DockPanel>
+                    <controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Bottom" />
+                    <ScrollViewer>
+                        <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
+                    </ScrollViewer>
+                </DockPanel>
+            </TabItem>
+            <TabItem x:Name="TabViewer" Header="Viewer">
+                <DockPanel>
+                    <controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Bottom" />
+                    <ScrollViewer>
+                        <ContentPresenter Content="{Binding ViewerPage}" Classes="page" />
+                    </ScrollViewer>
+                </DockPanel>
+            </TabItem>
+        </TabControl>
+    </DockPanel>
+
+</UserControl>

app/Desktop/Main/MainContentScreen.axaml.cs

@@ -0,0 +1,16 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace DHT.Desktop.Main {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class MainContentScreen : UserControl {
+		public MainContentScreen() {
+			InitializeComponent();
+		}
+
+		private void InitializeComponent() {
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+}

app/Desktop/Main/MainContentScreenModel.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using DHT.Desktop.Main.Controls;
+using DHT.Desktop.Main.Pages;
+using DHT.Server.Database;
+using DHT.Server.Service;
+
+namespace DHT.Desktop.Main {
+	sealed class MainContentScreenModel : IDisposable {
+		public DatabasePage DatabasePage { get; }
+		private DatabasePageModel DatabasePageModel { get; }
+
+		public TrackingPage TrackingPage { get; }
+		private TrackingPageModel TrackingPageModel { get; }
+
+		public ViewerPage ViewerPage { get; }
+		private ViewerPageModel ViewerPageModel { get; }
+
+		public StatusBarModel StatusBarModel { get; }
+
+		public event EventHandler? DatabaseClosed {
+			add {
+				DatabasePageModel.DatabaseClosed += value;
+			}
+			remove {
+				DatabasePageModel.DatabaseClosed -= value;
+			}
+		}
+
+		[Obsolete("Designer")]
+		public MainContentScreenModel() : this(null!, DummyDatabaseFile.Instance) {}
+
+		public MainContentScreenModel(Window window, IDatabaseFile db) {
+			DatabasePageModel = new DatabasePageModel(window, db);
+			DatabasePage = new DatabasePage { DataContext = DatabasePageModel };
+
+			TrackingPageModel = new TrackingPageModel(window, db);
+			TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
+
+			ViewerPageModel = new ViewerPageModel(window, db);
+			ViewerPage = new ViewerPage { DataContext = ViewerPageModel };
+
+			StatusBarModel = new StatusBarModel(db.Statistics);
+			TrackingPageModel.ServerStatusChanged += TrackingPageModelOnServerStatusChanged;
+			StatusBarModel.CurrentStatus = ServerLauncher.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped;
+		}
+
+		public async Task Initialize() {
+			await TrackingPageModel.Initialize();
+		}
+
+		private void TrackingPageModelOnServerStatusChanged(object? sender, StatusBarModel.Status e) {
+			StatusBarModel.CurrentStatus = e;
+		}
+
+		public void Dispose() {
+			TrackingPageModel.Dispose();
+		}
+	}
+}

app/Desktop/Main/MainWindow.axaml

@@ -5,19 +5,19 @@
         xmlns:main="clr-namespace:DHT.Desktop.Main"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="DHT.Desktop.Main.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"
+        MinWidth="480" MinHeight="240"
         WindowStartupLocation="CenterScreen"
-        Closing="OnClosing">
+        Closed="OnClosed">
 
     <Design.DataContext>
         <main:MainWindowModel />
     </Design.DataContext>
 
     <Panel>
-        <ContentPresenter Content="{Binding CurrentScreen}" />
+        <ContentPresenter Content="{Binding WelcomeScreen}" IsVisible="{Binding ShowWelcomeScreen}" />
+        <ContentPresenter Content="{Binding MainContentScreen}" IsVisible="{Binding ShowMainContentScreen}" />
     </Panel>
 </Window>

app/Desktop/Main/MainWindow.axaml.cs

@@ -1,44 +1,34 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
+using Avalonia;
 using Avalonia.Controls;
-using DHT.Utils.Logging;
+using Avalonia.Markup.Xaml;
 using JetBrains.Annotations;
 
-namespace DHT.Desktop.Main;
+namespace DHT.Desktop.Main {
-
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class MainWindow : Window {
-public sealed partial class MainWindow : Window {
+		[UsedImplicitly]
-	private static readonly Log Log = Log.ForType<MainWindow>();
+		public MainWindow() {
-	
+			InitializeComponent(Arguments.Empty);
-	[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();
 		}
-	}
+
-	
+		internal MainWindow(Arguments args) {
-	private async Task Dispose() {
+			InitializeComponent(args);
-		if (DataContext is MainWindowModel model) {
+		}
-			try {
+
-				await model.DisposeAsync();
+		private void InitializeComponent(Arguments args) {
-			} catch (Exception ex) {
+			AvaloniaXamlLoader.Load(this);
-				Log.Error("Caught exception while disposing window: " + ex);
+			DataContext = new MainWindowModel(this, args);
+
+			#if DEBUG
+			this.AttachDevTools();
+			#endif
+		}
+
+		public void OnClosed(object? sender, EventArgs e) {
+			if (DataContext is IDisposable disposable) {
+				disposable.Dispose();
 			}
 		}
 	}

app/Desktop/Main/MainWindowModel.cs

@@ -1,137 +1,113 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
+using DHT.Desktop.Main.Pages;
-using DHT.Desktop.Main.Screens;
-using DHT.Desktop.Server;
-using DHT.Server;
 using DHT.Server.Database;
-using DHT.Utils.Logging;
+using DHT.Utils.Models;
-using PropertyChanged.SourceGenerator;
 
-namespace DHT.Desktop.Main;
+namespace DHT.Desktop.Main {
+	sealed class MainWindowModel : BaseModel, IDisposable {
+		private const string DefaultTitle = "Discord History Tracker";
 
-sealed partial class MainWindowModel : IAsyncDisposable {
+		public string Title { get; private set; } = DefaultTitle;
-	private const string DefaultTitle = "Discord History Tracker";
+
-	
+		public WelcomeScreen WelcomeScreen { get; }
-	private static readonly Log Log = Log.ForType<MainWindowModel>();
+		private WelcomeScreenModel WelcomeScreenModel { get; }
-	
+
-	[Notify(Setter.Private)]
+		public MainContentScreen? MainContentScreen { get; private set; }
-	private string title = DefaultTitle;
+		private MainContentScreenModel? MainContentScreenModel { get; set; }
-	
+
-	[Notify(Setter.Private)]
+		public bool ShowWelcomeScreen => db == null;
-	private UserControl currentScreen;
+		public bool ShowMainContentScreen => db != null;
-	
+
-	private readonly WelcomeScreen welcomeScreen;
+		private readonly Window window;
-	private readonly WelcomeScreenModel welcomeScreenModel;
+
-	
+		private IDatabaseFile? db;
-	private MainContentScreenModel? mainContentScreenModel;
+
-	
+		[Obsolete("Designer")]
-	private readonly Window window;
+		public MainWindowModel() : this(null!, Arguments.Empty) {}
-	private readonly int? concurrentDownloads;
+
-	
+		public MainWindowModel(Window window, Arguments args) {
-	private State? state;
+			this.window = window;
-	
+
-	[Obsolete("Designer")]
+			WelcomeScreenModel = new WelcomeScreenModel(window);
-	public MainWindowModel() : this(null!, Arguments.Empty) {}
+			WelcomeScreen = new WelcomeScreen { DataContext = WelcomeScreenModel };
-	
+
-	public MainWindowModel(Window window, Arguments args) {
+			WelcomeScreenModel.PropertyChanged += WelcomeScreenModelOnPropertyChanged;
-		this.window = window;
+
-		
+			var dbFile = args.DatabaseFile;
-		welcomeScreenModel = new WelcomeScreenModel(window);
+			if (!string.IsNullOrWhiteSpace(dbFile)) {
-		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
+				async void OnWindowOpened(object? o, EventArgs eventArgs) {
-		
+					window.Opened -= OnWindowOpened;
-		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
+
-		currentScreen = welcomeScreen;
+					// https://github.com/AvaloniaUI/Avalonia/issues/3071
-		
+					if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
-		string? dbFile = args.DatabaseFile;
+						await Task.Delay(500);
-		if (!string.IsNullOrWhiteSpace(dbFile)) {
+					}
-			async void OnWindowOpened(object? o, EventArgs eventArgs) {
+
-				window.Opened -= OnWindowOpened;
+					if (File.Exists(dbFile)) {
-				
+						await WelcomeScreenModel.OpenOrCreateDatabaseFromPath(dbFile);
-				// https://github.com/AvaloniaUI/Avalonia/issues/3071
+					}
-				if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+					else {
-					await Task.Delay(500);
+						await Dialog.ShowOk(window, "Database Error", "Database file not found:\n" + dbFile);
+					}
 				}
-				
+
-				if (File.Exists(dbFile)) {
+				window.Opened += OnWindowOpened;
-					await welcomeScreenModel.OpenOrCreateDatabaseFromPath(dbFile);
+			}
+
+			if (args.ServerPort != null) {
+				TrackingPageModel.ServerPort = args.ServerPort.ToString()!;
+			}
+
+			if (args.ServerToken != null) {
+				TrackingPageModel.ServerToken = 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;
 				}
 				else {
-					await Dialog.ShowOk(window, "Database Error", "Database file not found:\n" + dbFile);
+					Title = Path.GetFileName(db.Path) + " - " + DefaultTitle;
+					MainContentScreenModel = new MainContentScreenModel(window, db);
+					await MainContentScreenModel.Initialize();
+					MainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
+					MainContentScreen = new MainContentScreen { DataContext = MainContentScreenModel };
+					OnPropertyChanged(nameof(MainContentScreen));
 				}
+
+				OnPropertyChanged(nameof(ShowWelcomeScreen));
+				OnPropertyChanged(nameof(ShowMainContentScreen));
+				OnPropertyChanged(nameof(Title));
+
+				window.Focus();
 			}
-			
-			window.Opened += OnWindowOpened;
 		}
-		
+
-		if (args.ServerPort != null) {
+		private void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-			ServerConfiguration.Port = args.ServerPort.Value;
+			WelcomeScreenModel.CloseDatabase();
 		}
-		
+
-		if (args.ServerToken != null) {
+		public void Dispose() {
-			ServerConfiguration.Token = args.ServerToken;
+			MainContentScreenModel?.Dispose();
+			db?.Dispose();
 		}
-		
-		concurrentDownloads = args.ConcurrentDownloads;
-	}
-	
-	private async void OnDatabaseSelected(object? sender, IDatabaseFile db) {
-		welcomeScreenModel.DatabaseSelected -= OnDatabaseSelected;
-		
-		await DisposeState();
-		
-		state = new State(db, concurrentDownloads);
-		
-		try {
-			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
-		} catch (Exception ex) {
-			Log.Error(ex);
-			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
-		}
-		
-		mainContentScreenModel = new MainContentScreenModel(window, state);
-		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-		
-		await mainContentScreenModel.Initialize();
-		
-		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
-		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
-		
-		window.Focus();
-	}
-	
-	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-		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/AdvancedPage.axaml

@@ -1,20 +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.AdvancedPage"
-             x:DataType="pages:AdvancedPageModel">
-
-    <Design.DataContext>
-        <pages:AdvancedPageModel />
-    </Design.DataContext>
-
-    <StackPanel Orientation="Vertical" Spacing="10">
-        <Expander Header="Internal Server Configuration" IsExpanded="True">
-            <controls:ServerConfigurationPanel DataContext="{Binding ServerConfigurationModel}" />
-        </Expander>
-    </StackPanel>
-</UserControl>

app/Desktop/Main/Pages/AdvancedPage.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 AdvancedPage : UserControl {
-	public AdvancedPage() {
-		InitializeComponent();
-	}
-}

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/DatabasePage.axaml

@@ -4,29 +4,27 @@
              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.DatabasePage"
+             x:Class="DHT.Desktop.Main.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/Main/Pages/DatabasePage.axaml.cs

@@ -1,11 +1,16 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.Main.Pages {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class DatabasePage : UserControl {
+		public DatabasePage() {
+			InitializeComponent();
+		}
 
-[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+		private void InitializeComponent() {
-public sealed partial class DatabasePage : UserControl {
+			AvaloniaXamlLoader.Load(this);
-	public DatabasePage() {
+		}
-		InitializeComponent();
 	}
 }

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -1,312 +1,157 @@
 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.Service;
-using DHT.Server.Database.Sqlite.Schema;
-using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.Main.Pages {
+	sealed class DatabasePageModel : BaseModel {
+		private static readonly Log Log = Log.ForType<DatabasePageModel>();
 
-sealed class DatabasePageModel {
+		public IDatabaseFile Db { get; }
-	private static readonly Log Log = Log.ForType<DatabasePageModel>();
+
-	
+		public event EventHandler? DatabaseClosed;
-	public IDatabaseFile Db { get; }
+
-	
+		private readonly Window window;
-	public event EventHandler? DatabaseClosed;
+
-	
+		[Obsolete("Designer")]
-	private readonly Window window;
+		public DatabasePageModel() : this(null!, DummyDatabaseFile.Instance) {}
-	
+
-	[Obsolete("Designer")]
+		public DatabasePageModel(Window window, IDatabaseFile db) {
-	public DatabasePageModel() : this(null!, State.Dummy) {}
+			this.window = window;
-	
+			this.Db = db;
-	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) {
+		public async void OpenDatabaseFolder() {
-			case PlatformID.Win32NT:
+			string file = Db.Path;
-				Process.Start("explorer.exe", "/select,\"" + file + "\"");
+			string? folder = Path.GetDirectoryName(file);
-				break;
+
-			
+			if (folder == null) {
-			case PlatformID.Unix:
+				return;
-				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(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 {
+			switch (Environment.OSVersion.Platform) {
-				await target.AddFrom(db);
+				case PlatformID.Win32NT:
-				return true;
+					Process.Start("explorer.exe", "/select,\"" + file + "\"");
-			} finally {
+					break;
-				await db.DisposeAsync();
+
-			}
+				case PlatformID.Unix:
-		});
+					Process.Start("xdg-open", new string[] { folder });
-	}
+					break;
-	
+
-	private sealed class SchemaUpgradeCallbacks(ProgressDialog dialog, int total) : ISchemaUpgradeCallbacks {
+				case PlatformID.MacOSX:
-		private bool? decision;
+					Process.Start("open", new string[] { folder });
-		
+					break;
-		public Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+
-			return Task.FromResult<InitialDatabaseSettings?>(null);
+				default:
-		}
+					await Dialog.ShowOk(window, "Feature Not Supported", "This feature is not supported for your operating system.");
-		
+					break;
-		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 void MergeWithDatabase() {
-	public async Task ImportLegacyArchive() {
+			var fileDialog = DatabaseGui.NewOpenDatabaseFileDialog();
-		string[] paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+			fileDialog.Directory = Path.GetDirectoryName(Db.Path);
-			Title = "Open Legacy DHT Archive",
+			fileDialog.AllowMultiple = true;
-			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
+
-			AllowMultiple = true,
+			string[]? paths = await fileDialog.ShowAsync(window);
-		});
+			if (paths == null || paths.Length == 0) {
-		
+				return;
-		if (paths.Length == 0) {
-			return;
-		}
-		
-		const string Title = "Legacy Archive Import";
-		
-		ImportResult? result;
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "archive file"));
-	}
-	
-	private static async Task<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 {
+			ProgressDialog progressDialog = new ProgressDialog();
-				if (await performImport(path)) {
+			progressDialog.DataContext = new ProgressDialogModel(async callback => await MergeWithDatabaseFromPaths(Db, paths, progressDialog, callback)) {
-					++successful;
+				Title = "Database Merge"
+			};
+
+			await progressDialog.ShowDialog(window);
+		}
+
+		public void CloseDatabase() {
+			ServerLauncher.Stop();
+			DatabaseClosed?.Invoke(this, EventArgs.Empty);
+		}
+
+		private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+			int total = paths.Length;
+
+			DialogResult.YesNo? upgradeResult = null;
+
+			async Task<bool> CheckCanUpgradeDatabase() {
+				upgradeResult ??= total > 1
+					                  ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
+					                  : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog);
+
+				return DialogResult.YesNo.Yes == upgradeResult;
+			}
+
+			var oldStatistics = target.Statistics.Clone();
+			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, "Database Error", "Database '" + Path.GetFileName(path) + "' no longer exists.");
+					continue;
 				}
-			} catch (Exception ex) {
+
-				Log.Error(ex);
+				IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, CheckCanUpgradeDatabase);
-				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
+				if (db == null) {
+					continue;
+				}
+
+				try {
+					target.AddFrom(db);
+				} catch (Exception ex) {
+					Log.Error(ex);
+					await Dialog.ShowOk(dialog, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be merged: " + ex.Message);
+					continue;
+				} finally {
+					db.Dispose();
+				}
+
+				++successful;
 			}
+
+			await callback.Update("Done", finished, total);
+
+			if (successful == 0) {
+				await Dialog.ShowOk(dialog, "Database Merge", "Nothing was merged.");
+				return;
+			}
+
+			var newStatistics = target.Statistics;
+			long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
+			long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
+			long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
+
+			StringBuilder message = new StringBuilder();
+			message.Append("Processed ");
+
+			if (successful == total) {
+				message.Append(successful.Pluralize("database file"));
+			}
+			else {
+				message.Append(successful.Format()).Append(" out of ").Append(total.Pluralize("database file"));
+			}
+
+			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(newMessages.Pluralize("message"));
+
+			await Dialog.ShowOk(dialog, "Database Merge", message.ToString());
 		}
-		
-		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(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,49 +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>
-    </StackPanel>
-</UserControl>

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

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

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -1,174 +0,0 @@
-#if DEBUG
-using System;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Threading.Tasks;
-using Avalonia.Controls;
-using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
-using DHT.Server;
-using DHT.Server.Data;
-using DHT.Server.Service;
-
-namespace DHT.Desktop.Main.Pages;
-
-sealed class DebugPageModel {
-	public string GenerateChannels { get; set; } = "0";
-	public string GenerateUsers { get; set; } = "0";
-	public string GenerateMessages { get; set; } = "0";
-	
-	private readonly Window window;
-	private readonly State state;
-	
-	[Obsolete("Designer")]
-	public DebugPageModel() : this(null!, State.Dummy) {}
-	
-	public DebugPageModel(Window window, State state) {
-		this.window = window;
-		this.state = state;
-	}
-	
-	public async void OnClickAddRandomDataToDatabase() {
-		if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
-			await Dialog.ShowOk(window, "Generate Random Data", "Amount of channels must be at least 1!");
-			return;
-		}
-		
-		if (!int.TryParse(GenerateUsers, out int users) || users < 1) {
-			await Dialog.ShowOk(window, "Generate Random Data", "Amount of users must be at least 1!");
-			return;
-		}
-		
-		if (!int.TryParse(GenerateMessages, out int messages) || messages < 1) {
-			await Dialog.ShowOk(window, "Generate Random Data", "Amount of messages must be at least 1!");
-			return;
-		}
-		
-		await ProgressDialog.Show(window, "Generating Random Data", async (_, callback) => await GenerateRandomData(channels, users, messages, callback));
-	}
-	
-	private const int BatchSize = 500;
-	
-	private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
-		int batchCount = (messageCount + BatchSize - 1) / BatchSize;
-		await callback.Update("Adding messages in batches of " + BatchSize, 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 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();
-	}
-}

app/Desktop/Main/Pages/DownloadsPageModel.cs

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

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -4,51 +4,61 @@
              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.TrackingPage"
+             x:Class="DHT.Desktop.Main.Pages.TrackingPage">
-             x:DataType="pages:TrackingPageModel">
 
     <Design.DataContext>
         <pages:TrackingPageModel />
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="TextBlock">
+        <Style Selector="TextBox">
-            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="FontFamily" Value="Consolas,Courier" />
+            <Setter Property="FontSize" Value="15" />
+        </Style>
+        <Style Selector="WrapPanel > StackPanel">
+            <Setter Property="Orientation" Value="Vertical" />
+            <Setter Property="Margin" Value="0 0 10 10" />
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Spacing="20">
+    <StackPanel Spacing="10">
-        <Expander Header="Method 1: Manual" IsExpanded="True">
+        <TextBlock TextWrapping="Wrap">
-            <StackPanel Orientation="Vertical" Spacing="10">
+            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>
+        </TextBlock>
-                    <TextBlock.Text>
+        <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="10">
-                        <MultiBinding StringFormat="Use {0} to open Dev Tools in your browser or the Discord app, copy the tracking script, and paste it into the console.">
+            <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick">Copy Tracking Script</Button>
-                            <Binding Path="OpenDevToolsShortcutText" />
+            <Button Command="{Binding OnClickToggleTrackingButton}" Content="{Binding ToggleTrackingButtonText}" IsEnabled="{Binding IsToggleButtonEnabled}" />
-                        </MultiBinding>
+        </StackPanel>
-                    </TextBlock.Text>
+        <Expander Header="Advanced Tracking Settings">
+            <StackPanel Spacing="10">
+                <TextBlock TextWrapping="Wrap">
+                    The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy and apply the tracking script again.
                 </TextBlock>
-                <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick">Copy Tracking Script</Button>
+                <WrapPanel>
-                <TextBlock Margin="0 5 0 0">
+                    <StackPanel>
-                    By default, the Discord app blocks the Dev Tools shortcut. The button below changes a hidden setting to unblock the shortcut.
+                        <Label Target="Port">Port</Label>
-                </TextBlock>
+                        <TextBox x:Name="Port" Width="70" Text="{Binding InputPort}" />
-                <Button Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
+                    </StackPanel>
-            </StackPanel>
+                    <StackPanel>
-        </Expander>
+                        <Label Target="Token">Token</Label>
-        <Expander Header="Method 2: Userscript" IsExpanded="True">
+                        <StackPanel Orientation="Horizontal">
-            <StackPanel Orientation="Vertical" Spacing="10">
+                            <TextBox x:Name="Token" Width="200" Text="{Binding InputToken}" />
-                <TextBlock>
+                        </StackPanel>
-                    Requires a userscript manager in your browser. The userscript adds a DHT icon next to the Help icon on Discord.
+                    </StackPanel>
-                    If the icon does not appear, update this app and reinstall the userscript.
+                    <StackPanel VerticalAlignment="Bottom">
-                </TextBlock>
+                        <Button Command="{Binding OnClickRandomizeToken}">Randomize Token</Button>
-                <TextBlock>
+                    </StackPanel>
-                    Copy the Connection Code, click the DHT icon, and paste the code into the prompt.
-                </TextBlock>
-                <WrapPanel ItemSpacing="10" LineSpacing="10">
-                    <Button Command="{Binding OnClickInstallOrUpdateUserscript}">Install or Update Userscript</Button>
-                    <Button x:Name="CopyConnectionCode" Click="CopyConnectionScriptButton_OnClick">Copy Connection Code</Button>
                 </WrapPanel>
+                <StackPanel Orientation="Horizontal" Spacing="10">
+                    <Button IsEnabled="{Binding HasMadeChanges}" Command="{Binding OnClickApplyChanges}">Apply &amp; Restart</Button>
+                    <Button IsEnabled="{Binding HasMadeChanges}" Command="{Binding OnClickCancelChanges}">Cancel</Button>
+                </StackPanel>
             </StackPanel>
         </Expander>
+        <TextBlock TextWrapping="Wrap" Margin="0 15 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/Main/Pages/TrackingPage.axaml.cs

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

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,154 +1,230 @@
 using System;
-using System.Text.RegularExpressions;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
+using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Input.Platform;
-using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
-using DHT.Desktop.Server;
+using DHT.Desktop.Main.Controls;
+using DHT.Server.Database;
+using DHT.Server.Service;
 using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
+using DHT.Utils.Models;
 using static DHT.Desktop.Program;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.Main.Pages {
+	sealed class TrackingPageModel : BaseModel, IDisposable {
+		private static readonly Log Log = Log.ForType<TrackingPageModel>();
 
-sealed partial class TrackingPageModel {
+		internal static string ServerPort { get; set; } = ServerUtils.FindAvailablePort(50000, 60000).ToString();
-	private static readonly Log Log = Log.ForType<TrackingPageModel>();
+		internal static string ServerToken { get; set; } = ServerUtils.GenerateRandomToken(20);
-	
+
-	[Notify(Setter.Private)]
+		private string inputPort = ServerPort;
-	private bool? areDevToolsEnabled = null;
+
-	
+		public string InputPort {
-	[Notify(Setter.Private)]
+			get => inputPort;
-	private bool isToggleAppDevToolsButtonEnabled = false;
+			set {
-	
+				Change(ref inputPort, value);
-	public string OpenDevToolsShortcutText { get; } = OperatingSystem.IsMacOS() ? "Cmd+Shift+I" : "Ctrl+Shift+I";
+				OnPropertyChanged(nameof(HasMadeChanges));
-	
-	[DependsOn(nameof(AreDevToolsEnabled), nameof(IsToggleAppDevToolsButtonEnabled))]
-	public string ToggleAppDevToolsButtonText {
-		get {
-			if (!AreDevToolsEnabled.HasValue) {
-				return "Loading...";
 			}
-			
+		}
-			if (!IsToggleAppDevToolsButtonEnabled) {
+
-				return "Unavailable";
+		private string inputToken = ServerToken;
+
+		public string InputToken {
+			get => inputToken;
+			set {
+				Change(ref inputToken, value);
+				OnPropertyChanged(nameof(HasMadeChanges));
 			}
-			
-			return (AreDevToolsEnabled.Value ? "Disable" : "Enable") + " " + OpenDevToolsShortcutText;
 		}
-	}
+
-	
+		public bool HasMadeChanges => ServerPort != InputPort || ServerToken != InputToken;
-	private readonly Window window;
+
-	
+		private bool isToggleTrackingButtonEnabled = true;
-	[Obsolete("Designer")]
+
-	public TrackingPageModel() : this(null!) {}
+		public bool IsToggleButtonEnabled {
-	
+			get => isToggleTrackingButtonEnabled;
-	public TrackingPageModel(Window window) {
+			set => Change(ref isToggleTrackingButtonEnabled, value);
-		this.window = window;
-		
-		Task.Factory.StartNew(InitializeDevToolsToggle, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.FromCurrentSynchronizationContext());
-	}
-	
-	public async Task<bool> OnClickCopyTrackingScript() {
-		string url = ServerConfiguration.HttpHost + $"/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
-		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
-		return await TryCopy(script, "Copy Tracking Script");
-	}
-	
-	private async Task InitializeDevToolsToggle() {
-		bool? devToolsEnabled = await Task.Run(DiscordAppSettings.AreDevToolsEnabled);
-		
-		if (devToolsEnabled.HasValue) {
-			AreDevToolsEnabled = devToolsEnabled.Value;
-			IsToggleAppDevToolsButtonEnabled = true;
 		}
-		else {
+
-			IsToggleAppDevToolsButtonEnabled = false;
+		public string ToggleTrackingButtonText => ServerLauncher.IsRunning ? "Pause Tracking" : "Resume Tracking";
+
+		private bool areDevToolsEnabled;
+
+		private bool AreDevToolsEnabled {
+			get => areDevToolsEnabled;
+			set {
+				Change(ref areDevToolsEnabled, value);
+				OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
+			}
 		}
-	}
+
-	
+		public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
-	public async Task OnClickToggleAppDevTools() {
+
-		const string DialogTitle = "Discord App Settings File";
+		public string ToggleAppDevToolsButtonText {
-		
+			get {
-		if (!AreDevToolsEnabled.HasValue) {
+				if (!IsToggleAppDevToolsButtonEnabled) {
-			return;
+					return "Unavailable";
+				}
+
+				return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+			}
 		}
-		
+
-		bool oldState = AreDevToolsEnabled.Value;
+		public event EventHandler<StatusBarModel.Status>? ServerStatusChanged;
-		bool newState = !oldState;
+
-		
+		private readonly Window window;
-		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
+		private readonly IDatabaseFile db;
-			case SettingsJsonResult.Success:
+
-				AreDevToolsEnabled = newState;
+		[Obsolete("Designer")]
-				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
+		public TrackingPageModel() : this(null!, DummyDatabaseFile.Instance) {}
-				break;
+
-			
+		public TrackingPageModel(Window window, IDatabaseFile db) {
-			case SettingsJsonResult.AlreadySet:
+			this.window = window;
-				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " is already " + (newState ? "enabled." : "disabled."));
+			this.db = db;
-				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();
 		}
-	}
+
-	
+		public async Task Initialize() {
-	public async Task OnClickInstallOrUpdateUserscript() {
+			ServerLauncher.ServerStatusChanged += ServerLauncherOnServerStatusChanged;
-		try {
+			ServerLauncher.ServerManagementExceptionCaught += ServerLauncherOnServerManagementExceptionCaught;
-			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/get-userscript/dht.user.js");
+
-		} catch (Exception e) {
+			if (int.TryParse(ServerPort, out int port)) {
-			await Dialog.ShowOk(window, "Install or Update Userscript", "Could not open the browser: " + e.Message);
+				string token = ServerToken;
+				ServerLauncher.Relaunch(port, token, db);
+			}
+
+			bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
+			if (devToolsEnabled.HasValue) {
+				AreDevToolsEnabled = devToolsEnabled.Value;
+			}
+			else {
+				IsToggleAppDevToolsButtonEnabled = false;
+				OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
+			}
 		}
-	}
+
-	
+		public void Dispose() {
-	[GeneratedRegex("^[a-zA-Z0-9]{1,100}$")]
+			ServerLauncher.ServerManagementExceptionCaught -= ServerLauncherOnServerManagementExceptionCaught;
-	private static partial Regex ConnectionCodeTokenRegex();
+			ServerLauncher.ServerStatusChanged -= ServerLauncherOnServerStatusChanged;
-	
+			ServerLauncher.Stop();
-	public async Task<bool> OnClickCopyConnectionCode() {
-		const string Title = "Copy Connection Code";
-		
-		if (ConnectionCodeTokenRegex().IsMatch(ServerConfiguration.Token)) {
-			return await TryCopy(ServerConfiguration.Port + ":" + ServerConfiguration.Token, Title);
 		}
-		else {
+
-			await Dialog.ShowOk(window, Title, "The internal server token cannot be used to create a connection code.\n\nCheck the 'Advanced' tab and ensure the token is 1-100 characters long, and only contains plain letters and numbers.");
+		private void ServerLauncherOnServerStatusChanged(object? sender, EventArgs e) {
-			return false;
+			ServerStatusChanged?.Invoke(this, ServerLauncher.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped);
+			OnPropertyChanged(nameof(ToggleTrackingButtonText));
+			IsToggleButtonEnabled = true;
 		}
-	}
+
-	
+		private async void ServerLauncherOnServerManagementExceptionCaught(object? sender, Exception ex) {
-	private async Task<bool> TryCopy(string script, string errorDialogTitle) {
+			Log.Error(ex);
-		IClipboard? clipboard = window.Clipboard;
+			await Dialog.ShowOk(window, "Server Error", ex.Message);
-		if (clipboard == null) {
-			await Dialog.ShowOk(window, errorDialogTitle, "Clipboard is not available on this system.");
-			return false;
 		}
-		
+
-		try {
+		private async Task<bool> StartServer() {
-			await clipboard.SetTextAsync(script);
+			if (!int.TryParse(InputPort, out int port) || port is < 0 or > 65535) {
+				await Dialog.ShowOk(window, "Invalid Port", "Port must be a number between 0 and 65535.");
+				return false;
+			}
+
+			IsToggleButtonEnabled = false;
+			ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Starting);
+			ServerLauncher.Relaunch(port, InputToken, db);
 			return true;
-		} catch (Exception e) {
+		}
-			Log.Error(e);
+
-			await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
+		private void StopServer() {
-			return false;
+			IsToggleButtonEnabled = false;
+			ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Stopping);
+			ServerLauncher.Stop();
+		}
+
+		public async Task<bool> OnClickToggleTrackingButton() {
+			if (ServerLauncher.IsRunning) {
+				StopServer();
+				return true;
+			}
+			else {
+				return await StartServer();
+			}
+		}
+
+		public async Task<bool> OnClickCopyTrackingScript() {
+			string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
+			string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerPort + ";")
+			                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(ServerToken))
+			                         .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 = Application.Current?.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 void OnClickRandomizeToken() {
+			InputToken = ServerUtils.GenerateRandomToken(20);
+		}
+
+		public async void OnClickApplyChanges() {
+			if (await StartServer()) {
+				ServerPort = InputPort;
+				ServerToken = InputToken;
+				OnPropertyChanged(nameof(HasMadeChanges));
+			}
+		}
+
+		public void OnClickCancelChanges() {
+			InputPort = ServerPort;
+			InputToken = ServerToken;
+		}
+
+		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/Main/Pages/ViewerPage.axaml

@@ -5,8 +5,7 @@
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.ViewerPage"
+             x:Class="DHT.Desktop.Main.Pages.ViewerPage">
-             x:DataType="pages:ViewerPageModel">
 
     <Design.DataContext>
         <pages:ViewerPageModel />
@@ -14,15 +13,17 @@
 
     <UserControl.Styles>
         <Style Selector="Expander">
-            <Setter Property="Margin" Value="0 5 0 0" />
+            <Setter Property="Margin" Value="0 25 0 0" />
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Orientation="Vertical" Spacing="20">
+    <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
             <Button Command="{Binding OnClickOpenViewer}" Margin="0 0 5 0">Open Viewer</Button>
+            <Button Command="{Binding OnClickSaveViewer}" Margin="5 0 0 0">Save Viewer</Button>
         </StackPanel>
-        <controls:MessageFilterPanel DataContext="{Binding FilterModel}" />
+        <TextBlock Text="{Binding ExportedMessageText}" Margin="0 20 0 0" />
+        <controls:FilterPanel DataContext="{Binding FilterModel}" />
         <Expander Header="Database Tools">
             <StackPanel Orientation="Vertical" Spacing="10">
                 <StackPanel Orientation="Vertical" Spacing="4">

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

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

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,101 +1,127 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
+using System.IO;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
-using DHT.Desktop.Server;
-using DHT.Server;
 using DHT.Server.Data.Filters;
-using DHT.Server.Service.Viewer;
+using DHT.Server.Database;
-using DHT.Utils.Logging;
+using DHT.Server.Database.Export;
-using PropertyChanged.SourceGenerator;
+using DHT.Utils.Models;
+using static DHT.Desktop.Program;
 
-namespace DHT.Desktop.Main.Pages;
+namespace DHT.Desktop.Main.Pages {
+	sealed class ViewerPageModel : BaseModel {
+		public string ExportedMessageText { get; private set; } = "";
 
-sealed partial class ViewerPageModel : IDisposable {
+		public bool DatabaseToolFilterModeKeep { get; set; } = true;
-	private static readonly Log Log = Log.ForType<ViewerPageModel>();
+		public bool DatabaseToolFilterModeRemove { get; set; } = false;
-	
+
-	public bool DatabaseToolFilterModeKeep { get; set; } = true;
+		private bool hasFilters = false;
-	public bool DatabaseToolFilterModeRemove { get; set; } = false;
+
-	
+		public bool HasFilters {
-	[Notify]
+			get => hasFilters;
-	private bool hasFilters = false;
+			set => Change(ref hasFilters, value);
-	
-	public MessageFilterPanelModel FilterModel { get; }
-	
-	private readonly Window window;
-	private readonly State state;
-	
-	[Obsolete("Designer")]
-	public ViewerPageModel() : this(null!, State.Dummy) {}
-	
-	public ViewerPageModel(Window window, State state) {
-		this.window = window;
-		this.state = state;
-		
-		FilterModel = new MessageFilterPanelModel(window, state, "Will export");
-		FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
-	}
-	
-	public void Dispose() {
-		FilterModel.Dispose();
-	}
-	
-	private void OnFilterPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		HasFilters = FilterModel.HasAnyFilters;
-	}
-	
-	public async void OnClickOpenViewer() {
-		try {
-			string serverToken = ServerConfiguration.Token;
-			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
-			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
 		}
-	}
+
-	
+		private FilterPanelModel FilterModel { get; }
-	public async Task OnClickApplyFiltersToDatabase() {
+
-		try {
+		private readonly Window window;
-			MessageFilter filter = FilterModel.CreateFilter();
+		private readonly IDatabaseFile db;
-			long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
+
+		[Obsolete("Designer")]
+		public ViewerPageModel() : this(null!, DummyDatabaseFile.Instance) {}
+
+		public ViewerPageModel(Window window, IDatabaseFile db) {
+			this.window = window;
+			this.db = db;
+
+			this.FilterModel = new FilterPanelModel(window, db);
+			this.FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
+			this.db.Statistics.PropertyChanged += OnDbStatisticsChanged;
+			UpdateStatistics();
+		}
+
+		private void OnFilterPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+			UpdateStatistics();
+			HasFilters = FilterModel.HasAnyFilters;
+		}
+
+		private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+			if (e.PropertyName == nameof(DatabaseStatistics.TotalMessages)) {
+				UpdateStatistics();
+			}
+		}
+
+		private void UpdateStatistics() {
+			ExportedMessageText = "Will export " + db.CountMessages(FilterModel.CreateFilter()).Format() + " out of " + db.Statistics.TotalMessages.Format() + " message(s).";
+			OnPropertyChanged(nameof(ExportedMessageText));
+		}
+
+		private async Task<string> GenerateViewerContents() {
+			string json = ViewerJsonExport.Generate(db, FilterModel.CreateFilter());
 			
+			string index = await Resources.ReadTextAsync("Viewer/index.html");
+			string viewer = index.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
+			                     .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'))
+			                     .Replace("/*[ARCHIVE]*/", HttpUtility.JavaScriptStringEncode(json));
+			return viewer;
+		}
+
+		public async void OnClickOpenViewer() {
+			string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
+			string filenameBase = Path.GetFileNameWithoutExtension(db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
+			string fullPath = Path.Combine(rootPath, filenameBase + ".html");
+			int counter = 0;
+
+			while (File.Exists(fullPath)) {
+				++counter;
+				fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
+			}
+
+			Directory.CreateDirectory(rootPath);
+			await File.WriteAllTextAsync(fullPath, await GenerateViewerContents());
+
+			Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
+		}
+
+		public async void OnClickSaveViewer() {
+			var dialog = new SaveFileDialog {
+				Title = "Save Viewer",
+				InitialFileName = "archive.html",
+				Directory = Path.GetDirectoryName(db.Path),
+				Filters = new List<FileDialogFilter> {
+					new() {
+						Name = "Discord History Viewer",
+						Extensions = { "html" }
+					}
+				}
+			}.ShowAsync(window);
+
+			string? path = await dialog;
+			if (!string.IsNullOrEmpty(path)) {
+				await File.WriteAllTextAsync(path, await GenerateViewerContents());
+			}
+		}
+
+		public async void OnClickApplyFiltersToDatabase() {
+			var filter = FilterModel.CreateFilter();
+
 			if (DatabaseToolFilterModeKeep) {
-				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
+				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
-					await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
+					db.RemoveMessages(filter, MessageFilterRemovalMode.KeepMatching);
 				}
 			}
 			else if (DatabaseToolFilterModeRemove) {
-				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
+				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
-					await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
+					db.RemoveMessages(filter, MessageFilterRemovalMode.RemoveMatching);
 				}
 			}
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
 		}
 	}
-	
-	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {
-		await ProgressDialog.Show(window, "Apply Filters", async (_, callback) => {
-			await callback.UpdateIndeterminate("Removing messages...");
-			Log.Info("Removed messages: " + await state.Db.Messages.Remove(filter, removalMode));
-			
-			await callback.UpdateIndeterminate("Cleaning up attachments...");
-			Log.Info("Removed orphaned attachments: " + await state.Db.Messages.RemoveUnreachableAttachments());
-			
-			await callback.UpdateIndeterminate("Cleaning up users...");
-			Log.Info("Removed orphaned users: " + await state.Db.Users.RemoveUnreachable());
-			
-			await callback.UpdateIndeterminate("Cleaning up channels...");
-			Log.Info("Removed orphaned channels: " + await state.Db.Channels.RemoveUnreachable());
-			
-			await callback.UpdateIndeterminate("Cleaning up servers...");
-			Log.Info("Removed orphaned servers: " + await state.Db.Servers.RemoveUnreachable());
-		});
-	}
 }

app/Desktop/Main/Screens/MainContentScreen.axaml

@@ -1,122 +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"
-             xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Screens.MainContentScreen"
-             x:DataType="screens:MainContentScreenModel">
-
-    <Design.DataContext>
-        <screens:MainContentScreenModel />
-    </Design.DataContext>
-
-    <UserControl.Styles>
-        <Style Selector="Border.statusBar">
-            <Setter Property="Background" Value="#3C4F79" />
-        </Style>
-        <Style Selector="TextBlock.invisibleTabItem">
-            <Setter Property="FontSize" Value="20" />
-            <Setter Property="FontWeight" Value="SemiLight" />
-            <Setter Property="Margin" Value="17 0" />
-            <Setter Property="Opacity" Value="0" />
-        </Style>
-        <Style Selector="TabControl ItemsPresenter > Grid">
-            <Setter Property="Background" Value="#546A9F" />
-        </Style>
-        <Style Selector="TabItem">
-            <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Foreground" Value="#E9E9E9" />
-            <Setter Property="FontSize" Value="20" />
-        </Style>
-        <Style Selector="TabItem[TabStripPlacement=Left] /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Margin" Value="5 0" />
-        </Style>
-        <Style Selector="TabItem:pointerover">
-            <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Background" Value="#455785" />
-        </Style>
-        <Style Selector="TabItem:pointerover /template/ Border">
-            <Setter Property="Background" Value="#455785" />
-        </Style>
-        <Style Selector="TabItem:pointerover /template/ ContentPresenter">
-            <Setter Property="Foreground" Value="#E9E9E9" />
-        </Style>
-        <Style Selector="TabItem:selected:pointerover /template/ Border">
-            <Setter Property="Background" Value="#FFFFFF" />
-        </Style>
-        <Style Selector="TabItem:selected:pointerover /template/ ContentPresenter">
-            <Setter Property="Foreground" Value="#1A2234" />
-        </Style>
-        <Style Selector="TabItem:selected">
-            <Setter Property="Foreground" Value="#1A2234" />
-            <Setter Property="Background" Value="#FFFFFF" />
-        </Style>
-        <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
-            <Setter Property="IsVisible" Value="False" />
-        </Style>
-        <Style Selector="TabItem:disabled /template/ ContentPresenter">
-            <Setter Property="Foreground" Value="#B2B2B2" />
-        </Style>
-        <Style Selector="TabItem:disabled /template/ ContentPresenter">
-            <Setter Property="AccessText.TextDecorations" Value="Strikethrough" />
-        </Style>
-        <Style Selector="TabItem.first">
-            <Setter Property="Margin" Value="0 13 0 0" />
-        </Style>
-        <Style Selector="TabControl">
-            <Setter Property="Padding" Value="0" />
-        </Style>
-        <Style Selector="ContentPresenter.page">
-            <Setter Property="Margin" Value="15 21 20 21" />
-        </Style>
-    </UserControl.Styles>
-
-    <DockPanel>
-        <Border Classes="statusBar" DockPanel.Dock="Bottom">
-            <DockPanel>
-                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Downloads</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" />
-                </ItemsPanelTemplate>
-            </TabControl.ItemsPanel>
-            <TabItem x:Name="TabDatabase" Header="Database" Classes="first" Grid.Row="0">
-                <ScrollViewer>
-                    <ContentPresenter Content="{Binding DatabasePage}" Classes="page" />
-                </ScrollViewer>
-            </TabItem>
-            <TabItem x:Name="TabTracking" Header="Tracking" Grid.Row="1">
-                <ScrollViewer>
-                    <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
-                </ScrollViewer>
-            </TabItem>
-            <TabItem x:Name="TabDownloads" Header="Downloads" Grid.Row="2">
-                <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>
-
-</UserControl>

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

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

app/Desktop/Main/Screens/MainContentScreenModel.cs

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

app/Desktop/Main/Screens/WelcomeScreen.axaml

@@ -1,42 +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:screens="clr-namespace:DHT.Desktop.Main.Screens"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Screens.WelcomeScreen"
-             x:DataType="screens:WelcomeScreenModel">
-
-    <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="Grid#ButtonPanel > Button">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-        </Style>
-    </UserControl.Styles>
-
-    <Panel Name="RootPanel">
-        <StackPanel Margin="42 30">
-            <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 25" HorizontalAlignment="Center" />
-
-            <Grid Name="ButtonPanel" RowDefinitions="Auto,12,Auto,12,Auto" ColumnDefinitions="*,12,*" Margin="12 0" HorizontalAlignment="Stretch">
-                <Button Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
-                <Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Command="{Binding CheckUpdates}">Check For Updates</Button>
-                <Button Grid.Row="4" Grid.Column="0" Command="{Binding ShowAboutDialog}">About</Button>
-                <Button Grid.Row="4" Grid.Column="2" Command="{Binding Exit}">Exit</Button>
-            </Grid>
-        </StackPanel>
-    </Panel>
-</UserControl>

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

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

app/Desktop/Main/Screens/WelcomeScreenModel.cs

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

app/Desktop/Main/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:main="clr-namespace:DHT.Desktop.Main"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="DHT.Desktop.Main.WelcomeScreen">
+
+    <Design.DataContext>
+        <main: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/Main/WelcomeScreen.axaml.cs

@@ -0,0 +1,16 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace DHT.Desktop.Main {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class WelcomeScreen : UserControl {
+		public WelcomeScreen() {
+			InitializeComponent();
+		}
+
+		private void InitializeComponent() {
+			AvaloniaXamlLoader.Load(this);
+		}
+	}
+}

app/Desktop/Main/WelcomeScreenModel.cs

@@ -0,0 +1,69 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Server.Database;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.Main {
+	sealed class WelcomeScreenModel : BaseModel {
+		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 dialog = DatabaseGui.NewOpenOrCreateDatabaseFileDialog();
+			dialog.Directory = Path.GetDirectoryName(dbFilePath);
+
+			string? path = await dialog.ShowAsync(window);
+			if (!string.IsNullOrWhiteSpace(path)) {
+				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() {
+			Db = null;
+
+			OnPropertyChanged(nameof(Db));
+			OnPropertyChanged(nameof(HasDatabase));
+		}
+
+		public async void ShowAboutDialog() {
+			await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(this.window);
+		}
+
+		public void Exit() {
+			window.Close();
+		}
+	}
+}

app/Desktop/Program.cs

@@ -1,65 +1,39 @@
-using System;
+using System.Globalization;
-using System.Globalization;
 using System.Reflection;
 using Avalonia;
-using DHT.Utils.Logging;
 using DHT.Utils.Resources;
 
-namespace DHT.Desktop;
+namespace DHT.Desktop {
+	static class Program {
+		public static string Version { get; }
+		public static CultureInfo Culture { get; }
+		public static ResourceLoader Resources { get; }
 
-static class Program {
+		static Program() {
-	public static string Version { get; }
+			var assembly = Assembly.GetExecutingAssembly();
-	public static Version AssemblyVersion { get; }
+			
-	public static CultureInfo Culture { get; }
+			Version = assembly.GetName().Version?.ToString() ?? "";
-	public static ResourceLoader Resources { get; }
+			while (Version.EndsWith(".0")) {
-	public static Arguments Arguments { get; }
+				Version = Version[..^2];
-	
-	public const string Website = "https://dht.chylex.com";
-	
-	static Program() {
-		var assembly = Assembly.GetExecutingAssembly();
-		
-		AssemblyVersion = assembly.GetName().Version ?? new Version(major: 0, minor: 0, build: 0, revision: 0);
-		Version = VersionToString(AssemblyVersion);
-		
-		Culture = CultureInfo.CurrentCulture;
-		CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
-		CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
-		CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
-		CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
-		
-		Resources = new ResourceLoader(assembly);
-		Arguments = new Arguments(Environment.GetCommandLineArgs());
-	}
-	
-	public static string VersionToString(Version version) {
-		string versionStr = version.ToString();
-		
-		while (versionStr.EndsWith(".0")) {
-			versionStr = versionStr[..^2];
-		}
-		
-		return versionStr;
-	}
-	
-	public static void Main(string[] args) {
-		if (Arguments.Console && OperatingSystem.IsWindows()) {
-			WindowsConsole.AllocConsole();
-		}
-		
-		try {
-			BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-		} finally {
-			if (Arguments.Console && OperatingSystem.IsWindows()) {
-				WindowsConsole.FreeConsole();
 			}
+
+			Culture = CultureInfo.CurrentCulture;
+			CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
+			CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
+			CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+			CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
+			
+			Resources = new ResourceLoader(assembly);
+		}
+
+		public static void Main(string[] args) {
+			BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+		}
+
+		private static AppBuilder BuildAvaloniaApp() {
+			return AppBuilder.Configure<App>()
+			                 .UsePlatformDetect()
+			                 .LogToTrace();
 		}
-	}
-	
-	private static AppBuilder BuildAvaloniaApp() {
-		return AppBuilder.Configure<App>()
-		                 .UsePlatformDetect()
-		                 .WithInterFont()
-		                 .LogToTrace();
 	}
 }

app/Desktop/Resources/tracker-loader.js

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