Release v42.0

Closes #256

README.md

@@ -16,17 +16,30 @@ 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, open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
+To start editing source code for the desktop app, install the [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
 
 ### Building
 
 To build a `Debug` version of the desktop app, there are no additional requirements.
 
-To build a `Release` version of the desktop app, you will need [Python 3](https://www.python.org/downloads), which is used by the build process to launch `app/Resources/minify.py` script.
+To build a `Release` version of the desktop app, follow the instructions for your operating system.
 
-When creating `Release` builds on systems other than 64-bit Windows, you will also need [Node + npm](https://nodejs.org/en), and [uglify-js](https://www.npmjs.com/package/uglify-js) installed globally (`npm install uglify-js -g`). On 64-bit Windows, both Node and uglify-js are already included in the `lib/` folder for convenience.
+#### Release – Windows (64-bit)
 
-To create `Release` builds ready for distribution, run the `app/build.bat` script on Windows, or `app/build.sh` script on other operating systems. This will create 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. All builds are placed in the `app/bin` folder.
+1. Install [Powershell 5](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) or newer (on Windows 10, the included version of Powershell should be enough)
+
+Run the `app/build.bat` script, and read the [Distribution](#distribution) section below.
+
+#### Release – Other Operating Systems
+
+1. Install the `zip` package from your repository
+
+Run the `app/build.sh` script, and read the [Distribution](#distribution) section below.
+
+#### Distribution
+
+The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires .NET 8 to be installed.
+
+Note that when building on Windows, the generated `.zip` files for Linux and Mac will not have correct file permissions, so it will not be possible to run them by double-clicking the executable. Since .NET 8 fixed several issues with publishing Windows executables on Linux, I recommend using Linux to build the app for all operating systems.

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

@@ -7,14 +7,17 @@
         <entry key="Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Dialogs/Message/MessageDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Dialogs/Progress/ProgressDialog.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Dialogs/TextBox/TextBoxDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/AboutWindow.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Controls/FilterPanel.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Controls/DownloadItemFilterPanel.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Controls/MessageFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DebugPage.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Pages/DownloadsPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/TrackingPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/ViewerPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Screens/MainContentScreen.axaml" value="Desktop/Desktop.csproj" />

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,11 +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" />
+        <FluentTheme />
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml" />
 
         <Style Selector="Button, CheckBox, RadioButton, Expander /template/ ToggleButton#ExpanderHeader">
             <Setter Property="Cursor" Value="Hand" />
@@ -32,72 +34,24 @@
         <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
             <Setter Property="BorderThickness" Value="1" />
         </Style>
-        <Style Selector="TextBox:disabled"><!-- TODO bug in Avalonia (https://github.com/AvaloniaUI/Avalonia/pull/7792) -->
-            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
+        <Style Selector="TextBox:error DataValidationErrors">
+            <Style.Resources>
+                <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
+                    <ContentPresenter Name="PART_ContentPresenter"
+                                      Padding="{TemplateBinding Padding}"
+                                      Background="{TemplateBinding Background}"
+                                      BorderThickness="{TemplateBinding BorderThickness}"
+                                      CornerRadius="{TemplateBinding CornerRadius}"
+                                      Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}" />
+                </ControlTemplate>
+            </Style.Resources>
+            <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
         </Style>
 
-        <Style Selector="Expander /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>
-        <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>
-        <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="Expander">
+            <Setter Property="MinHeight" Value="40" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
         
     </Application.Styles>
@@ -105,6 +59,7 @@
     <Application.Resources>
 
         <common:NumberValueConverter x:Key="NumberValueConverter" />
+        <common:BytesValueConverter x:Key="BytesValueConverter" />
 
         <system:Double x:Key="ControlContentThemeFontSize">14</system:Double>
         <CornerRadius x:Key="ControlCornerRadius">0</CornerRadius>
@@ -154,13 +109,27 @@
         <SolidColorBrush x:Key="TextControlPlaceholderForegroundDisabled" Color="#AAAAAA" />
         
         <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
-        <Thickness x:Key="ExpanderContentPadding">15</Thickness>
-        <SolidColorBrush x:Key="ExpanderBorderBrush" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderBackground" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderForeground" Color="#FFFFFF" />
+        <Thickness x:Key="ExpanderContentPadding">12</Thickness>
+        <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,43 @@
 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>();
 
+	private const int FirstArgument = 1;
+
 	public static Arguments Empty => new (Array.Empty<string>());
 
+	public bool Console { get; }
 	public string? DatabaseFile { get; }
 	public ushort? ServerPort { get; }
 	public string? ServerToken { get; }
+	public byte? ConcurrentDownloads { get; }
 
-		public Arguments(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 +51,11 @@ namespace DHT.Desktop {
 					continue;
 
 				case "-port": {
-						if (ushort.TryParse(value, out var port)) {
-							ServerPort = port;
+					if (!ushort.TryParse(value, out var port)) {
+						Log.Warn("Invalid port number: " + value);
 					}
 					else {
-							Log.Warn("Invalid port number: " + value);
+						ServerPort = port;
 					}
 
 					continue;
@@ -55,6 +65,20 @@ namespace DHT.Desktop {
 					ServerToken = value;
 					continue;
 				
+				case "-concurrentdownloads":
+					if (!ulong.TryParse(value, out var concurrentDownloads) || concurrentDownloads == 0) {
+						Log.Warn("Invalid concurrent downloads count: " + value);
+					}
+					else if (concurrentDownloads > 10) {
+						Log.Warn("Limiting concurrent downloads to 10");
+						ConcurrentDownloads = 10;
+					}
+					else {
+						ConcurrentDownloads = (byte) concurrentDownloads;
+					}
+					
+					continue;
+
 				default:
 					Log.Warn("Unknown command line argument: " + key);
 					break;
@@ -62,4 +86,3 @@ namespace DHT.Desktop {
 		}
 	}
 }
-}

app/Desktop/Common/BytesValueConverter.cs

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

app/Desktop/Common/DatabaseGui.cs

@@ -3,46 +3,50 @@ 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) {
@@ -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/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,72 +1,44 @@
 <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.13" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.13" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.13" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
   </ItemGroup>
+  
   <ItemGroup>
     <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
+  
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
   </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,6 +5,7 @@
         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"
@@ -34,17 +35,17 @@
 
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
-            <ItemsControl Items="{Binding Items}">
-                <ItemsControl.ItemTemplate>
+            <ItemsRepeater ItemsSource="{Binding Items}">
+                <ItemsRepeater.ItemTemplate>
                     <DataTemplate>
-                        <CheckBox IsChecked="{Binding Checked}">
+                        <CheckBox IsChecked="{Binding IsChecked}">
                             <Label>
                                 <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
                             </Label>
                         </CheckBox>
                     </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
+                </ItemsRepeater.ItemTemplate>
+            </ItemsRepeater>
         </ScrollViewer>
         <Panel Classes="buttons">
             <WrapPanel Classes="left">

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.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.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);
 	}
 
 	public void ClickOk(object? sender, RoutedEventArgs e) {
@@ -27,5 +19,3 @@ namespace DHT.Desktop.Dialogs.CheckBox {
 		Close(DialogResult.OkCancel.Cancel);
 	}
 }
-}
-

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

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

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

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

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -0,0 +1,36 @@
+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[]> 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 IStorageFile file) {
+		return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
+	}
+
+	private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
+		return files.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()) {
@@ -71,4 +72,3 @@ namespace DHT.Desktop.Dialogs.Message {
 		return result.ToYesNoCancel();
 	}
 }
-}

app/Desktop/Dialogs/Message/DialogResult.cs

@@ -1,6 +1,7 @@
 using System;
 
-namespace DHT.Desktop.Dialogs.Message {
+namespace DHT.Desktop.Dialogs.Message;
+
 static class DialogResult {
 	public enum All {
 		Ok,
@@ -56,4 +57,3 @@ namespace DHT.Desktop.Dialogs.Message {
 		};
 	}
 }
-}

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"

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/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 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,89 @@
 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 {
+	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
+		var taskCompletionSource = new TaskCompletionSource();
+		var dialog = new ProgressDialog();
+		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
+			try {
+				await action(dialog, callbacks[0]);
+				taskCompletionSource.SetResult();
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
+		});
+		
+		await dialog.ShowProgressDialog(owner);
+		await taskCompletionSource.Task;
+	}
+	
+	internal static async Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
+		var taskCompletionSource = new TaskCompletionSource();
+		var dialog = new ProgressDialog();
+		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
+			await callbacks[0].UpdateIndeterminate(message);
+			try {
+				await action(dialog);
+				taskCompletionSource.SetResult();
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
+		});
+		
+		await dialog.ShowProgressDialog(owner);
+		await taskCompletionSource.Task;
+	}
+	
+	internal static async Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
+		var taskCompletionSource = new TaskCompletionSource<T>();
+		var dialog = new ProgressDialog();
+
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
+			await callbacks[0].UpdateIndeterminate(message);
+			try {
+				taskCompletionSource.SetResult(await action(dialog));
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
+		});
+		
+		await dialog.ShowProgressDialog(owner);
+		return await taskCompletionSource.Task;
+	}
+
 	private bool isFinished = false;
+	private Task progressTask = Task.CompletedTask;
 
 	public ProgressDialog() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
 	}
 
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-
-		public void OnClosing(object? sender, CancelEventArgs e) {
-			e.Cancel = !isFinished;
-		}
-
-		public void Loaded(object? sender, EventArgs e) {
+	public void OnOpened(object? sender, EventArgs e) {
 		if (DataContext is ProgressDialogModel model) {
-				Task.Run(model.StartTask).ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
+			progressTask = Task.Run(model.StartTask);
+			progressTask.ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
 		}
 	}
 
+	public void OnClosing(object? sender, WindowClosingEventArgs e) {
+		e.Cancel = !isFinished;
+	}
+
 	private void OnFinished(Task task) {
 		isFinished = true;
 		Close();
 	}
+
+	public async Task ShowProgressDialog(Window owner) {
+		await ShowDialog(owner);
+		await progressTask;
 	}
 }

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -1,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; } = Array.Empty<ProgressItem>();
 
 	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(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, int finishedItems, int 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, 0, 0);
 		}
 	}
 }

app/Desktop/Dialogs/Progress/ProgressItem.cs

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

app/Desktop/Dialogs/TextBox/TextBoxDialog.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.Dialogs.TextBox"
+        mc:Ignorable="d" d:DesignWidth="500"
+        x:Class="DHT.Desktop.Dialogs.TextBox.TextBoxDialog"
+        x:DataType="namespace:TextBoxDialogModel"
+        Title="{Binding Title}"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Width="500" SizeToContent="Height" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Window.DataContext>
+        <namespace:TextBoxDialogModel />
+    </Window.DataContext>
+
+    <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 ItemsSource="{Binding Items}">
+                    <ItemsRepeater.ItemTemplate>
+                        <DataTemplate>
+                            <DockPanel Margin="0 5 25 0">
+                                <TextBox Name="Input" Text="{Binding Value}" Width="180" VerticalAlignment="Top" DockPanel.Dock="Right" />
+                                <Label Target="Input" VerticalAlignment="Center" DockPanel.Dock="Left">
+                                    <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
+                                </Label>
+                            </DockPanel>
+                        </DataTemplate>
+                    </ItemsRepeater.ItemTemplate>
+                </ItemsRepeater>
+            </StackPanel>
+        </ScrollViewer>
+        <Panel Classes="buttons">
+            <WrapPanel Classes="right">
+                <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
+                <Button Click="ClickCancel">Cancel</Button>
+            </WrapPanel>
+        </Panel>
+    </StackPanel>
+
+</Window>

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

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

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

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

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace DHT.Desktop.Dialogs.TextBox;
+
+class TextBoxItem : ObservableObject, 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);
+
+	private string value = string.Empty;
+
+	public string Value {
+		get => this.value;
+		set {
+			SetProperty(ref this.value, value);
+			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
+		}
+	}
+
+	public IEnumerable GetErrors(string? propertyName) {
+		if (propertyName == nameof(Value) && !IsValid) {
+			yield return string.Empty;
+		}
+	}
+
+	public bool HasErrors => !IsValid;
+	public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
+}
+
+sealed class TextBoxItem<T> : TextBoxItem {
+	public new T Item { get; }
+
+	public TextBoxItem(T item) {
+		this.Item = item;
+		base.Item = item;
+	}
+}

app/Desktop/Discord/DiscordAppSettings.cs

@@ -1,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,21 @@ namespace DHT.Desktop.Discord {
 
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-				return AreDevToolsEnabled(await ReadSettingsJson());
-			} catch (Exception) {
+			var settingsJson = await ReadSettingsJson();
+			return AreDevToolsEnabled(settingsJson);
+		} catch (Exception e) {
+			Log.Error("Cannot read settings file.");
+			Log.Error(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 var node) && node?.GetValueKind() == JsonValueKind.True;
 	}
 
 	public static async Task<SettingsJsonResult> ConfigureDevTools(bool enable) {
-			Dictionary<string, object?> json;
+		JsonObject json;
 
 		try {
 			json = await ReadSettingsJson();
@@ -106,14 +110,13 @@ namespace DHT.Desktop.Discord {
 		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,4 +1,5 @@
-namespace DHT.Desktop.Discord {
+namespace DHT.Desktop.Discord;
+
 enum SettingsJsonResult {
 	Success,
 	AlreadySet,
@@ -7,4 +8,3 @@ namespace DHT.Desktop.Discord {
 	InvalidJson,
 	WriteError
 }
-}

app/Desktop/Main/AboutWindow.axaml

@@ -5,6 +5,7 @@
         xmlns:main="clr-namespace:DHT.Desktop.Main"
         mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
         x:Class="DHT.Desktop.Main.AboutWindow"
+        x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="480" Height="295" CanResize="False"
@@ -46,7 +47,7 @@
             <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 8</TextBlock>
             <TextBlock Grid.Row="2" Grid.Column="1">MIT</TextBlock>
             <Button Grid.Row="2" Grid.Column="2" Command="{Binding ShowLibraryNetCore}">GitHub</Button>
 

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,6 +1,7 @@
 using System.Diagnostics;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main;
+
 sealed class AboutWindowModel {
 	public void ShowOfficialWebsite() {
 		OpenUrl("https://dht.chylex.com");
@@ -30,4 +31,3 @@ namespace DHT.Desktop.Main {
 		Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
 	}
 }
-}

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

@@ -0,0 +1,52 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             mc:Ignorable="d"
+             x:Class="DHT.Desktop.Main.Controls.DownloadItemFilterPanel"
+             x:DataType="controls:DownloadItemFilterPanelModel">
+
+    <Design.DataContext>
+        <controls:DownloadItemFilterPanelModel />
+    </Design.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="WrapPanel > StackPanel">
+            <Setter Property="Margin" Value="0 20 40 0" />
+            <Setter Property="Spacing" Value="4" />
+        </Style>
+        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Grid > Label">
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style Selector="ComboBox">
+            <Setter Property="Margin" Value="8 0 0 0" />
+        </Style>
+        <Style Selector="Button">
+            <Setter Property="Margin" Value="0 0 0 8" />
+        </Style>
+    </UserControl.Styles>
+
+    <StackPanel>
+        <TextBlock Text="{Binding FilterStatisticsText}" />
+        <WrapPanel>
+            <StackPanel>
+                <CheckBox IsChecked="{Binding LimitSize}">Limit Size</CheckBox>
+                <StackPanel Orientation="Horizontal">
+                    <TextBox Text="{Binding MaximumSize}" IsEnabled="{Binding LimitSize}" HorizontalContentAlignment="Right" />
+                    <ComboBox IsEnabled="{Binding LimitSize}" ItemsSource="{Binding Units}" SelectedItem="{Binding MaximumSizeUnit}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Name}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+                </StackPanel>
+            </StackPanel>
+        </WrapPanel>
+    </StackPanel>
+
+</UserControl>

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

@@ -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,124 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Desktop.Common;
+using DHT.Server;
+using DHT.Server.Data.Filters;
+using DHT.Utils.Tasks;
+
+namespace DHT.Desktop.Main.Controls;
+
+sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposable {
+	public sealed record Unit(string Name, uint Scale);
+
+	private static readonly Unit[] AllUnits = [
+		new Unit("B", 1),
+		new Unit("kB", 1024),
+		new Unit("MB", 1024 * 1024)
+	];
+
+	private static readonly HashSet<string> FilterProperties = [
+		nameof(LimitSize),
+		nameof(MaximumSize),
+		nameof(MaximumSizeUnit)
+	];
+
+	public string FilterStatisticsText { get; private set; } = "";
+
+	[ObservableProperty]
+	private bool limitSize = false;
+	
+	[ObservableProperty]
+	private ulong maximumSize = 0L;
+	
+	[ObservableProperty]
+	private Unit maximumSizeUnit = AllUnits[0];
+
+	public IEnumerable<Unit> Units => AllUnits;
+
+	private readonly State state;
+	private readonly string verb;
+
+	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.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
+		this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
+
+		UpdateFilterStatistics();
+
+		PropertyChanged += OnPropertyChanged;
+	}
+
+	public void Dispose() {
+		downloadItemCountTask.Cancel();
+		downloadItemCountSubscription.Dispose();
+	}
+
+	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
+			UpdateFilterStatistics();
+		}
+	}
+	
+	private void OnDownloadItemCountChanged(long newItemCount) {
+		totalItemCount = newItemCount;
+		UpdateFilterStatistics();
+	}
+	
+
+	private void UpdateFilterStatistics() {
+		var filter = CreateFilter();
+		if (filter.IsEmpty) {
+			downloadItemCountTask.Cancel();
+			matchingItemCount = totalItemCount;
+			UpdateFilterStatisticsText();
+		}
+		else {
+			matchingItemCount = null;
+			UpdateFilterStatisticsText();
+			downloadItemCountTask.Restart(cancellationToken => state.Db.Downloads.Count(filter, cancellationToken));
+		}
+	}
+
+	private void SetMatchingCount(long matchingAttachmentCount) {
+		this.matchingItemCount = matchingAttachmentCount;
+		UpdateFilterStatisticsText();
+	}
+
+	private void UpdateFilterStatisticsText() {
+		var matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
+		var totalItemCountStr = totalItemCount?.Format() ?? "(...)";
+
+		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
+	}
+
+	public DownloadItemFilter CreateFilter() {
+		DownloadItemFilter filter = new ();
+
+		if (LimitSize) {
+			try {
+				filter.MaxBytes = maximumSize * maximumSizeUnit.Scale;
+			} catch (ArithmeticException) {
+				// set no size limit, because the overflown size is larger than any file could possibly be
+			}
+		}
+
+		return filter;
+	}
+}

app/Desktop/Main/Controls/FilterPanel.axaml

@@ -1,60 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
-             mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.FilterPanel">
-
-    <Design.DataContext>
-        <controls:FilterPanelModel />
-    </Design.DataContext>
-
-    <UserControl.Styles>
-        <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Margin" Value="0 20 40 0" />
-            <Setter Property="Spacing" Value="4" />
-        </Style>
-        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
-        <Style Selector="Grid > Label">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="Grid > CalendarDatePicker">
-            <Setter Property="CornerRadius" Value="0" />
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="IsTodayHighlighted" Value="True" />
-            <Setter Property="SelectedDateFormat" Value="Short" />
-        </Style>
-        <Style Selector="Button">
-            <Setter Property="Margin" Value="0 0 0 8" />
-        </Style>
-    </UserControl.Styles>
-
-    <WrapPanel>
-        <StackPanel>
-            <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
-            <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">
-                <Label Grid.Row="0" Grid.Column="0">From:</Label>
-                <CalendarDatePicker Grid.Row="0" Grid.Column="2" x:Name="StartDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
-                <Label Grid.Row="2" Grid.Column="0">To:</Label>
-                <CalendarDatePicker Grid.Row="2" Grid.Column="2" x:Name="EndDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
-            </Grid>
-        </StackPanel>
-        <StackPanel>
-            <CheckBox IsChecked="{Binding FilterByChannel}">Filter by Channel</CheckBox>
-            <Button Command="{Binding OpenChannelFilterDialog}" IsEnabled="{Binding FilterByChannel}">Select Channels...</Button>
-            <TextBlock Text="{Binding ChannelFilterLabel}" />
-        </StackPanel>
-        <StackPanel>
-            <CheckBox IsChecked="{Binding FilterByUser}">Filter by User</CheckBox>
-            <Button Command="{Binding OpenUserFilterDialog}" IsEnabled="{Binding FilterByUser}">Select Users...</Button>
-            <TextBlock Text="{Binding UserFilterLabel}" />
-        </StackPanel>
-    </WrapPanel>
-
-</UserControl>

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

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

app/Desktop/Main/Controls/FilterPanelModel.cs

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

app/Desktop/Main/Controls/MessageFilterPanel.axaml

@@ -0,0 +1,64 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             mc:Ignorable="d"
+             x:Class="DHT.Desktop.Main.Controls.MessageFilterPanel"
+             x:DataType="controls:MessageFilterPanelModel">
+
+    <Design.DataContext>
+        <controls:MessageFilterPanelModel />
+    </Design.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="WrapPanel > StackPanel">
+            <Setter Property="Margin" Value="0 20 40 0" />
+            <Setter Property="Spacing" Value="4" />
+        </Style>
+        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Grid > Label">
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style Selector="Grid > CalendarDatePicker">
+            <Setter Property="CornerRadius" Value="0" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="IsTodayHighlighted" Value="True" />
+            <Setter Property="SelectedDateFormat" Value="Short" />
+        </Style>
+        <Style Selector="Button">
+            <Setter Property="Margin" Value="0 0 0 8" />
+        </Style>
+    </UserControl.Styles>
+
+    <StackPanel>
+        <TextBlock Text="{Binding FilterStatisticsText}" />
+        <WrapPanel>
+            <StackPanel>
+                <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
+                <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">
+                    <Label Grid.Row="0" Grid.Column="0">From:</Label>
+                    <CalendarDatePicker Grid.Row="0" Grid.Column="2" x:Name="StartDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
+                    <Label Grid.Row="2" Grid.Column="0">To:</Label>
+                    <CalendarDatePicker Grid.Row="2" Grid.Column="2" x:Name="EndDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
+                </Grid>
+            </StackPanel>
+            <StackPanel>
+                <CheckBox IsChecked="{Binding FilterByChannel}">Filter by Channel</CheckBox>
+                <Button Command="{Binding OpenChannelFilterDialog}" IsEnabled="{Binding FilterByChannel}">Select Channels...</Button>
+                <TextBlock Text="{Binding ChannelFilterLabel}" />
+            </StackPanel>
+            <StackPanel>
+                <CheckBox IsChecked="{Binding FilterByUser}">Filter by User</CheckBox>
+                <Button Command="{Binding OpenUserFilterDialog}" IsEnabled="{Binding FilterByUser}">Select Users...</Button>
+                <TextBlock Text="{Binding UserFilterLabel}" />
+            </StackPanel>
+        </WrapPanel>
+    </StackPanel>
+
+</UserControl>

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

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

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -0,0 +1,311 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.CheckBox;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
+using DHT.Server;
+using DHT.Server.Data;
+using DHT.Server.Data.Filters;
+using DHT.Utils.Tasks;
+
+namespace DHT.Desktop.Main.Controls;
+
+sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
+	private static readonly HashSet<string> FilterProperties = [
+		nameof(FilterByDate),
+		nameof(StartDate),
+		nameof(EndDate),
+		nameof(FilterByChannel),
+		nameof(IncludedChannels),
+		nameof(FilterByUser),
+		nameof(IncludedUsers)
+	];
+
+	public string FilterStatisticsText { get; private set; } = "";
+
+	public event PropertyChangedEventHandler? FilterPropertyChanged;
+
+	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
+
+	[ObservableProperty]
+	private bool filterByDate = false;
+
+	[ObservableProperty]
+	private DateTime? startDate = null;
+
+	[ObservableProperty]
+	private DateTime? endDate = null;
+
+	[ObservableProperty]
+	private bool filterByChannel = false;
+
+	[ObservableProperty]
+	private HashSet<ulong>? includedChannels = null;
+
+	[ObservableProperty]
+	private bool filterByUser = false;
+
+	[ObservableProperty]
+	private HashSet<ulong>? includedUsers = null;
+
+	[ObservableProperty]
+	private string channelFilterLabel = "";
+
+	[ObservableProperty]
+	private string userFilterLabel = "";
+
+	private readonly Window window;
+	private readonly State state;
+	private readonly string verb;
+
+	private readonly RestartableTask<long> exportedMessageCountTask;
+	private long? exportedMessageCount;
+	
+	private readonly IDisposable messageCountSubscription;
+	private long? totalMessageCount;
+	
+	private readonly IDisposable channelCountSubscription;
+	private long? totalChannelCount;
+	
+	private readonly IDisposable userCountSubscription;
+	private long? totalUserCount;
+
+	[Obsolete("Designer")]
+	public MessageFilterPanelModel() : this(null!, State.Dummy) {}
+
+	public MessageFilterPanelModel(Window window, State state, string verb = "Matches") {
+		this.window = window;
+		this.state = state;
+		this.verb = verb;
+
+		this.exportedMessageCountTask = new RestartableTask<long>(SetExportedMessageCount, TaskScheduler.FromCurrentSynchronizationContext());
+		
+		this.messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnMessageCountChanged);
+		this.channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnChannelCountChanged);
+		this.userCountSubscription = state.Db.Users.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnUserCountChanged);
+
+		UpdateFilterStatistics();
+		UpdateChannelFilterLabel();
+		UpdateUserFilterLabel();
+		
+		PropertyChanged += OnPropertyChanged;
+	}
+
+	public void Dispose() {
+		exportedMessageCountTask.Cancel();
+		
+		messageCountSubscription.Dispose();
+		channelCountSubscription.Dispose();
+		userCountSubscription.Dispose();
+	}
+
+	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
+			UpdateFilterStatistics();
+			FilterPropertyChanged?.Invoke(sender, e);
+		}
+
+		if (e.PropertyName is nameof(FilterByChannel) or nameof(IncludedChannels)) {
+			UpdateChannelFilterLabel();
+		}
+		else if (e.PropertyName is nameof(FilterByUser) or nameof(IncludedUsers)) {
+			UpdateUserFilterLabel();
+		}
+	}
+
+	private void OnMessageCountChanged(long newMessageCount) {
+		totalMessageCount = newMessageCount;
+		UpdateFilterStatistics();
+	}
+
+	private void OnChannelCountChanged(long newChannelCount) {
+		totalChannelCount = newChannelCount;
+		UpdateChannelFilterLabel();
+	}
+	
+	private void OnUserCountChanged(long newUserCount) {
+		totalUserCount = newUserCount;
+		UpdateUserFilterLabel();
+	}
+
+	private void UpdateChannelFilterLabel() {
+		if (totalChannelCount.HasValue) {
+			long total = totalChannelCount.Value;
+			long included = FilterByChannel && IncludedChannels != null ? IncludedChannels.Count : total;
+			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+		}
+		else {
+			ChannelFilterLabel = "Loading...";
+		}
+	}
+
+	private void UpdateUserFilterLabel() {
+		if (totalUserCount.HasValue) {
+			long total = totalUserCount.Value;
+			long included = FilterByUser && IncludedUsers != null ? IncludedUsers.Count : total;
+			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
+		}
+		else {
+			UserFilterLabel = "Loading...";
+		}
+	}
+
+	private void UpdateFilterStatistics() {
+		var filter = CreateFilter();
+		if (filter.IsEmpty) {
+			exportedMessageCountTask.Cancel();
+			exportedMessageCount = totalMessageCount;
+			UpdateFilterStatisticsText();
+		}
+		else {
+			exportedMessageCount = null;
+			UpdateFilterStatisticsText();
+			exportedMessageCountTask.Restart(cancellationToken => state.Db.Messages.Count(filter, cancellationToken));
+		}
+	}
+
+	private void SetExportedMessageCount(long exportedMessageCount) {
+		this.exportedMessageCount = exportedMessageCount;
+		UpdateFilterStatisticsText();
+	}
+
+	private void UpdateFilterStatisticsText() {
+		var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
+		var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+
+		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
+	}
+
+	public async Task OpenChannelFilterDialog() {
+		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
+			var items = new List<CheckBoxItem<ulong>>();
+			var servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
+
+			await foreach (var channel in state.Db.Channels.Get()) {
+				var channelId = channel.Id;
+				var channelName = channel.Name;
+
+				string title;
+				if (servers.TryGetValue(channel.Server, out var server)) {
+					var titleBuilder = new StringBuilder();
+					var serverType = server.Type;
+
+					titleBuilder.Append('[')
+					            .Append(ServerTypes.ToString(serverType))
+					            .Append("] ");
+
+					if (serverType == ServerType.DirectMessage) {
+						titleBuilder.Append(channelName);
+					}
+					else {
+						titleBuilder.Append(server.Name)
+						            .Append(" - ")
+						            .Append(channelName);
+					}
+
+					title = titleBuilder.ToString();
+				}
+				else {
+					title = channelName;
+				}
+
+				items.Add(new CheckBoxItem<ulong>(channelId) {
+					Title = title,
+					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId)
+				});
+			}
+
+			return items;
+		}
+
+		const string Title = "Included Channels";
+
+		List<CheckBoxItem<ulong>> items;
+		try {
+			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading channels...", PrepareChannelItems);
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, Title, "Error loading channels: " + e.Message);
+			return;
+		}
+
+		var result = await OpenIdFilterDialog(Title, items);
+		if (result != null) {
+			IncludedChannels = result;
+		}
+	}
+
+	public async Task OpenUserFilterDialog() {
+		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
+			var checkBoxItems = new List<CheckBoxItem<ulong>>();
+
+			await foreach (var user in state.Db.Users.Get()) {
+				var name = user.Name;
+				var discriminator = user.Discriminator;
+
+				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
+					Title = discriminator == null ? name : name + " #" + discriminator,
+					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
+				});
+			}
+
+			return checkBoxItems;
+		}
+
+		const string Title = "Included Users";
+
+		List<CheckBoxItem<ulong>> items;
+		try {
+			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, Title, "Error loading users: " + e.Message);
+			return;
+		}
+
+		var result = await OpenIdFilterDialog(Title, items);
+		if (result != null) {
+			IncludedUsers = result;
+		}
+	}
+
+	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, List<CheckBoxItem<ulong>> items) {
+		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
+
+		var model = new CheckBoxDialogModel<ulong>(items) {
+			Title = title
+		};
+
+		var dialog = new CheckBoxDialog { DataContext = model };
+		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
+
+		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
+	}
+
+	public MessageFilter CreateFilter() {
+		MessageFilter filter = new ();
+
+		if (FilterByDate) {
+			filter.StartDate = StartDate;
+			filter.EndDate = EndDate?.AddDays(1).AddMilliseconds(-1);
+		}
+
+		if (FilterByChannel && IncludedChannels != null) {
+			filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
+		}
+
+		if (FilterByUser && IncludedUsers != null) {
+			filter.UserIds = new HashSet<ulong>(IncludedUsers);
+		}
+
+		return filter;
+	}
+}

app/Desktop/Main/Controls/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 />
@@ -24,7 +25,7 @@
     <StackPanel>
         <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 and apply the tracking script again.
+            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script again.
         </TextBlock>
         <WrapPanel>
             <StackPanel>

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.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 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;
 
-namespace DHT.Desktop.Main.Controls {
-	sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main.Controls;
+
+sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
+	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
+	
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
 	private string inputPort;
 
-		public string InputPort {
-			get => inputPort;
-			set {
-				Change(ref inputPort, value);
-				OnPropertyChanged(nameof(HasMadeChanges));
-			}
-		}
-
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
 	private string inputToken;
 
-		public string InputToken {
-			get => inputToken;
-			set {
-				Change(ref inputToken, value);
-				OnPropertyChanged(nameof(HasMadeChanges));
-			}
-		}
-
-		public bool HasMadeChanges => ServerManager.Port.ToString() != InputPort || ServerManager.Token != InputToken;
+	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
 
+	[ObservableProperty(Setter = Access.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);
+	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
+		Dispatcher.UIThread.InvokeAsync(UpdateServerStatus);
+	}
+
+	private void UpdateServerStatus() {
 		OnPropertyChanged(nameof(ToggleServerButtonText));
+	}
+
+	private async Task StartServer() {
+		IsToggleServerButtonEnabled = false;
+		
+		try {
+			await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
+		}
+		
+		UpdateServerStatus();
 		IsToggleServerButtonEnabled = true;
 	}
 
-		private void BeforeServerStart() {
+	private async Task StopServer() {
 		IsToggleServerButtonEnabled = false;
-			ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Starting);
+		
+		try {
+			await server.Stop();
+		} catch (Exception e) {
+			Log.Error(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);
+		ServerConfiguration.Port = port;
+		ServerConfiguration.Token = inputToken;
+		
 		OnPropertyChanged(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 CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Server;
+using DHT.Server.Service;
 
-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 : ObservableObject, IDisposable {
+	[ObservableProperty(Setter = Access.Private)]
+	private long? serverCount;
 	
-		public Status CurrentStatus {
-			get => status;
-			set {
-				status = value;
-				OnPropertyChanged(nameof(StatusText));
-			}
-		}
+	[ObservableProperty(Setter = Access.Private)]
+	private long? channelCount;
 	
-		public string StatusText {
-			get {
-				return CurrentStatus switch {
-					Status.Starting => "STARTING",
-					Status.Ready    => "READY",
-					Status.Stopping => "STOPPING",
-					Status.Stopped  => "STOPPED",
+	[ObservableProperty(Setter = Access.Private)]
+	private long? messageCount;
+
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
+	private ServerManager.Status serverStatus;
+
+	public string ServerStatusText => serverStatus switch {
+		ServerManager.Status.Starting => "STARTING",
+		ServerManager.Status.Started  => "READY",
+		ServerManager.Status.Stopping => "STOPPING",
+		ServerManager.Status.Stopped  => "STOPPED",
 		_                             => ""
 	};
-			}
-		}
+
+	private readonly State state;
+	private readonly IDisposable serverCountSubscription;
+	private readonly IDisposable channelCountSubscription;
+	private readonly IDisposable messageCountSubscription;
 
 	[Obsolete("Designer")]
-		public StatusBarModel() : this(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 += OnServerStatusChanged;
+		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 -= OnServerStatusChanged;
+	}
+
+	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
+		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
 	}
 }

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"
-        MinWidth="500" MinHeight="275"
+        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,34 +1,44 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Avalonia;
+using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+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;
+
+		try {
+			await Dispose();
+		} finally {
+			Close();
+		}
+	}
+
+	private async Task Dispose() {
+		if (DataContext is MainWindowModel model) {
+			try {
+				await model.DisposeAsync();
+			} catch (Exception ex) {
+				Log.Error("Caught exception while disposing window: " + ex);
 			}
 		}
 	}

app/Desktop/Main/MainWindowModel.cs

@@ -1,32 +1,38 @@
 using System;
-using System.ComponentModel;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Screens;
 using DHT.Desktop.Server;
+using DHT.Server;
 using DHT.Server.Database;
-using DHT.Utils.Models;
+using DHT.Utils.Logging;
 
-namespace DHT.Desktop.Main {
-	sealed class MainWindowModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main;
+
+sealed partial class MainWindowModel : ObservableObject, 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; }
+	[ObservableProperty(Setter = Access.Private)]
+	private string title = DefaultTitle;
+
+	[ObservableProperty(Setter = Access.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,10 +41,10 @@ namespace DHT.Desktop.Main {
 		this.window = window;
 
 		welcomeScreenModel = new WelcomeScreenModel(window);
-			welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
-			CurrentScreen = welcomeScreen;
+		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
 
-			welcomeScreenModel.PropertyChanged += WelcomeScreenModelOnPropertyChanged;
+		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
+		currentScreen = welcomeScreen;
 
 		var dbFile = args.DatabaseFile;
 		if (!string.IsNullOrWhiteSpace(dbFile)) {
@@ -62,55 +68,63 @@ 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(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();
+
+		mainContentScreenModel = new MainContentScreenModel(window, state);
 		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-					mainContentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
-					CurrentScreen = mainContentScreen;
-				}
 		
-				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) {
+		if (mainContentScreenModel != null) {
+			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
+			mainContentScreenModel.Dispose();
+			mainContentScreenModel = null;
 		}
 
-		private void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-			welcomeScreenModel.CloseDatabase();
+		await DisposeState();
+
+		Title = DefaultTitle;
+		CurrentScreen = welcomeScreen;
+
+		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
 	}
 
-		public void Dispose() {
-			welcomeScreenModel.Dispose();
+	private async Task DisposeState() {
+		if (state != null) {
+			await state.DisposeAsync();
+			state = null;
+		}
+	}
+
+	public async ValueTask DisposeAsync() {
 		mainContentScreenModel?.Dispose();
-			db?.Dispose();
-			db = null;
-		}
+		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 />

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,36 @@
 using System;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
-using DHT.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;
+	private readonly State state;
 
 	[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) {
+	public AdvancedPageModel(Window window, State state) {
 		this.window = window;
-			this.db = db;
+		this.state = state;
 
-			ServerConfigurationModel = new ServerConfigurationPanelModel(window, serverManager);
-		}
-
-		public void Initialize() {
-			ServerConfigurationModel.Initialize();
+		ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
 	}
 
 	public void Dispose() {
 		ServerConfigurationModel.Dispose();
 	}
 
-		public async void VacuumDatabase() {
-			db.Vacuum();
-			await Dialog.ShowOk(window, "Vacuum Database", "Done.");
-		}
+	public async Task VacuumDatabase() {
+		const string Title = "Vacuum Database";
+		await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => state.Db.Vacuum());
+		await Dialog.ShowOk(window, Title, "Done.");
 	}
 }

app/Desktop/Main/Pages/DatabasePage.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.DatabasePage">
+             x:Class="DHT.Desktop.Main.Pages.DatabasePage"
+             x:DataType="pages:DatabasePageModel">
 
     <Design.DataContext>
         <pages:DatabasePageModel />
@@ -24,6 +25,7 @@
         <WrapPanel>
             <Button Command="{Binding OpenDatabaseFolder}">Open Database Folder</Button>
             <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
+            <Button Command="{Binding ImportLegacyArchive}">Import Legacy Archive(s)...</Button>
         </WrapPanel>
     </StackPanel>
 

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

@@ -1,18 +1,29 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
+using DHT.Desktop.Dialogs.TextBox;
+using DHT.Server;
+using DHT.Server.Data;
 using DHT.Server.Database;
+using DHT.Server.Database.Import;
+using DHT.Server.Database.Sqlite.Schema;
 using DHT.Utils.Logging;
-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; }
@@ -22,14 +33,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);
 
@@ -56,43 +67,133 @@ namespace DHT.Desktop.Main.Pages {
 		}
 	}
 
-		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) {
-				return;
-			}
-
-			ProgressDialog progressDialog = new ProgressDialog();
-			progressDialog.DataContext = new ProgressDialogModel(async callback => await MergeWithDatabaseFromPaths(Db, paths, progressDialog, callback)) {
-				Title = "Database Merge"
-			};
-
-			await progressDialog.ShowDialog(window);
-		}
-
 	public void CloseDatabase() {
 		DatabaseClosed?.Invoke(this, EventArgs.Empty);
 	}
 
-		private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-			int total = paths.Length;
-
-			DialogResult.YesNo? upgradeResult = null;
-
-			async Task<bool> CheckCanUpgradeDatabase() {
-				upgradeResult ??= total > 1
-					                  ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
-					                  : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog);
-
-				return DialogResult.YesNo.Yes == upgradeResult;
+	public async Task MergeWithDatabase() {
+		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		if (paths.Length > 0) {
+			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
+		}
 	}
 
-			var oldStatistics = target.Statistics.Clone();
-			var oldMessageCount = target.CountMessages();
+	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
+
+		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
+			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
+
+			if (db == null) {
+				return false;
+			}
+
+			try {
+				await target.AddFrom(db);
+				return true;
+			} finally {
+				await db.DisposeAsync();
+			}
+		});
+	}
+
+	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
+		private readonly ProgressDialog dialog;
+		private readonly int total;
+		private bool? decision;
+
+		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
+			this.total = total;
+			this.dialog = dialog;
+		}
+
+		public async Task<bool> CanUpgrade() {
+			return decision ??= (total > 1
+				                     ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
+				                     : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog)) == DialogResult.YesNo.Yes;
+		}
+
+		public Task Start(int versionSteps, Func<ISchemaUpgradeCallbacks.IProgressReporter, Task> doUpgrade) {
+			return doUpgrade(new NullReporter());
+		}
+
+		private sealed class NullReporter : ISchemaUpgradeCallbacks.IProgressReporter {
+			public Task NextVersion() {
+				return Task.CompletedTask;
+			}
+
+			public Task MainWork(string message, int finishedItems, int totalItems) {
+				return Task.CompletedTask;
+			}
+
+			public Task SubWork(string message, int finishedItems, int totalItems) {
+				return Task.CompletedTask;
+			}
+		}
+	}
+
+	public async Task ImportLegacyArchive() {
+		var paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+			Title = "Open Legacy DHT Archive",
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
+			AllowMultiple = true
+		});
+
+		if (paths.Length > 0) {
+			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
+		}
+	}
+
+	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+		var fakeSnowflake = new FakeSnowflake();
+
+		await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
+			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
+
+			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
+				SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
+				SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
+				Dictionary<DHT.Server.Data.Server, ulong>? result = await Dispatcher.UIThread.InvokeAsync(() => AskForServerIds(dialog, servers));
+				SynchronizationContext.SetSynchronizationContext(prevSyncContext);
+				return result;
+			});
+		});
+	}
+
+	private static async Task<Dictionary<DHT.Server.Data.Server, ulong>?> AskForServerIds(Window window, DHT.Server.Data.Server[] servers) {
+		static bool IsValidSnowflake(string value) {
+			return string.IsNullOrEmpty(value) || ulong.TryParse(value, out _);
+		}
+
+		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
+
+		foreach (var server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
+			items.Add(new TextBoxItem<DHT.Server.Data.Server>(server) {
+				Title = server.Name + " (" + ServerTypes.ToNiceString(server.Type) + ")",
+				ValidityCheck = IsValidSnowflake
+			});
+		}
+
+		var model = new TextBoxDialogModel<DHT.Server.Data.Server>(items) {
+			Title = "Imported Server IDs",
+			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID."
+		};
+
+		var dialog = new TextBoxDialog { DataContext = model };
+		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
+
+		if (result != DialogResult.OkCancel.Ok) {
+			return null;
+		}
+
+		return model.ValidItems
+		            .Where(static item => !string.IsNullOrEmpty(item.Value))
+		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
+	}
+
+	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
+		int total = paths.Length;
+		var oldStatistics = await DatabaseStatistics.Take(target);
 
 		int successful = 0;
 		int finished = 0;
@@ -102,56 +203,64 @@ namespace DHT.Desktop.Main.Pages {
 			++finished;
 
 			if (!File.Exists(path)) {
-					await Dialog.ShowOk(dialog, "Database Error", "Database '" + Path.GetFileName(path) + "' no longer exists.");
-					continue;
-				}
-
-				IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, CheckCanUpgradeDatabase);
-				if (db == null) {
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
 				continue;
 			}
 
 			try {
-					target.AddFrom(db);
+				if (await performImport(path)) {
+					++successful;
+				}
 			} catch (Exception ex) {
 				Log.Error(ex);
-					await Dialog.ShowOk(dialog, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be merged: " + ex.Message);
-					continue;
-				} finally {
-					db.Dispose();
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
-
-				++successful;
 		}
 
 		await callback.Update("Done", finished, total);
 
 		if (successful == 0) {
-				await Dialog.ShowOk(dialog, "Database Merge", "Nothing was merged.");
+			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
 			return;
 		}
 
-			var newStatistics = target.Statistics;
-			long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
-			long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
-			long newMessages = target.CountMessages() - oldMessageCount;
+		var newStatistics = await DatabaseStatistics.Take(target);
+		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
+	}
+
+	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
+		public static async Task<DatabaseStatistics> Take(IDatabaseFile db) {
+			return new DatabaseStatistics(
+				await db.Servers.Count(),
+				await db.Channels.Count(),
+				await db.Users.Count(),
+				await db.Messages.Count()
+			);
+		}
+	}
+
+	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
+		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
+		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
+		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
+		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
 
 		StringBuilder message = new StringBuilder();
 		message.Append("Processed ");
 
-			if (successful == total) {
-				message.Append(successful.Pluralize("database file"));
+		if (successfulItems == totalItems) {
+			message.Append(successfulItems.Pluralize(itemName));
 		}
 		else {
-				message.Append(successful.Format()).Append(" out of ").Append(total.Pluralize("database file"));
+			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
 		}
 
 		message.Append(" and added:\n\n  \u2022 ");
 		message.Append(newServers.Pluralize("server")).Append("\n  \u2022 ");
 		message.Append(newChannels.Pluralize("channel")).Append("\n  \u2022 ");
+		message.Append(newUsers.Pluralize("user")).Append("\n  \u2022 ");
 		message.Append(newMessages.Pluralize("message"));
 
-			await Dialog.ShowOk(dialog, "Database Merge", message.ToString());
-		}
+		return message.ToString();
 	}
 }

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

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,26 @@ 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;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class DebugPageModel : BaseModel {
+namespace DHT.Desktop.Main.Pages;
+
+sealed class DebugPageModel {
 	public string GenerateChannels { get; set; } = "0";
 	public string GenerateUsers { get; set; } = "0";
 	public string GenerateMessages { get; set; } = "0";
 
 	private readonly Window window;
-		private readonly 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 void OnClickAddRandomDataToDatabase() {
@@ -44,13 +44,7 @@ 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;
@@ -63,7 +57,7 @@ namespace DHT.Desktop.Main.Pages {
 		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 {
@@ -73,22 +67,19 @@ namespace DHT.Desktop.Main.Pages {
 			ParentId = null,
 			Position = i,
 			Topic = RandomText(rand, 10),
-				Nsfw = rand.Next(4) == 0
+			Nsfw = rand.Next(4) == 0,
 		}).ToArray();
 
 		var users = Enumerable.Range(0, userCount).Select(_ => new User {
 			Id = RandomId(rand),
 			Name = RandomName("u"),
 			AvatarUrl = null,
-				Discriminator = rand.Next(0, 9999).ToString()
+			Discriminator = rand.Next(0, 9999).ToString(),
 		}).ToArray();
 
-			db.AddServer(server);
-			db.AddUsers(users);
-			
-			foreach (var channel in channels) {
-				db.AddChannel(channel);
-			}
+		await state.Db.Users.Add(users);
+		await state.Db.Servers.Add([server]);
+		await state.Db.Channels.Add(channels);
 
 		var now = DateTimeOffset.Now;
 		int batchIndex = 0;
@@ -97,7 +88,7 @@ namespace DHT.Desktop.Main.Pages {
 			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 time = now.AddHours(hourOffset).AddMinutes(i * 60.0 / BatchSize);
 				DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(1, 60)) : null;
 
 				var timeMillis = time.ToUnixTimeMilliseconds();
@@ -111,13 +102,13 @@ namespace DHT.Desktop.Main.Pages {
 					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 +129,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",
@@ -162,24 +153,21 @@ namespace DHT.Desktop.Main.Pages {
 		"watercress", "watermelon",
 		"yam",
 		"zucchini"
-		};
+	];
 
 	private static string RandomText(Random rand, int maxWords) {
 		int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), 3));
 		return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
 	}
 }
-}
 #else
-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 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="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">
+        <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
+        <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
+        <StackPanel Orientation="Vertical" Spacing="12">
+            <Expander Header="Download Status" IsExpanded="True">
+                <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Header="State" Binding="{Binding State, Mode=OneWay}" Width="*" />
+                        <DataGridTextColumn Header="Files" Binding="{Binding Items, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
+                        <DataGridTextColumn Header="Size" Binding="{Binding SizeText, Mode=OneWay}" Width="*" CellStyleClasses="right" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Expander>
+            <StackPanel Orientation="Horizontal" Spacing="10">
+                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
+            </StackPanel>
+        </StackPanel>
+    </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,186 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Desktop.Common;
+using DHT.Desktop.Main.Controls;
+using DHT.Server;
+using DHT.Server.Data.Aggregations;
+using DHT.Server.Data.Filters;
+using DHT.Server.Download;
+using DHT.Utils.Logging;
+using DHT.Utils.Tasks;
+
+namespace DHT.Desktop.Main.Pages;
+
+sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
+	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
+
+	[ObservableProperty(Setter = Access.Private)]
+	private bool isToggleDownloadButtonEnabled = true;
+
+	public string ToggleDownloadButtonText => IsDownloading ? "Stop Downloading" : "Start Downloading";
+
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
+	private bool isRetryingFailedDownloads = false;
+
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
+	private bool hasFailedDownloads;
+
+	public bool IsRetryFailedOnDownloadsButtonEnabled => !IsRetryingFailedDownloads && HasFailedDownloads;
+
+	[ObservableProperty(Setter = Access.Private)]
+	private string downloadMessage = "";
+
+	public DownloadItemFilterPanelModel FilterModel { get; }
+
+	private readonly StatisticsRow statisticsPending = new ("Pending");
+	private readonly StatisticsRow statisticsDownloaded = new ("Downloaded");
+	private readonly StatisticsRow statisticsFailed = new ("Failed");
+	private readonly StatisticsRow statisticsSkipped = new ("Skipped");
+
+	public ObservableCollection<StatisticsRow> StatisticsRows { get; }
+
+	public bool IsDownloading => state.Downloader.IsDownloading;
+
+	private readonly State state;
+	private readonly ThrottledTask<DownloadStatusStatistics> downloadStatisticsTask;
+	private readonly IDisposable downloadItemCountSubscription;
+	
+	private IDisposable? finishedItemsSubscription;
+	private DownloadItemFilter? currentDownloadFilter;
+
+	public DownloadsPageModel() : this(State.Dummy) {}
+
+	public DownloadsPageModel(State state) {
+		this.state = state;
+
+		FilterModel = new DownloadItemFilterPanelModel(state);
+		
+		StatisticsRows = [
+			statisticsPending,
+			statisticsDownloaded,
+			statisticsFailed,
+			statisticsSkipped
+		];
+
+		downloadStatisticsTask = new ThrottledTask<DownloadStatusStatistics>(Log, UpdateStatistics, TaskScheduler.FromCurrentSynchronizationContext());
+		downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadCountChanged);
+
+		RecomputeDownloadStatistics();
+	}
+
+	public void Dispose() {
+		finishedItemsSubscription?.Dispose();
+		
+		downloadItemCountSubscription.Dispose();
+		downloadStatisticsTask.Dispose();
+
+		FilterModel.Dispose();
+	}
+
+	private void OnDownloadCountChanged(long newDownloadCount) {
+		RecomputeDownloadStatistics();
+	}
+
+	public async Task OnClickToggleDownload() {
+		IsToggleDownloadButtonEnabled = false;
+
+		if (IsDownloading) {
+			await state.Downloader.Stop();
+			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+
+			finishedItemsSubscription?.Dispose();
+			finishedItemsSubscription = null;
+			
+			currentDownloadFilter = null;
+		}
+		else {
+			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+			
+			var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
+			finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
+		}
+
+		RecomputeDownloadStatistics();
+
+		OnPropertyChanged(nameof(ToggleDownloadButtonText));
+		OnPropertyChanged(nameof(IsDownloading));
+		IsToggleDownloadButtonEnabled = true;
+	}
+
+	private void OnItemFinished(DownloadItem item) {
+		RecomputeDownloadStatistics();
+	}
+
+	public async Task OnClickRetryFailedDownloads() {
+		IsRetryingFailedDownloads = true;
+
+		try {
+			await state.Db.Downloads.RetryFailed();
+			RecomputeDownloadStatistics();
+		} catch (Exception e) {
+			Log.Error(e);
+		} finally {
+			IsRetryingFailedDownloads = false;
+		}
+	}
+
+	private void RecomputeDownloadStatistics() {
+		downloadStatisticsTask.Post(cancellationToken => state.Db.Downloads.GetStatistics(currentDownloadFilter ?? new DownloadItemFilter(), cancellationToken));
+	}
+
+	private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
+		statisticsPending.Items = statusStatistics.PendingCount;
+		statisticsPending.Size = statusStatistics.PendingTotalSize;
+		statisticsPending.HasFilesWithUnknownSize = statusStatistics.PendingWithUnknownSizeCount > 0;
+
+		statisticsDownloaded.Items = statusStatistics.SuccessfulCount;
+		statisticsDownloaded.Size = statusStatistics.SuccessfulTotalSize;
+		statisticsDownloaded.HasFilesWithUnknownSize = statusStatistics.SuccessfulWithUnknownSizeCount > 0;
+
+		statisticsFailed.Items = statusStatistics.FailedCount;
+		statisticsFailed.Size = statusStatistics.FailedTotalSize;
+		statisticsFailed.HasFilesWithUnknownSize = statusStatistics.FailedWithUnknownSizeCount > 0;
+		
+		statisticsSkipped.Items = statusStatistics.SkippedCount;
+		statisticsSkipped.Size = statusStatistics.SkippedTotalSize;
+		statisticsSkipped.HasFilesWithUnknownSize = statusStatistics.SkippedWithUnknownSizeCount > 0;
+
+		HasFailedDownloads = statusStatistics.FailedCount > 0;
+	}
+
+	[ObservableObject]
+	public sealed partial class StatisticsRow(string state) {
+		public string State { get; } = state;
+
+		[ObservableProperty]
+		private int items;
+
+		[ObservableProperty]
+		[NotifyPropertyChangedFor(nameof(SizeText))]
+		private ulong? size;
+		
+		[ObservableProperty]
+		[NotifyPropertyChangedFor(nameof(SizeText))]
+		private bool hasFilesWithUnknownSize;
+
+		public string SizeText {
+			get {
+				if (size == null) {
+					return "-";
+				}
+				else if (hasFilesWithUnknownSize) {
+					return "\u2265 " + BytesValueConverter.Convert(size.Value);
+				}
+				else {
+					return BytesValueConverter.Convert(size.Value);
+				}
+			}
+		}
+	}
+}

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

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

@@ -3,36 +3,30 @@ 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 {
+public sealed partial class TrackingPage : UserControl {
 	private bool isCopyingScript;
 
 	public TrackingPage() {
 		InitializeComponent();
 	}
 
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-
 	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
 		if (DataContext is TrackingPageModel model) {
-				var button = this.FindControl<Button>("CopyTrackingScript");
-				var originalText = button.Content;
-				button.MinWidth = button.Bounds.Width;
+			var originalText = CopyTrackingScript.Content;
+			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;
 
 			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
 				isCopyingScript = true;
-					button.Content = "Script Copied!";
+				CopyTrackingScript.Content = "Script Copied!";
 
 				await Task.Delay(TimeSpan.FromSeconds(2));
-					button.Content = originalText;
+				CopyTrackingScript.Content = originalText;
 				isCopyingScript = false;
 			}
 		}
 	}
 }
-}

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,35 +1,39 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
-using Avalonia;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
-using DHT.Utils.Models;
 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 : ObservableObject {
+	[ObservableProperty(Setter = Access.Private)]
+	private bool isCopyTrackingScriptButtonEnabled = true;
 
-		public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
+	private bool? areDevToolsEnabled = null;
+
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
+	private bool isToggleAppDevToolsButtonEnabled = false;
 
 	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 Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
 		}
 	}
 
@@ -40,28 +44,25 @@ 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"));
+		IsCopyTrackingScriptButtonEnabled = false;
 
-			var clipboard = Application.Current?.Clipboard;
+		try {
+			return await CopyTrackingScript();
+		} finally {
+			IsCopyTrackingScriptButtonEnabled = true;
+		}
+	}
+
+	private async Task<bool> CopyTrackingScript() {
+		string url = $"http://127.0.0.1:{ServerConfiguration.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
+		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
+
+		var clipboard = window.Clipboard;
 		if (clipboard == null) {
 			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
 			return false;
@@ -76,10 +77,26 @@ namespace DHT.Desktop.Main.Pages {
 		}
 	}
 
-		public async void OnClickToggleAppDevTools() {
+	private async Task InitializeDevToolsToggle() {
+		bool? devToolsEnabled = await Task.Run(DiscordAppSettings.AreDevToolsEnabled);
+
+		if (devToolsEnabled.HasValue) {
+			AreDevToolsEnabled = devToolsEnabled.Value;
+			IsToggleAppDevToolsButtonEnabled = true;
+		}
+		else {
+			IsToggleAppDevToolsButtonEnabled = false;
+		}
+	}
+
+	public async Task OnClickToggleAppDevTools() {
 		const string DialogTitle = "Discord App Settings File";
 
-			bool oldState = AreDevToolsEnabled;
+		if (!AreDevToolsEnabled.HasValue) {
+			return;
+		}
+
+		bool oldState = AreDevToolsEnabled.Value;
 		bool newState = !oldState;
 
 		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
@@ -114,4 +131,3 @@ namespace DHT.Desktop.Main.Pages {
 		}
 	}
 }
-}

app/Desktop/Main/Pages/ViewerPage.axaml

@@ -6,8 +6,7 @@
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="DHT.Desktop.Main.Pages.ViewerPage"
-             AttachedToVisualTree="OnAttachedToVisualTree"
-             DetachedFromVisualTree="OnDetachedFromVisualTree">
+             x:DataType="pages:ViewerPageModel">
 
     <Design.DataContext>
         <pages:ViewerPageModel />
@@ -15,17 +14,15 @@
 
     <UserControl.Styles>
         <Style Selector="Expander">
-            <Setter Property="Margin" Value="0 25 0 0" />
+            <Setter Property="Margin" Value="0 5 0 0" />
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Orientation="Vertical">
+    <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>
-        <TextBlock Text="{Binding ExportedMessageText}" Margin="0 20 0 0" />
-        <controls:FilterPanel DataContext="{Binding FilterModel}" />
+        <controls:MessageFilterPanel DataContext="{Binding FilterModel}" />
         <Expander Header="Database Tools">
             <StackPanel Orientation="Vertical" Spacing="10">
                 <StackPanel Orientation="Vertical" Spacing="4">

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

@@ -1,29 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
-using Avalonia;
 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);
-		}
-
-		public void OnAttachedToVisualTree(object? sender, VisualTreeAttachmentEventArgs e) {
-			if (DataContext is ViewerPageModel model) {
-				model.SetPageVisible(true);
-			}
-		}
-
-		public void OnDetachedFromVisualTree(object? sender, VisualTreeAttachmentEventArgs e) {
-			if (DataContext is ViewerPageModel model) {
-				model.SetPageVisible(false);
-			}
-		}
-	}
 }

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,144 +1,83 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
+using DHT.Desktop.Server;
+using DHT.Server;
 using DHT.Server.Data.Filters;
-using DHT.Server.Database;
-using DHT.Server.Database.Export;
-using DHT.Utils.Models;
-using static DHT.Desktop.Program;
+using DHT.Server.Service.Viewer;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class ViewerPageModel : BaseModel, IDisposable {
-		public string ExportedMessageText { get; private set; } = "";
+namespace DHT.Desktop.Main.Pages;
 
+sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
+	[ObservableProperty]
 	private bool hasFilters = false;
 
-		public bool HasFilters {
-			get => hasFilters;
-			set => Change(ref hasFilters, value);
-		}
-
-		private FilterPanelModel FilterModel { get; }
+	public MessageFilterPanelModel FilterModel { get; }
 
 	private readonly Window window;
-		private readonly IDatabaseFile db;
-
-		private bool isPageVisible = false;
+	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 FilterPanelModel(window, db);
+		FilterModel = new MessageFilterPanelModel(window, state, "Will export");
 		FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
-			db.Statistics.PropertyChanged += OnDbStatisticsChanged;
 	}
 
 	public void Dispose() {
-			db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
 		FilterModel.Dispose();
 	}
 
-		public void SetPageVisible(bool isPageVisible) {
-			this.isPageVisible = isPageVisible;
-			if (isPageVisible) {
-				UpdateStatistics();
-			}
-		}
-
 	private void OnFilterPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-			UpdateStatistics();
 		HasFilters = FilterModel.HasAnyFilters;
 	}
 
-		private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
-			if (isPageVisible && e.PropertyName == nameof(DatabaseStatistics.TotalMessages)) {
-				UpdateStatistics();
-			}
-		}
-
-		private void UpdateStatistics() {
-			var filter = FilterModel.CreateFilter();
-			var allMessagesCount = db.Statistics.TotalMessages?.Format() ?? "?";
-			var filteredMessagesCount = filter.IsEmpty ? allMessagesCount : db.CountMessages(filter).Format();
-
-			ExportedMessageText = "Will export " + filteredMessagesCount + " out of " + allMessagesCount + " message(s).";
-			OnPropertyChanged(nameof(ExportedMessageText));
-		}
-
-		private async Task<string> GenerateViewerContents() {
-			string json = ViewerJsonExport.Generate(db, FilterModel.CreateFilter());
-
-			string index = await Resources.ReadTextAsync("Viewer/index.html");
-			string viewer = index.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
-			                     .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'))
-			                     .Replace("/*[ARCHIVE]*/", HttpUtility.JavaScriptStringEncode(json));
-			return viewer;
-		}
-
 	public async void OnClickOpenViewer() {
-			string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
-			string filenameBase = Path.GetFileNameWithoutExtension(db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
-			string fullPath = Path.Combine(rootPath, filenameBase + ".html");
-			int counter = 0;
+		try {
+			string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
+			string serverToken = ServerConfiguration.Token;
+			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
 			
-			while (File.Exists(fullPath)) {
-				++counter;
-				fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
-			}
-
-			Directory.CreateDirectory(rootPath);
-			await File.WriteAllTextAsync(fullPath, await GenerateViewerContents());
-
-			Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
-		}
-
-		public async void OnClickSaveViewer() {
-			var dialog = new SaveFileDialog {
-				Title = "Save Viewer",
-				InitialFileName = "archive.html",
-				Directory = Path.GetDirectoryName(db.Path),
-				Filters = new List<FileDialogFilter> {
-					new() {
-						Name = "Discord History Viewer",
-						Extensions = { "html" }
-					}
-				}
-			}.ShowAsync(window);
-
-			string? path = await dialog;
-			if (!string.IsNullOrEmpty(path)) {
-				await File.WriteAllTextAsync(path, await GenerateViewerContents());
+			Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId)) {
+				UseShellExecute = true
+			});
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
 		}
 	}
 
-		public async void OnClickApplyFiltersToDatabase() {
+	public async Task OnClickApplyFiltersToDatabase() {
 		var filter = FilterModel.CreateFilter();
+		var messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
 
 		if (DatabaseToolFilterModeKeep) {
-				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", 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, MessageFilterRemovalMode.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, MessageFilterRemovalMode.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);
 			}
 		}
 	}
+
+	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {
+		await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Removing messages...", _ => state.Db.Messages.Remove(filter, removalMode));
 	}
 }

app/Desktop/Main/Screens/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 />
@@ -73,14 +74,14 @@
     <DockPanel>
         <Border Classes="statusBar" DockPanel.Dock="Bottom">
             <DockPanel>
-                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Advanced</TextBlock>
+                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Downloads</TextBlock>
                 <controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Right" />
             </DockPanel>
         </Border>
         <TabControl x:Name="TabControl" TabStripPlacement="Left" DockPanel.Dock="Top">
             <TabControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto,Auto,*,Auto,Auto" />
+                    <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto" />
                 </ItemsPanelTemplate>
             </TabControl.ItemsPanel>
             <TabItem x:Name="TabDatabase" Header="Database" Classes="first" Grid.Row="0">
@@ -93,17 +94,22 @@
                     <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabViewer" Header="Viewer" Grid.Row="2">
+            <TabItem x:Name="TabDownloads" Header="Downloads" Grid.Row="2">
+                <ScrollViewer>
+                    <ContentPresenter Content="{Binding DownloadsPage}" Classes="page" />
+                </ScrollViewer>
+            </TabItem>
+            <TabItem x:Name="TabViewer" Header="Viewer" Grid.Row="3">
                 <ScrollViewer>
                     <ContentPresenter Content="{Binding ViewerPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabAdvanced" Header="Advanced" Grid.Row="4">
+            <TabItem x:Name="TabAdvanced" Header="Advanced" Grid.Row="5">
                 <ScrollViewer>
                     <ContentPresenter Content="{Binding AdvancedPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabDebug" Header="Debug" Grid.Row="5" IsVisible="{Binding HasDebugPage}">
+            <TabItem x:Name="TabDebug" Header="Debug" Grid.Row="6" IsVisible="{Binding HasDebugPage}">
                 <ScrollViewer>
                     <ContentPresenter Content="{Binding DebugPage}" Classes="page" />
                 </ScrollViewer>

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,24 +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;
 
-namespace DHT.Desktop.Main.Screens {
 sealed class MainContentScreenModel : IDisposable {
-		private static readonly Log Log = Log.ForType<MainContentScreenModel>();
-
 	public DatabasePage DatabasePage { get; }
 	private DatabasePageModel DatabasePageModel { get; }
 
 	public TrackingPage TrackingPage { get; }
 	private TrackingPageModel TrackingPageModel { get; }
 
+	public DownloadsPage DownloadsPage { get; }
+	private DownloadsPageModel DownloadsPageModel { get; }
+
 	public ViewerPage ViewerPage { get; }
 	private ViewerPageModel ViewerPageModel { get; }
 
@@ -45,68 +42,39 @@ namespace DHT.Desktop.Main.Screens {
 		}
 	}
 
-		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 };
 
-			ViewerPageModel = new ViewerPageModel(window, db);
+		DownloadsPageModel = new DownloadsPageModel(state);
+		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
+
+		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;
-		}
-
-		public async Task Initialize() {
-			await TrackingPageModel.Initialize();
-			AdvancedPageModel.Initialize();
-			serverManager.Launch();
+		StatusBarModel = new StatusBarModel(state);
 	}
 
 	public void Dispose() {
-			ServerLauncher.ServerManagementExceptionCaught -= ServerLauncherOnServerManagementExceptionCaught;
+		DownloadsPageModel.Dispose();
 		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 />
@@ -31,7 +32,7 @@
             <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button Command="{Binding OpenOrCreateDatabase}">Open or Create Database</Button>
+                <Button Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
                 <Button Command="{Binding ShowAboutDialog}">About</Button>
                 <Button Command="{Binding Exit}">Exit</Button>
             </StackPanel>

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,24 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Server.Database;
-using DHT.Utils.Models;
+using DHT.Server.Database.Sqlite.Schema;
 
-namespace DHT.Desktop.Main.Screens {
-	sealed class WelcomeScreenModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main.Screens;
+
+sealed partial class WelcomeScreenModel : ObservableObject {
 	public string Version => Program.Version;
 	
-		public IDatabaseFile? Db { get; private set; }
-		public bool HasDatabase => Db != null;
+	[ObservableProperty(Setter = Access.Private)]
+	private bool isOpenOrCreateDatabaseButtonEnabled = true;
+	
+	public event EventHandler<IDatabaseFile>? DatabaseSelected; 
 	
 	private readonly Window window;
 
@@ -25,49 +31,89 @@ 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 {
+			var 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));
+		var 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 : ISchemaUpgradeCallbacks {
+		private readonly Window window;
+		
+		public SchemaUpgradeCallbacks(Window window) {
+			this.window = window;
+		}
+
+		public async Task<bool> CanUpgrade() {
 			return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
 		}
 
-		public 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 : ISchemaUpgradeCallbacks.IProgressReporter {
+			private readonly IReadOnlyList<IProgressCallback> callbacks;
+			
+			private readonly int versionSteps;
+			private int versionProgress = 0;
+			
+			public ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) {
+				this.callbacks = callbacks;
+				this.versionSteps = versionSteps;
+			}
+
+			public async Task NextVersion() {
+				await callbacks[0].Update("Upgrading schema version...", versionProgress++, versionSteps);
+				await HideChildren(0);
+			}
+
+			public async Task MainWork(string message, int finishedItems, int totalItems) {
+				await callbacks[1].Update(message, finishedItems, totalItems);
+				await HideChildren(1);
+			}
+
+			public async Task SubWork(string message, int finishedItems, int totalItems) {
+				await callbacks[2].Update(message, finishedItems, totalItems);
+				await HideChildren(2);
+			}
+
+			private async Task HideChildren(int parentIndex) {
+				for (int i = parentIndex + 1; i < callbacks.Count; i++) {
+					await callbacks[i].Hide();
+				}
+			}
+		}
+	}
+
+	public async Task ShowAboutDialog() {
+		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
 	}
 
 	public void Exit() {
 		window.Close();
 	}
-
-		public void Dispose() {
-			Db?.Dispose();
-			Db = null;
-		}
-	}
 }

app/Desktop/Program.cs

@@ -1,13 +1,17 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.Reflection;
 using Avalonia;
+using DHT.Utils.Logging;
 using DHT.Utils.Resources;
 
-namespace DHT.Desktop {
+namespace DHT.Desktop;
+
 static class Program {
 	public static string Version { get; }
 	public static CultureInfo Culture { get; }
 	public static ResourceLoader Resources { get; }
+	public static Arguments Arguments { get; }
 
 	static Program() {
 		var assembly = Assembly.GetExecutingAssembly();
@@ -24,16 +28,27 @@ namespace DHT.Desktop {
 		CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
 
 		Resources = new ResourceLoader(assembly);
+		Arguments = new Arguments(Environment.GetCommandLineArgs());
 	}
 
 	public static void Main(string[] args) {
+		if (Arguments.Console && OperatingSystem.IsWindows()) {
+			WindowsConsole.AllocConsole();
+		}
+
+		try {
 			BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+		} finally {
+			if (Arguments.Console && OperatingSystem.IsWindows()) {
+				WindowsConsole.FreeConsole();
+			}
+		}
 	}
 
 	private static AppBuilder BuildAvaloniaApp() {
 		return AppBuilder.Configure<App>()
 		                 .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,8 @@
+using DHT.Server.Service;
+
+namespace DHT.Desktop.Server;
+
+static class ServerConfiguration {
+	public static ushort Port { get; set; } = ServerUtils.FindAvailablePort(50000, 60000);
+	public static string Token { get; set; } = ServerUtils.GenerateRandomToken(20);
+}

app/Desktop/Server/ServerManager.cs

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

app/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/Tracker/bootstrap.js

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

app/Resources/Tracker/scripts/discord.js

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

app/Resources/Tracker/scripts/dom.js

@@ -11,7 +11,7 @@ class DOM {
 	 * Returns the first child element containing the specified obfuscated class. Parent defaults to the entire document.
 	 */
 	static queryReactClass(cls, parent) {
-		return (parent || document).querySelector(`[class*="${cls}-"]`);
+		return (parent || document).querySelector(`[class*="${cls}_"]`);
 	}
 	
 	/**
@@ -71,4 +71,15 @@ class DOM {
 		key = keys.find(key => key.startsWith("__reactProps$"));
 		return key ? ele[key] : null;
 	}
+	
+	/**
+	 * Returns internal React state object of an element, or null if the retrieval throws.
+	 */
+	static tryGetReactProps(ele) {
+		try {
+			return this.getReactProps(ele);
+		} catch (e) {
+			return null;
+		}
+	}
 }

app/Resources/Tracker/scripts/gui.js

@@ -86,12 +86,12 @@ const GUI = (function() {
 <label><input id='dht-cfg-autoscroll' type='checkbox'> Autoscroll</label><br>
 <br>
 <label>After reaching the first message in channel...</label><br>
-${radio("afm", "nothing", "Do Nothing")}
+${radio("afm", "nothing", "Continue Tracking")}
 ${radio("afm", "pause", "Pause Tracking")}
 ${radio("afm", "switch", "Switch to Next Channel")}
 <br>
 <label>After reaching a previously saved message...</label><br>
-${radio("asm", "nothing", "Do Nothing")}
+${radio("asm", "nothing", "Continue Tracking")}
 ${radio("asm", "pause", "Pause Tracking")}
 ${radio("asm", "switch", "Switch to Next Channel")}
 <p id='dht-cfg-note'>It is recommended to disable link and image previews to avoid putting unnecessary strain on your browser.</p>`;

app/Resources/Tracker/scripts/state.js

@@ -48,6 +48,16 @@ const STATE = (function() {
 		});
 	};
 	
+	const getDate = function(date) {
+		if (date instanceof Date) {
+			return date;
+		}
+		else {
+			// noinspection JSUnresolvedReference
+			return date.toDate();
+		}
+	};
+	
 	const trackingStateChangedListeners = [];
 	let isTracking = false;
 	
@@ -69,8 +79,8 @@ const STATE = (function() {
 	 * @property {String} channel_id
 	 * @property {DiscordUser} author
 	 * @property {String} content
-	 * @property {Timestamp} timestamp
-	 * @property {Timestamp|null} editedTimestamp
+	 * @property {Date} timestamp
+	 * @property {Date|null} editedTimestamp
 	 * @property {DiscordAttachment[]} attachments
 	 * @property {Object[]} embeds
 	 * @property {DiscordMessageReaction[]} [reactions]
@@ -106,11 +116,6 @@ const STATE = (function() {
 	 * @property {Boolean} animated
 	 */
 	
-	/**
-	 * @name Timestamp
-	 * @property {Function} toDate
-	 */
-	
 	return {
 		setup(port, token) {
 			serverPort = port;
@@ -174,12 +179,10 @@ const STATE = (function() {
 		},
 		
 		/**
-		 * @param {String} channelId
 		 * @param {DiscordMessage[]} discordMessageArray
 		 */
-		async addDiscordMessages(channelId, discordMessageArray) {
-			// https://discord.com/developers/docs/resources/channel#message-object-message-types
-			discordMessageArray = discordMessageArray.filter(msg => (msg.type === 0 || msg.type === 19 || msg.type === 21) && msg.state === "SENT");
+		async addDiscordMessages(discordMessageArray) {
+			discordMessageArray = discordMessageArray.filter(msg => (msg.type === DISCORD.MESSAGE_TYPE.DEFAULT || msg.type === DISCORD.MESSAGE_TYPE.REPLY || msg.type === DISCORD.MESSAGE_TYPE.THREAD_STARTER) && msg.state === "SENT");
 			
 			if (discordMessageArray.length === 0) {
 				return false;
@@ -225,12 +228,12 @@ const STATE = (function() {
 					sender: msg.author.id,
 					channel: msg.channel_id,
 					text: msg.content,
-					timestamp: msg.timestamp.toDate().getTime()
+					timestamp: getDate(msg.timestamp).getTime()
 				};
 				
 				if (msg.editedTimestamp !== null) {
 					// noinspection JSUnusedGlobalSymbols
-					obj.editTimestamp = msg.editedTimestamp.toDate().getTime();
+					obj.editTimestamp = getDate(msg.editedTimestamp).getTime();
 				}
 				
 				if (msg.messageReference !== null) {
@@ -251,6 +254,11 @@ const STATE = (function() {
 							mapped.type = attachment.content_type;
 						}
 						
+						if (attachment.width && attachment.height) {
+							mapped.width = attachment.width;
+							mapped.height = attachment.height;
+						}
+						
 						return mapped;
 					});
 				}

app/Resources/Tracker/styles/controller.css

@@ -1,5 +1,5 @@
-#app-mount > div[class*="app-"] {
-  margin-bottom: 48px !important;
+#app-mount {
+  height: calc(100% - 48px) !important;
 }
 
 #dht-ctrl {
@@ -8,6 +8,7 @@
   width: 100%;
   height: 48px;
   background-color: #fff;
+  z-index: 1000000;
 }
 
 #dht-ctrl button {

app/Resources/Tracker/styles/settings.css

@@ -7,7 +7,7 @@
   background-color: #000;
   opacity: 0.5;
   display: block;
-  z-index: 1000;
+  z-index: 1000001;
 }
 
 #dht-cfg {
@@ -20,7 +20,7 @@
   margin-top: -131px;
   padding: 8px;
   background-color: #fff;
-  z-index: 1001;
+  z-index: 1000002;
 }
 
 #dht-cfg-note {

app/Resources/Viewer/index.html

@@ -2,15 +2,24 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <meta name="referrer" content="no-referrer">
+    
     <title>Discord Offline History</title>
     
+    <link rel="icon" href="favicon.ico">
+    
+    <link rel="stylesheet" href="styles/main.css">
+    <link rel="stylesheet" href="styles/menu.css">
+    <link rel="stylesheet" href="styles/channels.css">
+    <link rel="stylesheet" href="styles/messages.css">
+    <link rel="stylesheet" href="styles/modal.css">
+    
     <script type="text/javascript">
-		window.DHT_EMBEDDED = "/*[ARCHIVE]*/";
-		/*[JS]*/
+		const query = new URLSearchParams(location.search);
+		window.DHT_SERVER_TOKEN = query.get("token");
+		window.DHT_SERVER_SESSION = query.get("session");
     </script>
-    <style>
-      /*[CSS]*/
-    </style>
+    <script type="module" src="scripts/bootstrap.mjs"></script>
   </head>
   <body>
     <div id="menu">
@@ -64,7 +73,9 @@
     </div>
     
     <div id="app">
-      <div id="channels"></div>
+      <div id="channels">
+        <div class="loading"></div>
+      </div>
       <div id="messages"></div>
     </div>
     

app/Resources/Viewer/scripts/bootstrap.js

@@ -1,39 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
-	DISCORD.setup();
-	GUI.setup();
-	
-	GUI.onOptionMessagesPerPageChanged(() => {
-		STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
-	});
-	
-	STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
-	
-	GUI.onOptMessageFilterChanged(filter => {
-		STATE.setActiveFilter(filter);
-	});
-	
-	GUI.onNavigationButtonClicked(action => {
-		STATE.updateCurrentPage(action);
-	});
-	
-	STATE.onUsersRefreshed(users => {
-		GUI.updateUserList(users);
-	});
-	
-	STATE.onChannelsRefreshed((channels, selected) => {
-		GUI.updateChannelList(channels, selected, STATE.selectChannel);
-	});
-	
-	STATE.onMessagesRefreshed(messages => {
-		GUI.updateNavigation(STATE.getCurrentPage(), STATE.getPageCount());
-		GUI.updateMessageList(messages);
-		GUI.scrollMessagesToTop();
-	});
-	
-	try {
-		STATE.uploadFile(JSON.parse(window.DHT_EMBEDDED));
-	} catch (e) {
-		console.error(e);
-		alert("Could not parse embedded file, see console for details.");
-	}
-});

app/Resources/Viewer/scripts/bootstrap.mjs

@@ -0,0 +1,110 @@
+import discord from "./discord.mjs";
+import gui from "./gui.mjs";
+import state from "./state.mjs";
+
+window.DISCORD = discord;
+
+document.addEventListener("DOMContentLoaded", () => {
+	discord.setup();
+	gui.setup();
+	
+	gui.onOptionMessagesPerPageChanged(() => {
+		state.setMessagesPerPage(gui.getOptionMessagesPerPage());
+	});
+	
+	state.setMessagesPerPage(gui.getOptionMessagesPerPage());
+	
+	gui.onOptMessageFilterChanged(filter => {
+		state.setActiveFilter(filter);
+	});
+	
+	gui.onNavigationButtonClicked(action => {
+		state.updateCurrentPage(action);
+	});
+	
+	state.onUsersRefreshed(users => {
+		gui.updateUserList(users);
+	});
+	
+	state.onChannelsRefreshed((channels, selected) => {
+		gui.updateChannelList(channels, selected, state.selectChannel);
+	});
+	
+	state.onMessagesRefreshed(messages => {
+		gui.updateNavigation(state.getCurrentPage(), state.getPageCount());
+		gui.updateMessageList(messages);
+		gui.scrollMessagesToTop();
+	});
+	
+	async function fetchUrl(path, contentType) {
+		const response = await fetch("/" + path + "?token=" + encodeURIComponent(window.DHT_SERVER_TOKEN) + "&session=" + encodeURIComponent(window.DHT_SERVER_SESSION), {
+			method: "GET",
+			headers: {
+				"Content-Type": contentType,
+			},
+			credentials: "omit",
+			redirect: "error",
+		});
+		
+		if (!response.ok) {
+			throw "Unexpected response status: " + response.statusText;
+		}
+		
+		return response;
+	}
+	
+	async function processLines(response, callback) {
+		let body = "";
+		
+		for await (const chunk of response.body.pipeThrough(new TextDecoderStream("utf-8"))) {
+			body += chunk;
+			
+			let startIndex = 0;
+			
+			while (true) {
+				const endIndex = body.indexOf("\n", startIndex);
+				if (endIndex === -1) {
+					break;
+				}
+				
+				callback(body.substring(startIndex, endIndex));
+				startIndex = endIndex + 1;
+			}
+			
+			body = body.substring(startIndex);
+		}
+		
+		if (body !== "") {
+			callback(body);
+		}
+	}
+	
+	async function loadData() {
+		try {
+			const metadataResponse = await fetchUrl("get-viewer-metadata", "application/json");
+			const metadataJson = await metadataResponse.json();
+			
+			const messagesResponse = await fetchUrl("get-viewer-messages", "application/x-ndjson");
+			const messages = {};
+			
+			await processLines(messagesResponse, line => {
+				const message = JSON.parse(line);
+				const channel = message.c;
+				
+				const channelMessages = messages[channel] || (messages[channel] = {});
+				channelMessages[message.id] = message;
+				
+				delete message.id;
+				delete message.c;
+			});
+			
+			state.uploadFile(metadataJson, messages);
+		} catch (e) {
+			console.error(e);
+			alert("Could not load data, see console for details.");
+			document.querySelector("#channels > div.loading").remove();
+		}
+	}
+	
+	loadData();
+});

app/Resources/Viewer/scripts/discord.mjs

@@ -1,7 +1,14 @@
-const DISCORD = (function() {
+import discord from "./discord.mjs";
+import dom from "./dom.mjs";
+import template from "./template.mjs";
+import settings from "./settings.mjs";
+import state from "./state.mjs";
+
+export default (function() {
 	const regex = {
 		formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
-		formatItalic: /(.)?\*([\s\S]+?)\*(?!\*)/g,
+		formatItalic1: /\*([\s\S]+?)\*(?!\*)/g,
+		formatItalic2: /_([\s\S]+?)_(?!_)\b/g,
 		formatUnderline: /__([\s\S]+?)__(?!_)/g,
 		formatStrike: /~~([\s\S]+?)~~(?!~)/g,
 		formatCodeInline: /(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/g,
@@ -9,7 +16,7 @@ const DISCORD = (function() {
 		formatUrl: /(\b(?:https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig,
 		formatUrlNoEmbed: /<(\b(?:https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])>/ig,
 		specialEscapedBacktick: /\\`/g,
-		specialEscapedSingle: /\\([*\\])/g,
+		specialEscapedSingle: /\\([*_\\])/g,
 		specialEscapedDouble: /\\__|_\\_|\\_\\_|\\~~|~\\~|\\~\\~/g,
 		specialUnescaped: /([*_~\\])/g,
 		mentionRole: /&lt;@&(\d+?)&gt;/g,
@@ -26,6 +33,7 @@ const DISCORD = (function() {
 	let templateUserAvatar;
 	let templateAttachmentDownload;
 	let templateEmbedImage;
+	let templateEmbedImageWithSize;
 	let templateEmbedRich;
 	let templateEmbedRichNoDescription;
 	let templateEmbedUrl;
@@ -33,10 +41,24 @@ const DISCORD = (function() {
 	let templateReaction;
 	let templateReactionCustom;
 	
-	const processMessageContents = function(contents) {
-		let processed = DOM.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
+	const fileUrlProcessor = function(serverToken) {
+		if (typeof serverToken === "string") {
+			return url => "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
+		}
+		else {
+			return url => url;
+		}
+	}(window.DHT_SERVER_TOKEN);
 	
-		if (SETTINGS.enableFormatting) {
+	const getEmoji = function(name, id, extension) {
+		const tag = ":" + name + ":";
+		return "<img src='" + fileUrlProcessor("https://cdn.discordapp.com/emojis/" + id + "." + extension) + "' alt='" + tag + "' title='" + tag + "' class='emoji'>";
+	};
+	
+	const processMessageContents = function(contents) {
+		let processed = dom.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
+		
+		if (settings.enableFormatting) {
 			const escapeHtmlMatch = (full, match) => "&#" + match.charCodeAt(0) + ";";
 			
 			processed = processed
@@ -46,41 +68,65 @@ const DISCORD = (function() {
 				.replace(regex.specialEscapedSingle, escapeHtmlMatch)
 				.replace(regex.specialEscapedDouble, full => full.replace(/\\/g, "").replace(/(.)/g, escapeHtmlMatch))
 				.replace(regex.formatBold, "<b>$1</b>")
-				.replace(regex.formatItalic, (full, pre, match) => pre === "\\" ? full : (pre || "") + "<i>" + match + "</i>")
 				.replace(regex.formatUnderline, "<u>$1</u>")
+				.replace(regex.formatItalic1, "<i>$1</i>")
+				.replace(regex.formatItalic2, "<i>$1</i>")
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		
-		const animatedEmojiExtension = SETTINGS.enableAnimatedEmoji ? "gif" : "png";
+		const animatedEmojiExtension = settings.enableAnimatedEmoji ? "gif" : "webp";
 		
 		// noinspection HtmlUnknownTarget
 		processed = processed
 			.replace(regex.formatUrl, "<a href='$1' target='_blank' rel='noreferrer'>$1</a>")
-			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + STATE.getChannelName(match) + "</span>")
-			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (STATE.getUserTag(match) || "????") + "'>@" + STATE.getUserName(match) + "</span>")
-			.replace(regex.customEmojiStatic, "<img src='https://cdn.discordapp.com/emojis/$2.png' alt=':$1:' title=':$1:' class='emoji'>")
-			.replace(regex.customEmojiAnimated, "<img src='https://cdn.discordapp.com/emojis/$2." + animatedEmojiExtension + "' alt=':$1:' title=':$1:' class='emoji'>");
+			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + state.getChannelName(match) + "</span>")
+			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (state.getUserTag(match) || "????") + "'>@" + state.getUserName(match) + "</span>")
+			.replace(regex.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
+			.replace(regex.customEmojiAnimated, (full, m1, m2) => getEmoji(m1, m2, animatedEmojiExtension));
 		
 		return "<p>" + processed + "</p>";
 	};
 	
+	const getAvatarUrlObject = function(avatar) {
+		return { url: fileUrlProcessor("https://cdn.discordapp.com/avatars/" + avatar.id + "/" + avatar.path + ".webp") };
+	};
+	
+	const getImageEmbed = function(url, image) {
+		if (!settings.enableImagePreviews) {
+			return "";
+		}
+		
+		if (image.width && image.height) {
+			return templateEmbedImageWithSize.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url), width: image.width, height: image.height });
+		}
+		else {
+			return templateEmbedImage.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url) });
+		}
+	};
+	
+	const isImageUrl = function(url) {
+		const dot = url.pathname.lastIndexOf(".");
+		const ext = dot === -1 ? "" : url.pathname.substring(dot).toLowerCase();
+		return ext === ".png" || ext === ".gif" || ext === ".jpg" || ext === ".jpeg";
+	};
+	
 	return {
 		setup() {
-			templateChannelServer = new TEMPLATE([
-				"<div data-channel='{id}'>",
+			templateChannelServer = new template([
+				"<div class='channel' data-channel='{id}'>",
 				"<div class='info' title='{topic}'><strong class='name'>#{name}</strong>{nsfw}<span class='tag'>{msgcount}</span></div>",
 				"<span class='server'>{server.name} ({server.type})</span>",
 				"</div>"
 			].join(""));
 			
-			templateChannelPrivate = new TEMPLATE([
-				"<div data-channel='{id}'>",
+			templateChannelPrivate = new template([
+				"<div class='channel' data-channel='{id}'>",
 				"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
 				"<span class='server'>({server.type})</span>",
 				"</div>"
 			].join(""));
 			
-			templateMessageNoAvatar = new TEMPLATE([
+			templateMessageNoAvatar = new template([
 				"<div>",
 				"<div class='reply-message'>{reply}</div>",
 				"<h2><strong class='username' title='#{user.tag}'>{user.name}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
@@ -89,7 +135,7 @@ const DISCORD = (function() {
 				"</div>"
 			].join(""));
 			
-			templateMessageWithAvatar = new TEMPLATE([
+			templateMessageWithAvatar = new template([
 				"<div>",
 				"<div class='reply-message reply-message-with-avatar'>{reply}</div>",
 				"<div class='avatar-wrapper'>",
@@ -103,52 +149,69 @@ const DISCORD = (function() {
 				"</div>"
 			].join(""));
 			
-			templateUserAvatar = new TEMPLATE([
-				"<img src='https://cdn.discordapp.com/avatars/{id}/{path}.webp?size=128' alt=''>"
+			// noinspection HtmlUnknownTarget
+			templateUserAvatar = new template([
+				"<img src='{url}' alt=''>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateAttachmentDownload = new TEMPLATE([
-				"<a href='{url}' class='embed download'>Download {filename}</a>"
+			templateAttachmentDownload = new template([
+				"<a href='{url}' class='embed download'>Download {name}</a>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedImage = new TEMPLATE([
-				"<a href='{url}' class='embed thumbnail'><img src='{src}' alt='(image attachment not found)'></a><br>"
+			templateEmbedImage = new template([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedRich = new TEMPLATE([
+			templateEmbedImageWithSize = new template([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
+			].join(""));
+			
+			// noinspection HtmlUnknownTarget
+			templateEmbedRich = new template([
 				"<div class='embed download'><a href='{url}' class='title'>{title}</a><p class='desc'>{description}</p></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedRichNoDescription = new TEMPLATE([
+			templateEmbedRichNoDescription = new template([
 				"<div class='embed download'><a href='{url}' class='title'>{title}</a></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedUrl = new TEMPLATE([
+			templateEmbedUrl = new template([
 				"<a href='{url}' class='embed download'>{url}</a>"
 			].join(""));
 			
-			templateEmbedUnsupported = new TEMPLATE([
+			templateEmbedUnsupported = new template([
 				"<div class='embed download'><p>(Unsupported embed)</p></div>"
 			].join(""));
 			
-			templateReaction = new TEMPLATE([
+			templateReaction = new template([
 				"<span class='reaction-wrapper'><span class='reaction-emoji'>{n}</span><span class='count'>{c}</span></span>"
 			].join(""));
 			
-			templateReactionCustom = new TEMPLATE([
-				"<span class='reaction-wrapper'><img src='https://cdn.discordapp.com/emojis/{id}.{ext}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
+			// noinspection HtmlUnknownTarget
+			templateReactionCustom = new template([
+				"<span class='reaction-wrapper'><img src='{url}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
 			].join(""));
 		},
 		
+		handleImageLoad(ele) {
+			ele.parentElement.classList.remove("loading");
+		},
+		
+		handleImageLoadError(ele) {
+			// noinspection JSUnusedGlobalSymbols
+			ele.onerror = null;
+			ele.parentElement.classList.remove("loading");
+			ele.setAttribute("alt", "(image attachment not found)");
+		},
+		
 		isImageAttachment(attachment) {
-			const dot = attachment.url.lastIndexOf(".");
-			const ext = dot === -1 ? "" : attachment.url.substring(dot).toLowerCase();
-			return ext === ".png" || ext === ".gif" || ext === ".jpg" || ext === ".jpeg";
+			const url = dom.tryParseUrl(attachment.url);
+			return url != null && isImageUrl(url);
 		},
 		
 		getChannelHTML(channel) { // noinspection FunctionWithInconsistentReturnsJS
@@ -160,15 +223,15 @@ const DISCORD = (function() {
 		},
 		
 		getMessageHTML(message) { // noinspection FunctionWithInconsistentReturnsJS
-			return (SETTINGS.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
+			return (settings.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
 				if (property === "avatar") {
-					return value ? templateUserAvatar.apply(value) : "";
+					return value ? templateUserAvatar.apply(getAvatarUrlObject(value)) : "";
 				}
 				else if (property === "user.tag") {
 					return value ? value : "????";
 				}
 				else if (property === "timestamp") {
-					return DOM.getHumanReadableTime(value);
+					return dom.getHumanReadableTime(value);
 				}
 				else if (property === "contents") {
 					return value && value.length > 0 ? processMessageContents(value) : "";
@@ -183,10 +246,10 @@ const DISCORD = (function() {
 							return templateEmbedUnsupported.apply(embed);
 						}
 						else if ("image" in embed && embed.image.url) {
-							return SETTINGS.enableImagePreviews ? templateEmbedImage.apply({ url: embed.url, src: embed.image.url }) : "";
+							return getImageEmbed(embed.url, embed.image);
 						}
 						else if ("thumbnail" in embed && embed.thumbnail.url) {
-							return SETTINGS.enableImagePreviews ? templateEmbedImage.apply({ url: embed.url, src: embed.thumbnail.url }) : "";
+							return getImageEmbed(embed.url, embed.thumbnail);
 						}
 						else if ("title" in embed && "description" in embed) {
 							return templateEmbedRich.apply(embed);
@@ -205,24 +268,24 @@ const DISCORD = (function() {
 					}
 					
 					return value.map(attachment => {
-						if (this.isImageAttachment(attachment) && SETTINGS.enableImagePreviews) {
-							return templateEmbedImage.apply({ url: attachment.url, src: attachment.url });
+						const url = fileUrlProcessor(attachment.url);
+						
+						if (!discord.isImageAttachment(attachment) || !settings.enableImagePreviews) {
+							return templateAttachmentDownload.apply({ url, name: attachment.name });
+						}
+						else if ("width" in attachment && "height" in attachment) {
+							return templateEmbedImageWithSize.apply({ url, src: url, width: attachment.width, height: attachment.height });
 						}
 						else {
-							const sliced = attachment.url.split("/");
-							
-							return templateAttachmentDownload.apply({
-								"url": attachment.url,
-								"filename": sliced[sliced.length - 1]
-							});
+							return templateEmbedImage.apply({ url, src: url });
 						}
 					}).join("");
 				}
 				else if (property === "edit") {
-					return value ? "<span class='info edited'>Edited " + DOM.getHumanReadableTime(value) + "</span>" : "";
+					return value ? "<span class='info edited'>Edited " + dom.getHumanReadableTime(value) + "</span>" : "";
 				}
 				else if (property === "jump") {
-					return STATE.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
+					return state.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
 				}
 				else if (property === "reply") {
 					if (!value) {
@@ -230,7 +293,7 @@ const DISCORD = (function() {
 					}
 					
 					const user = "<span class='reply-username' title='#" + (value.user.tag ? value.user.tag : "????") + "'>" + value.user.name + "</span>";
-					const avatar = SETTINGS.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(value.avatar) + "</span>" : "";
+					const avatar = settings.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
 					const contents = value.contents ? "<span class='reply-contents'>" + processMessageContents(value.contents) + "</span>" : "";
 					
 					return "<span class='jump' data-jump='" + value.id + "'>Jump to reply</span><span class='user'>" + avatar + user + "</span>" + contents;
@@ -242,9 +305,10 @@ const DISCORD = (function() {
 					
 					return "<div class='reactions'>" + value.map(reaction => {
 						if ("id" in reaction){
-							// noinspection JSUnusedGlobalSymbols, JSUnresolvedVariable
-							reaction.ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "png";
-							return templateReactionCustom.apply(reaction);
+							const ext = reaction.a && settings.enableAnimatedEmoji ? "gif" : "webp";
+							const url = fileUrlProcessor("https://cdn.discordapp.com/emojis/" + reaction.id + "." + ext);
+							// noinspection JSUnusedGlobalSymbols
+							return templateReactionCustom.apply({ url, n: reaction.n, c: reaction.c });
 						}
 						else {
 							return templateReaction.apply(reaction);

app/Resources/Viewer/scripts/dom.mjs

@@ -8,9 +8,12 @@ const HTML_ENTITY_MAP = {
 
 const HTML_ENTITY_REGEX = /[&<>"']/g;
 
-class DOM {
+export default class {
 	/**
 	 * Returns a child element by its ID. Parent defaults to the entire document.
+	 * @param {string} id
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement|null}
 	 */
 	static id(id, parent) {
 		return (parent || document).getElementById(id);
@@ -18,6 +21,9 @@ class DOM {
 	
 	/**
 	 * Returns an array of all child elements containing the specified class. Parent defaults to the entire document.
+	 * @param {string} cls
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement[]}
 	 */
 	static cls(cls, parent) {
 		return Array.prototype.slice.call((parent || document).getElementsByClassName(cls));
@@ -25,6 +31,9 @@ class DOM {
 	
 	/**
 	 * Returns an array of all child elements that have the specified tag. Parent defaults to the entire document.
+	 * @param {string} tag
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement[]}
 	 */
 	static tag(tag, parent) {
 		return Array.prototype.slice.call((parent || document).getElementsByTagName(tag));
@@ -32,6 +41,9 @@ class DOM {
 	
 	/**
 	 * Returns the first child element containing the specified class. Parent defaults to the entire document.
+	 * @param {string} cls
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement}
 	 */
 	static fcls(cls, parent) {
 		return (parent || document).getElementsByClassName(cls)[0];
@@ -51,4 +63,15 @@ class DOM {
 		const date = new Date(timestamp);
 		return date.toLocaleDateString() + ", " + date.toLocaleTimeString();
 	};
+	
+	/**
+	 * Parses a url string into a URL object and returns it. If the parsing fails, returns null.
+	 */
+	static tryParseUrl(url) {
+		try {
+			return new URL(url);
+		} catch (ignore) {
+			return null;
+		}
+	}
 }