Merge branch 'chylex:master' into master

Closes #292

.github/FUNDING.yml

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

README.md

@@ -16,10 +16,9 @@ Fork the repository and clone it to your computer (if you've never used git, you
 
 Folder organization:
 * `app/` contains a Visual Studio solution for the desktop app
-* `lib/` contains utilities required to build the project
 * `web/` contains source code of the [official website](https://dht.chylex.com), which can be used as a template when making your own website
 
-To start editing source code for the desktop app, install the [.NET 5 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/5.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
+To start editing source code for the desktop app, install the [.NET 9 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
 
 ### Building
 
@@ -29,27 +28,18 @@ To build a `Release` version of the desktop app, follow the instructions for you
 
 #### Release – Windows (64-bit)
 
-1. Install [Python 3](https://www.python.org/downloads), and ensure the `python` executable is in your `PATH`
-2. Install [Powershell 5](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) or newer (on Windows 10, the included version of Powershell should be enough)
+1. Install Debian in WSL and open a terminal in the project folder.
+2. Run the `app/build.wsl.sh` script.
+3. Read the [Distribution](#distribution) section below.
 
-The `lib/` folder contains an installation of [Node](https://nodejs.org/en) and [uglify-js](https://www.npmjs.com/package/uglify-js), which are used to minify the tracking script. This installation will only work on 64-bit Windows; building on 32-bit Windows is not supported, but you can try.
-
-Run the `app/build.bat` script, and read the [Distribution](#distribution) section below.
+Note: The build script expects `dotnet.exe` to be installed in `C:\Program Files\dotnet`.
 
 #### Release – Other Operating Systems
 
-1. Install [Python 3](https://www.python.org/downloads), and ensure the `python` executable exists and launches Python 3
-   - On Debian and derivatives, you can install `python-is-python3`
-   - On other distributions, you can create a link manually, for ex. `ln -s /usr/bin/python3 /usr/bin/python`
-   - If you don't want `python` to mean Python 3, then edit `Desktop.csproj` and change `python` to `python3`
-2. Install [Node + npm](https://nodejs.org/en)
-3. Install [uglify-js](https://www.npmjs.com/package/uglify-js) globally (`npm install -g uglify-js`)
-4. Install the `zip` package from your repository
-
-Run the `app/build.sh` script, and read the [Distribution](#distribution) section below.
+1. Install the `zip` package from your repository.
+2. Run the `app/build.sh` script.
+3. Read the [Distribution](#distribution) section below.
 
 #### Distribution
 
-The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires .NET 5 to be installed.
-
-Note that when building on Windows, the generated `.zip` files for Linux and Mac will not have correct file permissions, so it will not be possible to run them by double-clicking `DiscordHistoryTracker`. I tried using Python to re-create the archives with correct file permissions, but found that Linux `zip` tools could not see them. The only working solution is building the Windows + portable version on Windows, and Linux + Mac version on Linux.
+The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires the ASP.NET Core Runtime to be installed.

app/.editorconfig

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

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

@@ -9,15 +9,16 @@
         <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/AttachmentFilterPanel.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Controls/DownloadItemFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/MessageFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Pages/AttachmentsPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DebugPage.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Pages/DownloadsPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/TrackingPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/ViewerPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Screens/MainContentScreen.axaml" value="Desktop/Desktop.csproj" />

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

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

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

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

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

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

app/.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$/Desktop/bin/Debug/net5.0/DiscordHistoryTracker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Desktop/debug/DiscordHistoryTracker.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Desktop/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.artifacts/bin/Desktop/debug" />
     <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="net5.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
     <method v="2">
       <option name="Build" />
     </method>

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

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

app/Desktop/App.axaml

@@ -2,12 +2,13 @@
              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 Mode="Light" />
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml" />
+        <FluentTheme />
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml" />
 
         <Style Selector="Button, CheckBox, RadioButton, Expander /template/ ToggleButton#ExpanderHeader">
             <Setter Property="Cursor" Value="Hand" />
@@ -48,68 +49,56 @@
             <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
         </Style>
 
-        <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
-            <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Border x:Name="ToggleButtonBackground">
-                        <Grid ColumnDefinitions="Auto,*" RowDefinitions="35">
-                            <Border x:Name="ExpandCollapseChevronBorder"
-                                    Grid.Column="0"
-                                    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 Selector="Expander">
+            <Setter Property="MinHeight" Value="40" />
+            <Setter Property="Padding" Value="12" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
-        <Style Selector="Expander:expanded /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-            <Style.Animations>
-                <Animation FillMode="Both" Duration="0:0:0.0625">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="180" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="180" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
+
+        <Style Selector="TreeViewItem:not(:empty) /template/ Panel#PART_ExpandCollapseChevronContainer">
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="Margin" Value="0 0 5 0" />
         </Style>
-        <Style Selector="Expander:not(:expanded) /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-            <Style.Animations>
-                <Animation FillMode="Both" Duration="0:0:0.0625">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="0" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="0" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
+        <Style Selector="TreeViewItem:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
+            <Setter Property="Margin" Value="10 0" />
+        </Style>
+        <Style Selector="TreeViewItem[Level=0]:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="Width" Value="0" />
+        </Style>
+        <Style Selector="TreeViewItem /template/ ToggleButton#PART_ExpandCollapseChevron">
+            <Setter Property="Width" Value="18" />
+            <Setter Property="Height" Value="32" />
+        </Style>
+        <Style Selector="TreeViewItem /template/ ToggleButton#PART_ExpandCollapseChevron > Border">
+            <Setter Property="Padding" Value="2 10 3 10" />
+        </Style>
+
+        <Style Selector="TreeView.noSelection">
+            <Style Selector="^ TreeViewItem /template/ Border#PART_LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}" />
+            </Style>
+            <Style Selector="^ TreeViewItem /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
+            </Style>
+            <Style Selector="^ TreeViewItem:disabled /template/ Border#PART_LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundDisabled}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushDisabled}" />
+            </Style>
+            <Style Selector="^ TreeViewItem:disabled /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
+            </Style>
+        </Style>
+
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel">
+            <Setter Property="ItemSpacing" Value="8" />
+        </Style>
+        <Style Selector="Panel.buttons Button">
+            <Setter Property="MinWidth" Value="80" />
         </Style>
 
     </Application.Styles>
@@ -168,12 +157,26 @@
 
         <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
         <Thickness x:Key="ExpanderContentPadding">12</Thickness>
-        <SolidColorBrush x:Key="ExpanderBorderBrush" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderBackground" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderForeground" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#697DAB" />
+        <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="ExpanderDropDownBorderBrush" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderDropDownBackground" 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,7 +3,8 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main;
 
-namespace DHT.Desktop {
+namespace DHT.Desktop;
+
 sealed class App : Application {
 	public override void Initialize() {
 		AvaloniaXamlLoader.Load(this);
@@ -11,10 +12,9 @@ namespace DHT.Desktop {
 	
 	public override void OnFrameworkInitializationCompleted() {
 		if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
-				desktop.MainWindow = new MainWindow(new Arguments(desktop.Args));
+			desktop.MainWindow = new MainWindow(Program.Arguments);
 		}
 		
 		base.OnFrameworkInitializationCompleted();
 	}
 }
-}

app/Desktop/Arguments.cs

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

app/Desktop/Common/AvaloniaReflection.cs

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

app/Desktop/Common/BytesValueConverter.cs

@@ -2,7 +2,8 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace DHT.Desktop.Common {
+namespace DHT.Desktop.Common;
+
 sealed class BytesValueConverter : IValueConverter {
 	private sealed class Unit {
 		private readonly string label;
@@ -18,17 +19,17 @@ namespace DHT.Desktop.Common {
 		}
 	}
 	
-		private static readonly Unit[] Units = {
-			new ("B", decimalPlaces: 0),
-			new ("kB", decimalPlaces: 0),
-			new ("MB", decimalPlaces: 1),
-			new ("GB", decimalPlaces: 1),
-			new ("TB", decimalPlaces: 1)
-		};
+	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;
 	
-		private static string Convert(ulong size) {
+	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));
@@ -50,4 +51,3 @@ namespace DHT.Desktop.Common {
 		throw new NotSupportedException();
 	}
 }
-}

app/Desktop/Common/DatabaseGui.cs

@@ -3,52 +3,56 @@ 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));
 	
 	private const string DatabaseFileInitialName = "archive.dht";
 	
-		private static readonly List<FileDialogFilter> DatabaseFileDialogFilter = new() {
-			new FileDialogFilter {
-				Name = "Discord History Tracker Database",
-				Extensions = { "dht" }
-			}
-		};
+	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = [
+		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"]),
+	];
 	
-		public static OpenFileDialog NewOpenDatabaseFileDialog() {
-			return new OpenFileDialog {
+	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
+		return await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Database File",
-				InitialFileName = DatabaseFileInitialName,
-				Filters = DatabaseFileDialogFilter
-			};
+			FileTypeFilter = DatabaseFileDialogFilter,
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
+			AllowMultiple = true,
+		});
 	}
 	
-		public static SaveFileDialog NewOpenOrCreateDatabaseFileDialog() {
-			return new SaveFileDialog {
+	public static async Task<string?> NewOpenOrCreateDatabaseFileDialog(Window window, string? suggestedDirectory) {
+		return await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
 			Title = "Open or Create Database File",
-				InitialFileName = DatabaseFileInitialName,
-				Filters = DatabaseFileDialogFilter
-			};
+			FileTypeChoices = 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) {
+	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
 		IDatabaseFile? file = null;
 		
 		try {
-				file = await SqliteDatabaseFile.OpenOrCreate(path, checkCanUpgradeDatabase);
+			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks);
 		} catch (InvalidDatabaseVersionException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
 		} catch (DatabaseTooNewException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' was opened in a newer version of DHT (database version " + ex.DatabaseVersion + ", app version " + ex.CurrentVersion + ").");
 		} catch (Exception ex) {
-				Log.Error(ex);
+			Log.Error("Could not open database file: " + path, ex);
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
 		}
 		
@@ -63,4 +67,3 @@ namespace DHT.Desktop.Common {
 		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,7 +2,8 @@ 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 value == null ? "-" : string.Format(Program.Culture, "{0:n0}", value);
@@ -12,4 +13,3 @@ namespace DHT.Desktop.Common {
 		throw new NotSupportedException();
 	}
 }
-}

app/Desktop/Common/SystemUtils.cs

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

app/Desktop/Common/TextFormat.cs

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

app/Desktop/Desktop.csproj

@@ -1,77 +1,47 @@
 <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>
-    <AssemblyName>DiscordHistoryTracker</AssemblyName>
-    <RootNamespace>DHT.Desktop</RootNamespace>
-    <PackageId>DiscordHistoryTracker</PackageId>
-    <Authors>chylex</Authors>
-    <Company>DiscordHistoryTracker</Company>
-    <Product>DiscordHistoryTracker</Product>
     <ApplicationIcon>./Resources/icon.ico</ApplicationIcon>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>none</DebugType>
   </PropertyGroup>
+  
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.16" Condition=" '$(Configuration)' == 'Debug' " />
+    <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>
     <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
+  
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
-    <Compile Update="Dialogs\TextBox\TextBoxDialog.axaml.cs">
-      <DependentUpon>CheckBoxDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
+  
   <ItemGroup>
     <AvaloniaResource Include="Resources/icon.ico" />
-    <EmbeddedResource Include="../Resources/Tracker/bootstrap.js">
-      <LogicalName>Tracker\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Tracker/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../Resources/Tracker/scripts/**" Condition=" '$(Configuration)' == 'Debug' ">
-      <LogicalName>Tracker\scripts\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Tracker/scripts/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../Resources/Tracker/styles/**">
-      <LogicalName>Tracker\styles\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Tracker/styles/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../Resources/Viewer/**">
-      <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
+    <EmbeddedResource Include="Resources/tracker-loader.js">
+      <LogicalName>tracker-loader.js</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
-  <Target Name="MinifyResources" BeforeTargets="PrepareForBuild" Condition=" '$(Configuration)' == 'Release' ">
-    <PropertyGroup>
-      <MinifiedResourceDir>$(ProjectDir)bin/.res/scripts</MinifiedResourceDir>
-    </PropertyGroup>
-    <ItemGroup>
-      <UpToDateCheckInput Include="$(ProjectDir)../Resources/Tracker/scripts/**" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/discord.js" LogicalName="Tracker\scripts\discord.js" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/dom.js" LogicalName="Tracker\scripts\dom.js" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/gui.js" LogicalName="Tracker\scripts\gui.js" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/settings.js" LogicalName="Tracker\scripts\settings.js" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/state.js" LogicalName="Tracker\scripts\state.js" Visible="false" />
-    </ItemGroup>
-    <RemoveDir Directories="$(ProjectDir)bin/.res/scripts" />
-    <Exec Command="python $(ProjectDir)../Resources/minify.py" WorkingDirectory="$(ProjectDir)../Resources" IgnoreExitCode="false" />
-  </Target>
+
 </Project>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

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

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

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

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

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

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

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

app/Desktop/Dialogs/CheckBox/CheckBoxItemList.cs

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

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -0,0 +1,40 @@
+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,7 +2,8 @@ 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()) {
@@ -14,8 +15,8 @@ namespace DHT.Desktop.Dialogs.Message {
 			DataContext = new MessageDialogModel {
 				Title = title,
 				Message = message,
-					IsOkVisible = true
-				}
+				IsOkVisible = true,
+			},
 		}.ShowDialog<DialogResult.All>(owner);
 	}
 	
@@ -29,8 +30,8 @@ namespace DHT.Desktop.Dialogs.Message {
 				Title = title,
 				Message = message,
 				IsOkVisible = true,
-					IsCancelVisible = true
-				}
+				IsCancelVisible = true,
+			},
 		}.ShowDialog<DialogResult.All?>(owner);
 		
 		return result.ToOkCancel();
@@ -46,8 +47,8 @@ namespace DHT.Desktop.Dialogs.Message {
 				Title = title,
 				Message = message,
 				IsYesVisible = true,
-					IsNoVisible = true
-				}
+				IsNoVisible = true,
+			},
 		}.ShowDialog<DialogResult.All?>(owner);
 		
 		return result.ToYesNo();
@@ -64,11 +65,10 @@ namespace DHT.Desktop.Dialogs.Message {
 				Message = message,
 				IsYesVisible = true,
 				IsNoVisible = true,
-					IsCancelVisible = true
-				}
+				IsCancelVisible = true,
+			},
 		}.ShowDialog<DialogResult.All?>(owner);
 		
 		return result.ToYesNoCancel();
 	}
 }
-}

app/Desktop/Dialogs/Message/DialogResult.cs

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

app/Desktop/Dialogs/Message/MessageDialog.axaml

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

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

@@ -1,21 +1,13 @@
 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 sealed partial class MessageDialog : Window {
 	public MessageDialog() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
 	}
 	
 	public void ClickOk(object? sender, RoutedEventArgs e) {
@@ -34,4 +26,3 @@ namespace DHT.Desktop.Dialogs.Message {
 		Close(DialogResult.All.Cancel);
 	}
 }
-}

app/Desktop/Dialogs/Message/MessageDialogModel.cs

@@ -1,4 +1,5 @@
-namespace DHT.Desktop.Dialogs.Message {
+namespace DHT.Desktop.Dialogs.Message;
+
 sealed class MessageDialogModel {
 	public string Title { get; init; } = "";
 	public string Message { get; init; } = "";
@@ -8,4 +9,3 @@ namespace DHT.Desktop.Dialogs.Message {
 	public bool IsNoVisible { get; init; } = false;
 	public bool IsCancelVisible { get; init; } = false;
 }
-}

app/Desktop/Dialogs/Progress/DelayedProgressDialog.cs

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

app/Desktop/Dialogs/Progress/IProgressCallback.cs

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

app/Desktop/Dialogs/Progress/ProgressDialog.axaml

@@ -5,9 +5,10 @@
         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="Loaded"
+        Opened="OnOpened"
         Closing="OnClosing"
         Width="500" SizeToContent="Height" CanResize="False"
         WindowStartupLocation="CenterOwner">
@@ -31,12 +32,18 @@
         </Style>
     </Window.Styles>
 
-    <StackPanel Margin="20">
+    <ItemsRepeater ItemsSource="{Binding Items}" Margin="0 10">
+        <ItemsRepeater.ItemTemplate>
+            <DataTemplate>
+                <StackPanel Margin="20 10" IsHitTestVisible="{Binding IsVisible}" Opacity="{Binding Opacity}">
                     <DockPanel>
                         <TextBlock DockPanel.Dock="Right" Text="{Binding Items}" Classes="items" />
                         <TextBlock DockPanel.Dock="Left" Text="{Binding Message}" />
                     </DockPanel>
-        <ProgressBar Value="{Binding Progress}" />
+                    <ProgressBar IsIndeterminate="{Binding IsIndeterminate}" Value="{Binding Progress}" />
                 </StackPanel>
+            </DataTemplate>
+        </ItemsRepeater.ItemTemplate>
+    </ItemsRepeater>
 
 </Window>

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

@@ -1,40 +1,80 @@
 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 {
+public sealed partial class ProgressDialog : Window {
+	private static readonly TimeSpan MinimumShowDuration = TimeSpan.FromMilliseconds(500);
+	
+	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
+		var dialog = new ProgressDialog();
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => await action(dialog, callbacks[0]));
+		await dialog.ShowProgressDialog(owner);
+	}
+	
+	internal static async Task<T> Show<T>(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task<T>> action) {
+		var taskCompletionSource = new TaskCompletionSource<T>();
+		var dialog = new ProgressDialog();
+		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
+			taskCompletionSource.SetResult(await action(dialog, callbacks[0]));
+		});
+		
+		await dialog.ShowProgressDialog(owner);
+		return await taskCompletionSource.Task;
+	}
+	
+	internal static Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
+		return Show(owner, title, async (dialog, callback) => {
+			await callback.UpdateIndeterminate(message);
+			await action(dialog);
+		});
+	}
+	
+	internal static Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
+		return Show<T>(owner, title, async (dialog, callback) => {
+			await callback.UpdateIndeterminate(message);
+			return await action(dialog);
+		});
+	}
+	
 	private bool isFinished = false;
+	private DateTime startTime = DateTime.Now;
+	private Task progressTask = Task.CompletedTask;
 	
 	public ProgressDialog() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
 	}
 	
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
+	public void OnOpened(object? sender, EventArgs e) {
+		startTime = DateTime.Now;
+		
+		if (DataContext is ProgressDialogModel model) {
+			progressTask = Task.Run(model.StartTask);
+			progressTask.ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
+		}
 	}
 	
-		public void OnClosing(object? sender, CancelEventArgs e) {
+	public void OnClosing(object? sender, WindowClosingEventArgs e) {
 		e.Cancel = !isFinished;
 	}
 	
-		public void Loaded(object? sender, EventArgs e) {
-			if (DataContext is ProgressDialogModel model) {
-				Task.Run(model.StartTask).ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
-			}
+	private async Task OnFinished(Task task) {
+		isFinished = true;
+		
+		TimeSpan elapsedTime = DateTime.Now - startTime;
+		if (elapsedTime < MinimumShowDuration) {
+			await Task.Delay(MinimumShowDuration - elapsedTime);
 		}
 		
-		private void OnFinished(Task task) {
-			isFinished = true;
 		Close();
 	}
+	
+	public async Task ShowProgressDialog(Window owner) {
+		await ShowDialog(owner);
+		await progressTask;
 	}
 }

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -1,65 +1,63 @@
 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 {
-	sealed class ProgressDialogModel : BaseModel {
+namespace DHT.Desktop.Dialogs.Progress;
+
+sealed class ProgressDialogModel {
 	public string Title { get; init; } = "";
 	
-		private string message = "";
-
-		public string Message {
-			get => message;
-			private set => Change(ref message, value);
-		}
-
-		private string items = "";
-
-		public string Items {
-			get => items;
-			private set => Change(ref items, value);
-		}
-
-		private int progress = 0;
-
-		public int Progress {
-			get => progress;
-			private set => Change(ref progress, value);
-		}
+	public IReadOnlyList<ProgressItem> Items { get; } = [];
 	
 	private readonly TaskRunner? task;
 	
 	[Obsolete("Designer")]
 	public ProgressDialogModel() {}
 	
-		public ProgressDialogModel(TaskRunner task) {
+	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(new Callback(this));
+			await task(Items.Select(static item => new Callback(item)).ToArray());
 		}
 	}
 	
-		public delegate Task TaskRunner(IProgressCallback callback);
+	public delegate Task TaskRunner(IReadOnlyList<IProgressCallback> callbacks);
 	
 	private sealed class Callback : IProgressCallback {
-			private readonly ProgressDialogModel model;
+		private readonly ProgressItem item;
 		
-			public Callback(ProgressDialogModel model) {
-				this.model = model;
+		public Callback(ProgressItem item) {
+			this.item = item;
 		}
 		
-			async Task IProgressCallback.Update(string message, int finishedItems, int totalItems) {
+		public async Task Update(string message, long finishedItems, long totalItems) {
 			await Dispatcher.UIThread.InvokeAsync(() => {
-					model.Message = message;
-					model.Items = finishedItems.Format() + " / " + totalItems.Format();
-					model.Progress = 100 * finishedItems / totalItems;
+				item.Message = message;
+				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
+				item.Progress = totalItems == 0 ? 0 : 100 * finishedItems / totalItems;
+				item.IsIndeterminate = false;
 			});
 		}
+		
+		public async Task UpdateIndeterminate(string message) {
+			await Dispatcher.UIThread.InvokeAsync(() => {
+				item.Message = message;
+				item.Items = string.Empty;
+				item.Progress = 0;
+				item.IsIndeterminate = true;
+			});
+		}
+		
+		public Task Hide() {
+			return Update(string.Empty, finishedItems: 0, totalItems: 0);
 		}
 	}
 }

app/Desktop/Dialogs/Progress/ProgressItem.cs

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

@@ -5,6 +5,7 @@
         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"
@@ -14,24 +15,11 @@
         <namespace:TextBoxDialogModel />
     </Window.DataContext>
 
-    <Window.Styles>
-        <Style Selector="Panel.buttons">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right">
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
-        <Style Selector="Panel.buttons Button">
-            <Setter Property="MinWidth" Value="80" />
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
-    </Window.Styles>
-
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
             <StackPanel Spacing="10">
                 <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
-                <ItemsRepeater Items="{Binding Items}">
+                <ItemsRepeater ItemsSource="{Binding Items}">
                     <ItemsRepeater.ItemTemplate>
                         <DataTemplate>
                             <DockPanel Margin="0 5 25 0">
@@ -46,7 +34,7 @@
             </StackPanel>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel Classes="right">
+            <WrapPanel HorizontalAlignment="Right">
                 <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

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

@@ -1,22 +1,14 @@
 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.TextBox {
+namespace DHT.Desktop.Dialogs.TextBox;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class TextBoxDialog : Window {
+public sealed partial class TextBoxDialog : Window {
 	public TextBoxDialog() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
 	}
 	
 	public void ClickOk(object? sender, RoutedEventArgs e) {
@@ -27,5 +19,3 @@ namespace DHT.Desktop.Dialogs.TextBox {
 		Close(DialogResult.OkCancel.Cancel);
 	}
 }
-}
-

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

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

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

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

app/Desktop/Discord/DiscordAppSettings.cs

@@ -1,15 +1,16 @@
 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));
 	
@@ -38,18 +39,20 @@ namespace DHT.Desktop.Discord {
 	
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-				return AreDevToolsEnabled(await ReadSettingsJson());
-			} catch (Exception) {
+			JsonObject settingsJson = await ReadSettingsJson();
+			return AreDevToolsEnabled(settingsJson);
+		} catch (Exception e) {
+			Log.Error("Could not read settings file.", e);
 			return null;
 		}
 	}
 	
-		private static bool AreDevToolsEnabled(Dictionary<string, object?> json) {
-			return json.TryGetValue(JsonKeyDevTools, out var value) && value is JsonElement { ValueKind: JsonValueKind.True };
+	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) {
-			Dictionary<string, object?> json;
+		JsonObject json;
 		
 		try {
 			json = await ReadSettingsJson();
@@ -58,7 +61,7 @@ namespace DHT.Desktop.Discord {
 		} catch (JsonException) {
 			return SettingsJsonResult.InvalidJson;
 		} catch (Exception e) {
-				Log.Error(e);
+			Log.Error("Could not read settings file.", e);
 			return SettingsJsonResult.ReadError;
 		}
 		
@@ -80,16 +83,14 @@ namespace DHT.Desktop.Discord {
 			
 			await WriteSettingsJson(json);
 		} catch (Exception e) {
-				Log.Error("An error occurred when writing settings file.");
-				Log.Error(e);
+			Log.Error("Could not write settings file.", e);
 			
 			if (File.Exists(JsonBackupFilePath)) {
 				try {
-						File.Move(JsonBackupFilePath, JsonFilePath, true);
+					File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
 					Log.Info("Restored settings file from backup.");
 				} catch (Exception e2) {
-						Log.Error("Cannot restore settings file from backup.");
-						Log.Error(e2);
+					Log.Error("Could not restore settings file from backup.", e2);
 				}
 			}
 			
@@ -99,21 +100,19 @@ namespace DHT.Desktop.Discord {
 		try {
 			File.Delete(JsonBackupFilePath);
 		} catch (Exception e) {
-				Log.Error("Cannot delete backup file.");
-				Log.Error(e);
+			Log.Error("Could not delete backup file.", e);
 		}
 		
 		return SettingsJsonResult.Success;
 	}
 	
-		private static async Task<Dictionary<string, object?>> ReadSettingsJson() {
+	private static async Task<JsonObject> ReadSettingsJson() {
 		await using var stream = new FileStream(JsonFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
-			return await JsonSerializer.DeserializeAsync<Dictionary<string, object?>?>(stream) ?? throw new JsonException();
+		return await JsonSerializer.DeserializeAsync(stream, DiscordAppSettingsJsonContext.Default.JsonObject) ?? throw new JsonException();
 	}
 	
-		private static async Task WriteSettingsJson(Dictionary<string, object?> json) {
+	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, new JsonSerializerOptions { WriteIndented = true });
-		}
+		await JsonSerializer.SerializeAsync(stream, json, DiscordAppSettingsJsonContext.Default.JsonObject);
 	}
 }

app/Desktop/Discord/DiscordAppSettingsJsonContext.cs

@@ -0,0 +1,8 @@
+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 {
 	Success,
 	AlreadySet,
 	FileNotFound,
 	ReadError,
 	InvalidJson,
-		WriteError
-	}
+	WriteError,
 }

app/Desktop/Main/AboutWindow.axaml

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

app/Desktop/Main/AboutWindow.axaml.cs

@@ -1,20 +1,11 @@
 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 sealed partial class AboutWindow : Window {
 	public AboutWindow() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
 	}
 }

app/Desktop/Main/AboutWindowModel.cs

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

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

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

app/Desktop/Main/Controls/AttachmentFilterPanelModel.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

@@ -4,20 +4,17 @@
              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.AttachmentFilterPanel">
+             x:Class="DHT.Desktop.Main.Controls.DownloadItemFilterPanel"
+             x:DataType="controls:DownloadItemFilterPanelModel">
 
     <Design.DataContext>
-        <controls:AttachmentFilterPanelModel />
+        <controls:DownloadItemFilterPanelModel />
     </Design.DataContext>
 
     <UserControl.Styles>
         <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Margin" Value="0 20 40 0" />
             <Setter Property="Spacing" Value="4" />
         </Style>
-        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
         <Style Selector="Grid > Label">
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
@@ -29,14 +26,14 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel>
+    <StackPanel Spacing="20">
         <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel>
+        <WrapPanel ItemSpacing="40" LineSpacing="20">
             <StackPanel>
                 <CheckBox IsChecked="{Binding LimitSize}">Limit Size</CheckBox>
                 <StackPanel Orientation="Horizontal">
                     <TextBox Text="{Binding MaximumSize}" IsEnabled="{Binding LimitSize}" HorizontalContentAlignment="Right" />
-                    <ComboBox IsEnabled="{Binding LimitSize}" Items="{Binding Units}" SelectedItem="{Binding MaximumSizeUnit}">
+                    <ComboBox IsEnabled="{Binding LimitSize}" ItemsSource="{Binding Units}" SelectedItem="{Binding MaximumSizeUnit}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Name}" />

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

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

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

app/Desktop/Main/Controls/MessageFilterPanel.axaml

@@ -4,7 +4,8 @@
              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:Class="DHT.Desktop.Main.Controls.MessageFilterPanel"
+             x:DataType="controls:MessageFilterPanelModel">
 
     <Design.DataContext>
         <controls:MessageFilterPanelModel />
@@ -12,12 +13,8 @@
 
     <UserControl.Styles>
         <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Margin" Value="0 20 40 0" />
             <Setter Property="Spacing" Value="4" />
         </Style>
-        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
         <Style Selector="Grid > Label">
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
@@ -35,9 +32,9 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel>
+    <StackPanel Spacing="20">
         <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel>
+        <WrapPanel ItemSpacing="40" LineSpacing="20">
             <StackPanel>
                 <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
                 <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">

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

@@ -1,22 +1,16 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class MessageFilterPanel : UserControl {
-		private CalendarDatePicker StartDatePicker => this.FindControl<CalendarDatePicker>("StartDatePicker");
-		private CalendarDatePicker EndDatePicker => this.FindControl<CalendarDatePicker>("EndDatePicker");
-
+public sealed partial class MessageFilterPanel : UserControl {
 	public MessageFilterPanel() {
 		InitializeComponent();
-		}
 		
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-
-			var culture = Program.Culture;
-			foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
+		CultureInfo culture = Program.Culture;
+		foreach (CalendarDatePicker picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
 			picker.FirstDayOfWeek = culture.DateTimeFormat.FirstDayOfWeek;
 			picker.SelectedDateFormat = CalendarDatePickerFormat.Custom;
 			picker.CustomDateFormatString = culture.DateTimeFormat.ShortDatePattern;
@@ -31,4 +25,3 @@ namespace DHT.Desktop.Main.Controls {
 		}
 	}
 }
-}

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

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

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

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

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

@@ -1,16 +1,11 @@
 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 ServerConfigurationPanel : UserControl {
+public sealed partial class ServerConfigurationPanel : UserControl {
 	public ServerConfigurationPanel() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

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

app/Desktop/Main/Controls/StatusBar.axaml

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

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

@@ -1,16 +1,11 @@
 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 sealed partial class StatusBar : UserControl {
 	public StatusBar() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }

app/Desktop/Main/Controls/StatusBarModel.cs

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

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

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

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

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialogModel.cs

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

app/Desktop/Main/MainWindow.axaml

@@ -5,12 +5,13 @@
         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="800" Height="500"
+        Width="820" Height="520"
         MinWidth="520" MinHeight="300"
         WindowStartupLocation="CenterScreen"
-        Closed="OnClosed">
+        Closing="OnClosing">
 
     <Design.DataContext>
         <main:MainWindowModel />

app/Desktop/Main/MainWindow.axaml.cs

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

app/Desktop/Main/MainWindowModel.cs

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

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

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

@@ -1,16 +1,11 @@
 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 AdvancedPage : UserControl {
+public sealed partial class AdvancedPage : UserControl {
 	public AdvancedPage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }

app/Desktop/Main/Pages/AdvancedPageModel.cs

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

app/Desktop/Main/Pages/AttachmentsPage.axaml

@@ -1,54 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
-             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.AttachmentsPage">
-
-    <Design.DataContext>
-        <pages:AttachmentsPageModel />
-    </Design.DataContext>
-
-    <UserControl.Styles>
-        <Style Selector="Expander">
-            <Setter Property="Margin" Value="0 5 0 0" />
-        </Style>
-        <Style Selector="DataGridColumnHeader">
-            <Setter Property="FontWeight" Value="Medium" />
-        </Style>
-        <Style Selector="DataGridColumnHeader:nth-child(2)">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-        <Style Selector="DataGridColumnHeader:nth-child(3)">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-        <Style Selector="DataGridCell.right">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-        </Style>
-    </UserControl.Styles>
-
-    <StackPanel Orientation="Vertical" Spacing="20">
-        <DockPanel>
-            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" DockPanel.Dock="Left" />
-            <TextBlock Text="{Binding DownloadMessage}" Margin="10 0 0 0" VerticalAlignment="Center" DockPanel.Dock="Left" />
-            <ProgressBar Value="{Binding DownloadProgress}" IsVisible="{Binding IsDownloading}" Margin="15 0" VerticalAlignment="Center" DockPanel.Dock="Right" />
-        </DockPanel>
-        <controls:AttachmentFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !DataContext.IsDownloading, RelativeSource={RelativeSource AncestorType=UserControl}}" />
-        <StackPanel Orientation="Vertical" Spacing="12">
-            <Expander Header="Download Status" IsExpanded="True">
-                <DataGrid Items="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="State" Binding="{Binding State}" Width="*" />
-                        <DataGridTextColumn Header="Attachments" Binding="{Binding Items, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
-                        <DataGridTextColumn Header="Size" Binding="{Binding Size, Converter={StaticResource BytesValueConverter}}" Width="*" CellStyleClasses="right" />
-                    </DataGrid.Columns>
-                </DataGrid>
-            </Expander>
-            <StackPanel Orientation="Horizontal" Spacing="10">
-                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding HasFailedDownloads}">Retry Failed Downloads</Button>
-            </StackPanel>
-        </StackPanel>
-    </StackPanel>
-</UserControl>

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

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

app/Desktop/Main/Pages/AttachmentsPageModel.cs

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

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -4,28 +4,29 @@
              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>
+        <WrapPanel ItemSpacing="10" LineSpacing="10">
             <Button Command="{Binding OpenDatabaseFolder}">Open Database Folder</Button>
             <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
             <Button Command="{Binding ImportLegacyArchive}">Import Legacy Archive(s)...</Button>
         </WrapPanel>
+        <Expander Header="Advanced Tools" Margin="0 25 0 0">
+            <StackPanel Orientation="Vertical" Spacing="10">
+                <TextBlock TextWrapping="Wrap">Recreate the database to free up space after deleting data.</TextBlock>
+                <Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>
+            </StackPanel>
+        </Expander>
     </StackPanel>
 
 </UserControl>

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

@@ -1,16 +1,11 @@
 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 sealed partial class DatabasePage : UserControl {
 	public DatabasePage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -7,19 +7,24 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Dialogs.TextBox;
+using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Server.Database.Import;
+using DHT.Server.Database.Sqlite.Schema;
+using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
-using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class DatabasePageModel : BaseModel {
+namespace DHT.Desktop.Main.Pages;
+
+sealed class DatabasePageModel {
 	private static readonly Log Log = Log.ForType<DatabasePageModel>();
 	
 	public IDatabaseFile Db { get; }
@@ -29,14 +34,14 @@ namespace DHT.Desktop.Main.Pages {
 	private readonly Window window;
 	
 	[Obsolete("Designer")]
-		public DatabasePageModel() : this(null!, DummyDatabaseFile.Instance) {}
+	public DatabasePageModel() : this(null!, State.Dummy) {}
 	
-		public DatabasePageModel(Window window, IDatabaseFile db) {
+	public DatabasePageModel(Window window, State state) {
 		this.window = window;
-			this.Db = db;
+		this.Db = state.Db;
 	}
 	
-		public async void OpenDatabaseFolder() {
+	public async Task OpenDatabaseFolder() {
 		string file = Db.Path;
 		string? folder = Path.GetDirectoryName(file);
 		
@@ -50,11 +55,11 @@ namespace DHT.Desktop.Main.Pages {
 				break;
 			
 			case PlatformID.Unix:
-					Process.Start("xdg-open", new string[] { folder });
+				Process.Start("xdg-open", [ folder ]);
 				break;
 			
 			case PlatformID.MacOSX:
-					Process.Start("open", new string[] { folder });
+				Process.Start("open", [ folder ]);
 				break;
 			
 			default:
@@ -67,80 +72,106 @@ namespace DHT.Desktop.Main.Pages {
 		DatabaseClosed?.Invoke(this, EventArgs.Empty);
 	}
 	
-		public async void MergeWithDatabase() {
-			var fileDialog = DatabaseGui.NewOpenDatabaseFileDialog();
-			fileDialog.Directory = Path.GetDirectoryName(Db.Path);
-			fileDialog.AllowMultiple = true;
-
-			string[]? paths = await fileDialog.ShowAsync(window);
-			if (paths == null || paths.Length == 0) {
+	public async Task MergeWithDatabase() {
+		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		if (paths.Length == 0) {
 			return;
 		}
 		
-			ProgressDialog progressDialog = new ProgressDialog();
-			progressDialog.DataContext = new ProgressDialogModel(async callback => await MergeWithDatabaseFromPaths(Db, paths, progressDialog, callback)) {
-				Title = "Database Merge"
-			};
+		const string Title = "Database Merge";
 		
-			await progressDialog.ShowDialog(window);
+		ImportResult? result;
+		try {
+			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
+		} catch (Exception e) {
+			Log.Error("Could not merge databases.", e);
+			await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
+			return;
 		}
 		
-		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;
+		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "database file"));
 	}
 	
-			await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
-				SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
-				SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
-				IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, CheckCanUpgradeDatabase);
-				SynchronizationContext.SetSynchronizationContext(prevSyncContext);
+	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 {
-					target.AddFrom(db);
+				await target.AddFrom(db);
 				return true;
 			} finally {
-					db.Dispose();
+				await db.DisposeAsync();
 			}
 		});
 	}
 	
-		public async void ImportLegacyArchive() {
-			var fileDialog = new OpenFileDialog {
-				Title = "Open Legacy DHT Archive",
-				Directory = Path.GetDirectoryName(Db.Path),
-				AllowMultiple = true
-			};
+	private sealed class SchemaUpgradeCallbacks(ProgressDialog dialog, int total) : ISchemaUpgradeCallbacks {
+		private bool? decision;
 		
-			string[]? paths = await fileDialog.ShowAsync(window);
-			if (paths == null || paths.Length == 0) {
+		public Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+			return Task.FromResult<InitialDatabaseSettings?>(null);
+		}
+		
+		public async Task<bool> CanUpgrade() {
+			return decision ??= (total > 1
+				                     ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
+				                     : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog)) == DialogResult.YesNo.Yes;
+		}
+		
+		public Task Start(int versionSteps, Func<ISchemaUpgradeCallbacks.IProgressReporter, Task> doUpgrade) {
+			return doUpgrade(new NullReporter());
+		}
+		
+		private sealed class NullReporter : ISchemaUpgradeCallbacks.IProgressReporter {
+			public Task NextVersion() {
+				return Task.CompletedTask;
+			}
+			
+			public Task MainWork(string message, int finishedItems, int totalItems) {
+				return Task.CompletedTask;
+			}
+			
+			public Task SubWork(string message, int finishedItems, int totalItems) {
+				return Task.CompletedTask;
+			}
+		}
+	}
+	
+	public async Task ImportLegacyArchive() {
+		string[] paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+			Title = "Open Legacy DHT Archive",
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
+			AllowMultiple = true,
+		});
+		
+		if (paths.Length == 0) {
 			return;
 		}
 		
-			ProgressDialog progressDialog = new ProgressDialog();
-			progressDialog.DataContext = new ProgressDialogModel(async callback => await ImportLegacyArchiveFromPaths(Db, paths, progressDialog, callback)) {
-				Title = "Legacy Archive Import"
-			};
+		const string Title = "Legacy Archive Import";
 		
-			await progressDialog.ShowDialog(window);
+		ImportResult? result;
+		try {
+			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
+		} catch (Exception e) {
+			Log.Error("Could not import legacy archives.", e);
+			await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
+			return;
 		}
 		
-		private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+		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();
 		
-			await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
+		return await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", async path => {
 			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
 			
 			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
@@ -160,16 +191,16 @@ namespace DHT.Desktop.Main.Pages {
 		
 		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
 		
-			foreach (var server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
+		foreach (DHT.Server.Data.Server server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
 			items.Add(new TextBoxItem<DHT.Server.Data.Server>(server) {
 				Title = server.Name + " (" + ServerTypes.ToNiceString(server.Type) + ")",
-					ValidityCheck = IsValidSnowflake
+				ValidityCheck = IsValidSnowflake,
 			});
 		}
 		
 		var model = new TextBoxDialogModel<DHT.Server.Data.Server>(items) {
 			Title = "Imported Server IDs",
-				Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID."
+			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID.",
 		};
 		
 		var dialog = new TextBoxDialog { DataContext = model };
@@ -184,9 +215,9 @@ namespace DHT.Desktop.Main.Pages {
 		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
 	}
 	
-		private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
+	private static async Task<ImportResult?> PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string dialogTitle, Func<string, Task<bool>> performImport) {
 		int total = paths.Length;
-			var oldStatistics = target.SnapshotStatistics();
+		DatabaseStatistics oldStatistics = await DatabaseStatistics.Take(target);
 		
 		int successful = 0;
 		int finished = 0;
@@ -196,7 +227,7 @@ namespace DHT.Desktop.Main.Pages {
 			++finished;
 			
 			if (!File.Exists(path)) {
-					await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
+				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
 				continue;
 			}
 			
@@ -205,35 +236,55 @@ namespace DHT.Desktop.Main.Pages {
 					++successful;
 				}
 			} catch (Exception ex) {
-					Log.Error(ex);
-					await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
+				Log.Error("Could not import file: " + path, ex);
+				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
 		}
 		
 		await callback.Update("Done", finished, total);
 		
 		if (successful == 0) {
-				await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
-				return;
+			return null;
 		}
 		
-			await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, target.SnapshotStatistics(), successful, total, itemName));
+		DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
+		return new ImportResult(oldStatistics, newStatistics, successful, total);
 	}
 	
-		private static string GetImportDialogMessage(DatabaseStatisticsSnapshot oldStatistics, DatabaseStatisticsSnapshot newStatistics, int successfulItems, int totalItems, string itemName) {
-			long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
-			long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
-			long newUsers = newStatistics.TotalUsers - oldStatistics.TotalUsers;
-			long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
+	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()
+			);
+		}
+	}
 	
-			StringBuilder message = new StringBuilder();
+	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 (successfulItems == totalItems) {
-				message.Append(successfulItems.Pluralize(itemName));
+		if (result.SuccessfulItems == result.TotalItems) {
+			message.Append(result.SuccessfulItems.Pluralize(itemName));
 		}
 		else {
-				message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
+			message.Append(result.SuccessfulItems.Format()).Append(" out of ").Append(result.TotalItems.Pluralize(itemName));
 		}
 		
 		message.Append(" and added:\n\n  \u2022 ");
@@ -244,5 +295,18 @@ namespace DHT.Desktop.Main.Pages {
 		
 		return message.ToString();
 	}
+	
+	public async Task VacuumDatabase() {
+		const string Title = "Vacuum Database";
+		
+		try {
+			await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
+		} catch (Exception e) {
+			Log.Error("Could not vacuum database.", e);
+			await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
+			return;
+		}
+		
+		await Dialog.ShowOk(window, Title, "Done.");
 	}
 }

app/Desktop/Main/Pages/DebugPage.axaml

@@ -4,7 +4,8 @@
              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:Class="DHT.Desktop.Main.Pages.DebugPage"
+             x:DataType="pages:DebugPageModel">
 
     <Design.DataContext>
         <pages:DebugPageModel />
@@ -15,24 +16,27 @@
             <Setter Property="FontFamily" Value="Consolas,Courier" />
             <Setter Property="FontSize" Value="15" />
         </Style>
+        <Style Selector="Label">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="Padding" Value="0" />
+        </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Orientation" Value="Vertical" />
-            <Setter Property="Margin" Value="0 0 10 10" />
         </Style>
     </UserControl.Styles>
 
     <StackPanel Orientation="Vertical" Spacing="10">
         <Expander Header="Generate Random Data" IsExpanded="True">
-            <WrapPanel>
-                <StackPanel>
+            <WrapPanel ItemSpacing="10" LineSpacing="10">
+                <StackPanel Spacing="8">
                     <Label Target="Channels">Channels</Label>
                     <TextBox x:Name="Channels" Width="100" Text="{Binding GenerateChannels}" />
                 </StackPanel>
-                <StackPanel>
+                <StackPanel Spacing="8">
                     <Label Target="Users">Users</Label>
                     <TextBox x:Name="Users" Width="100" Text="{Binding GenerateUsers}" />
                 </StackPanel>
-                <StackPanel>
+                <StackPanel Spacing="8">
                     <Label Target="Messages">Messages</Label>
                     <TextBox x:Name="Messages" Width="100" Text="{Binding GenerateMessages}" />
                 </StackPanel>
@@ -41,5 +45,8 @@
                 </StackPanel>
             </WrapPanel>
         </Expander>
+        <Expander Header="About" IsExpanded="True">
+            <TextBlock Text="{Binding SqliteVersion, StringFormat=Sqlite Version: {0}}" />
+        </Expander>
     </StackPanel>
 </UserControl>

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

@@ -1,16 +1,11 @@
 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 DebugPage : UserControl {
+public sealed partial class DebugPage : UserControl {
 	public DebugPage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -6,26 +6,34 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
+using DHT.Server;
 using DHT.Server.Data;
-using DHT.Server.Database;
 using DHT.Server.Service;
-using DHT.Utils.Models;
+using PropertyChanged.SourceGenerator;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class DebugPageModel : BaseModel {
+namespace DHT.Desktop.Main.Pages;
+
+sealed partial class DebugPageModel {
 	public string GenerateChannels { get; set; } = "0";
 	public string GenerateUsers { get; set; } = "0";
 	public string GenerateMessages { get; set; } = "0";
 	
+	[Notify(Setter.Private)]
+	private string? sqliteVersion = string.Empty;
+	
 	private readonly Window window;
-		private readonly IDatabaseFile db;
+	private readonly State state;
 	
 	[Obsolete("Designer")]
-		public DebugPageModel() : this(null!, DummyDatabaseFile.Instance) {}
+	public DebugPageModel() : this(null!, State.Dummy) {}
 	
-		public DebugPageModel(Window window, IDatabaseFile db) {
+	public DebugPageModel(Window window, State state) {
 		this.window = window;
-			this.db = db;
+		this.state = state;
+	}
+	
+	public async Task Initialize() {
+		SqliteVersion = await state.Db.GetVersion() ?? "<unknown>";
 	}
 	
 	public async void OnClickAddRandomDataToDatabase() {
@@ -44,80 +52,72 @@ namespace DHT.Desktop.Main.Pages {
 			return;
 		}
 		
-			ProgressDialog progressDialog = new ProgressDialog {
-				DataContext = new ProgressDialogModel(async callback => await GenerateRandomData(channels, users, messages, callback)) {
-					Title = "Generating Random Data"
-				}
-			};
-
-			await progressDialog.ShowDialog(window);
+		await ProgressDialog.Show(window, "Generating Random Data", async (_, callback) => await GenerateRandomData(channels, users, messages, callback));
 	}
 	
 	private const int BatchSize = 500;
 	
 	private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
 		int batchCount = (messageCount + BatchSize - 1) / BatchSize;
-			await callback.Update("Adding messages in batches of " + BatchSize, 0, batchCount);
+		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
+			Type = ServerType.Server,
 		};
 		
-			var channels = Enumerable.Range(0, channelCount).Select(i => new Channel {
+		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, 10),
-				Nsfw = rand.Next(4) == 0
+			Topic = RandomText(rand, maxWords: 10),
+			Nsfw = rand.Next(4) == 0,
 		}).ToArray();
 		
-			var users = Enumerable.Range(0, userCount).Select(_ => new User {
+		User[] users = Enumerable.Range(start: 0, userCount).Select(_ => new User {
 			Id = RandomId(rand),
 			Name = RandomName("u"),
-				AvatarUrl = null,
-				Discriminator = rand.Next(0, 9999).ToString()
+			DisplayName = RandomName("u"),
+			AvatarHash = null,
+			Discriminator = rand.Next(minValue: 0, maxValue: 9999).ToString(),
 		}).ToArray();
 		
-			db.AddServer(server);
-			db.AddUsers(users);
+		await state.Db.Users.Add(users);
+		await state.Db.Servers.Add([server]);
+		await state.Db.Channels.Add(channels);
 		
-			foreach (var channel in channels) {
-				db.AddChannel(channel);
-			}
-			
-			var now = DateTimeOffset.Now;
+		DateTimeOffset now = DateTimeOffset.Now;
 		int batchIndex = 0;
 		
 		while (messageCount > 0) {
 			int hourOffset = batchIndex;
 			
-				var messages = Enumerable.Range(0, Math.Min(messageCount, BatchSize)).Select(i => {
-					DateTimeOffset time = now.AddHours(hourOffset).AddMinutes((i * 60.0) / BatchSize);
-					DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(1, 60)) : null;
+			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;
 				
-					var timeMillis = time.ToUnixTimeMilliseconds();
-					var editMillis = edit?.ToUnixTimeMilliseconds();
+				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, 100),
+					Text = RandomText(rand, maxWords: 100),
 					Timestamp = timeMillis,
 					EditTimestamp = editMillis,
 					RepliedToId = null,
-						Attachments = ImmutableArray<Attachment>.Empty,
-						Embeds = ImmutableArray<Embed>.Empty,
-						Reactions = ImmutableArray<Reaction>.Empty
+					Attachments = ImmutableList<Attachment>.Empty,
+					Embeds = ImmutableList<Embed>.Empty,
+					Reactions = ImmutableList<Reaction>.Empty,
 				};
 			}).ToArray();
 			
-				db.AddMessages(messages);
+			await state.Db.Messages.Add(messages);
 			
 			messageCount -= BatchSize;
 			await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
@@ -138,7 +138,7 @@ namespace DHT.Desktop.Main.Pages {
 		return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
 	}
 	
-		private static readonly string[] RandomWords = {
+	private static readonly string[] RandomWords = [
 		"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
 		"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",
@@ -161,25 +161,24 @@ namespace DHT.Desktop.Main.Pages {
 		"vanilla",
 		"watercress", "watermelon",
 		"yam",
-			"zucchini"
-		};
+		"zucchini",
+	];
 	
 	private static string RandomText(Random rand, int maxWords) {
-			int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), 3));
-			return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
-		}
+		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
-using DHT.Utils.Models;
+namespace DHT.Desktop.Main.Pages;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class DebugPageModel : BaseModel {
+sealed class DebugPageModel {
 	public string GenerateChannels { get; set; } = "0";
 	public string GenerateUsers { get; set; } = "0";
 	public string GenerateMessages { get; set; } = "0";
 
+	public string SqliteVersion => string.Empty;
+	
 	public void OnClickAddRandomDataToDatabase() {}
 }
-}
 #endif

app/Desktop/Main/Pages/DownloadsPage.axaml

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

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

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

app/Desktop/Main/Pages/TrackingPage.axaml

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

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

@@ -1,36 +1,43 @@
 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 sealed partial class TrackingPage : UserControl {
+	private readonly HashSet<Button> copyingButtons = new (ReferenceEqualityComparer.Instance);
 	
 	public TrackingPage() {
 		InitializeComponent();
 	}
 	
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
+	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+		await HandleCopyButton(CopyTrackingScript, "Script Copied!", static model => model.OnClickCopyTrackingScript());
 	}
 	
-		public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+	public async void CopyConnectionScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+		await HandleCopyButton(CopyConnectionCode, "Code Copied!", static model => model.OnClickCopyConnectionCode());
+	}
+	
+	private async Task HandleCopyButton(Button button, string copiedText, Func<TrackingPageModel, Task<bool>> onClick) {
 		if (DataContext is TrackingPageModel model) {
-				var button = this.FindControl<Button>("CopyTrackingScript");
-				var originalText = button.Content;
+			object? originalText = button.Content;
 			button.MinWidth = button.Bounds.Width;
 			
-				if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
-					isCopyingScript = true;
-					button.Content = "Script Copied!";
+			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,35 +1,43 @@
 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.Utils.Models;
+using DHT.Utils.Logging;
+using PropertyChanged.SourceGenerator;
 using static DHT.Desktop.Program;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class TrackingPageModel : BaseModel {
-		private bool areDevToolsEnabled;
+namespace DHT.Desktop.Main.Pages;
 
-		private bool AreDevToolsEnabled {
-			get => areDevToolsEnabled;
-			set {
-				Change(ref areDevToolsEnabled, value);
-				OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
-			}
-		}
+sealed partial class TrackingPageModel {
+	private static readonly Log Log = Log.ForType<TrackingPageModel>();
 	
-		public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
+	[Notify(Setter.Private)]
+	private bool? areDevToolsEnabled = null;
 	
+	[Notify(Setter.Private)]
+	private bool isToggleAppDevToolsButtonEnabled = false;
+	
+	public string OpenDevToolsShortcutText { get; } = OperatingSystem.IsMacOS() ? "Cmd+Shift+I" : "Ctrl+Shift+I";
+	
+	[DependsOn(nameof(AreDevToolsEnabled), nameof(IsToggleAppDevToolsButtonEnabled))]
 	public string ToggleAppDevToolsButtonText {
 		get {
+			if (!AreDevToolsEnabled.HasValue) {
+				return "Loading...";
+			}
+			
 			if (!IsToggleAppDevToolsButtonEnabled) {
 				return "Unavailable";
 			}
 			
-				return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+			return (AreDevToolsEnabled.Value ? "Disable" : "Enable") + " " + OpenDevToolsShortcutText;
 		}
 	}
 	
@@ -40,56 +48,46 @@ namespace DHT.Desktop.Main.Pages {
 	
 	public TrackingPageModel(Window window) {
 		this.window = window;
-		}
 		
-		public async Task Initialize() {
-			bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
-			if (devToolsEnabled.HasValue) {
-				AreDevToolsEnabled = devToolsEnabled.Value;
-			}
-			else {
-				IsToggleAppDevToolsButtonEnabled = false;
-				OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
-			}
+		Task.Factory.StartNew(InitializeDevToolsToggle, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.FromCurrentSynchronizationContext());
 	}
 	
 	public async Task<bool> OnClickCopyTrackingScript() {
-			string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
-			string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerManager.Port + ";")
-			                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(ServerManager.Token))
-			                         .Replace("/*[IMPORTS]*/", await Resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
-			                         .Replace("/*[CSS-CONTROLLER]*/", await Resources.ReadTextAsync("Tracker/styles/controller.css"))
-			                         .Replace("/*[CSS-SETTINGS]*/", await Resources.ReadTextAsync("Tracker/styles/settings.css"));
-
-			var clipboard = Application.Current?.Clipboard;
-			if (clipboard == null) {
-				await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
-				return false;
+		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");
 	}
 	
-			try {
-				await clipboard.SetTextAsync(script);
-				return true;
-			} catch {
-				await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
-				return false;
+	private async Task InitializeDevToolsToggle() {
+		bool? devToolsEnabled = await Task.Run(DiscordAppSettings.AreDevToolsEnabled);
+		
+		if (devToolsEnabled.HasValue) {
+			AreDevToolsEnabled = devToolsEnabled.Value;
+			IsToggleAppDevToolsButtonEnabled = true;
+		}
+		else {
+			IsToggleAppDevToolsButtonEnabled = false;
 		}
 	}
 	
-		public async void OnClickToggleAppDevTools() {
+	public async Task OnClickToggleAppDevTools() {
 		const string DialogTitle = "Discord App Settings File";
 		
-			bool oldState = AreDevToolsEnabled;
+		if (!AreDevToolsEnabled.HasValue) {
+			return;
+		}
+		
+		bool oldState = AreDevToolsEnabled.Value;
 		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.");
+				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
 				break;
 			
 			case SettingsJsonResult.AlreadySet:
-					await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
+				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " is already " + (newState ? "enabled." : "disabled."));
 				AreDevToolsEnabled = newState;
 				break;
 			
@@ -113,5 +111,44 @@ namespace DHT.Desktop.Main.Pages {
 				throw new ArgumentOutOfRangeException();
 		}
 	}
+	
+	public async Task OnClickInstallOrUpdateUserscript() {
+		try {
+			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/get-userscript/dht.user.js");
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, "Install or Update Userscript", "Could not open the browser: " + e.Message);
+		}
+	}
+	
+	[GeneratedRegex("^[a-zA-Z0-9]{1,100}$")]
+	private static partial Regex ConnectionCodeTokenRegex();
+	
+	public async Task<bool> OnClickCopyConnectionCode() {
+		const string Title = "Copy Connection Code";
+		
+		if (ConnectionCodeTokenRegex().IsMatch(ServerConfiguration.Token)) {
+			return await TryCopy(ServerConfiguration.Port + ":" + ServerConfiguration.Token, Title);
+		}
+		else {
+			await Dialog.ShowOk(window, Title, "The internal server token cannot be used to create a connection code.\n\nCheck the 'Advanced' tab and ensure the token is 1-100 characters long, and only contains plain letters and numbers.");
+			return false;
+		}
+	}
+	
+	private async Task<bool> TryCopy(string script, string errorDialogTitle) {
+		IClipboard? clipboard = window.Clipboard;
+		if (clipboard == null) {
+			await Dialog.ShowOk(window, errorDialogTitle, "Clipboard is not available on this system.");
+			return false;
+		}
+		
+		try {
+			await clipboard.SetTextAsync(script);
+			return true;
+		} catch (Exception e) {
+			Log.Error("Could not copy to clipboard.", e);
+			await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
+			return false;
+		}
 	}
 }

app/Desktop/Main/Pages/ViewerPage.axaml

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

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

@@ -1,16 +1,11 @@
 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 sealed partial class ViewerPage : UserControl {
 	public ViewerPage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,51 +1,43 @@
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
 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.Database;
-using DHT.Server.Database.Export;
-using DHT.Server.Database.Export.Strategy;
-using DHT.Utils.Models;
-using static DHT.Desktop.Program;
+using DHT.Server.Service.Viewer;
+using DHT.Utils.Logging;
+using PropertyChanged.SourceGenerator;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class ViewerPageModel : BaseModel, IDisposable {
-		public static readonly ConcurrentBag<string> TemporaryFiles = new ();
+namespace DHT.Desktop.Main.Pages;
+
+sealed partial class ViewerPageModel : IDisposable {
+	private static readonly Log Log = Log.ForType<ViewerPageModel>();
 	
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 	
+	[Notify]
 	private bool hasFilters = false;
 	
-		public bool HasFilters {
-			get => hasFilters;
-			set => Change(ref hasFilters, value);
-		}
-
-		private MessageFilterPanelModel FilterModel { get; }
+	public MessageFilterPanelModel FilterModel { get; }
 	
 	private readonly Window window;
-		private readonly IDatabaseFile db;
+	private readonly State state;
 	
 	[Obsolete("Designer")]
-		public ViewerPageModel() : this(null!, DummyDatabaseFile.Instance) {}
+	public ViewerPageModel() : this(null!, State.Dummy) {}
 	
-		public ViewerPageModel(Window window, IDatabaseFile db) {
+	public ViewerPageModel(Window window, State state) {
 		this.window = window;
-			this.db = db;
+		this.state = state;
 		
-			FilterModel = new MessageFilterPanelModel(window, db, "Will export");
+		FilterModel = new MessageFilterPanelModel(window, state, "Will export");
 		FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
 	}
 	
@@ -57,94 +49,53 @@ namespace DHT.Desktop.Main.Pages {
 		HasFilters = FilterModel.HasAnyFilters;
 	}
 	
-		private async Task WriteViewerFile(string path, IViewerExportStrategy strategy) {
-			const string ArchiveTag = "/*[ARCHIVE]*/";
-
-			string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
-			string viewerTemplate = indexFile.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
-			                                 .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
-			
-			int viewerArchiveTagStart = viewerTemplate.IndexOf(ArchiveTag);
-			int viewerArchiveTagEnd = viewerArchiveTagStart + ArchiveTag.Length;
-
-			string jsonTempFile = path + ".tmp";
-
-			await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
-				await ViewerJsonExport.Generate(jsonStream, strategy, db, FilterModel.CreateFilter());
-
-				char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
-				jsonStream.Position = 0;
-
-				await using (var outputStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
-				await using (var outputWriter = new StreamWriter(outputStream, Encoding.UTF8)) {
-					await outputWriter.WriteAsync(viewerTemplate[..viewerArchiveTagStart]);
-
-					using (var jsonReader = new StreamReader(jsonStream, Encoding.UTF8)) {
-						int readBytes;
-						while ((readBytes = await jsonReader.ReadAsync(jsonBuffer, 0, jsonBuffer.Length)) > 0) {
-							string jsonChunk = new string(jsonBuffer, 0, readBytes);
-							await outputWriter.WriteAsync(HttpUtility.JavaScriptStringEncode(jsonChunk));
-						}
-					}
-
-					await outputWriter.WriteAsync(viewerTemplate[viewerArchiveTagEnd..]);
-				}
-			}
-
-			File.Delete(jsonTempFile);
-		}
-
 	public async void OnClickOpenViewer() {
-			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");
-			}
-
-			TemporaryFiles.Add(fullPath);
-			
-			Directory.CreateDirectory(rootPath);
-			await WriteViewerFile(fullPath, new LiveViewerExportStrategy(ServerManager.Port, ServerManager.Token));
-
-			Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
-		}
-
-		public async void OnClickSaveViewer() {
-			var dialog = new SaveFileDialog {
-				Title = "Save Viewer",
-				InitialFileName = Path.GetFileNameWithoutExtension(db.Path) + ".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 WriteViewerFile(path, StandaloneViewerExportStrategy.Instance);
+		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);
 		}
 	}
 	
-		public async void OnClickApplyFiltersToDatabase() {
-			var filter = FilterModel.CreateFilter();
+	public async Task OnClickApplyFiltersToDatabase() {
+		try {
+			MessageFilter filter = FilterModel.CreateFilter();
+			long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
 			
 			if (DatabaseToolFilterModeKeep) {
-				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
-					db.RemoveMessages(filter, FilterRemovalMode.KeepMatching);
+				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
+					await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
 				}
 			}
 			else if (DatabaseToolFilterModeRemove) {
-				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
-					db.RemoveMessages(filter, FilterRemovalMode.RemoveMatching);
+				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
+					await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
 				}
 			}
+		} catch (Exception e) {
+			Log.Error("Could not apply filters.", e);
+			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
 		}
 	}
+	
+	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {
+		await ProgressDialog.Show(window, "Apply Filters", async (_, callback) => {
+			await callback.UpdateIndeterminate("Removing messages...");
+			Log.Info("Removed messages: " + await state.Db.Messages.Remove(filter, removalMode));
+			
+			await callback.UpdateIndeterminate("Cleaning up attachments...");
+			Log.Info("Removed orphaned attachments: " + await state.Db.Messages.RemoveUnreachableAttachments());
+			
+			await callback.UpdateIndeterminate("Cleaning up users...");
+			Log.Info("Removed orphaned users: " + await state.Db.Users.RemoveUnreachable());
+			
+			await callback.UpdateIndeterminate("Cleaning up channels...");
+			Log.Info("Removed orphaned channels: " + await state.Db.Channels.RemoveUnreachable());
+			
+			await callback.UpdateIndeterminate("Cleaning up servers...");
+			Log.Info("Removed orphaned servers: " + await state.Db.Servers.RemoveUnreachable());
+		});
+	}
 }

app/Desktop/Main/Screens/MainContentScreen.axaml

@@ -5,7 +5,8 @@
              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:Class="DHT.Desktop.Main.Screens.MainContentScreen"
+             x:DataType="screens:MainContentScreenModel">
 
     <Design.DataContext>
         <screens:MainContentScreenModel />
@@ -39,13 +40,13 @@
         <Style Selector="TabItem:pointerover /template/ Border">
             <Setter Property="Background" Value="#455785" />
         </Style>
-        <Style Selector="TabItem:pointerover > TextBlock">
+        <Style Selector="TabItem:pointerover /template/ ContentPresenter">
             <Setter Property="Foreground" Value="#E9E9E9" />
         </Style>
         <Style Selector="TabItem:selected:pointerover /template/ Border">
             <Setter Property="Background" Value="#FFFFFF" />
         </Style>
-        <Style Selector="TabItem:selected:pointerover > TextBlock">
+        <Style Selector="TabItem:selected:pointerover /template/ ContentPresenter">
             <Setter Property="Foreground" Value="#1A2234" />
         </Style>
         <Style Selector="TabItem:selected">
@@ -55,9 +56,11 @@
         <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
             <Setter Property="IsVisible" Value="False" />
         </Style>
-        <Style Selector="TabItem:disabled > TextBlock">
+        <Style Selector="TabItem:disabled /template/ ContentPresenter">
             <Setter Property="Foreground" Value="#B2B2B2" />
-            <Setter Property="TextDecorations" Value="Strikethrough" />
+        </Style>
+        <Style Selector="TabItem:disabled /template/ ContentPresenter">
+            <Setter Property="AccessText.TextDecorations" Value="Strikethrough" />
         </Style>
         <Style Selector="TabItem.first">
             <Setter Property="Margin" Value="0 13 0 0" />
@@ -73,7 +76,7 @@
     <DockPanel>
         <Border Classes="statusBar" DockPanel.Dock="Bottom">
             <DockPanel>
-                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Attachments</TextBlock>
+                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Downloads</TextBlock>
                 <controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Right" />
             </DockPanel>
         </Border>
@@ -93,9 +96,9 @@
                     <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabAttachments" Header="Attachments" Grid.Row="2">
+            <TabItem x:Name="TabDownloads" Header="Downloads" Grid.Row="2">
                 <ScrollViewer>
-                    <ContentPresenter Content="{Binding AttachmentsPage}" Classes="page" />
+                    <ContentPresenter Content="{Binding DownloadsPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
             <TabItem x:Name="TabViewer" Header="Viewer" Grid.Row="3">

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

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

app/Desktop/Main/Screens/MainContentScreenModel.cs

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

app/Desktop/Main/Screens/WelcomeScreen.axaml

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

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

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

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -1,18 +1,31 @@
 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.Utils.Models;
+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>();
 	
-namespace DHT.Desktop.Main.Screens {
-	sealed class WelcomeScreenModel : BaseModel, IDisposable {
 	public string Version => Program.Version;
 	
-		public IDatabaseFile? Db { get; private set; }
-		public bool HasDatabase => Db != null;
+	[Notify(Setter.Private)]
+	private bool isOpenOrCreateDatabaseButtonEnabled = true;
+	
+	public event EventHandler<IDatabaseFile>? DatabaseSelected;
 	
 	private readonly Window window;
 	
@@ -25,49 +38,125 @@ namespace DHT.Desktop.Main.Screens {
 		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)) {
+	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) {
-			if (Db != null) {
-				Db = null;
-			}
-
 		dbFilePath = path;
-			Db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, CheckCanUpgradeDatabase);
 		
-			OnPropertyChanged(nameof(Db));
-			OnPropertyChanged(nameof(HasDatabase));
+		IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
+		if (db != null) {
+			DatabaseSelected?.Invoke(this, db);
+		}
 	}
 	
-		private async Task<bool> CheckCanUpgradeDatabase() {
+	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 void CloseDatabase() {
-			Dispose();
-			OnPropertyChanged(nameof(Db));
-			OnPropertyChanged(nameof(HasDatabase));
+		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));
 			}
 			
-		public async void ShowAboutDialog() {
-			await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(this.window);
+			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("Could not check for updates.", e);
+			await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
+			return;
+		}
+		
+		if (!System.Version.TryParse(response, out Version? latestVersion)) {
+			await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
+			return;
+		}
+		
+		if (Program.AssemblyVersion >= latestVersion) {
+			await Dialog.ShowOk(window, "Check Updates", "You are using the latest version.");
+			return;
+		}
+		
+		if (await Dialog.ShowYesNo(window, "Check Updates", "A newer version is available: v" + Program.VersionToString(latestVersion) + "\nVisit the official website and close the app?") == DialogResult.YesNo.Yes) {
+			SystemUtils.OpenUrl(Program.Website);
+			Exit();
+		}
+	}
+	
+	public async Task ShowAboutDialog() {
+		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
 	}
 	
 	public void Exit() {
 		window.Close();
 	}
-
-		public void Dispose() {
-			Db?.Dispose();
-			Db = null;
-		}
-	}
 }

app/Desktop/Program.cs

@@ -1,21 +1,27 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.Reflection;
 using Avalonia;
+using DHT.Desktop.Common;
+using DHT.Utils.Logging;
 using DHT.Utils.Resources;
 
-namespace DHT.Desktop {
+namespace DHT.Desktop;
+
 static class Program {
 	public static string Version { get; }
+	public static Version AssemblyVersion { get; }
 	public static CultureInfo Culture { get; }
 	public static ResourceLoader Resources { get; }
+	public static Arguments Arguments { get; }
+	
+	public const string Website = "https://dht.chylex.com";
 	
 	static Program() {
 		var assembly = Assembly.GetExecutingAssembly();
 		
-			Version = assembly.GetName().Version?.ToString() ?? "";
-			while (Version.EndsWith(".0")) {
-				Version = Version[..^2];
-			}
+		AssemblyVersion = assembly.GetName().Version ?? new Version(major: 0, minor: 0, build: 0, revision: 0);
+		Version = VersionToString(AssemblyVersion);
 		
 		Culture = CultureInfo.CurrentCulture;
 		CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
@@ -24,16 +30,39 @@ namespace DHT.Desktop {
 		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();
+			}
+		}
 	}
 	
 	private static AppBuilder BuildAvaloniaApp() {
+		AvaloniaReflection.Check();
+		
 		return AppBuilder.Configure<App>()
 		                 .UsePlatformDetect()
+		                 .WithInterFont()
 		                 .LogToTrace();
 	}
 }
-}

app/Desktop/Resources/tracker-loader.js

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

app/Desktop/Server/ServerConfiguration.cs

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

app/Desktop/Server/ServerManager.cs

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

app/Directory.Build.props

@@ -0,0 +1,51 @@
+<Project>
+  
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <LangVersion>13</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <Authors>chylex</Authors>
+    <Company>DiscordHistoryTracker</Company>
+    <Product>DiscordHistoryTracker</Product>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>full</TrimMode>
+    <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
+    <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
+    <EventSourceSupport>false</EventSourceSupport>
+    <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
+    <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
+    <XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <PublishSingleFile>true</PublishSingleFile>
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
+    <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
+    <ArtifactsPath>$(MSBuildThisFileDirectory).artifacts</ArtifactsPath>
+  </PropertyGroup>
+
+</Project>

app/NuGet.Config

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

app/Resources/Schemas/track-users.yml

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