Release v41.0

Resolves #200

README.md

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

@@ -9,15 +9,15 @@
         <entry key="Desktop/Dialogs/Progress/ProgressDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Dialogs/TextBox/TextBoxDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/AboutWindow.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Controls/AttachmentFilterPanel.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Controls/DownloadItemFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/MessageFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Pages/AttachmentsPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DebugPage.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Pages/DownloadsPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/TrackingPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/ViewerPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Screens/MainContentScreen.axaml" value="Desktop/Desktop.csproj" />

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

@@ -29,9 +29,6 @@
     <H2CodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </H2CodeStyleSettings>
-    <H2CodeStyleSettings version="6">
-      <option name="USE_GENERIC_STYLE" value="true" />
-    </H2CodeStyleSettings>
     <HSQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </HSQLCodeStyleSettings>

app/.idea/.idea.DiscordHistoryTracker/.idea/runConfigurations/Desktop.xml

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

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

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

app/Desktop/App.axaml

@@ -2,12 +2,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:common="clr-namespace:DHT.Desktop.Common"
              xmlns:system="clr-namespace:System;assembly=System.Runtime"
-             x:Class="DHT.Desktop.App">
+             x:Class="DHT.Desktop.App"
+             RequestedThemeVariant="Light">
 
     <Application.Styles>
 
-        <FluentTheme Mode="Light" />
+        <FluentTheme />
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml" />
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml" />
 
         <Style Selector="Button, CheckBox, RadioButton, Expander /template/ ToggleButton#ExpanderHeader">
             <Setter Property="Cursor" Value="Hand" />
@@ -33,9 +34,6 @@
         <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>
         <Style Selector="TextBox:error DataValidationErrors">
             <Style.Resources>
                 <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
@@ -51,68 +49,9 @@
             <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
         </Style>
 
-        <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
+        <Style Selector="Expander">
-            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="MinHeight" Value="40" />
-            <Setter Property="Template">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <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>
         
     </Application.Styles>
@@ -171,12 +110,26 @@
         
         <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
         <Thickness x:Key="ExpanderContentPadding">12</Thickness>
-        <SolidColorBrush x:Key="ExpanderBorderBrush" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderBackground" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderForeground" Color="#FFFFFF" />
+        <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="ExpanderChevronForegroundPointerOver" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronForegroundPressed" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronForegroundDisabled" Color="#FFFFFF" />
 
     </Application.Resources>
 

app/Desktop/App.axaml.cs

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

app/Desktop/Arguments.cs

@@ -1,33 +1,42 @@
 using System;
+using System.Collections.Generic;
 using DHT.Utils.Logging;
 
-namespace DHT.Desktop {
+namespace DHT.Desktop;
+
 sealed class Arguments {
 	private static readonly Log Log = Log.ForType<Arguments>();
 
+	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 Arguments(string[] args) {
+	public Arguments(IReadOnlyList<string> args) {
-			for (int i = 0; i < args.Length; i++) {
+		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;
 			}
@@ -62,4 +71,3 @@ namespace DHT.Desktop {
 		}
 	}
 }
-}

app/Desktop/Common/BytesValueConverter.cs

@@ -2,28 +2,37 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace DHT.Desktop.Common {
+namespace DHT.Desktop.Common;
+
 sealed class BytesValueConverter : IValueConverter {
-		private static readonly string[] Units = {
+	private sealed class Unit {
-			"B",
+		private readonly string label;
-			"kB",
+		private readonly string numberFormat;
-			"MB",
+
-			"GB",
+		public Unit(string label, int decimalPlaces) {
-			"TB"
+			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;
 
-		private static string Convert(ulong size) {
+	public static string Convert(ulong size) {
 		int power = size == 0L ? 0 : (int) Math.Log(size, Scale);
 		int unit = power >= Units.Length ? Units.Length - 1 : power;
-			if (unit == 0) {
+		return Units[unit].Format(unit == 0 ? size : size / Math.Pow(Scale, unit));
-				return string.Format(Program.Culture, "{0:n0}", size) + " " + Units[unit];
-			}
-			else {
-				double humanReadableSize = size / Math.Pow(Scale, unit);
-				return string.Format(Program.Culture, "{0:n0}", humanReadableSize) + " " + Units[unit];
-			}
 	}
 
 	public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
@@ -42,4 +51,3 @@ namespace DHT.Desktop.Common {
 		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() {
+	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = [
-			new FileDialogFilter {
+		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"])
-				Name = "Discord History Tracker Database",
+	];
-				Extensions = { "dht" }
-			}
-		};
 
-		public static OpenFileDialog NewOpenDatabaseFileDialog() {
+	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
-			return new OpenFileDialog {
+		return await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Database File",
-				InitialFileName = DatabaseFileInitialName,
+			FileTypeFilter = DatabaseFileDialogFilter,
-				Filters = DatabaseFileDialogFilter
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			};
+			AllowMultiple = true
+		});
 	}
 
-		public static SaveFileDialog NewOpenOrCreateDatabaseFileDialog() {
+	public static async Task<string?> NewOpenOrCreateDatabaseFileDialog(Window window, string? suggestedDirectory) {
-			return new SaveFileDialog {
+		return await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
 			Title = "Open or Create Database File",
-				InitialFileName = DatabaseFileInitialName,
+			FileTypeChoices = DatabaseFileDialogFilter,
-				Filters = DatabaseFileDialogFilter
+			SuggestedFileName = DatabaseFileInitialName,
-			};
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
+			ShowOverwritePrompt = false
+		});
 	}
 
-		public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, Func<Task<bool>> checkCanUpgradeDatabase) {
+	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,57 +1,43 @@
 <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.14" />
+    <PackageReference Include="Avalonia" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.14" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.14" Condition=" '$(Configuration)' == 'Debug' " />
+    <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" />
-    <Compile Update="Dialogs\TextBox\TextBoxDialog.axaml.cs">
-      <DependentUpon>CheckBoxDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
+  
   <ItemGroup>
     <AvaloniaResource Include="Resources/icon.ico" />
-    <EmbeddedResource Include="../Resources/Tracker/bootstrap.js">
+    <EmbeddedResource Include="Resources/tracker-loader.js">
-      <LogicalName>Tracker\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <LogicalName>tracker-loader.js</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>
@@ -59,19 +45,5 @@
       <Visible>false</Visible>
     </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,10 +35,10 @@
 
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
-            <ItemsRepeater Items="{Binding Items}">
+            <ItemsRepeater ItemsSource="{Binding Items}">
                 <ItemsRepeater.ItemTemplate>
                     <DataTemplate>
-                        <CheckBox IsChecked="{Binding Checked}">
+                        <CheckBox IsChecked="{Binding IsChecked}">
                             <Label>
                                 <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
                             </Label>

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 {
+namespace DHT.Desktop.Dialogs.CheckBox;
-	class CheckBoxDialogModel : BaseModel {
+
+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 AreAllSelected => Items.All(static item => item.IsChecked);
-		public bool AreNoneSelected => Items.All(static item => !item.Checked);
+	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 {
+namespace DHT.Desktop.Dialogs.CheckBox;
-	class CheckBoxItem : BaseModel {
+
+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() {
+	public void OnOpened(object? sender, EventArgs e) {
-			AvaloniaXamlLoader.Load(this);
-		}
-
-		public void OnClosing(object? sender, CancelEventArgs e) {
-			e.Cancel = !isFinished;
-		}
-
-		public void Loaded(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 {
+namespace DHT.Desktop.Dialogs.Progress;
-	sealed class ProgressDialogModel : BaseModel {
+
+sealed class ProgressDialogModel {
 	public string Title { get; init; } = "";
 
-		private string message = "";
+	public IReadOnlyList<ProgressItem> Items { get; } = Array.Empty<ProgressItem>();
-
-		public string Message {
-			get => message;
-			private set => Change(ref message, value);
-		}
-
-		private string items = "";
-
-		public string Items {
-			get => items;
-			private set => Change(ref items, value);
-		}
-
-		private int progress = 0;
-
-		public int Progress {
-			get => progress;
-			private set => Change(ref progress, value);
-		}
 
 	private readonly TaskRunner? task;
 
 	[Obsolete("Designer")]
 	public ProgressDialogModel() {}
 
-		public ProgressDialogModel(TaskRunner task) {
+	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) {
+		public Callback(ProgressItem item) {
-				this.model = model;
+			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;
+				item.Message = message;
-					model.Items = finishedItems.Format() + " / " + totalItems.Format();
+				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
-					model.Progress = 100 * finishedItems / totalItems;
+				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

@@ -5,6 +5,7 @@
         xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.TextBox"
         mc:Ignorable="d" d:DesignWidth="500"
         x:Class="DHT.Desktop.Dialogs.TextBox.TextBoxDialog"
+        x:DataType="namespace:TextBoxDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
         Width="500" SizeToContent="Height" CanResize="False"
@@ -31,7 +32,7 @@
         <ScrollViewer MaxHeight="400">
             <StackPanel Spacing="10">
                 <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
-                <ItemsRepeater Items="{Binding Items}">
+                <ItemsRepeater ItemsSource="{Binding Items}">
                     <ItemsRepeater.ItemTemplate>
                         <DataTemplate>
                             <DockPanel Margin="0 5 25 0">

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

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

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -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.TextBox {
+namespace DHT.Desktop.Dialogs.TextBox;
-	class TextBoxDialogModel : BaseModel {
+
+class TextBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
 
@@ -35,7 +36,7 @@ namespace DHT.Desktop.Dialogs.TextBox {
 }
 
 sealed class TextBoxDialogModel<T> : TextBoxDialogModel {
-		public new IReadOnlyList<TextBoxItem<T>> Items { get; }
+	private new IReadOnlyList<TextBoxItem<T>> Items { get; }
 
 	public IEnumerable<TextBoxItem<T>> ValidItems => Items.Where(static item => item.IsValid);
 
@@ -44,4 +45,3 @@ namespace DHT.Desktop.Dialogs.TextBox {
 		base.Items = this.Items;
 	}
 }
-}

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

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

app/Desktop/Discord/DiscordAppSettings.cs

@@ -1,15 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.Json;
+using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using DHT.Utils.Logging;
 using static System.Environment.SpecialFolder;
 using static System.Environment.SpecialFolderOption;
 
-namespace DHT.Desktop.Discord {
+namespace DHT.Desktop.Discord;
+
 static class DiscordAppSettings {
 	private static readonly Log Log = Log.ForType(typeof(DiscordAppSettings));
 
@@ -38,18 +39,21 @@ namespace DHT.Desktop.Discord {
 
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-				return AreDevToolsEnabled(await ReadSettingsJson());
+			var settingsJson = await ReadSettingsJson();
-			} catch (Exception) {
+			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) {
+	private static bool AreDevToolsEnabled(JsonObject json) {
-			return json.TryGetValue(JsonKeyDevTools, out var value) && value is JsonElement { ValueKind: JsonValueKind.True };
+		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/AttachmentFilterPanel.axaml.cs

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

app/Desktop/Main/Controls/AttachmentFilterPanelModel.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

@@ -4,10 +4,11 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.AttachmentFilterPanel">
+             x:Class="DHT.Desktop.Main.Controls.DownloadItemFilterPanel"
+             x:DataType="controls:DownloadItemFilterPanelModel">
 
     <Design.DataContext>
-        <controls:AttachmentFilterPanelModel />
+        <controls:DownloadItemFilterPanelModel />
     </Design.DataContext>
 
     <UserControl.Styles>
@@ -36,7 +37,7 @@
                 <CheckBox IsChecked="{Binding LimitSize}">Limit Size</CheckBox>
                 <StackPanel Orientation="Horizontal">
                     <TextBox Text="{Binding MaximumSize}" IsEnabled="{Binding LimitSize}" HorizontalContentAlignment="Right" />
-                    <ComboBox IsEnabled="{Binding LimitSize}" Items="{Binding Units}" SelectedItem="{Binding MaximumSizeUnit}">
+                    <ComboBox IsEnabled="{Binding LimitSize}" ItemsSource="{Binding Units}" SelectedItem="{Binding MaximumSizeUnit}">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Name}" />

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

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

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -0,0 +1,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/MessageFilterPanel.axaml

@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.MessageFilterPanel">
+             x:Class="DHT.Desktop.Main.Controls.MessageFilterPanel"
+             x:DataType="controls:MessageFilterPanelModel">
 
     <Design.DataContext>
         <controls:MessageFilterPanelModel />

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

@@ -1,19 +1,12 @@
 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 MessageFilterPanel : UserControl {
+public sealed partial class MessageFilterPanel : UserControl {
-		private CalendarDatePicker StartDatePicker => this.FindControl<CalendarDatePicker>("StartDatePicker");
-		private CalendarDatePicker EndDatePicker => this.FindControl<CalendarDatePicker>("EndDatePicker");
-
 	public MessageFilterPanel() {
 		InitializeComponent();
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
 
 		var culture = Program.Culture;
 		foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
@@ -31,4 +24,3 @@ namespace DHT.Desktop.Main.Controls {
 		}
 	}
 }
-}

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -2,21 +2,25 @@ 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.Server.Database;
-using DHT.Utils.Models;
 using DHT.Utils.Tasks;
 
-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
-	sealed class MessageFilterPanelModel : BaseModel, IDisposable {
+
-		private static readonly HashSet<string> FilterProperties = new () {
+sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
+	private static readonly HashSet<string> FilterProperties = [
 		nameof(FilterByDate),
 		nameof(StartDate),
 		nameof(EndDate),
@@ -24,7 +28,7 @@ namespace DHT.Desktop.Main.Controls {
 		nameof(IncludedChannels),
 		nameof(FilterByUser),
 		nameof(IncludedUsers)
-		};
+	];
 
 	public string FilterStatisticsText { get; private set; } = "";
 
@@ -32,91 +36,76 @@ namespace DHT.Desktop.Main.Controls {
 
 	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;
 
-		public bool FilterByDate {
+	[ObservableProperty]
-			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 {
+	[ObservableProperty]
-			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;
+	private readonly State state;
 	private readonly string verb;
 
-		private readonly AsyncValueComputer<long> exportedMessageCountComputer;
+	private readonly RestartableTask<long> exportedMessageCountTask;
 	private long? exportedMessageCount;
+	
+	private readonly IDisposable messageCountSubscription;
 	private long? totalMessageCount;
 	
-		[Obsolete("Designer")]
+	private readonly IDisposable channelCountSubscription;
-		public MessageFilterPanelModel() : this(null!, DummyDatabaseFile.Instance) {}
+	private long? totalChannelCount;
 	
-		public MessageFilterPanelModel(Window window, IDatabaseFile db, string verb = "Matches") {
+	private readonly IDisposable userCountSubscription;
+	private long? totalUserCount;
+
+	[Obsolete("Designer")]
+	public MessageFilterPanelModel() : this(null!, State.Dummy) {}
+
+	public MessageFilterPanelModel(Window window, State state, string verb = "Matches") {
 		this.window = window;
-			this.db = db;
+		this.state = state;
 		this.verb = verb;
 
-			this.exportedMessageCountComputer = AsyncValueComputer<long>.WithResultProcessor(SetExportedMessageCount).Build();
+		this.exportedMessageCountTask = new RestartableTask<long>(SetExportedMessageCount, TaskScheduler.FromCurrentSynchronizationContext());
+		
+		this.messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnMessageCountChanged);
+		this.channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnChannelCountChanged);
+		this.userCountSubscription = state.Db.Users.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnUserCountChanged);
 
 		UpdateFilterStatistics();
 		UpdateChannelFilterLabel();
 		UpdateUserFilterLabel();
 		
 		PropertyChanged += OnPropertyChanged;
-			db.Statistics.PropertyChanged += OnDbStatisticsChanged;
 	}
 
 	public void Dispose() {
-			db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
+		exportedMessageCountTask.Cancel();
+		
+		messageCountSubscription.Dispose();
+		channelCountSubscription.Dispose();
+		userCountSubscription.Dispose();
 	}
 
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
@@ -133,30 +122,54 @@ namespace DHT.Desktop.Main.Controls {
 		}
 	}
 
-		private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+	private void OnMessageCountChanged(long newMessageCount) {
-			if (e.PropertyName == nameof(DatabaseStatistics.TotalMessages)) {
+		totalMessageCount = newMessageCount;
-				totalMessageCount = db.Statistics.TotalMessages;
 		UpdateFilterStatistics();
 	}
-			else if (e.PropertyName == nameof(DatabaseStatistics.TotalChannels)) {
+
+	private void OnChannelCountChanged(long newChannelCount) {
+		totalChannelCount = newChannelCount;
 		UpdateChannelFilterLabel();
 	}
-			else if (e.PropertyName == nameof(DatabaseStatistics.TotalUsers)) {
+	
+	private void OnUserCountChanged(long newUserCount) {
+		totalUserCount = newUserCount;
 		UpdateUserFilterLabel();
 	}
+
+	private void UpdateChannelFilterLabel() {
+		if (totalChannelCount.HasValue) {
+			long total = totalChannelCount.Value;
+			long included = FilterByChannel && IncludedChannels != null ? IncludedChannels.Count : total;
+			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+		}
+		else {
+			ChannelFilterLabel = "Loading...";
+		}
+	}
+
+	private void UpdateUserFilterLabel() {
+		if (totalUserCount.HasValue) {
+			long total = totalUserCount.Value;
+			long included = FilterByUser && IncludedUsers != null ? IncludedUsers.Count : total;
+			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
+		}
+		else {
+			UserFilterLabel = "Loading...";
+		}
 	}
 
 	private void UpdateFilterStatistics() {
 		var filter = CreateFilter();
 		if (filter.IsEmpty) {
-				exportedMessageCountComputer.Cancel();
+			exportedMessageCountTask.Cancel();
 			exportedMessageCount = totalMessageCount;
 			UpdateFilterStatisticsText();
 		}
 		else {
 			exportedMessageCount = null;
 			UpdateFilterStatisticsText();
-				exportedMessageCountComputer.Compute(() => db.CountMessages(filter));
+			exportedMessageCountTask.Restart(cancellationToken => state.Db.Messages.Count(filter, cancellationToken));
 		}
 	}
 
@@ -173,12 +186,12 @@ namespace DHT.Desktop.Main.Controls {
 		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 
-		public async void OpenChannelFilterDialog() {
+	public async Task OpenChannelFilterDialog() {
-			var servers = db.GetAllServers().ToDictionary(static server => server.Id);
+		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
 			var items = new List<CheckBoxItem<ulong>>();
-			var included = IncludedChannels;
+			var servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
 
-			foreach (var channel in db.GetAllChannels()) {
+			await foreach (var channel in state.Db.Channels.Get()) {
 				var channelId = channel.Id;
 				var channelName = channel.Name;
 
@@ -208,68 +221,63 @@ namespace DHT.Desktop.Main.Controls {
 
 				items.Add(new CheckBoxItem<ulong>(channelId) {
 					Title = title,
-					Checked = included.Contains(channelId)
+					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId)
 				});
 			}
 
-			var result = await OpenIdFilterDialog(window, "Included Channels", items);
+			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 void OpenUserFilterDialog() {
+	public async Task OpenUserFilterDialog() {
-			var items = new List<CheckBoxItem<ulong>>();
+		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
-			var included = IncludedUsers;
+			var checkBoxItems = new List<CheckBoxItem<ulong>>();
 
-			foreach (var user in db.GetAllUsers()) {
+			await foreach (var user in state.Db.Users.Get()) {
 				var name = user.Name;
 				var discriminator = user.Discriminator;
 
-				items.Add(new CheckBoxItem<ulong>(user.Id) {
+				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
 					Title = discriminator == null ? name : name + " #" + discriminator,
-					Checked = included.Contains(user.Id)
+					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
 				});
 			}
 
-			var result = await OpenIdFilterDialog(window, "Included Users", items);
+			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 void UpdateChannelFilterLabel() {
+	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, List<CheckBoxItem<ulong>> items) {
-			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) {
@@ -281,5 +289,23 @@ namespace DHT.Desktop.Main.Controls {
 
 		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 />

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 {
+namespace DHT.Desktop.Main.Controls;
-	sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
+
+sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
+	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
+	
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
 	private string inputPort;
 
-		public string InputPort {
+	[ObservableProperty]
-			get => inputPort;
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
-			set {
-				Change(ref inputPort, value);
-				OnPropertyChanged(nameof(HasMadeChanges));
-			}
-		}
-
 	private string inputToken;
 
-		public string InputToken {
+	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
-			get => inputToken;
-			set {
-				Change(ref inputToken, value);
-				OnPropertyChanged(nameof(HasMadeChanges));
-			}
-		}
-
-		public bool HasMadeChanges => ServerManager.Port.ToString() != InputPort || ServerManager.Token != InputToken;
 
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isToggleServerButtonEnabled = true;
 
-		public bool IsToggleServerButtonEnabled {
+	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
-			get => isToggleServerButtonEnabled;
-			set => Change(ref isToggleServerButtonEnabled, value);
-		}
-
-		public string ToggleServerButtonText => serverManager.IsRunning ? "Stop Server" : "Start Server";
-
-		public event EventHandler<StatusBarModel.Status>? ServerStatusChanged;
 
 	private readonly Window window;
-		private readonly ServerManager serverManager;
+	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.server = state.Server;
-			this.inputPort = ServerManager.Port.ToString();
+		this.inputPort = ServerConfiguration.Port.ToString();
-			this.inputToken = ServerManager.Token;
+		this.inputToken = ServerConfiguration.Token;
-		}
 		
-		public void Initialize() {
+		server.StatusChanged += OnServerStatusChanged;
-			ServerLauncher.ServerStatusChanged += ServerLauncherOnServerStatusChanged;
 	}
 
 	public void Dispose() {
-			ServerLauncher.ServerStatusChanged -= ServerLauncherOnServerStatusChanged;
+		server.StatusChanged -= OnServerStatusChanged;
 	}
 
-		private void ServerLauncherOnServerStatusChanged(object? sender, EventArgs e) {
+	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
-			ServerStatusChanged?.Invoke(this, serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped);
+		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() {
+		UpdateServerStatus();
-			BeforeServerStart();
+		IsToggleServerButtonEnabled = true;
-			serverManager.Launch();
 	}
 
-		private void StopServer() {
+	public async Task OnClickToggleServerButton() {
-			IsToggleServerButtonEnabled = false;
+		if (server.IsRunning) {
-			ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Stopping);
+			await StopServer();
-			serverManager.Stop();
-		}
-
-		public void OnClickToggleServerButton() {
-			if (serverManager.IsRunning) {
-				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();
+		ServerConfiguration.Port = port;
-			serverManager.Relaunch(port, InputToken);
+		ServerConfiguration.Token = inputToken;
+		
 		OnPropertyChanged(nameof(HasMadeChanges));
+		
+		await StartServer();
 	}
 
 	public void OnClickCancelChanges() {
-			InputPort = ServerManager.Port.ToString();
+		InputPort = ServerConfiguration.Port.ToString();
-			InputToken = ServerManager.Token;
+		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 System.Reactive.Linq;
-using DHT.Utils.Models;
+using Avalonia.ReactiveUI;
+using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Server;
+using DHT.Server.Service;
 
-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
-	sealed class StatusBarModel : BaseModel {
-		public DatabaseStatistics DatabaseStatistics { get; }
 
-		private Status status = Status.Stopped;
+sealed partial class StatusBarModel : ObservableObject, IDisposable {
+	[ObservableProperty(Setter = Access.Private)]
+	private long? serverCount;
 	
-		public Status CurrentStatus {
+	[ObservableProperty(Setter = Access.Private)]
-			get => status;
+	private long? channelCount;
-			set {
-				status = value;
-				OnPropertyChanged(nameof(StatusText));
-			}
-		}
 	
-		public string StatusText {
+	[ObservableProperty(Setter = Access.Private)]
-			get {
+	private long? messageCount;
-				return CurrentStatus switch {
+
-					Status.Starting => "STARTING",
+	[ObservableProperty(Setter = Access.Private)]
-					Status.Ready    => "READY",
+	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
-					Status.Stopping => "STOPPING",
+	private ServerManager.Status serverStatus;
-					Status.Stopped  => "STOPPED",
+
+	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) {
+	public StatusBarModel(State state) {
-			this.DatabaseStatistics = databaseStatistics;
+		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 {
+	public void Dispose() {
-			Starting,
+		serverCountSubscription.Dispose();
-			Ready,
+		channelCountSubscription.Dispose();
-			Stopping,
+		messageCountSubscription.Dispose();
-			Stopped
+		
-		}
+		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"
+        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,36 +1,47 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using Avalonia;
+using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main.Pages;
+using DHT.Utils.Logging;
 using JetBrains.Annotations;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class MainWindow : Window {
+public sealed partial class MainWindow : Window {
+	private static readonly Log Log = Log.ForType<MainWindow>();
+	
 	[UsedImplicitly]
 	public MainWindow() {
-			InitializeComponent(Arguments.Empty);
+		InitializeComponent();
+		DataContext = new MainWindowModel(this, Arguments.Empty);
 	}
 
 	internal MainWindow(Arguments args) {
-			InitializeComponent(args);
+		InitializeComponent();
-		}
-
-		private void InitializeComponent(Arguments args) {
-			AvaloniaXamlLoader.Load(this);
 		DataContext = new MainWindowModel(this, args);
-
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
 	}
 
-		public void OnClosed(object? sender, EventArgs e) {
+	public async void OnClosing(object? sender, WindowClosingEventArgs e) {
-			if (DataContext is IDisposable disposable) {
+		e.Cancel = true;
-				disposable.Dispose();
+		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);
+			}
 		}
 
 		foreach (var temporaryFile in ViewerPageModel.TemporaryFiles) {
@@ -42,4 +53,3 @@ namespace DHT.Desktop.Main {
 		}
 	}
 }
-}

app/Desktop/Main/MainWindowModel.cs

@@ -1,32 +1,37 @@
 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 {
+namespace DHT.Desktop.Main;
-	sealed class MainWindowModel : BaseModel, IDisposable {
+
+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 IDatabaseFile? db;
+	private State? state;
 
 	[Obsolete("Designer")]
 	public MainWindowModel() : this(null!, Arguments.Empty) {}
@@ -35,10 +40,10 @@ namespace DHT.Desktop.Main {
 		this.window = window;
 
 		welcomeScreenModel = new WelcomeScreenModel(window);
-			welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
+		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
-			CurrentScreen = welcomeScreen;
 
-			welcomeScreenModel.PropertyChanged += WelcomeScreenModelOnPropertyChanged;
+		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
+		currentScreen = welcomeScreen;
 
 		var dbFile = args.DatabaseFile;
 		if (!string.IsNullOrWhiteSpace(dbFile)) {
@@ -62,55 +67,61 @@ 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) {
+	private async void OnDatabaseSelected(object? sender, IDatabaseFile db) {
-			if (e.PropertyName == nameof(welcomeScreenModel.Db)) {
+		welcomeScreenModel.DatabaseSelected -= OnDatabaseSelected;
-				if (mainContentScreenModel != null) {
+		
-					mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
+		await DisposeState();
-					mainContentScreenModel.Dispose();
+		
+		state = new State(db);
+
+		try {
+			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
+		} catch (Exception ex) {
+			Log.Error(ex);
+			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
 		}
 
-				db?.Dispose();
+		mainContentScreenModel = new MainContentScreenModel(window, state);
-				db = welcomeScreenModel.Db;
-
-				if (db == null) {
-					Title = DefaultTitle;
-					mainContentScreenModel = null;
-					mainContentScreen = null;
-					CurrentScreen = welcomeScreen;
-				}
-				else {
-					Title = Path.GetFileName(db.Path) + " - " + DefaultTitle;
-					mainContentScreenModel = new MainContentScreenModel(window, db);
-					await mainContentScreenModel.Initialize();
 		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-					mainContentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
-					CurrentScreen = mainContentScreen;
-				}
 		
-				OnPropertyChanged(nameof(CurrentScreen));
+		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
-				OnPropertyChanged(nameof(Title));
+		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) {
+		await DisposeState();
-			welcomeScreenModel.CloseDatabase();
+
+		Title = DefaultTitle;
+		CurrentScreen = welcomeScreen;
+
+		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
 	}
 
-		public void Dispose() {
+	private async Task DisposeState() {
-			welcomeScreenModel.Dispose();
+		if (state != null) {
+			await state.DisposeAsync();
+			state = null;
+		}
+	}
+
+	public async ValueTask DisposeAsync() {
 		mainContentScreenModel?.Dispose();
-			db?.Dispose();
+		await DisposeState();
-			db = null;
-		}
 	}
 }

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;
-using DHT.Server.Database;
-using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
-	sealed class AdvancedPageModel : BaseModel, IDisposable {
+
+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);
+		ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
-		}
-
-		public void Initialize() {
-			ServerConfigurationModel.Initialize();
 	}
 
 	public void Dispose() {
 		ServerConfigurationModel.Dispose();
 	}
 
-		public async void VacuumDatabase() {
+	public async Task VacuumDatabase() {
-			db.Vacuum();
+		const string Title = "Vacuum Database";
-			await Dialog.ShowOk(window, "Vacuum Database", "Done.");
+		await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => state.Db.Vacuum());
-		}
+		await Dialog.ShowOk(window, Title, "Done.");
 	}
 }

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

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

app/Desktop/Main/Pages/AttachmentsPageModel.cs

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

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -4,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 />

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

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

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -7,19 +7,23 @@ 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 {
+namespace DHT.Desktop.Main.Pages;
-	sealed class DatabasePageModel : BaseModel {
+
+sealed class DatabasePageModel {
 	private static readonly Log Log = Log.ForType<DatabasePageModel>();
 
 	public IDatabaseFile Db { get; }
@@ -29,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);
 
@@ -67,74 +71,77 @@ namespace DHT.Desktop.Main.Pages {
 		DatabaseClosed?.Invoke(this, EventArgs.Empty);
 	}
 
-		public async void MergeWithDatabase() {
+	public async Task MergeWithDatabase() {
-			var fileDialog = DatabaseGui.NewOpenDatabaseFileDialog();
+		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
-			fileDialog.Directory = Path.GetDirectoryName(Db.Path);
+		if (paths.Length > 0) {
-			fileDialog.AllowMultiple = true;
+			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
-
-			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);
 	}
 
 	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-			int total = paths.Length;
+		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
-
-			DialogResult.YesNo? upgradeResult = null;
-
-			async Task<bool> CheckCanUpgradeDatabase() {
-				upgradeResult ??= total > 1
-					                  ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
-					                  : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog);
-
-				return DialogResult.YesNo.Yes == upgradeResult;
-			}
 
 		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
-				SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
+			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
-				SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
-				IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, CheckCanUpgradeDatabase);
-				SynchronizationContext.SetSynchronizationContext(prevSyncContext);
 
 			if (db == null) {
 				return false;
 			}
 
 			try {
-					target.AddFrom(db);
+				await target.AddFrom(db);
 				return true;
 			} finally {
-					db.Dispose();
+				await db.DisposeAsync();
 			}
 		});
 	}
 
-		public async void ImportLegacyArchive() {
+	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
-			var fileDialog = new OpenFileDialog {
+		private readonly ProgressDialog dialog;
-				Title = "Open Legacy DHT Archive",
+		private readonly int total;
-				Directory = Path.GetDirectoryName(Db.Path),
+		private bool? decision;
-				AllowMultiple = true
-			};
 
-			string[]? paths = await fileDialog.ShowAsync(window);
+		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
-			if (paths == null || paths.Length == 0) {
+			this.total = total;
-				return;
+			this.dialog = dialog;
 		}
 
-			ProgressDialog progressDialog = new ProgressDialog();
+		public async Task<bool> CanUpgrade() {
-			progressDialog.DataContext = new ProgressDialogModel(async callback => await ImportLegacyArchiveFromPaths(Db, paths, progressDialog, callback)) {
+			return decision ??= (total > 1
-				Title = "Legacy Archive Import"
+				                     ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
-			};
+				                     : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog)) == DialogResult.YesNo.Yes;
+		}
 
-			await progressDialog.ShowDialog(window);
+		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) {
@@ -186,7 +193,7 @@ namespace DHT.Desktop.Main.Pages {
 
 	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 = target.SnapshotStatistics();
+		var oldStatistics = await DatabaseStatistics.Take(target);
 
 		int successful = 0;
 		int finished = 0;
@@ -217,14 +224,26 @@ namespace DHT.Desktop.Main.Pages {
 			return;
 		}
 
-			await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, target.SnapshotStatistics(), successful, total, itemName));
+		var newStatistics = await DatabaseStatistics.Take(target);
+		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
 	}
 
-		private static string GetImportDialogMessage(DatabaseStatisticsSnapshot oldStatistics, DatabaseStatisticsSnapshot newStatistics, int successfulItems, int totalItems, string itemName) {
+	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
-			long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
+		public static async Task<DatabaseStatistics> Take(IDatabaseFile db) {
-			long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
+			return new DatabaseStatistics(
-			long newUsers = newStatistics.TotalUsers - oldStatistics.TotalUsers;
+				await db.Servers.Count(),
-			long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
+				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 ");
@@ -245,4 +264,3 @@ namespace DHT.Desktop.Main.Pages {
 		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,25 @@ 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 {
+	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 +43,7 @@ namespace DHT.Desktop.Main.Pages {
 				return;
 			}
 
-			ProgressDialog progressDialog = new ProgressDialog {
+			await ProgressDialog.Show(window, "Generating Random Data", async (_, callback) => await GenerateRandomData(channels, users, messages, callback));
-				DataContext = new ProgressDialogModel(async callback => await GenerateRandomData(channels, users, messages, callback)) {
-					Title = "Generating Random Data"
-				}
-			};
-
-			await progressDialog.ShowDialog(window);
 		}
 
 		private const int BatchSize = 500;
@@ -63,7 +56,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 +66,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);
+			await state.Db.Users.Add(users);
-			db.AddUsers(users);
+			await state.Db.Servers.Add([server]);
-			
+			await state.Db.Channels.Add(channels);
-			foreach (var channel in channels) {
-				db.AddChannel(channel);
-			}
 
 			var now = DateTimeOffset.Now;
 			int batchIndex = 0;
@@ -97,7 +87,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 +101,13 @@ namespace DHT.Desktop.Main.Pages {
 						Timestamp = timeMillis,
 						EditTimestamp = editMillis,
 						RepliedToId = null,
-						Attachments = ImmutableArray<Attachment>.Empty,
+						Attachments = ImmutableList<Attachment>.Empty,
-						Embeds = ImmutableArray<Embed>.Empty,
+						Embeds = ImmutableList<Embed>.Empty,
-						Reactions = ImmutableArray<Reaction>.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 +128,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,7 +152,7 @@ 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));
@@ -171,10 +161,8 @@ namespace DHT.Desktop.Main.Pages {
 	}
 }
 #else
-using DHT.Utils.Models;
-
 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";

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -5,10 +5,11 @@
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.AttachmentsPage">
+             x:Class="DHT.Desktop.Main.Pages.DownloadsPage"
+             x:DataType="pages:DownloadsPageModel">
 
     <Design.DataContext>
-        <pages:AttachmentsPageModel />
+        <pages:DownloadsPageModel />
     </Design.DataContext>
 
     <UserControl.Styles>
@@ -30,24 +31,20 @@
     </UserControl.Styles>
 
     <StackPanel Orientation="Vertical" Spacing="20">
-        <DockPanel>
+        <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" DockPanel.Dock="Left" />
+        <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
-            <TextBlock Text="{Binding DownloadMessage}" Margin="10 0 0 0" VerticalAlignment="Center" DockPanel.Dock="Left" />
-            <ProgressBar Value="{Binding DownloadProgress}" IsVisible="{Binding IsDownloading}" Margin="15 0" VerticalAlignment="Center" DockPanel.Dock="Right" />
-        </DockPanel>
-        <controls:AttachmentFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !DataContext.IsDownloading, RelativeSource={RelativeSource AncestorType=UserControl}}" />
         <StackPanel Orientation="Vertical" Spacing="12">
             <Expander Header="Download Status" IsExpanded="True">
-                <DataGrid Items="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
+                <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="State" Binding="{Binding State}" Width="*" />
+                        <DataGridTextColumn Header="State" Binding="{Binding State, Mode=OneWay}" Width="*" />
-                        <DataGridTextColumn Header="Attachments" Binding="{Binding Items, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
+                        <DataGridTextColumn Header="Files" Binding="{Binding Items, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
-                        <DataGridTextColumn Header="Size" Binding="{Binding Size, Converter={StaticResource BytesValueConverter}}" 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 HasFailedDownloads}">Retry Failed Downloads</Button>
+                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
             </StackPanel>
         </StackPanel>
     </StackPanel>

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 = CopyTrackingScript.Content;
-				var originalText = button.Content;
+			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;
-				button.MinWidth = button.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 {
+namespace DHT.Desktop.Main.Pages;
-	sealed class TrackingPageModel : BaseModel {
-		private bool areDevToolsEnabled;
 
-		private bool AreDevToolsEnabled {
+sealed partial class TrackingPageModel : ObservableObject {
-			get => areDevToolsEnabled;
+	[ObservableProperty(Setter = Access.Private)]
-			set {
+	private bool isCopyTrackingScriptButtonEnabled = true;
-				Change(ref areDevToolsEnabled, value);
-				OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
-			}
-		}
 
-		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() {
+		Task.Factory.StartNew(InitializeDevToolsToggle, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.FromCurrentSynchronizationContext());
-			bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
-			if (devToolsEnabled.HasValue) {
-				AreDevToolsEnabled = devToolsEnabled.Value;
-			}
-			else {
-				IsToggleAppDevToolsButtonEnabled = false;
-				OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
-			}
 	}
 
 	public async Task<bool> OnClickCopyTrackingScript() {
-			string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
+		IsCopyTrackingScriptButtonEnabled = false;
-			string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerManager.Port + ";")
-			                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(ServerManager.Token))
-			                         .Replace("/*[IMPORTS]*/", await Resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
-			                         .Replace("/*[CSS-CONTROLLER]*/", await Resources.ReadTextAsync("Tracker/styles/controller.css"))
-			                         .Replace("/*[CSS-SETTINGS]*/", await Resources.ReadTextAsync("Tracker/styles/settings.css"));
 
-			var clipboard = Application.Current?.Clipboard;
+		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

@@ -5,7 +5,8 @@
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.ViewerPage">
+             x:Class="DHT.Desktop.Main.Pages.ViewerPage"
+             x:DataType="pages:ViewerPageModel">
 
     <Design.DataContext>
         <pages:ViewerPageModel />

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

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

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
@@ -8,42 +7,47 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
+using DHT.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;
 
-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
-	sealed class ViewerPageModel : BaseModel, IDisposable {
+
-		public static readonly ConcurrentBag<string> TemporaryFiles = new ();
+sealed partial class ViewerPageModel : ObservableObject, IDisposable {
+	public static readonly ConcurrentBag<string> TemporaryFiles = [];
+
+	private static readonly FilePickerFileType[] ViewerFileTypes = [
+		FileDialogs.CreateFilter("Discord History Viewer", ["html"])
+	];
 
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
+	[ObservableProperty]
 	private bool hasFilters = false;
 
-		public bool HasFilters {
+	public MessageFilterPanelModel FilterModel { get; }
-			get => hasFilters;
-			set => Change(ref hasFilters, value);
-		}
-
-		private MessageFilterPanelModel FilterModel { get; }
 
 	private readonly Window window;
-		private readonly IDatabaseFile db;
+	private readonly State state;
 
 	[Obsolete("Designer")]
-		public ViewerPageModel() : this(null!, DummyDatabaseFile.Instance) {}
+	public ViewerPageModel() : this(null!, State.Dummy) {}
 
-		public ViewerPageModel(Window window, IDatabaseFile db) {
+	public ViewerPageModel(Window window, State state) {
 		this.window = window;
-			this.db = db;
+		this.state = state;
 
-			FilterModel = new MessageFilterPanelModel(window, db, "Will export");
+		FilterModel = new MessageFilterPanelModel(window, state, "Will export");
 		FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
 	}
 
@@ -55,11 +59,71 @@ namespace DHT.Desktop.Main.Pages {
 		HasFilters = FilterModel.HasAnyFilters;
 	}
 
-		private async Task WriteViewerFile(string path) {
+	public async void OnClickOpenViewer() {
+		try {
+			var fullPath = await PrepareTemporaryViewerFile();
+			
+			string jsConstants = $"""
+			                      window.DHT_SERVER_URL = "{HttpUtility.JavaScriptStringEncode("http://127.0.0.1:" + ServerConfiguration.Port)}";
+			                      window.DHT_SERVER_TOKEN = "{HttpUtility.JavaScriptStringEncode(ServerConfiguration.Token)}";
+			                      """;
+
+			await ProgressDialog.ShowIndeterminate(window, "Open Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(fullPath, jsConstants)));
+			
+			Process.Start(new ProcessStartInfo(fullPath) {
+				UseShellExecute = true
+			});
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, "Open Viewer", "Could not create or save viewer: " + e.Message);
+		}
+	}
+
+	private async Task<string> PrepareTemporaryViewerFile() {
+		return await Task.Run(() => {
+			string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
+			string filenameBase = Path.GetFileNameWithoutExtension(state.Db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
+			string fullPath = Path.Combine(rootPath, filenameBase + ".html");
+			
+			int counter = 0;
+
+			while (File.Exists(fullPath)) {
+				++counter;
+				fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
+			}
+
+			TemporaryFiles.Add(fullPath);
+
+			Directory.CreateDirectory(rootPath);
+
+			return fullPath;
+		});
+	}
+
+	public async void OnClickSaveViewer() {
+		string? path = await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
+			Title = "Save Viewer",
+			FileTypeChoices = ViewerFileTypes,
+			SuggestedFileName = Path.GetFileNameWithoutExtension(state.Db.Path) + ".html",
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(state.Db.Path)),
+		});
+
+		if (path == null) {
+			return;
+		}
+
+		try {
+			await ProgressDialog.ShowIndeterminate(window, "Save Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(path, string.Empty)));
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, "Save Viewer", "Could not create or save viewer: " + e.Message);
+		}
+	}
+
+	private async Task WriteViewerFile(string path, string jsConstants) {
 		const string ArchiveTag = "/*[ARCHIVE]*/";
 
 		string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
-			string viewerTemplate = indexFile.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
+		string viewerTemplate = indexFile.Replace("/*[CONSTANTS]*/", jsConstants)
+		                                 .Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
 		                                 .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
 
 		int viewerArchiveTagStart = viewerTemplate.IndexOf(ArchiveTag);
@@ -68,7 +132,7 @@ namespace DHT.Desktop.Main.Pages {
 		string jsonTempFile = path + ".tmp";
 
 		await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
-				await ViewerJsonExport.Generate(jsonStream, db, FilterModel.CreateFilter());
+			await ViewerJsonExport.Generate(jsonStream, state.Db, FilterModel.CreateFilter());
 
 			char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
 			jsonStream.Position = 0;
@@ -92,57 +156,23 @@ namespace DHT.Desktop.Main.Pages {
 		File.Delete(jsonTempFile);
 	}
 
-		public async void OnClickOpenViewer() {
+	public async Task OnClickApplyFiltersToDatabase() {
-			string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
-			string filenameBase = Path.GetFileNameWithoutExtension(db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
-			string fullPath = Path.Combine(rootPath, filenameBase + ".html");
-			int counter = 0;
-
-			while (File.Exists(fullPath)) {
-				++counter;
-				fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
-			}
-
-			TemporaryFiles.Add(fullPath);
-			
-			Directory.CreateDirectory(rootPath);
-			await WriteViewerFile(fullPath);
-
-			Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
-		}
-
-		public async void OnClickSaveViewer() {
-			var dialog = new SaveFileDialog {
-				Title = "Save Viewer",
-				InitialFileName = Path.GetFileNameWithoutExtension(db.Path) + ".html",
-				Directory = Path.GetDirectoryName(db.Path),
-				Filters = new List<FileDialogFilter> {
-					new() {
-						Name = "Discord History Viewer",
-						Extensions = { "html" }
-					}
-				}
-			}.ShowAsync(window);
-
-			string? path = await dialog;
-			if (!string.IsNullOrEmpty(path)) {
-				await WriteViewerFile(path);
-			}
-		}
-
-		public async void 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?")) {
+			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?")) {
-					db.RemoveMessages(filter, FilterRemovalMode.KeepMatching);
+				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?")) {
+			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?")) {
-					db.RemoveMessages(filter, FilterRemovalMode.RemoveMatching);
+				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,7 +74,7 @@
     <DockPanel>
         <Border Classes="statusBar" DockPanel.Dock="Bottom">
             <DockPanel>
-                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Attachments</TextBlock>
+                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Downloads</TextBlock>
                 <controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Right" />
             </DockPanel>
         </Border>
@@ -93,9 +94,9 @@
                     <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabAttachments" Header="Attachments" Grid.Row="2">
+            <TabItem x:Name="TabDownloads" Header="Downloads" Grid.Row="2">
                 <ScrollViewer>
-                    <ContentPresenter Content="{Binding AttachmentsPage}" Classes="page" />
+                    <ContentPresenter Content="{Binding DownloadsPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
             <TabItem x:Name="TabViewer" Header="Viewer" Grid.Row="3">

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

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

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -1,26 +1,20 @@
 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;
-using DHT.Server.Database;
+
-using DHT.Server.Service;
+namespace DHT.Desktop.Main.Screens;
-using DHT.Utils.Logging;
 
-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 AttachmentsPage AttachmentsPage { get; }
+	public DownloadsPage DownloadsPage { get; }
-		private AttachmentsPageModel AttachmentsPageModel { get; }
+	private DownloadsPageModel DownloadsPageModel { get; }
 
 	public ViewerPage ViewerPage { get; }
 	private ViewerPageModel ViewerPageModel { get; }
@@ -48,72 +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) {
+	public MainContentScreenModel(Window window, State state) {
-			this.window = window;
+		DatabasePageModel = new DatabasePageModel(window, state);
-			this.serverManager = new ServerManager(db);
-
-			ServerLauncher.ServerManagementExceptionCaught += ServerLauncherOnServerManagementExceptionCaught;
-
-			DatabasePageModel = new DatabasePageModel(window, db);
 		DatabasePage = new DatabasePage { DataContext = DatabasePageModel };
 
 		TrackingPageModel = new TrackingPageModel(window);
 		TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
 
-			AttachmentsPageModel = new AttachmentsPageModel(db);
+		DownloadsPageModel = new DownloadsPageModel(state);
-			AttachmentsPage = new AttachmentsPage { DataContext = AttachmentsPageModel };
+		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
 
-			ViewerPageModel = new ViewerPageModel(window, db);
+		ViewerPageModel = new ViewerPageModel(window, state);
 		ViewerPage = new ViewerPage { DataContext = ViewerPageModel };
 
-			AdvancedPageModel = new AdvancedPageModel(window, db, serverManager);
+		AdvancedPageModel = new AdvancedPageModel(window, state);
 		AdvancedPage = new AdvancedPage { DataContext = AdvancedPageModel };
 
 		#if DEBUG
-			DebugPageModel = new DebugPageModel(window, db);
+		DebugPageModel = new DebugPageModel(window, state);
 		DebugPage = new DebugPage { DataContext = DebugPageModel };
 		#else
 		DebugPage = null;
 		#endif
 
-			StatusBarModel = new StatusBarModel(db.Statistics);
+		StatusBarModel = new StatusBarModel(state);
-
-			AdvancedPageModel.ServerConfigurationModel.ServerStatusChanged += OnServerStatusChanged;
-			DatabaseClosed += OnDatabaseClosed;
-
-			StatusBarModel.CurrentStatus = serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped;
-		}
-
-		public async Task Initialize() {
-			await TrackingPageModel.Initialize();
-			AdvancedPageModel.Initialize();
-			serverManager.Launch();
 	}
 
 	public void Dispose() {
-			ServerLauncher.ServerManagementExceptionCaught -= ServerLauncherOnServerManagementExceptionCaught;
+		DownloadsPageModel.Dispose();
-			AttachmentsPageModel.Dispose();
 		ViewerPageModel.Dispose();
-			serverManager.Dispose();
+		AdvancedPageModel.Dispose();
-		}
+		StatusBarModel.Dispose();
-
-		private void OnServerStatusChanged(object? sender, StatusBarModel.Status e) {
-			StatusBarModel.CurrentStatus = e;
-		}
-
-		private void OnDatabaseClosed(object? sender, EventArgs e) {
-			serverManager.Stop();
-		}
-
-		private async void ServerLauncherOnServerManagementExceptionCaught(object? sender, Exception ex) {
-			Log.Error(ex);
-			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
-		}
 	}
 }

app/Desktop/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 {
+namespace DHT.Desktop.Main.Screens;
-	sealed class WelcomeScreenModel : BaseModel, IDisposable {
+
+sealed partial class WelcomeScreenModel : ObservableObject {
 	public string Version => Program.Version;
 	
-		public IDatabaseFile? Db { get; private set; }
+	[ObservableProperty(Setter = Access.Private)]
-		public bool HasDatabase => Db != null;
+	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() {
+	public async Task OpenOrCreateDatabase() {
-			var dialog = DatabaseGui.NewOpenOrCreateDatabaseFileDialog();
+		IsOpenOrCreateDatabaseButtonEnabled = false;
-			dialog.Directory = Path.GetDirectoryName(dbFilePath);
+		try {
-
+			var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
-			string? path = await dialog.ShowAsync(window);
+			if (path != null) {
-			if (!string.IsNullOrWhiteSpace(path)) {
 				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));
+		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
-			OnPropertyChanged(nameof(HasDatabase));
+		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() {
+		public async Task Start(int versionSteps, Func<ISchemaUpgradeCallbacks.IProgressReporter, Task> doUpgrade) {
-			Dispose();
+			async Task StartUpgrade(IReadOnlyList<IProgressCallback> callbacks) {
-			OnPropertyChanged(nameof(Db));
+				var reporter = new ProgressReporter(versionSteps, callbacks);
-			OnPropertyChanged(nameof(HasDatabase));
+				await reporter.NextVersion();
+				await Task.Delay(TimeSpan.FromMilliseconds(800));
+				await doUpgrade(reporter);
+				await Task.Delay(TimeSpan.FromMilliseconds(600));
 			}
 			
-		public async void ShowAboutDialog() {
+			await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
-			await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(this.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(() => {
+		const onMessageElementsChanged = function() {
-			if (skipsLeft > 0) {
+			const messages = DISCORD.getMessages();
-				--skipsLeft;
+			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !DISCORD.hasMoreMessages();
-				return;
-			}
-			
-			const view = this.getMessageOuterElement();
-			
-			if (!view) {
-				skipsLeft = 2;
-				return;
-			}
-			
-			const anyMessage = DOM.queryReactClass("message", this.getMessageOuterElement());
-			const messageCount = anyMessage ? anyMessage.parentElement.children.length : 0;
-			
-			if (messageCount > 300) {
-				if (waitForCleanup) {
-					return;
-				}
-				
-				skipsLeft = 3;
-				waitForCleanup = true;
-				
-				window.setTimeout(() => {
-					const view = this.getMessageScrollerElement();
-					// noinspection JSUnusedGlobalSymbols
-					view.scrollTop = view.scrollHeight / 2;
-				}, 1);
-			}
-			else {
-				waitForCleanup = false;
-			}
-			
-			const messages = this.getMessages();
-			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !this.hasMoreMessages();
 			
 			if (!hasChanged) {
 				return;
@@ -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 the message from a message element.
-	 * @returns { null | { message: DiscordMessage, channel: Object } }
+	 * @returns { null | DiscordMessage } }
 	 */
-	static getMessageElementProps(ele) {
+	static getMessageFromElement(ele) {
 		const props = DOM.getReactProps(ele);
 		
-		if (props.children && props.children.length >= 4) {
+		if (props && Array.isArray(props.children)) {
-			const childProps = props.children[3].props;
+			for (const child of props.children) {
+				if (!(child instanceof Object)) {
+					continue;
+				}
 				
-			if ("message" in childProps && "channel" in childProps) {
+				const childProps = child.props;
-				return childProps;
+				if (childProps instanceof Object && "message" in childProps) {
+					return childProps.message;
+				}
 			}
 		}
 		
@@ -111,10 +146,10 @@ class DISCORD {
 			
 			for (const ele of this.getMessageElements()) {
 				try {
-					const props = this.getMessageElementProps(ele);
+					const message = this.getMessageFromElement(ele);
 					
-					if (props != null) {
+					if (message != null) {
-						messages.push(props.message);
+						messages.push(message);
 					}
 				} catch (e) {
 					console.error("[DHT] Error extracing message data, skipping it.", e, ele, DOM.tryGetReactProps(ele));
@@ -135,7 +170,7 @@ class DISCORD {
 	 */
 	static getSelectedChannel() {
 		try {
-			let obj;
+			let obj = null;
 			
 			try {
 				for (const child of DOM.getReactProps(DOM.queryReactClass("chatContent")).children) {
@@ -146,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") {
@@ -166,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) {
@@ -183,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 DISCORD.CHANNEL_TYPE.DM: type = "DM"; break;
-					case 3: type = "GROUP"; break;
+					case DISCORD.CHANNEL_TYPE.GROUP_DM: type = "GROUP"; break;
 					default: return null;
 				}
 				
@@ -195,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,
+					"id": guild.id,
-					"name": document.querySelector("nav header h1[class*='name-']").innerText,
+					"name": guild.name,
 					"type": "SERVER"
 				};
 				
@@ -209,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 {
@@ -236,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;
 			}
 			
@@ -266,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}_"]`);
 	}
 	
 	/**

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

@@ -174,12 +174,10 @@ const STATE = (function() {
 		},
 		
 		/**
-		 * @param {String} channelId
 		 * @param {DiscordMessage[]} discordMessageArray
 		 */
-		async addDiscordMessages(channelId, discordMessageArray) {
+		async addDiscordMessages(discordMessageArray) {
-			// https://discord.com/developers/docs/resources/channel#message-object-message-types
+			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");
-			discordMessageArray = discordMessageArray.filter(msg => (msg.type === 0 || msg.type === 19 || msg.type === 21) && msg.state === "SENT");
 			
 			if (discordMessageArray.length === 0) {
 				return false;
@@ -251,6 +249,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,9 +1,5 @@
-#app-mount div[class*="app-"] {
+#app-mount {
-  margin-bottom: 48px !important;
+  height: calc(100% - 48px) !important;
-}
-
-#app-mount div[class*="app-"] > div[class*="app-"] {
-  margin-bottom: 0 !important;
 }
 
 #dht-ctrl {

app/Resources/Viewer/index.html

@@ -6,6 +6,7 @@
     
     <script type="text/javascript">
 		window.DHT_EMBEDDED = "/*[ARCHIVE]*/";
+		/*[CONSTANTS]*/
 		/*[JS]*/
     </script>
     <style>

app/Resources/Viewer/scripts/discord.js

@@ -1,7 +1,8 @@
 const DISCORD = (function() {
 	const regex = {
 		formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
-		formatItalic: /(.)?([_*])([\s\S]+?)\2(?!\2)/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,
@@ -34,6 +35,23 @@ const DISCORD = (function() {
 	let templateReaction;
 	let templateReactionCustom;
 	
+	const fileUrlProcessor = function(serverUrl, serverToken) {
+		if (typeof serverUrl === "string" && typeof serverToken === "string") {
+			return url => serverUrl + "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
+		}
+		else {
+			return url => url;
+		}
+	}(
+		window["DHT_SERVER_URL"],
+		window["DHT_SERVER_TOKEN"]
+	);
+	
+	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"));
 		
@@ -48,36 +66,47 @@ const DISCORD = (function() {
 				.replace(regex.specialEscapedDouble, full => full.replace(/\\/g, "").replace(/(.)/g, escapeHtmlMatch))
 				.replace(regex.formatBold, "<b>$1</b>")
 				.replace(regex.formatUnderline, "<u>$1</u>")
-				.replace(regex.formatItalic, (full, pre, char, match) => pre === "\\" ? full : (pre || "") + "<i>" + match + "</i>")
+				.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.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
-			.replace(regex.customEmojiAnimated, "<img src='https://cdn.discordapp.com/emojis/$2." + animatedEmojiExtension + "' alt=':$1:' title=':$1:' class='emoji'>");
+			.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, src: image.url, width: image.width, height: image.height });
+			return templateEmbedImageWithSize.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url), width: image.width, height: image.height });
 		}
 		else {
-			return templateEmbedImage.apply({ url, src: image.url });
+			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([
@@ -117,13 +146,14 @@ const DISCORD = (function() {
 				"</div>"
 			].join(""));
 			
+			// noinspection HtmlUnknownTarget
 			templateUserAvatar = new TEMPLATE([
-				"<img src='https://cdn.discordapp.com/avatars/{id}/{path}.webp?size=128' alt=''>"
+				"<img src='{url}' alt=''>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
 			templateAttachmentDownload = new TEMPLATE([
-				"<a href='{url}' class='embed download'>Download {filename}</a>"
+				"<a href='{url}' class='embed download'>Download {name}</a>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
@@ -159,8 +189,9 @@ const DISCORD = (function() {
 				"<span class='reaction-wrapper'><span class='reaction-emoji'>{n}</span><span class='count'>{c}</span></span>"
 			].join(""));
 			
+			// noinspection HtmlUnknownTarget
 			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>"
+				"<span class='reaction-wrapper'><img src='{url}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
 			].join(""));
 		},
 		
@@ -176,9 +207,8 @@ const DISCORD = (function() {
 		},
 		
 		isImageAttachment(attachment) {
-			const dot = attachment.url.lastIndexOf(".");
+			const url = DOM.tryParseUrl(attachment.url);
-			const ext = dot === -1 ? "" : attachment.url.substring(dot).toLowerCase();
+			return url != null && isImageUrl(url);
-			return ext === ".png" || ext === ".gif" || ext === ".jpg" || ext === ".jpeg";
 		},
 		
 		getChannelHTML(channel) { // noinspection FunctionWithInconsistentReturnsJS
@@ -192,7 +222,7 @@ const DISCORD = (function() {
 		getMessageHTML(message) { // noinspection FunctionWithInconsistentReturnsJS
 			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 : "????";
@@ -213,10 +243,10 @@ const DISCORD = (function() {
 							return templateEmbedUnsupported.apply(embed);
 						}
 						else if ("image" in embed && embed.image.url) {
-							return getImageEmbed(embed.url, embed.image);
+							return getImageEmbed(fileUrlProcessor(embed.url), embed.image);
 						}
 						else if ("thumbnail" in embed && embed.thumbnail.url) {
-							return getImageEmbed(embed.url, embed.thumbnail);
+							return getImageEmbed(fileUrlProcessor(embed.url), embed.thumbnail);
 						}
 						else if ("title" in embed && "description" in embed) {
 							return templateEmbedRich.apply(embed);
@@ -235,16 +265,16 @@ const DISCORD = (function() {
 					}
 					
 					return value.map(attachment => {
-						if (this.isImageAttachment(attachment) && SETTINGS.enableImagePreviews) {
+						const url = fileUrlProcessor(attachment.url);
-							return templateEmbedImage.apply({ url: attachment.url, src: 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 templateEmbedImage.apply({ url, src: url });
-							
-							return templateAttachmentDownload.apply({
-								"url": attachment.url,
-								"filename": sliced[sliced.length - 1]
-							});
 						}
 					}).join("");
 				}
@@ -260,7 +290,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;
@@ -272,9 +302,10 @@ const DISCORD = (function() {
 					
 					return "<div class='reactions'>" + value.map(reaction => {
 						if ("id" in reaction){
-							// noinspection JSUnusedGlobalSymbols, JSUnresolvedVariable
+							const ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
-							reaction.ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "png";
+							const url = fileUrlProcessor("https://cdn.discordapp.com/emojis/" + reaction.id + "." + ext);
-							return templateReactionCustom.apply(reaction);
+							// noinspection JSUnusedGlobalSymbols
+							return templateReactionCustom.apply({ url, n: reaction.n, c: reaction.c });
 						}
 						else {
 							return templateReaction.apply(reaction);

app/Resources/Viewer/scripts/dom.js

@@ -51,4 +51,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;
+		}
+	}
 }

app/Resources/minify.py

@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-
-import glob
-import os
-import shutil
-import sys
-
-if os.name == "nt":
-    uglifyjs = os.path.abspath("../../lib/uglifyjs.cmd")
-else:
-    uglifyjs = "uglifyjs"
-
-if shutil.which(uglifyjs) is None:
-    print("Cannot find executable: {0}".format(uglifyjs))
-    sys.exit(1)
-
-input_dir = os.path.abspath("./Tracker/scripts")
-output_dir = os.path.abspath("../Desktop/bin/.res/scripts")
-
-os.makedirs(output_dir, exist_ok=True)
-
-for file in glob.glob(input_dir + "/*.js"):
-    name = os.path.basename(file)
-    print("Minifying {0}...".format(name))
-    os.system("{0} {1} -o {2}/{3}".format(uglifyjs, file, output_dir, name))
-
-print("Done!")

app/Server/Data/Aggregations/DownloadStatusStatistics.cs

@@ -1,15 +1,19 @@
-namespace DHT.Server.Data.Aggregations {
+namespace DHT.Server.Data.Aggregations;
+
 public sealed class DownloadStatusStatistics {
-		public int EnqueuedCount { get; internal set; }
+	public int PendingCount { get; internal init; }
-		public ulong EnqueuedSize { get; internal set; }
+	public ulong PendingTotalSize { get; internal init; }
+	public int PendingWithUnknownSizeCount { get; internal init; }
 
-		public int SuccessfulCount { get; internal set; }
+	public int SuccessfulCount { get; internal init; }
-		public ulong SuccessfulSize { get; internal set; }
+	public ulong SuccessfulTotalSize { get; internal init; }
+	public int SuccessfulWithUnknownSizeCount { get; internal init; }
 
-		public int FailedCount { get; internal set; }
+	public int FailedCount { get; internal init; }
-		public ulong FailedSize { get; internal set; }
+	public ulong FailedTotalSize { get; internal init; }
+	public int FailedWithUnknownSizeCount { get; internal init; }
 	
-		public int SkippedCount { get; internal set; }
+	public int SkippedCount { get; internal init; }
-		public ulong SkippedSize { get; internal set; }
+	public ulong SkippedTotalSize { get; internal init; }
-	}
+	public int SkippedWithUnknownSizeCount { get; internal init; }
 }

app/Server/Data/Attachment.cs

@@ -1,9 +1,12 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct Attachment {
 	public ulong Id { get; internal init; }
 	public string Name { get; internal init; }
 	public string? Type { get; internal init; }
-		public string Url { get; internal init; }
+	public string NormalizedUrl { get; internal init; }
+	public string DownloadUrl { get; internal init; }
 	public ulong Size { get; internal init; }
-	}
+	public int? Width { get; internal init; }
+	public int? Height { get; internal init; }
 }

app/Server/Data/Channel.cs

@@ -1,4 +1,5 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct Channel {
 	public ulong Id { get; init; }
 	public ulong Server { get; init; }
@@ -8,4 +9,3 @@ namespace DHT.Server.Data {
 	public string? Topic { get; init; }
 	public bool? Nsfw { get; init; }
 }
-}