Release v41.2

Closes #256

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" />
@@ -25,4 +25,4 @@
       </map>
     </option>
   </component>
-</project>
+</project>

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" />
@@ -48,70 +49,11 @@
             <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>
 
     <Application.Resources>
@@ -165,15 +107,29 @@
         <SolidColorBrush x:Key="TextControlPlaceholderForegroundPointerOver" Color="#AAAAAA" />
         <SolidColorBrush x:Key="TextControlPlaceholderForegroundFocused" Color="#AAAAAA" />
         <SolidColorBrush x:Key="TextControlPlaceholderForegroundDisabled" Color="#AAAAAA" />
-
+        
         <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
         <Thickness x:Key="ExpanderContentPadding">12</Thickness>
-        <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,18 +3,18 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main;
 
-namespace DHT.Desktop {
+namespace DHT.Desktop;
-	sealed class App : Application {
+
-		public override void Initialize() {
+sealed class App : Application {
-			AvaloniaXamlLoader.Load(this);
+	public override void Initialize() {
+		AvaloniaXamlLoader.Load(this);
+	}
+
+	public override void OnFrameworkInitializationCompleted() {
+		if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
+			desktop.MainWindow = new MainWindow(Program.Arguments);
 		}
 
-		public override void OnFrameworkInitializationCompleted() {
+		base.OnFrameworkInitializationCompleted();
-			if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
-				desktop.MainWindow = new MainWindow(new Arguments(desktop.Args));
-			}
-
-			base.OnFrameworkInitializationCompleted();
-		}
 	}
 }

app/Desktop/Arguments.cs

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

app/Desktop/Common/BytesValueConverter.cs

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

app/Desktop/Common/DatabaseGui.cs

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

app/Desktop/Common/NumberValueConverter.cs

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

app/Desktop/Common/TextFormat.cs

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

app/Desktop/Desktop.csproj

@@ -1,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.16" />
+    <PackageReference Include="Avalonia" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.16" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.16" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.16" 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,31 +1,21 @@
 using System.Diagnostics.CodeAnalysis;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 using DHT.Desktop.Dialogs.Message;
 
-namespace DHT.Desktop.Dialogs.CheckBox {
+namespace DHT.Desktop.Dialogs.CheckBox;
-	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class CheckBoxDialog : Window {
-		public CheckBoxDialog() {
-			InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
 
-		private void InitializeComponent() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			AvaloniaXamlLoader.Load(this);
+public sealed partial class CheckBoxDialog : Window {
-		}
+	public CheckBoxDialog() {
+		InitializeComponent();
+	}
 
-		public void ClickOk(object? sender, RoutedEventArgs e) {
+	public void ClickOk(object? sender, RoutedEventArgs e) {
-			Close(DialogResult.OkCancel.Ok);
+		Close(DialogResult.OkCancel.Ok);
-		}
+	}
 
-		public void ClickCancel(object? sender, RoutedEventArgs e) {
+	public void ClickCancel(object? sender, RoutedEventArgs e) {
-			Close(DialogResult.OkCancel.Cancel);
+		Close(DialogResult.OkCancel.Cancel);
-		}
 	}
 }
-

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -2,69 +2,69 @@ 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 {
-		public string Title { get; init; } = "";
 
-		private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
+class CheckBoxDialogModel : ObservableObject {
+	public string Title { get; init; } = "";
 
-		public IReadOnlyList<CheckBoxItem> Items {
+	private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
-			get => items;
 
-			protected set {
+	public IReadOnlyList<CheckBoxItem> Items {
-				foreach (var item in items) {
+		get => items;
-					item.PropertyChanged -= OnItemPropertyChanged;
-				}
 
-				items = value;
+		protected set {
-
+			foreach (var item in items) {
-				foreach (var item in items) {
+				item.PropertyChanged -= OnItemPropertyChanged;
-					item.PropertyChanged += OnItemPropertyChanged;
-				}
-			}
-		}
-
-		private bool pauseCheckEvents = false;
-
-		public bool AreAllSelected => Items.All(static item => item.Checked);
-		public bool AreNoneSelected => Items.All(static item => !item.Checked);
-
-		public void SelectAll() => SetAllChecked(true);
-		public void SelectNone() => SetAllChecked(false);
-
-		private void SetAllChecked(bool isChecked) {
-			pauseCheckEvents = true;
-
-			foreach (var item in Items) {
-				item.Checked = isChecked;
 			}
 
-			pauseCheckEvents = false;
+			items = value;
-			UpdateBulkButtons();
-		}
 
-		private void UpdateBulkButtons() {
+			foreach (var item in items) {
-			OnPropertyChanged(nameof(AreAllSelected));
+				item.PropertyChanged += OnItemPropertyChanged;
-			OnPropertyChanged(nameof(AreNoneSelected));
-		}
-
-		private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-			if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.Checked)) {
-				UpdateBulkButtons();
 			}
 		}
 	}
 
-	sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
+	private bool pauseCheckEvents = false;
-		public new IReadOnlyList<CheckBoxItem<T>> Items { get; }
 
-		public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.Checked);
+	public bool AreAllSelected => Items.All(static item => item.IsChecked);
+	public bool AreNoneSelected => Items.All(static item => !item.IsChecked);
 
-		public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
+	public void SelectAll() => SetAllChecked(true);
-			this.Items = new List<CheckBoxItem<T>>(items);
+	public void SelectNone() => SetAllChecked(false);
-			base.Items = this.Items;
+
+	private void SetAllChecked(bool isChecked) {
+		pauseCheckEvents = true;
+
+		foreach (var item in Items) {
+			item.IsChecked = isChecked;
+		}
+
+		pauseCheckEvents = false;
+		UpdateBulkButtons();
+	}
+
+	private void UpdateBulkButtons() {
+		OnPropertyChanged(nameof(AreAllSelected));
+		OnPropertyChanged(nameof(AreNoneSelected));
+	}
+
+	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.IsChecked)) {
+			UpdateBulkButtons();
 		}
 	}
 }
+
+sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
+	private new IReadOnlyList<CheckBoxItem<T>> Items { get; }
+
+	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,24 +1,20 @@
-using DHT.Utils.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace DHT.Desktop.Dialogs.CheckBox {
+namespace DHT.Desktop.Dialogs.CheckBox;
-	class CheckBoxItem : BaseModel {
-		public string Title { get; init; } = "";
-		public object? Item { get; init; } = null;
 
-		private bool isChecked = false;
+partial class CheckBoxItem : ObservableObject {
+	public string Title { get; init; } = "";
+	public object? Item { get; init; } = null;
 
-		public bool Checked {
+	[ObservableProperty]
-			get => isChecked;
+	private bool isChecked = false;
-			set => Change(ref isChecked, value);
+}
-		}
-	}
 
-	sealed class CheckBoxItem<T> : CheckBoxItem {
+sealed class CheckBoxItem<T> : CheckBoxItem {
-		public new T Item { get; }
+	public new T Item { get; }
 
-		public CheckBoxItem(T item) {
+	public CheckBoxItem(T item) {
-			this.Item = item;
+		this.Item = item;
-			base.Item = item;
+		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,73 +2,73 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;
 
-namespace DHT.Desktop.Dialogs.Message {
+namespace DHT.Desktop.Dialogs.Message;
-	static class Dialog {
-		public static async Task ShowOk(Window owner, string title, string message) {
-			if (!Dispatcher.UIThread.CheckAccess()) {
-				await Dispatcher.UIThread.InvokeAsync(() => ShowOk(owner, title, message));
-				return;
-			}
 
-			await new MessageDialog {
+static class Dialog {
-				DataContext = new MessageDialogModel {
+	public static async Task ShowOk(Window owner, string title, string message) {
-					Title = title,
+		if (!Dispatcher.UIThread.CheckAccess()) {
-					Message = message,
+			await Dispatcher.UIThread.InvokeAsync(() => ShowOk(owner, title, message));
-					IsOkVisible = true
+			return;
-				}
-			}.ShowDialog<DialogResult.All>(owner);
 		}
 
-		public static async Task<DialogResult.OkCancel> ShowOkCancel(Window owner, string title, string message) {
+		await new MessageDialog {
-			if (!Dispatcher.UIThread.CheckAccess()) {
+			DataContext = new MessageDialogModel {
-				return await Dispatcher.UIThread.InvokeAsync(() => ShowOkCancel(owner, title, message));
+				Title = title,
+				Message = message,
+				IsOkVisible = true
 			}
+		}.ShowDialog<DialogResult.All>(owner);
+	}
 
-			var result = await new MessageDialog {
+	public static async Task<DialogResult.OkCancel> ShowOkCancel(Window owner, string title, string message) {
-				DataContext = new MessageDialogModel {
+		if (!Dispatcher.UIThread.CheckAccess()) {
-					Title = title,
+			return await Dispatcher.UIThread.InvokeAsync(() => ShowOkCancel(owner, title, message));
-					Message = message,
-					IsOkVisible = true,
-					IsCancelVisible = true
-				}
-			}.ShowDialog<DialogResult.All?>(owner);
-
-			return result.ToOkCancel();
 		}
 
-		public static async Task<DialogResult.YesNo> ShowYesNo(Window owner, string title, string message) {
+		var result = await new MessageDialog {
-			if (!Dispatcher.UIThread.CheckAccess()) {
+			DataContext = new MessageDialogModel {
-				return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNo(owner, title, message));
+				Title = title,
+				Message = message,
+				IsOkVisible = true,
+				IsCancelVisible = true
 			}
+		}.ShowDialog<DialogResult.All?>(owner);
 
-			var result = await new MessageDialog {
+		return result.ToOkCancel();
-				DataContext = new MessageDialogModel {
+	}
-					Title = title,
-					Message = message,
-					IsYesVisible = true,
-					IsNoVisible = true
-				}
-			}.ShowDialog<DialogResult.All?>(owner);
 
-			return result.ToYesNo();
+	public static async Task<DialogResult.YesNo> ShowYesNo(Window owner, string title, string message) {
+		if (!Dispatcher.UIThread.CheckAccess()) {
+			return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNo(owner, title, message));
 		}
 
-		public static async Task<DialogResult.YesNoCancel> ShowYesNoCancel(Window owner, string title, string message) {
+		var result = await new MessageDialog {
-			if (!Dispatcher.UIThread.CheckAccess()) {
+			DataContext = new MessageDialogModel {
-				return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNoCancel(owner, title, message));
+				Title = title,
+				Message = message,
+				IsYesVisible = true,
+				IsNoVisible = true
 			}
+		}.ShowDialog<DialogResult.All?>(owner);
 
-			var result = await new MessageDialog {
+		return result.ToYesNo();
-				DataContext = new MessageDialogModel {
+	}
-					Title = title,
-					Message = message,
-					IsYesVisible = true,
-					IsNoVisible = true,
-					IsCancelVisible = true
-				}
-			}.ShowDialog<DialogResult.All?>(owner);
 
-			return result.ToYesNoCancel();
+	public static async Task<DialogResult.YesNoCancel> ShowYesNoCancel(Window owner, string title, string message) {
+		if (!Dispatcher.UIThread.CheckAccess()) {
+			return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNoCancel(owner, title, message));
 		}
+
+		var result = await new MessageDialog {
+			DataContext = new MessageDialogModel {
+				Title = title,
+				Message = message,
+				IsYesVisible = true,
+				IsNoVisible = true,
+				IsCancelVisible = true
+			}
+		}.ShowDialog<DialogResult.All?>(owner);
+
+		return result.ToYesNoCancel();
 	}
 }

app/Desktop/Dialogs/Message/DialogResult.cs

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

app/Desktop/Dialogs/Message/MessageDialog.axaml

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

app/Desktop/Dialogs/Message/MessageDialogModel.cs

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

app/Desktop/Dialogs/Progress/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);
+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">
-        <DockPanel>
+        <ItemsRepeater.ItemTemplate>
-            <TextBlock DockPanel.Dock="Right" Text="{Binding Items}" Classes="items" />
+            <DataTemplate>
-            <TextBlock DockPanel.Dock="Left" Text="{Binding Message}" />
+                <StackPanel Margin="20 10" IsHitTestVisible="{Binding IsVisible}" Opacity="{Binding Opacity}">
-        </DockPanel>
+                    <DockPanel>
-        <ProgressBar Value="{Binding Progress}" />
+                        <TextBlock DockPanel.Dock="Right" Text="{Binding Items}" Classes="items" />
-    </StackPanel>
+                        <TextBlock DockPanel.Dock="Left" Text="{Binding Message}" />
+                    </DockPanel>
+                    <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 {
-		private bool isFinished = false;
 
-		public ProgressDialog() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			InitializeComponent();
+public sealed partial class ProgressDialog : Window {
-			#if DEBUG
+	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
-			this.AttachDevTools();
+		var taskCompletionSource = new TaskCompletionSource();
-			#endif
+		var dialog = new ProgressDialog();
-		}
+		
-
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-		private void InitializeComponent() {
+			try {
-			AvaloniaXamlLoader.Load(this);
+				await action(dialog, callbacks[0]);
-		}
+				taskCompletionSource.SetResult();
-
+			} catch (Exception e) {
-		public void OnClosing(object? sender, CancelEventArgs e) {
+				taskCompletionSource.SetException(e);
-			e.Cancel = !isFinished;
-		}
-
-		public void Loaded(object? sender, EventArgs e) {
-			if (DataContext is ProgressDialogModel model) {
-				Task.Run(model.StartTask).ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
 			}
-		}
+		});
+		
+		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();
 
-		private void OnFinished(Task task) {
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			isFinished = true;
+			await callbacks[0].UpdateIndeterminate(message);
-			Close();
+			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();
+	}
+
+	public void OnOpened(object? sender, EventArgs e) {
+		if (DataContext is ProgressDialogModel model) {
+			progressTask = Task.Run(model.StartTask);
+			progressTask.ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
 		}
 	}
+
+	public void OnClosing(object? sender, WindowClosingEventArgs e) {
+		e.Cancel = !isFinished;
+	}
+
+	private 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 {
-		public string Title { get; init; } = "";
 
-		private string message = "";
+sealed class ProgressDialogModel {
+	public string Title { get; init; } = "";
 
-		public string Message {
+	public IReadOnlyList<ProgressItem> Items { get; } = Array.Empty<ProgressItem>();
-			get => message;
+
-			private set => Change(ref message, value);
+	private readonly TaskRunner? task;
+
+	[Obsolete("Designer")]
+	public ProgressDialogModel() {}
+
+	public ProgressDialogModel(string title, TaskRunner task, int progressItems = 1) {
+		this.Title = title;
+		this.task = task;
+		this.Items = Enumerable.Range(0, progressItems).Select(static _ => new ProgressItem()).ToArray();
+	}
+
+	internal async Task StartTask() {
+		if (task != null) {
+			await task(Items.Select(static item => new Callback(item)).ToArray());
+		}
+	}
+
+	public delegate Task TaskRunner(IReadOnlyList<IProgressCallback> callbacks);
+
+	private sealed class Callback : IProgressCallback {
+		private readonly ProgressItem item;
+
+		public Callback(ProgressItem item) {
+			this.item = item;
 		}
 
-		private string items = "";
+		public async Task Update(string message, int finishedItems, int totalItems) {
-
+			await Dispatcher.UIThread.InvokeAsync(() => {
-		public string Items {
+				item.Message = message;
-			get => items;
+				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
-			private set => Change(ref items, value);
+				item.Progress = totalItems == 0 ? 0 : 100 * finishedItems / totalItems;
+				item.IsIndeterminate = false;
+			});
 		}
 
-		private int progress = 0;
+		public async Task UpdateIndeterminate(string message) {
-
+			await Dispatcher.UIThread.InvokeAsync(() => {
-		public int Progress {
+				item.Message = message;
-			get => progress;
+				item.Items = string.Empty;
-			private set => Change(ref progress, value);
+				item.Progress = 0;
+				item.IsIndeterminate = true;
+			});
 		}
 
-		private readonly TaskRunner? task;
+		public Task Hide() {
-
+			return Update(string.Empty, 0, 0);
-		[Obsolete("Designer")]
-		public ProgressDialogModel() {}
-
-		public ProgressDialogModel(TaskRunner task) {
-			this.task = task;
-		}
-
-		internal async Task StartTask() {
-			if (task != null) {
-				await task(new Callback(this));
-			}
-		}
-
-		public delegate Task TaskRunner(IProgressCallback callback);
-
-		private sealed class Callback : IProgressCallback {
-			private readonly ProgressDialogModel model;
-
-			public Callback(ProgressDialogModel model) {
-				this.model = model;
-			}
-
-			async Task IProgressCallback.Update(string message, int finishedItems, int totalItems) {
-				await Dispatcher.UIThread.InvokeAsync(() => {
-					model.Message = message;
-					model.Items = finishedItems.Format() + " / " + totalItems.Format();
-					model.Progress = 100 * finishedItems / totalItems;
-				});
-			}
 		}
 	}
 }

app/Desktop/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,31 +1,21 @@
 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 TextBoxDialog() {
-			InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
 
-		private void InitializeComponent() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			AvaloniaXamlLoader.Load(this);
+public sealed partial class TextBoxDialog : Window {
-		}
+	public TextBoxDialog() {
+		InitializeComponent();
+	}
 
-		public void ClickOk(object? sender, RoutedEventArgs e) {
+	public void ClickOk(object? sender, RoutedEventArgs e) {
-			Close(DialogResult.OkCancel.Ok);
+		Close(DialogResult.OkCancel.Ok);
-		}
+	}
 
-		public void ClickCancel(object? sender, RoutedEventArgs e) {
+	public void ClickCancel(object? sender, RoutedEventArgs e) {
-			Close(DialogResult.OkCancel.Cancel);
+		Close(DialogResult.OkCancel.Cancel);
-		}
 	}
 }
-

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -2,46 +2,46 @@ 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 {
-		public string Title { get; init; } = "";
-		public string Description { get; init; } = "";
 
-		private IReadOnlyList<TextBoxItem> items = Array.Empty<TextBoxItem>();
+class TextBoxDialogModel : ObservableObject {
+	public string Title { get; init; } = "";
+	public string Description { get; init; } = "";
 
-		public IReadOnlyList<TextBoxItem> Items {
+	private IReadOnlyList<TextBoxItem> items = Array.Empty<TextBoxItem>();
-			get => items;
 
-			protected set {
+	public IReadOnlyList<TextBoxItem> Items {
-				foreach (var item in items) {
+		get => items;
-					item.ErrorsChanged -= OnItemErrorsChanged;
-				}
 
-				items = value;
+		protected set {
+			foreach (var item in items) {
+				item.ErrorsChanged -= OnItemErrorsChanged;
+			}
 
-				foreach (var item in items) {
+			items = value;
-					item.ErrorsChanged += OnItemErrorsChanged;
+
-				}
+			foreach (var item in items) {
+				item.ErrorsChanged += OnItemErrorsChanged;
 			}
 		}
-		
-		public bool HasErrors => Items.Any(static item => !item.IsValid);
-
-		private void OnItemErrorsChanged(object? sender, DataErrorsChangedEventArgs e) {
-			OnPropertyChanged(nameof(HasErrors));
-		}
 	}
+		
+	public bool HasErrors => Items.Any(static item => !item.IsValid);
 
-	sealed class TextBoxDialogModel<T> : TextBoxDialogModel {
+	private void OnItemErrorsChanged(object? sender, DataErrorsChangedEventArgs e) {
-		public new IReadOnlyList<TextBoxItem<T>> Items { get; }
+		OnPropertyChanged(nameof(HasErrors));
-
+	}
-		public IEnumerable<TextBoxItem<T>> ValidItems => Items.Where(static item => item.IsValid);
+}
-
+
-		public TextBoxDialogModel(IEnumerable<TextBoxItem<T>> items) {
+sealed class TextBoxDialogModel<T> : TextBoxDialogModel {
-			this.Items = new List<TextBoxItem<T>>(items);
+	private new IReadOnlyList<TextBoxItem<T>> Items { get; }
-			base.Items = this.Items;
+
-		}
+	public IEnumerable<TextBoxItem<T>> ValidItems => Items.Where(static item => item.IsValid);
+
+	public TextBoxDialogModel(IEnumerable<TextBoxItem<T>> items) {
+		this.Items = new List<TextBoxItem<T>>(items);
+		base.Items = this.Items;
 	}
 }

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

@@ -1,42 +1,42 @@
 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 {
+
-		public string Title { get; init; } = "";
+class TextBoxItem : ObservableObject, INotifyDataErrorInfo {
-		public object? Item { get; init; } = null;
+	public string Title { get; init; } = "";
+	public object? Item { get; init; } = null;
 		
-		public Func<string, bool> ValidityCheck { get; init; } = static _ => true;
+	public Func<string, bool> ValidityCheck { get; init; } = static _ => true;
-		public bool IsValid => ValidityCheck(Value);
+	public bool IsValid => ValidityCheck(Value);
 
-		private string value = string.Empty;
+	private string value = string.Empty;
 
-		public string Value {
+	public string Value {
-			get => this.value;
+		get => this.value;
-			set {
+		set {
-				Change(ref this.value, value);
+			SetProperty(ref this.value, value);
-				ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
+			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
-			}
 		}
-
-		public IEnumerable GetErrors(string? propertyName) {
-			if (propertyName == nameof(Value) && !IsValid) {
-				yield return string.Empty;
-			}
-		}
-
-		public bool HasErrors => !IsValid;
-		public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
 	}
 
-	sealed class TextBoxItem<T> : TextBoxItem {
+	public IEnumerable GetErrors(string? propertyName) {
-		public new T Item { get; }
+		if (propertyName == nameof(Value) && !IsValid) {
-
+			yield return string.Empty;
-		public TextBoxItem(T item) {
-			this.Item = item;
-			base.Item = item;
 		}
 	}
+
+	public bool HasErrors => !IsValid;
+	public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
+}
+
+sealed class TextBoxItem<T> : TextBoxItem {
+	public new T Item { get; }
+
+	public TextBoxItem(T item) {
+		this.Item = item;
+		base.Item = item;
+	}
 }

app/Desktop/Discord/DiscordAppSettings.cs

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

app/Desktop/Discord/DiscordAppSettingsJsonContext.cs

@@ -0,0 +1,8 @@
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace DHT.Desktop.Discord;
+
+[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, WriteIndented = true)]
+[JsonSerializable(typeof(JsonObject))]
+sealed partial class DiscordAppSettingsJsonContext : JsonSerializerContext;

app/Desktop/Discord/SettingsJsonResult.cs

@@ -1,10 +1,10 @@
-namespace DHT.Desktop.Discord {
+namespace DHT.Desktop.Discord;
-	enum SettingsJsonResult {
+
-		Success,
+enum SettingsJsonResult {
-		AlreadySet,
+	Success,
-		FileNotFound,
+	AlreadySet,
-		ReadError,
+	FileNotFound,
-		InvalidJson,
+	ReadError,
-		WriteError
+	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 AboutWindow() {
-			InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
 
-		private void InitializeComponent() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			AvaloniaXamlLoader.Load(this);
+public sealed partial class AboutWindow : Window {
-		}
+	public AboutWindow() {
+		InitializeComponent();
 	}
 }

app/Desktop/Main/AboutWindowModel.cs

@@ -1,33 +1,33 @@
 using System.Diagnostics;
 
-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main;
-	sealed class AboutWindowModel {
-		public void ShowOfficialWebsite() {
-			OpenUrl("https://dht.chylex.com");
-		}
 
-		public void ShowSourceCode() {
+sealed class AboutWindowModel {
-			OpenUrl("https://github.com/chylex/Discord-History-Tracker");
+	public void ShowOfficialWebsite() {
-		}
+		OpenUrl("https://dht.chylex.com");
+	}
 
-		public void ShowLibraryAvalonia() {
+	public void ShowSourceCode() {
-			OpenUrl("https://www.nuget.org/packages/Avalonia");
+		OpenUrl("https://github.com/chylex/Discord-History-Tracker");
-		}
+	}
 
-		public void ShowLibrarySqlite() {
+	public void ShowLibraryAvalonia() {
-			OpenUrl("https://www.sqlite.org");
+		OpenUrl("https://www.nuget.org/packages/Avalonia");
-		}
+	}
 
-		public void ShowLibrarySqliteAdoNet() {
+	public void ShowLibrarySqlite() {
-			OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
+		OpenUrl("https://www.sqlite.org");
-		}
+	}
 
-		public void ShowLibraryNetCore() {
+	public void ShowLibrarySqliteAdoNet() {
-			OpenUrl("https://github.com/dotnet/core");
+		OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
-		}
+	}
 
-		private static void OpenUrl(string url) {
+	public void ShowLibraryNetCore() {
-			Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
+		OpenUrl("https://github.com/dotnet/core");
-		}
+	}
+
+	private static void OpenUrl(string url) {
+		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,34 +1,26 @@
 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 {
-		private CalendarDatePicker StartDatePicker => this.FindControl<CalendarDatePicker>("StartDatePicker");
-		private CalendarDatePicker EndDatePicker => this.FindControl<CalendarDatePicker>("EndDatePicker");
 
-		public MessageFilterPanel() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			InitializeComponent();
+public sealed partial class MessageFilterPanel : UserControl {
+	public MessageFilterPanel() {
+		InitializeComponent();
+
+		var culture = Program.Culture;
+		foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
+			picker.FirstDayOfWeek = culture.DateTimeFormat.FirstDayOfWeek;
+			picker.SelectedDateFormat = CalendarDatePickerFormat.Custom;
+			picker.CustomDateFormatString = culture.DateTimeFormat.ShortDatePattern;
+			picker.Watermark = culture.DateTimeFormat.ShortDatePattern;
 		}
+	}
 
-		private void InitializeComponent() {
+	public void CalendarDatePicker_OnSelectedDateChanged(object? sender, SelectionChangedEventArgs e) {
-			AvaloniaXamlLoader.Load(this);
+		if (DataContext is MessageFilterPanelModel model) {
-
+			model.StartDate = StartDatePicker.SelectedDate;
-			var culture = Program.Culture;
+			model.EndDate = EndDatePicker.SelectedDate;
-			foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
-				picker.FirstDayOfWeek = culture.DateTimeFormat.FirstDayOfWeek;
-				picker.SelectedDateFormat = CalendarDatePickerFormat.Custom;
-				picker.CustomDateFormatString = culture.DateTimeFormat.ShortDatePattern;
-				picker.Watermark = culture.DateTimeFormat.ShortDatePattern;
-			}
-		}
-
-		public void CalendarDatePicker_OnSelectedDateChanged(object? sender, SelectionChangedEventArgs e) {
-			if (DataContext is MessageFilterPanelModel model) {
-				model.StartDate = StartDatePicker.SelectedDate;
-				model.EndDate = EndDatePicker.SelectedDate;
-			}
 		}
 	}
 }

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -2,183 +2,196 @@ 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 () {
-			nameof(FilterByDate),
-			nameof(StartDate),
-			nameof(EndDate),
-			nameof(FilterByChannel),
-			nameof(IncludedChannels),
-			nameof(FilterByUser),
-			nameof(IncludedUsers)
-		};
 
-		public string FilterStatisticsText { get; private set; } = "";
+sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
+	private static readonly HashSet<string> FilterProperties = [
+		nameof(FilterByDate),
+		nameof(StartDate),
+		nameof(EndDate),
+		nameof(FilterByChannel),
+		nameof(IncludedChannels),
+		nameof(FilterByUser),
+		nameof(IncludedUsers)
+	];
 
-		public event PropertyChangedEventHandler? FilterPropertyChanged;
+	public string FilterStatisticsText { get; private set; } = "";
 
-		public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
+	public event PropertyChangedEventHandler? FilterPropertyChanged;
 
-		private bool filterByDate = false;
+	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
-		private DateTime? startDate = null;
-		private DateTime? endDate = null;
-		private bool filterByChannel = false;
-		private HashSet<ulong>? includedChannels = null;
-		private bool filterByUser = false;
-		private HashSet<ulong>? includedUsers = null;
 
-		public bool FilterByDate {
+	[ObservableProperty]
-			get => filterByDate;
+	private bool filterByDate = false;
-			set => Change(ref filterByDate, value);
-		}
 
-		public DateTime? StartDate {
+	[ObservableProperty]
-			get => startDate;
+	private DateTime? startDate = null;
-			set => Change(ref startDate, value);
-		}
 
-		public DateTime? EndDate {
+	[ObservableProperty]
-			get => endDate;
+	private DateTime? endDate = null;
-			set => Change(ref endDate, value);
-		}
 
-		public bool FilterByChannel {
+	[ObservableProperty]
-			get => filterByChannel;
+	private bool filterByChannel = false;
-			set => Change(ref filterByChannel, value);
-		}
 
-		public HashSet<ulong> IncludedChannels {
+	[ObservableProperty]
-			get => includedChannels ?? db.GetAllChannels().Select(static channel => channel.Id).ToHashSet();
+	private HashSet<ulong>? includedChannels = null;
-			set => Change(ref includedChannels, value);
-		}
 
-		public bool FilterByUser {
+	[ObservableProperty]
-			get => filterByUser;
+	private bool filterByUser = false;
-			set => Change(ref filterByUser, value);
-		}
 
-		public HashSet<ulong> IncludedUsers {
+	[ObservableProperty]
-			get => includedUsers ?? db.GetAllUsers().Select(static user => user.Id).ToHashSet();
+	private HashSet<ulong>? includedUsers = null;
-			set => Change(ref includedUsers, value);
-		}
 
-		private string channelFilterLabel = "";
+	[ObservableProperty]
+	private string channelFilterLabel = "";
 
-		public string ChannelFilterLabel {
+	[ObservableProperty]
-			get => channelFilterLabel;
+	private string userFilterLabel = "";
-			set => Change(ref channelFilterLabel, value);
-		}
 
-		private string userFilterLabel = "";
+	private readonly Window window;
+	private readonly State state;
+	private readonly string verb;
 
-		public string UserFilterLabel {
+	private readonly RestartableTask<long> exportedMessageCountTask;
-			get => userFilterLabel;
+	private long? exportedMessageCount;
-			set => Change(ref userFilterLabel, value);
+	
-		}
+	private readonly IDisposable messageCountSubscription;
+	private long? totalMessageCount;
+	
+	private readonly IDisposable channelCountSubscription;
+	private long? totalChannelCount;
+	
+	private readonly IDisposable userCountSubscription;
+	private long? totalUserCount;
 
-		private readonly Window window;
+	[Obsolete("Designer")]
-		private readonly IDatabaseFile db;
+	public MessageFilterPanelModel() : this(null!, State.Dummy) {}
-		private readonly string verb;
 
-		private readonly AsyncValueComputer<long> exportedMessageCountComputer;
+	public MessageFilterPanelModel(Window window, State state, string verb = "Matches") {
-		private long? exportedMessageCount;
+		this.window = window;
-		private long? totalMessageCount;
+		this.state = state;
+		this.verb = verb;
 
-		[Obsolete("Designer")]
+		this.exportedMessageCountTask = new RestartableTask<long>(SetExportedMessageCount, TaskScheduler.FromCurrentSynchronizationContext());
-		public MessageFilterPanelModel() : this(null!, DummyDatabaseFile.Instance) {}
+		
+		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);
 
-		public MessageFilterPanelModel(Window window, IDatabaseFile db, string verb = "Matches") {
+		UpdateFilterStatistics();
-			this.window = window;
+		UpdateChannelFilterLabel();
-			this.db = db;
+		UpdateUserFilterLabel();
-			this.verb = verb;
+		
-			
+		PropertyChanged += OnPropertyChanged;
-			this.exportedMessageCountComputer = AsyncValueComputer<long>.WithResultProcessor(SetExportedMessageCount).Build();
+	}
 
+	public void Dispose() {
+		exportedMessageCountTask.Cancel();
+		
+		messageCountSubscription.Dispose();
+		channelCountSubscription.Dispose();
+		userCountSubscription.Dispose();
+	}
+
+	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
 			UpdateFilterStatistics();
+			FilterPropertyChanged?.Invoke(sender, e);
+		}
+
+		if (e.PropertyName is nameof(FilterByChannel) or nameof(IncludedChannels)) {
 			UpdateChannelFilterLabel();
+		}
+		else if (e.PropertyName is nameof(FilterByUser) or nameof(IncludedUsers)) {
 			UpdateUserFilterLabel();
-
-			PropertyChanged += OnPropertyChanged;
-			db.Statistics.PropertyChanged += OnDbStatisticsChanged;
 		}
+	}
 
-		public void Dispose() {
+	private void OnMessageCountChanged(long newMessageCount) {
-			db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
+		totalMessageCount = newMessageCount;
+		UpdateFilterStatistics();
+	}
+
+	private void OnChannelCountChanged(long newChannelCount) {
+		totalChannelCount = newChannelCount;
+		UpdateChannelFilterLabel();
+	}
+	
+	private void OnUserCountChanged(long newUserCount) {
+		totalUserCount = newUserCount;
+		UpdateUserFilterLabel();
+	}
+
+	private void UpdateChannelFilterLabel() {
+		if (totalChannelCount.HasValue) {
+			long total = totalChannelCount.Value;
+			long included = FilterByChannel && IncludedChannels != null ? IncludedChannels.Count : total;
+			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
 		}
-
+		else {
-		private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+			ChannelFilterLabel = "Loading...";
-			if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
-				UpdateFilterStatistics();
-				FilterPropertyChanged?.Invoke(sender, e);
-			}
-
-			if (e.PropertyName is nameof(FilterByChannel) or nameof(IncludedChannels)) {
-				UpdateChannelFilterLabel();
-			}
-			else if (e.PropertyName is nameof(FilterByUser) or nameof(IncludedUsers)) {
-				UpdateUserFilterLabel();
-			}
 		}
+	}
 
-		private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+	private void UpdateUserFilterLabel() {
-			if (e.PropertyName == nameof(DatabaseStatistics.TotalMessages)) {
+		if (totalUserCount.HasValue) {
-				totalMessageCount = db.Statistics.TotalMessages;
+			long total = totalUserCount.Value;
-				UpdateFilterStatistics();
+			long included = FilterByUser && IncludedUsers != null ? IncludedUsers.Count : total;
-			}
+			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
-			else if (e.PropertyName == nameof(DatabaseStatistics.TotalChannels)) {
-				UpdateChannelFilterLabel();
-			}
-			else if (e.PropertyName == nameof(DatabaseStatistics.TotalUsers)) {
-				UpdateUserFilterLabel();
-			}
 		}
-
+		else {
-		private void UpdateFilterStatistics() {
+			UserFilterLabel = "Loading...";
-			var filter = CreateFilter();
-			if (filter.IsEmpty) {
-				exportedMessageCountComputer.Cancel();
-				exportedMessageCount = totalMessageCount;
-				UpdateFilterStatisticsText();
-			}
-			else {
-				exportedMessageCount = null;
-				UpdateFilterStatisticsText();
-				exportedMessageCountComputer.Compute(() => db.CountMessages(filter));
-			}
 		}
+	}
 
-		private void SetExportedMessageCount(long exportedMessageCount) {
+	private void UpdateFilterStatistics() {
-			this.exportedMessageCount = exportedMessageCount;
+		var filter = CreateFilter();
+		if (filter.IsEmpty) {
+			exportedMessageCountTask.Cancel();
+			exportedMessageCount = totalMessageCount;
 			UpdateFilterStatisticsText();
 		}
-		
+		else {
-		private void UpdateFilterStatisticsText() {
+			exportedMessageCount = null;
-			var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
+			UpdateFilterStatisticsText();
-			var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+			exportedMessageCountTask.Restart(cancellationToken => state.Db.Messages.Count(filter, cancellationToken));
-			
-			FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
-			OnPropertyChanged(nameof(FilterStatisticsText));
 		}
+	}
 
-		public async void OpenChannelFilterDialog() {
+	private void SetExportedMessageCount(long exportedMessageCount) {
-			var servers = db.GetAllServers().ToDictionary(static server => server.Id);
+		this.exportedMessageCount = exportedMessageCount;
+		UpdateFilterStatisticsText();
+	}
+
+	private void UpdateFilterStatisticsText() {
+		var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
+		var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+
+		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
+	}
+
+	public async Task OpenChannelFilterDialog() {
+		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
 			var items = new List<CheckBoxItem<ulong>>();
-			var 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,78 +221,91 @@ 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;
-			if (result != null) {
-				IncludedChannels = result;
-			}
 		}
 
-		public async void OpenUserFilterDialog() {
+		const string Title = "Included Channels";
-			var items = new List<CheckBoxItem<ulong>>();
-			var included = IncludedUsers;
 
-			foreach (var user in db.GetAllUsers()) {
+		List<CheckBoxItem<ulong>> items;
+		try {
+			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading channels...", PrepareChannelItems);
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, Title, "Error loading channels: " + e.Message);
+			return;
+		}
+
+		var result = await OpenIdFilterDialog(Title, items);
+		if (result != null) {
+			IncludedChannels = result;
+		}
+	}
+
+	public async Task OpenUserFilterDialog() {
+		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
+			var checkBoxItems = new List<CheckBoxItem<ulong>>();
+
+			await foreach (var user in state.Db.Users.Get()) {
 				var name = user.Name;
 				var discriminator = user.Discriminator;
 
-				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;
-			if (result != null) {
-				IncludedUsers = result;
-			}
 		}
 
-		private void UpdateChannelFilterLabel() {
+		const string Title = "Included Users";
-			long total = db.Statistics.TotalChannels;
+
-			long included = FilterByChannel ? IncludedChannels.Count : total;
+		List<CheckBoxItem<ulong>> items;
-			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+		try {
+			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, Title, "Error loading users: " + e.Message);
+			return;
 		}
 
-		private void UpdateUserFilterLabel() {
+		var result = await OpenIdFilterDialog(Title, items);
-			long total = db.Statistics.TotalUsers;
+		if (result != null) {
-			long included = FilterByUser ? IncludedUsers.Count : total;
+			IncludedUsers = result;
-			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
-		}
-
-		public MessageFilter CreateFilter() {
-			MessageFilter filter = new();
-
-			if (FilterByDate) {
-				filter.StartDate = StartDate;
-				filter.EndDate = EndDate?.AddDays(1).AddMilliseconds(-1);
-			}
-
-			if (FilterByChannel) {
-				filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
-			}
-
-			if (FilterByUser) {
-				filter.UserIds = new HashSet<ulong>(IncludedUsers);
-			}
-
-			return filter;
-		}
-
-		private static async Task<HashSet<ulong>?> OpenIdFilterDialog(Window window, string title, List<CheckBoxItem<ulong>> items) {
-			items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
-
-			var model = new CheckBoxDialogModel<ulong>(items) {
-				Title = title
-			};
-
-			var dialog = new CheckBoxDialog { DataContext = model };
-			var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
-
-			return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
 		}
 	}
+
+	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, List<CheckBoxItem<ulong>> items) {
+		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
+
+		var model = new CheckBoxDialogModel<ulong>(items) {
+			Title = title
+		};
+
+		var dialog = new CheckBoxDialog { DataContext = model };
+		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
+
+		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
+	}
+
+	public MessageFilter CreateFilter() {
+		MessageFilter filter = new ();
+
+		if (FilterByDate) {
+			filter.StartDate = StartDate;
+			filter.EndDate = EndDate?.AddDays(1).AddMilliseconds(-1);
+		}
+
+		if (FilterByChannel && IncludedChannels != null) {
+			filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
+		}
+
+		if (FilterByUser && IncludedUsers != null) {
+			filter.UserIds = new HashSet<ulong>(IncludedUsers);
+		}
+
+		return filter;
+	}
 }

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

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

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 ServerConfigurationPanel() {
-			InitializeComponent();
-		}
 
-		private void InitializeComponent() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			AvaloniaXamlLoader.Load(this);
+public sealed partial class ServerConfigurationPanel : UserControl {
-		}
+	public ServerConfigurationPanel() {
+		InitializeComponent();
 	}
 }

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -1,116 +1,118 @@
 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 {
-		private string inputPort;
 
-		public string InputPort {
+sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
-			get => inputPort;
+	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
-			set {
+	
-				Change(ref inputPort, value);
+	[ObservableProperty]
-				OnPropertyChanged(nameof(HasMadeChanges));
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
-			}
+	private string inputPort;
+
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
+	private string inputToken;
+
+	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
+
+	[ObservableProperty(Setter = Access.Private)]
+	private bool isToggleServerButtonEnabled = true;
+
+	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
+
+	private readonly Window window;
+	private readonly ServerManager server;
+
+	[Obsolete("Designer")]
+	public ServerConfigurationPanelModel() : this(null!, State.Dummy) {}
+
+	public ServerConfigurationPanelModel(Window window, State state) {
+		this.window = window;
+		this.server = state.Server;
+		this.inputPort = ServerConfiguration.Port.ToString();
+		this.inputToken = ServerConfiguration.Token;
+		
+		server.StatusChanged += OnServerStatusChanged;
+	}
+
+	public void Dispose() {
+		server.StatusChanged -= OnServerStatusChanged;
+	}
+
+	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
+		Dispatcher.UIThread.InvokeAsync(UpdateServerStatus);
+	}
+
+	private void UpdateServerStatus() {
+		OnPropertyChanged(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 string inputToken;
+	private async Task StopServer() {
-
+		IsToggleServerButtonEnabled = false;
-		public string InputToken {
+		
-			get => inputToken;
+		try {
-			set {
+			await server.Stop();
-				Change(ref inputToken, value);
+		} catch (Exception e) {
-				OnPropertyChanged(nameof(HasMadeChanges));
+			Log.Error(e);
-			}
+			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
 		}
+		
+		UpdateServerStatus();
+		IsToggleServerButtonEnabled = true;
+	}
 
-		public bool HasMadeChanges => ServerManager.Port.ToString() != InputPort || ServerManager.Token != InputToken;
+	public async Task OnClickToggleServerButton() {
-
+		if (server.IsRunning) {
-		private bool isToggleServerButtonEnabled = true;
+			await StopServer();
-
-		public bool IsToggleServerButtonEnabled {
-			get => isToggleServerButtonEnabled;
-			set => Change(ref isToggleServerButtonEnabled, value);
 		}
-
+		else {
-		public string ToggleServerButtonText => serverManager.IsRunning ? "Stop Server" : "Start Server";
+			await StartServer();
-
-		public event EventHandler<StatusBarModel.Status>? ServerStatusChanged;
-
-		private readonly Window window;
-		private readonly ServerManager serverManager;
-
-		[Obsolete("Designer")]
-		public ServerConfigurationPanelModel() : this(null!, new ServerManager(DummyDatabaseFile.Instance)) {}
-
-		public ServerConfigurationPanelModel(Window window, ServerManager serverManager) {
-			this.window = window;
-			this.serverManager = serverManager;
-			this.inputPort = ServerManager.Port.ToString();
-			this.inputToken = ServerManager.Token;
-		}
-
-		public void Initialize() {
-			ServerLauncher.ServerStatusChanged += ServerLauncherOnServerStatusChanged;
-		}
-
-		public void Dispose() {
-			ServerLauncher.ServerStatusChanged -= ServerLauncherOnServerStatusChanged;
-		}
-
-		private void ServerLauncherOnServerStatusChanged(object? sender, EventArgs e) {
-			ServerStatusChanged?.Invoke(this, serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped);
-			OnPropertyChanged(nameof(ToggleServerButtonText));
-			IsToggleServerButtonEnabled = true;
-		}
-
-		private void BeforeServerStart() {
-			IsToggleServerButtonEnabled = false;
-			ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Starting);
-		}
-
-		private void StartServer() {
-			BeforeServerStart();
-			serverManager.Launch();
-		}
-
-		private void StopServer() {
-			IsToggleServerButtonEnabled = false;
-			ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Stopping);
-			serverManager.Stop();
-		}
-
-		public void OnClickToggleServerButton() {
-			if (serverManager.IsRunning) {
-				StopServer();
-			}
-			else {
-				StartServer();
-			}
-		}
-
-		public void OnClickRandomizeToken() {
-			InputToken = ServerUtils.GenerateRandomToken(20);
-		}
-
-		public async void OnClickApplyChanges() {
-			if (!ushort.TryParse(InputPort, out ushort port)) {
-				await Dialog.ShowOk(window, "Invalid Port", "Port must be a number between 0 and 65535.");
-				return;
-			}
-
-			BeforeServerStart();
-			serverManager.Relaunch(port, InputToken);
-			OnPropertyChanged(nameof(HasMadeChanges));
-		}
-
-		public void OnClickCancelChanges() {
-			InputPort = ServerManager.Port.ToString();
-			InputToken = ServerManager.Token;
 		}
 	}
+
+	public void OnClickRandomizeToken() {
+		InputToken = ServerUtils.GenerateRandomToken(20);
+	}
+
+	public async Task OnClickApplyChanges() {
+		if (!ushort.TryParse(InputPort, out ushort port)) {
+			await Dialog.ShowOk(window, "Invalid Port", "Port must be a number between 0 and 65535.");
+			return;
+		}
+
+		ServerConfiguration.Port = port;
+		ServerConfiguration.Token = inputToken;
+		
+		OnPropertyChanged(nameof(HasMadeChanges));
+		
+		await StartServer();
+	}
+
+	public void OnClickCancelChanges() {
+		InputPort = ServerConfiguration.Port.ToString();
+		InputToken = ServerConfiguration.Token;
+	}
 }

app/Desktop/Main/Controls/StatusBar.axaml

@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.StatusBar">
+             x:Class="DHT.Desktop.Main.Controls.StatusBar"
+             x:DataType="controls:StatusBarModel">
 
     <Design.DataContext>
         <controls:StatusBarModel />
@@ -39,22 +40,22 @@
     <StackPanel Orientation="Horizontal" Margin="6 3">
         <StackPanel Orientation="Vertical" Width="65">
             <TextBlock Classes="label">Status</TextBlock>
-            <TextBlock FontSize="12" Margin="0 3 0 0" Text="{Binding StatusText}" />
+            <TextBlock FontSize="12" Margin="0 3 0 0" Text="{Binding ServerStatusText}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Servers</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalServers, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding ServerCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Channels</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalChannels, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding ChannelCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Messages</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalMessages, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding MessageCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
     </StackPanel>
 

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

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

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;
+	
+	[ObservableProperty(Setter = Access.Private)]
+	private long? channelCount;
+	
+	[ObservableProperty(Setter = Access.Private)]
+	private long? messageCount;
 
-		public Status CurrentStatus {
+	[ObservableProperty(Setter = Access.Private)]
-			get => status;
+	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
-			set {
+	private ServerManager.Status serverStatus;
-				status = value;
-				OnPropertyChanged(nameof(StatusText));
-			}
-		}
 
-		public string StatusText {
+	public string ServerStatusText => serverStatus switch {
-			get {
+		ServerManager.Status.Starting => "STARTING",
-				return CurrentStatus switch {
+		ServerManager.Status.Started  => "READY",
-					Status.Starting => "STARTING",
+		ServerManager.Status.Stopping => "STOPPING",
-					Status.Ready    => "READY",
+		ServerManager.Status.Stopped  => "STOPPED",
-					Status.Stopping => "STOPPING",
+		_                             => ""
-					Status.Stopped  => "STOPPED",
+	};
-					_               => ""
-				};
-			}
-		}
 
-		[Obsolete("Designer")]
+	private readonly State state;
-		public StatusBarModel() : this(new DatabaseStatistics()) {}
+	private readonly IDisposable serverCountSubscription;
+	private readonly IDisposable channelCountSubscription;
+	private readonly IDisposable messageCountSubscription;
 
-		public StatusBarModel(DatabaseStatistics databaseStatistics) {
+	[Obsolete("Designer")]
-			this.DatabaseStatistics = databaseStatistics;
+	public StatusBarModel() : this(State.Dummy) {}
-		}
 
-		public enum Status {
+	public StatusBarModel(State state) {
-			Starting,
+		this.state = state;
-			Ready,
+		
-			Stopping,
+		serverCountSubscription = state.Db.Servers.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newServerCount => ServerCount = newServerCount);
-			Stopped
+		channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newChannelCount => ChannelCount = newChannelCount);
-		}
+		messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newMessageCount => MessageCount = newMessageCount);
+
+		state.Server.StatusChanged += OnServerStatusChanged;
+		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
+	}
+
+	public void Dispose() {
+		serverCountSubscription.Dispose();
+		channelCountSubscription.Dispose();
+		messageCountSubscription.Dispose();
+		
+		state.Server.StatusChanged -= OnServerStatusChanged;
+	}
+
+	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
+		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
 	}
 }

app/Desktop/Main/MainWindow.axaml

@@ -5,12 +5,13 @@
         xmlns:main="clr-namespace:DHT.Desktop.Main"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="DHT.Desktop.Main.MainWindow"
+        x:DataType="main:MainWindowModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="800" Height="500"
+        Width="820" Height="520"
         MinWidth="520" MinHeight="300"
         WindowStartupLocation="CenterScreen"
-        Closed="OnClosed">
+        Closing="OnClosing">
 
     <Design.DataContext>
         <main:MainWindowModel />

app/Desktop/Main/MainWindow.axaml.cs

@@ -1,44 +1,54 @@
 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 {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-		[UsedImplicitly]
+public sealed partial class MainWindow : Window {
-		public MainWindow() {
+	private static readonly Log Log = Log.ForType<MainWindow>();
-			InitializeComponent(Arguments.Empty);
+	
+	[UsedImplicitly]
+	public MainWindow() {
+		InitializeComponent();
+		DataContext = new MainWindowModel(this, Arguments.Empty);
+	}
+
+	internal MainWindow(Arguments args) {
+		InitializeComponent();
+		DataContext = new MainWindowModel(this, args);
+	}
+
+	public async void OnClosing(object? sender, WindowClosingEventArgs e) {
+		e.Cancel = true;
+		Closing -= OnClosing;
+
+		try {
+			await Dispose();
+		} finally {
+			Close();
 		}
+	}
 
-		internal MainWindow(Arguments args) {
+	private async Task Dispose() {
-			InitializeComponent(args);
+		if (DataContext is MainWindowModel model) {
-		}
+			try {
-
+				await model.DisposeAsync();
-		private void InitializeComponent(Arguments args) {
+			} catch (Exception ex) {
-			AvaloniaXamlLoader.Load(this);
+				Log.Error("Caught exception while disposing window: " + ex);
-			DataContext = new MainWindowModel(this, args);
-
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		public void OnClosed(object? sender, EventArgs e) {
-			if (DataContext is IDisposable disposable) {
-				disposable.Dispose();
 			}
+		}
 
-			foreach (var temporaryFile in ViewerPageModel.TemporaryFiles) {
+		foreach (var temporaryFile in ViewerPageModel.TemporaryFiles) {
-				try {
+			try {
-					File.Delete(temporaryFile);
+				File.Delete(temporaryFile);
-				} catch (Exception) {
+			} catch (Exception) {
-					// ignored
+				// ignored
-				}
 			}
 		}
 	}

app/Desktop/Main/MainWindowModel.cs

@@ -1,116 +1,130 @@
 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 {
-		private const string DefaultTitle = "Discord History Tracker";
 
-		public string Title { get; private set; } = DefaultTitle;
+sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
+	private const string DefaultTitle = "Discord History Tracker";
 
-		public UserControl CurrentScreen { get; private set; }
+	private static readonly Log Log = Log.ForType<MainWindowModel>();
-		
-		private readonly WelcomeScreen welcomeScreen;
-		private readonly WelcomeScreenModel welcomeScreenModel;
 
-		private MainContentScreen? mainContentScreen;
+	[ObservableProperty(Setter = Access.Private)]
-		private MainContentScreenModel? mainContentScreenModel;
+	private string title = DefaultTitle;
 
-		private readonly Window window;
+	[ObservableProperty(Setter = Access.Private)]
+	private UserControl currentScreen;
 
-		private IDatabaseFile? db;
+	private readonly WelcomeScreen welcomeScreen;
+	private readonly WelcomeScreenModel welcomeScreenModel;
 
-		[Obsolete("Designer")]
+	private MainContentScreenModel? mainContentScreenModel;
-		public MainWindowModel() : this(null!, Arguments.Empty) {}
 
-		public MainWindowModel(Window window, Arguments args) {
+	private readonly Window window;
-			this.window = window;
+	private readonly int? concurrentDownloads;
 
-			welcomeScreenModel = new WelcomeScreenModel(window);
+	private State? state;
-			welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
-			CurrentScreen = welcomeScreen;
 
-			welcomeScreenModel.PropertyChanged += WelcomeScreenModelOnPropertyChanged;
+	[Obsolete("Designer")]
+	public MainWindowModel() : this(null!, Arguments.Empty) {}
 
-			var dbFile = args.DatabaseFile;
+	public MainWindowModel(Window window, Arguments args) {
-			if (!string.IsNullOrWhiteSpace(dbFile)) {
+		this.window = window;
-				async void OnWindowOpened(object? o, EventArgs eventArgs) {
-					window.Opened -= OnWindowOpened;
 
-					// https://github.com/AvaloniaUI/Avalonia/issues/3071
+		welcomeScreenModel = new WelcomeScreenModel(window);
-					if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
-						await Task.Delay(500);
-					}
 
-					if (File.Exists(dbFile)) {
+		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
-						await welcomeScreenModel.OpenOrCreateDatabaseFromPath(dbFile);
+		currentScreen = welcomeScreen;
-					}
+
-					else {
+		var dbFile = args.DatabaseFile;
-						await Dialog.ShowOk(window, "Database Error", "Database file not found:\n" + dbFile);
+		if (!string.IsNullOrWhiteSpace(dbFile)) {
-					}
+			async void OnWindowOpened(object? o, EventArgs eventArgs) {
+				window.Opened -= OnWindowOpened;
+
+				// https://github.com/AvaloniaUI/Avalonia/issues/3071
+				if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+					await Task.Delay(500);
 				}
 
-				window.Opened += OnWindowOpened;
+				if (File.Exists(dbFile)) {
-			}
+					await welcomeScreenModel.OpenOrCreateDatabaseFromPath(dbFile);
-
-			if (args.ServerPort != null) {
-				ServerManager.Port = args.ServerPort.Value;
-			}
-
-			if (args.ServerToken != null) {
-				ServerManager.Token = args.ServerToken;
-			}
-		}
-
-		private async void WelcomeScreenModelOnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-			if (e.PropertyName == nameof(welcomeScreenModel.Db)) {
-				if (mainContentScreenModel != null) {
-					mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
-					mainContentScreenModel.Dispose();
-				}
-
-				db?.Dispose();
-				db = welcomeScreenModel.Db;
-
-				if (db == null) {
-					Title = DefaultTitle;
-					mainContentScreenModel = null;
-					mainContentScreen = null;
-					CurrentScreen = welcomeScreen;
 				}
 				else {
-					Title = Path.GetFileName(db.Path) + " - " + DefaultTitle;
+					await Dialog.ShowOk(window, "Database Error", "Database file not found:\n" + dbFile);
-					mainContentScreenModel = new MainContentScreenModel(window, db);
-					await mainContentScreenModel.Initialize();
-					mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-					mainContentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
-					CurrentScreen = mainContentScreen;
 				}
-
-				OnPropertyChanged(nameof(CurrentScreen));
-				OnPropertyChanged(nameof(Title));
-
-				window.Focus();
 			}
+
+			window.Opened += OnWindowOpened;
 		}
 
-		private void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
+		if (args.ServerPort != null) {
-			welcomeScreenModel.CloseDatabase();
+			ServerConfiguration.Port = args.ServerPort.Value;
 		}
 
-		public void Dispose() {
+		if (args.ServerToken != null) {
-			welcomeScreenModel.Dispose();
+			ServerConfiguration.Token = args.ServerToken;
-			mainContentScreenModel?.Dispose();
+		}
-			db?.Dispose();
+		
-			db = null;
+		concurrentDownloads = args.ConcurrentDownloads;
+	}
+
+	private async void OnDatabaseSelected(object? sender, IDatabaseFile db) {
+		welcomeScreenModel.DatabaseSelected -= OnDatabaseSelected;
+		
+		await DisposeState();
+		
+		state = new State(db, concurrentDownloads);
+
+		try {
+			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
+		} catch (Exception ex) {
+			Log.Error(ex);
+			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
+		}
+
+		mainContentScreenModel = new MainContentScreenModel(window, state);
+		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
+		
+		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
+		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
+
+		window.Focus();
+	}
+
+	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
+		if (mainContentScreenModel != null) {
+			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
+			mainContentScreenModel.Dispose();
+			mainContentScreenModel = null;
+		}
+
+		await DisposeState();
+
+		Title = DefaultTitle;
+		CurrentScreen = welcomeScreen;
+
+		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
+	}
+
+	private async Task DisposeState() {
+		if (state != null) {
+			await state.DisposeAsync();
+			state = null;
 		}
 	}
+
+	public async ValueTask DisposeAsync() {
+		mainContentScreenModel?.Dispose();
+		await DisposeState();
+	}
 }

app/Desktop/Main/Pages/AdvancedPage.axaml

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

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

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

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 {
-		public ServerConfigurationPanelModel ServerConfigurationModel { get; }
 
-		private readonly Window window;
+sealed class AdvancedPageModel : IDisposable {
-		private readonly IDatabaseFile db;
+	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
+	
+	private readonly Window window;
+	private readonly State state;
 
-		[Obsolete("Designer")]
+	[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.window = window;
-			this.db = db;
+		this.state = state;
 
-			ServerConfigurationModel = new ServerConfigurationPanelModel(window, serverManager);
+		ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
-		}
+	}
 
-		public void Initialize() {
+	public void Dispose() {
-			ServerConfigurationModel.Initialize();
+		ServerConfigurationModel.Dispose();
-		}
+	}
 
-		public void Dispose() {
+	public async Task VacuumDatabase() {
-			ServerConfigurationModel.Dispose();
+		const string Title = "Vacuum Database";
-		}
+		await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => state.Db.Vacuum());
-
+		await Dialog.ShowOk(window, Title, "Done.");
-		public async void VacuumDatabase() {
-			db.Vacuum();
-			await Dialog.ShowOk(window, "Vacuum Database", "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 DatabasePage() {
-			InitializeComponent();
-		}
 
-		private void InitializeComponent() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			AvaloniaXamlLoader.Load(this);
+public sealed partial class DatabasePage : UserControl {
-		}
+	public DatabasePage() {
+		InitializeComponent();
 	}
 }

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -7,242 +7,260 @@ 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 {
-		private static readonly Log Log = Log.ForType<DatabasePageModel>();
 
-		public IDatabaseFile Db { get; }
+sealed class DatabasePageModel {
+	private static readonly Log Log = Log.ForType<DatabasePageModel>();
 
-		public event EventHandler? DatabaseClosed;
+	public IDatabaseFile Db { get; }
 
-		private readonly Window window;
+	public event EventHandler? DatabaseClosed;
 
-		[Obsolete("Designer")]
+	private readonly Window window;
-		public DatabasePageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-		public DatabasePageModel(Window window, IDatabaseFile db) {
+	[Obsolete("Designer")]
-			this.window = window;
+	public DatabasePageModel() : this(null!, State.Dummy) {}
-			this.Db = db;
+
+	public DatabasePageModel(Window window, State state) {
+		this.window = window;
+		this.Db = state.Db;
+	}
+
+	public async Task OpenDatabaseFolder() {
+		string file = Db.Path;
+		string? folder = Path.GetDirectoryName(file);
+
+		if (folder == null) {
+			return;
 		}
 
-		public async void OpenDatabaseFolder() {
+		switch (Environment.OSVersion.Platform) {
-			string file = Db.Path;
+			case PlatformID.Win32NT:
-			string? folder = Path.GetDirectoryName(file);
+				Process.Start("explorer.exe", "/select,\"" + file + "\"");
+				break;
 
-			if (folder == null) {
+			case PlatformID.Unix:
-				return;
+				Process.Start("xdg-open", new string[] { folder });
-			}
+				break;
 
-			switch (Environment.OSVersion.Platform) {
+			case PlatformID.MacOSX:
-				case PlatformID.Win32NT:
+				Process.Start("open", new string[] { folder });
-					Process.Start("explorer.exe", "/select,\"" + file + "\"");
+				break;
-					break;
 
-				case PlatformID.Unix:
+			default:
-					Process.Start("xdg-open", new string[] { folder });
+				await Dialog.ShowOk(window, "Feature Not Supported", "This feature is not supported for your operating system.");
-					break;
+				break;
-
-				case PlatformID.MacOSX:
-					Process.Start("open", new string[] { folder });
-					break;
-
-				default:
-					await Dialog.ShowOk(window, "Feature Not Supported", "This feature is not supported for your operating system.");
-					break;
-			}
-		}
-
-		public void CloseDatabase() {
-			DatabaseClosed?.Invoke(this, EventArgs.Empty);
-		}
-
-		public async void MergeWithDatabase() {
-			var fileDialog = DatabaseGui.NewOpenDatabaseFileDialog();
-			fileDialog.Directory = Path.GetDirectoryName(Db.Path);
-			fileDialog.AllowMultiple = true;
-
-			string[]? paths = await fileDialog.ShowAsync(window);
-			if (paths == null || paths.Length == 0) {
-				return;
-			}
-
-			ProgressDialog progressDialog = new ProgressDialog();
-			progressDialog.DataContext = new ProgressDialogModel(async callback => await MergeWithDatabaseFromPaths(Db, paths, progressDialog, callback)) {
-				Title = "Database Merge"
-			};
-
-			await progressDialog.ShowDialog(window);
-		}
-
-		private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-			int total = paths.Length;
-
-			DialogResult.YesNo? upgradeResult = null;
-
-			async Task<bool> CheckCanUpgradeDatabase() {
-				upgradeResult ??= total > 1
-					                  ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
-					                  : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog);
-
-				return DialogResult.YesNo.Yes == upgradeResult;
-			}
-
-			await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
-				SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
-				SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
-				IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, CheckCanUpgradeDatabase);
-				SynchronizationContext.SetSynchronizationContext(prevSyncContext);
-
-				if (db == null) {
-					return false;
-				}
-
-				try {
-					target.AddFrom(db);
-					return true;
-				} finally {
-					db.Dispose();
-				}
-			});
-		}
-
-		public async void ImportLegacyArchive() {
-			var fileDialog = new OpenFileDialog {
-				Title = "Open Legacy DHT Archive",
-				Directory = Path.GetDirectoryName(Db.Path),
-				AllowMultiple = true
-			};
-
-			string[]? paths = await fileDialog.ShowAsync(window);
-			if (paths == null || paths.Length == 0) {
-				return;
-			}
-
-			ProgressDialog progressDialog = new ProgressDialog();
-			progressDialog.DataContext = new ProgressDialogModel(async callback => await ImportLegacyArchiveFromPaths(Db, paths, progressDialog, callback)) {
-				Title = "Legacy Archive Import"
-			};
-
-			await progressDialog.ShowDialog(window);
-		}
-
-		private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-			var fakeSnowflake = new FakeSnowflake();
-
-			await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
-				await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
-				
-				return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
-					SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
-					SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
-					Dictionary<DHT.Server.Data.Server, ulong>? result = await Dispatcher.UIThread.InvokeAsync(() => AskForServerIds(dialog, servers));
-					SynchronizationContext.SetSynchronizationContext(prevSyncContext);
-					return result;
-				});
-			});
-		}
-
-		private static async Task<Dictionary<DHT.Server.Data.Server, ulong>?> AskForServerIds(Window window, DHT.Server.Data.Server[] servers) {
-			static bool IsValidSnowflake(string value) {
-				return string.IsNullOrEmpty(value) || ulong.TryParse(value, out _);
-			}
-			
-			var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
-
-			foreach (var server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
-				items.Add(new TextBoxItem<DHT.Server.Data.Server>(server) {
-					Title = server.Name + " (" + ServerTypes.ToNiceString(server.Type) + ")",
-					ValidityCheck = IsValidSnowflake
-				});
-			}
-
-			var model = new TextBoxDialogModel<DHT.Server.Data.Server>(items) {
-				Title = "Imported Server IDs",
-				Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID."
-			};
-
-			var dialog = new TextBoxDialog { DataContext = model };
-			var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
-
-			if (result != DialogResult.OkCancel.Ok) {
-				return null;
-			}
-
-			return model.ValidItems
-			            .Where(static item => !string.IsNullOrEmpty(item.Value))
-			            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
-		}
-
-		private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
-			int total = paths.Length;
-			var oldStatistics = target.SnapshotStatistics();
-
-			int successful = 0;
-			int finished = 0;
-
-			foreach (string path in paths) {
-				await callback.Update(Path.GetFileName(path), finished, total);
-				++finished;
-
-				if (!File.Exists(path)) {
-					await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
-					continue;
-				}
-
-				try {
-					if (await performImport(path)) {
-						++successful;
-					}
-				} catch (Exception ex) {
-					Log.Error(ex);
-					await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
-				}
-			}
-
-			await callback.Update("Done", finished, total);
-
-			if (successful == 0) {
-				await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
-				return;
-			}
-
-			await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, target.SnapshotStatistics(), successful, total, itemName));
-		}
-
-		private static string GetImportDialogMessage(DatabaseStatisticsSnapshot oldStatistics, DatabaseStatisticsSnapshot newStatistics, int successfulItems, int totalItems, string itemName) {
-			long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
-			long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
-			long newUsers = newStatistics.TotalUsers - oldStatistics.TotalUsers;
-			long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
-
-			StringBuilder message = new StringBuilder();
-			message.Append("Processed ");
-
-			if (successfulItems == totalItems) {
-				message.Append(successfulItems.Pluralize(itemName));
-			}
-			else {
-				message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
-			}
-
-			message.Append(" and added:\n\n  \u2022 ");
-			message.Append(newServers.Pluralize("server")).Append("\n  \u2022 ");
-			message.Append(newChannels.Pluralize("channel")).Append("\n  \u2022 ");
-			message.Append(newUsers.Pluralize("user")).Append("\n  \u2022 ");
-			message.Append(newMessages.Pluralize("message"));
-
-			return message.ToString();
 		}
 	}
+
+	public void CloseDatabase() {
+		DatabaseClosed?.Invoke(this, EventArgs.Empty);
+	}
+
+	public async Task MergeWithDatabase() {
+		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		if (paths.Length > 0) {
+			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
+		}
+	}
+
+	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
+
+		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
+			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
+
+			if (db == null) {
+				return false;
+			}
+
+			try {
+				await target.AddFrom(db);
+				return true;
+			} finally {
+				await db.DisposeAsync();
+			}
+		});
+	}
+
+	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
+		private readonly ProgressDialog dialog;
+		private readonly int total;
+		private bool? decision;
+
+		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
+			this.total = total;
+			this.dialog = dialog;
+		}
+
+		public async Task<bool> CanUpgrade() {
+			return decision ??= (total > 1
+				                     ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
+				                     : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog)) == DialogResult.YesNo.Yes;
+		}
+
+		public Task Start(int versionSteps, Func<ISchemaUpgradeCallbacks.IProgressReporter, Task> doUpgrade) {
+			return doUpgrade(new NullReporter());
+		}
+
+		private sealed class NullReporter : ISchemaUpgradeCallbacks.IProgressReporter {
+			public Task NextVersion() {
+				return Task.CompletedTask;
+			}
+
+			public Task MainWork(string message, int finishedItems, int totalItems) {
+				return Task.CompletedTask;
+			}
+
+			public Task SubWork(string message, int finishedItems, int totalItems) {
+				return Task.CompletedTask;
+			}
+		}
+	}
+
+	public async Task ImportLegacyArchive() {
+		var paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+			Title = "Open Legacy DHT Archive",
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
+			AllowMultiple = true
+		});
+
+		if (paths.Length > 0) {
+			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
+		}
+	}
+
+	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+		var fakeSnowflake = new FakeSnowflake();
+
+		await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
+			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
+
+			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
+				SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
+				SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
+				Dictionary<DHT.Server.Data.Server, ulong>? result = await Dispatcher.UIThread.InvokeAsync(() => AskForServerIds(dialog, servers));
+				SynchronizationContext.SetSynchronizationContext(prevSyncContext);
+				return result;
+			});
+		});
+	}
+
+	private static async Task<Dictionary<DHT.Server.Data.Server, ulong>?> AskForServerIds(Window window, DHT.Server.Data.Server[] servers) {
+		static bool IsValidSnowflake(string value) {
+			return string.IsNullOrEmpty(value) || ulong.TryParse(value, out _);
+		}
+
+		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
+
+		foreach (var server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
+			items.Add(new TextBoxItem<DHT.Server.Data.Server>(server) {
+				Title = server.Name + " (" + ServerTypes.ToNiceString(server.Type) + ")",
+				ValidityCheck = IsValidSnowflake
+			});
+		}
+
+		var model = new TextBoxDialogModel<DHT.Server.Data.Server>(items) {
+			Title = "Imported Server IDs",
+			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID."
+		};
+
+		var dialog = new TextBoxDialog { DataContext = model };
+		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
+
+		if (result != DialogResult.OkCancel.Ok) {
+			return null;
+		}
+
+		return model.ValidItems
+		            .Where(static item => !string.IsNullOrEmpty(item.Value))
+		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
+	}
+
+	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
+		int total = paths.Length;
+		var oldStatistics = await DatabaseStatistics.Take(target);
+
+		int successful = 0;
+		int finished = 0;
+
+		foreach (string path in paths) {
+			await callback.Update(Path.GetFileName(path), finished, total);
+			++finished;
+
+			if (!File.Exists(path)) {
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
+				continue;
+			}
+
+			try {
+				if (await performImport(path)) {
+					++successful;
+				}
+			} catch (Exception ex) {
+				Log.Error(ex);
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
+			}
+		}
+
+		await callback.Update("Done", finished, total);
+
+		if (successful == 0) {
+			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
+			return;
+		}
+
+		var newStatistics = await DatabaseStatistics.Take(target);
+		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
+	}
+
+	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
+		public static async Task<DatabaseStatistics> Take(IDatabaseFile db) {
+			return new DatabaseStatistics(
+				await db.Servers.Count(),
+				await db.Channels.Count(),
+				await db.Users.Count(),
+				await db.Messages.Count()
+			);
+		}
+	}
+
+	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
+		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
+		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
+		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
+		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
+
+		StringBuilder message = new StringBuilder();
+		message.Append("Processed ");
+
+		if (successfulItems == totalItems) {
+			message.Append(successfulItems.Pluralize(itemName));
+		}
+		else {
+			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
+		}
+
+		message.Append(" and added:\n\n  \u2022 ");
+		message.Append(newServers.Pluralize("server")).Append("\n  \u2022 ");
+		message.Append(newChannels.Pluralize("channel")).Append("\n  \u2022 ");
+		message.Append(newUsers.Pluralize("user")).Append("\n  \u2022 ");
+		message.Append(newMessages.Pluralize("message"));
+
+		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 DebugPage() {
-			InitializeComponent();
-		}
 
-		private void InitializeComponent() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			AvaloniaXamlLoader.Load(this);
+public sealed partial class DebugPage : UserControl {
-		}
+	public DebugPage() {
+		InitializeComponent();
 	}
 }

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -6,180 +6,168 @@ 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 {
+namespace DHT.Desktop.Main.Pages;
-	sealed class DebugPageModel : BaseModel {
-		public string GenerateChannels { get; set; } = "0";
-		public string GenerateUsers { get; set; } = "0";
-		public string GenerateMessages { get; set; } = "0";
 
-		private readonly Window window;
+sealed class DebugPageModel {
-		private readonly IDatabaseFile db;
+	public string GenerateChannels { get; set; } = "0";
+	public string GenerateUsers { get; set; } = "0";
+	public string GenerateMessages { get; set; } = "0";
 
-		[Obsolete("Designer")]
+	private readonly Window window;
-		public DebugPageModel() : this(null!, DummyDatabaseFile.Instance) {}
+	private readonly State state;
 
-		public DebugPageModel(Window window, IDatabaseFile db) {
+	[Obsolete("Designer")]
-			this.window = window;
+	public DebugPageModel() : this(null!, State.Dummy) {}
-			this.db = db;
+
+	public DebugPageModel(Window window, State state) {
+		this.window = window;
+		this.state = state;
+	}
+
+	public async void OnClickAddRandomDataToDatabase() {
+		if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
+			await Dialog.ShowOk(window, "Generate Random Data", "Amount of channels must be at least 1!");
+			return;
 		}
 
-		public async void OnClickAddRandomDataToDatabase() {
+		if (!int.TryParse(GenerateUsers, out int users) || users < 1) {
-			if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
+			await Dialog.ShowOk(window, "Generate Random Data", "Amount of users must be at least 1!");
-				await Dialog.ShowOk(window, "Generate Random Data", "Amount of channels must be at least 1!");
+			return;
-				return;
-			}
-
-			if (!int.TryParse(GenerateUsers, out int users) || users < 1) {
-				await Dialog.ShowOk(window, "Generate Random Data", "Amount of users must be at least 1!");
-				return;
-			}
-
-			if (!int.TryParse(GenerateMessages, out int messages) || messages < 1) {
-				await Dialog.ShowOk(window, "Generate Random Data", "Amount of messages must be at least 1!");
-				return;
-			}
-
-			ProgressDialog progressDialog = new ProgressDialog {
-				DataContext = new ProgressDialogModel(async callback => await GenerateRandomData(channels, users, messages, callback)) {
-					Title = "Generating Random Data"
-				}
-			};
-
-			await progressDialog.ShowDialog(window);
-		}
-		
-		private const int BatchSize = 500;
-		
-		private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
-			int batchCount = (messageCount + BatchSize - 1) / BatchSize;
-			await callback.Update("Adding messages in batches of " + BatchSize, 0, batchCount);
-
-			var rand = new Random();
-			var server = new DHT.Server.Data.Server {
-				Id = RandomId(rand),
-				Name = RandomName("s"),
-				Type = ServerType.Server
-			};
-
-			var channels = Enumerable.Range(0, channelCount).Select(i => new Channel {
-				Id = RandomId(rand),
-				Server = server.Id,
-				Name = RandomName("c"),
-				ParentId = null,
-				Position = i,
-				Topic = RandomText(rand, 10),
-				Nsfw = rand.Next(4) == 0
-			}).ToArray();
-			
-			var users = Enumerable.Range(0, userCount).Select(_ => new User {
-				Id = RandomId(rand),
-				Name = RandomName("u"),
-				AvatarUrl = null,
-				Discriminator = rand.Next(0, 9999).ToString()
-			}).ToArray();
-			
-			db.AddServer(server);
-			db.AddUsers(users);
-			
-			foreach (var channel in channels) {
-				db.AddChannel(channel);
-			}
-			
-			var now = DateTimeOffset.Now;
-			int batchIndex = 0;
-			
-			while (messageCount > 0) {
-				int hourOffset = batchIndex;
-				
-				var messages = Enumerable.Range(0, Math.Min(messageCount, BatchSize)).Select(i => {
-					DateTimeOffset time = now.AddHours(hourOffset).AddMinutes((i * 60.0) / BatchSize);
-					DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(1, 60)) : null;
-
-					var timeMillis = time.ToUnixTimeMilliseconds();
-					var editMillis = edit?.ToUnixTimeMilliseconds();
-					
-					return new Message {
-						Id = (ulong) timeMillis,
-						Sender = RandomBiasedIndex(rand, users).Id,
-						Channel = RandomBiasedIndex(rand, channels).Id,
-						Text = RandomText(rand, 100),
-						Timestamp = timeMillis,
-						EditTimestamp = editMillis,
-						RepliedToId = null,
-						Attachments = ImmutableArray<Attachment>.Empty,
-						Embeds = ImmutableArray<Embed>.Empty,
-						Reactions = ImmutableArray<Reaction>.Empty
-					};
-				}).ToArray();
-				
-				db.AddMessages(messages);
-				
-				messageCount -= BatchSize;
-				await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
-			}
 		}
 
-		private static ulong RandomId(Random rand) {
+		if (!int.TryParse(GenerateMessages, out int messages) || messages < 1) {
-			ulong h = unchecked((ulong) rand.Next());
+			await Dialog.ShowOk(window, "Generate Random Data", "Amount of messages must be at least 1!");
-			ulong l = unchecked((ulong) rand.Next());
+			return;
-			return (h << 32) | l;
 		}
 
-		private static string RandomName(string prefix) {
+		await ProgressDialog.Show(window, "Generating Random Data", async (_, callback) => await GenerateRandomData(channels, users, messages, callback));
-			return prefix + "-" + ServerUtils.GenerateRandomToken(5);
+	}
-		}
 
-		private static T RandomBiasedIndex<T>(Random rand, T[] options) {
+	private const int BatchSize = 500;
-			return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
-		}
 
-		private static readonly string[] RandomWords = {
+	private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
-			"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
+		int batchCount = (messageCount + BatchSize - 1) / BatchSize;
-			"banana", "bean", "beechnut", "beet", "blackberry", "blackcurrant", "blueberry", "boysenberry", "bramble", "broccoli",
+		await callback.Update("Adding messages in batches of " + BatchSize, 0, batchCount);
-			"cabbage", "cacao", "cantaloupe", "caper", "carambola", "carrot", "cauliflower", "celery", "chard", "cherry", "chokeberry", "citron", "clementine", "coconut", "corn", "crabapple", "cranberry", "cucumber", "currant",
+
-			"daikon", "date", "dewberry", "durian",
+		var rand = new Random();
-			"edamame", "eggplant", "elderberry", "endive",
+		var server = new DHT.Server.Data.Server {
-			"fig",
+			Id = RandomId(rand),
-			"garlic", "ginger", "gooseberry", "grape", "grapefruit", "guava",
+			Name = RandomName("s"),
-			"honeysuckle", "horseradish", "huckleberry",
+			Type = ServerType.Server,
-			"jackfruit", "jicama",
-			"kale", "kiwi", "kohlrabi", "kumquat",
-			"leek", "lemon", "lentil", "lettuce", "lime",
-			"mandarin", "mango", "mushroom", "myrtle",
-			"nectarine", "nut",
-			"olive", "okra", "onion", "orange",
-			"papaya", "parsnip", "pawpaw", "peach", "pear", "pea", "pepper", "persimmon", "pineapple", "plum", "plantain", "pomegranate", "pomelo", "potato", "prune", "pumpkin",
-			"quandong", "quinoa",
-			"radicchio", "radish", "raisin", "raspberry", "redcurrant", "rhubarb", "rutabaga",
-			"spinach", "strawberry", "squash",
-			"tamarind", "tangerine", "tomatillo", "tomato", "turnip",
-			"vanilla",
-			"watercress", "watermelon",
-			"yam",
-			"zucchini"
 		};
-		
+
-		private static string RandomText(Random rand, int maxWords) {
+		var channels = Enumerable.Range(0, channelCount).Select(i => new Channel {
-			int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), 3));
+			Id = RandomId(rand),
-			return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
+			Server = server.Id,
+			Name = RandomName("c"),
+			ParentId = null,
+			Position = i,
+			Topic = RandomText(rand, 10),
+			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(),
+		}).ToArray();
+
+		await state.Db.Users.Add(users);
+		await state.Db.Servers.Add([server]);
+		await state.Db.Channels.Add(channels);
+
+		var now = DateTimeOffset.Now;
+		int batchIndex = 0;
+
+		while (messageCount > 0) {
+			int hourOffset = batchIndex;
+
+			var messages = Enumerable.Range(0, Math.Min(messageCount, BatchSize)).Select(i => {
+				DateTimeOffset time = now.AddHours(hourOffset).AddMinutes(i * 60.0 / BatchSize);
+				DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(1, 60)) : null;
+
+				var timeMillis = time.ToUnixTimeMilliseconds();
+				var editMillis = edit?.ToUnixTimeMilliseconds();
+
+				return new Message {
+					Id = (ulong) timeMillis,
+					Sender = RandomBiasedIndex(rand, users).Id,
+					Channel = RandomBiasedIndex(rand, channels).Id,
+					Text = RandomText(rand, 100),
+					Timestamp = timeMillis,
+					EditTimestamp = editMillis,
+					RepliedToId = null,
+					Attachments = ImmutableList<Attachment>.Empty,
+					Embeds = ImmutableList<Embed>.Empty,
+					Reactions = ImmutableList<Reaction>.Empty,
+				};
+			}).ToArray();
+
+			await state.Db.Messages.Add(messages);
+
+			messageCount -= BatchSize;
+			await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
 		}
 	}
+
+	private static ulong RandomId(Random rand) {
+		ulong h = unchecked((ulong) rand.Next());
+		ulong l = unchecked((ulong) rand.Next());
+		return (h << 32) | l;
+	}
+
+	private static string RandomName(string prefix) {
+		return prefix + "-" + ServerUtils.GenerateRandomToken(5);
+	}
+
+	private static T RandomBiasedIndex<T>(Random rand, T[] options) {
+		return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
+	}
+
+	private static readonly string[] RandomWords = [
+		"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
+		"banana", "bean", "beechnut", "beet", "blackberry", "blackcurrant", "blueberry", "boysenberry", "bramble", "broccoli",
+		"cabbage", "cacao", "cantaloupe", "caper", "carambola", "carrot", "cauliflower", "celery", "chard", "cherry", "chokeberry", "citron", "clementine", "coconut", "corn", "crabapple", "cranberry", "cucumber", "currant",
+		"daikon", "date", "dewberry", "durian",
+		"edamame", "eggplant", "elderberry", "endive",
+		"fig",
+		"garlic", "ginger", "gooseberry", "grape", "grapefruit", "guava",
+		"honeysuckle", "horseradish", "huckleberry",
+		"jackfruit", "jicama",
+		"kale", "kiwi", "kohlrabi", "kumquat",
+		"leek", "lemon", "lentil", "lettuce", "lime",
+		"mandarin", "mango", "mushroom", "myrtle",
+		"nectarine", "nut",
+		"olive", "okra", "onion", "orange",
+		"papaya", "parsnip", "pawpaw", "peach", "pear", "pea", "pepper", "persimmon", "pineapple", "plum", "plantain", "pomegranate", "pomelo", "potato", "prune", "pumpkin",
+		"quandong", "quinoa",
+		"radicchio", "radish", "raisin", "raspberry", "redcurrant", "rhubarb", "rutabaga",
+		"spinach", "strawberry", "squash",
+		"tamarind", "tangerine", "tomatillo", "tomato", "turnip",
+		"vanilla",
+		"watercress", "watermelon",
+		"yam",
+		"zucchini"
+	];
+
+	private static string RandomText(Random rand, int maxWords) {
+		int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), 3));
+		return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
+	}
 }
 #else
-using DHT.Utils.Models;
+namespace DHT.Desktop.Main.Pages;
 
-namespace DHT.Desktop.Main.Pages {
+sealed class DebugPageModel {
-	sealed class DebugPageModel : BaseModel {
+	public string GenerateChannels { get; set; } = "0";
-		public string GenerateChannels { get; set; } = "0";
+	public string GenerateUsers { get; set; } = "0";
-		public string GenerateUsers { get; set; } = "0";
+	public string GenerateMessages { get; set; } = "0";
-		public string GenerateMessages { get; set; } = "0";
 
-		public void OnClickAddRandomDataToDatabase() {}
+	public void OnClickAddRandomDataToDatabase() {}
-	}
 }
 #endif

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,35 +3,29 @@ using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
-	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class TrackingPage : UserControl {
-		private bool isCopyingScript;
 
-		public TrackingPage() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			InitializeComponent();
+public sealed partial class TrackingPage : UserControl {
-		}
+	private bool isCopyingScript;
 
-		private void InitializeComponent() {
+	public TrackingPage() {
-			AvaloniaXamlLoader.Load(this);
+		InitializeComponent();
-		}
+	}
 
-		public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
-			if (DataContext is TrackingPageModel model) {
+		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) {
+			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
-					isCopyingScript = true;
+				isCopyingScript = true;
-					button.Content = "Script Copied!";
+				CopyTrackingScript.Content = "Script Copied!";
 
-					await Task.Delay(TimeSpan.FromSeconds(2));
+				await Task.Delay(TimeSpan.FromSeconds(2));
-					button.Content = originalText;
+				CopyTrackingScript.Content = originalText;
-					isCopyingScript = false;
+				isCopyingScript = false;
-				}
 			}
 		}
 	}

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,117 +1,133 @@
 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));
+	[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.Value ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+		}
+	}
+
+	private readonly Window window;
+
+	[Obsolete("Designer")]
+	public TrackingPageModel() : this(null!) {}
+
+	public TrackingPageModel(Window window) {
+		this.window = window;
+
+		Task.Factory.StartNew(InitializeDevToolsToggle, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.FromCurrentSynchronizationContext());
+	}
+
+	public async Task<bool> OnClickCopyTrackingScript() {
+		IsCopyTrackingScriptButtonEnabled = false;
+
+		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;
 		}
 
-		public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
+		try {
+			await clipboard.SetTextAsync(script);
+			return true;
+		} catch {
+			await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
+			return false;
+		}
+	}
 
-		public string ToggleAppDevToolsButtonText {
+	private async Task InitializeDevToolsToggle() {
-			get {
+		bool? devToolsEnabled = await Task.Run(DiscordAppSettings.AreDevToolsEnabled);
-				if (!IsToggleAppDevToolsButtonEnabled) {
-					return "Unavailable";
-				}
 
-				return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+		if (devToolsEnabled.HasValue) {
-			}
+			AreDevToolsEnabled = devToolsEnabled.Value;
+			IsToggleAppDevToolsButtonEnabled = true;
+		}
+		else {
+			IsToggleAppDevToolsButtonEnabled = false;
+		}
+	}
+
+	public async Task OnClickToggleAppDevTools() {
+		const string DialogTitle = "Discord App Settings File";
+
+		if (!AreDevToolsEnabled.HasValue) {
+			return;
 		}
 
-		private readonly Window window;
+		bool oldState = AreDevToolsEnabled.Value;
+		bool newState = !oldState;
 
-		[Obsolete("Designer")]
+		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
-		public TrackingPageModel() : this(null!) {}
+			case SettingsJsonResult.Success:
+				AreDevToolsEnabled = newState;
+				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
+				break;
 
-		public TrackingPageModel(Window window) {
+			case SettingsJsonResult.AlreadySet:
-			this.window = window;
+				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
-		}
+				AreDevToolsEnabled = newState;
+				break;
 
-		public async Task Initialize() {
+			case SettingsJsonResult.FileNotFound:
-			bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
+				await Dialog.ShowOk(window, DialogTitle, "Cannot find the settings file:\n" + DiscordAppSettings.JsonFilePath);
-			if (devToolsEnabled.HasValue) {
+				break;
-				AreDevToolsEnabled = devToolsEnabled.Value;
-			}
-			else {
-				IsToggleAppDevToolsButtonEnabled = false;
-				OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
-			}
-		}
 
-		public async Task<bool> OnClickCopyTrackingScript() {
+			case SettingsJsonResult.ReadError:
-			string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
+				await Dialog.ShowOk(window, DialogTitle, "Cannot read the settings file:\n" + DiscordAppSettings.JsonFilePath);
-			string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerManager.Port + ";")
+				break;
-			                         .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;
+			case SettingsJsonResult.InvalidJson:
-			if (clipboard == null) {
+				await Dialog.ShowOk(window, DialogTitle, "Unknown format of the settings file:\n" + DiscordAppSettings.JsonFilePath);
-				await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
+				break;
-				return false;
-			}
 
-			try {
+			case SettingsJsonResult.WriteError:
-				await clipboard.SetTextAsync(script);
+				await Dialog.ShowOk(window, DialogTitle, "Cannot save the settings file:\n" + DiscordAppSettings.JsonFilePath);
-				return true;
+				break;
-			} catch {
-				await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
-				return false;
-			}
-		}
 
-		public async void OnClickToggleAppDevTools() {
+			default:
-			const string DialogTitle = "Discord App Settings File";
+				throw new ArgumentOutOfRangeException();
-
-			bool oldState = AreDevToolsEnabled;
-			bool newState = !oldState;
-
-			switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
-				case SettingsJsonResult.Success:
-					AreDevToolsEnabled = newState;
-					await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
-					break;
-
-				case SettingsJsonResult.AlreadySet:
-					await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
-					AreDevToolsEnabled = newState;
-					break;
-
-				case SettingsJsonResult.FileNotFound:
-					await Dialog.ShowOk(window, DialogTitle, "Cannot find the settings file:\n" + DiscordAppSettings.JsonFilePath);
-					break;
-
-				case SettingsJsonResult.ReadError:
-					await Dialog.ShowOk(window, DialogTitle, "Cannot read the settings file:\n" + DiscordAppSettings.JsonFilePath);
-					break;
-
-				case SettingsJsonResult.InvalidJson:
-					await Dialog.ShowOk(window, DialogTitle, "Unknown format of the settings file:\n" + DiscordAppSettings.JsonFilePath);
-					break;
-
-				case SettingsJsonResult.WriteError:
-					await Dialog.ShowOk(window, DialogTitle, "Cannot save the settings file:\n" + DiscordAppSettings.JsonFilePath);
-					break;
-
-				default:
-					throw new ArgumentOutOfRangeException();
-			}
 		}
 	}
 }

app/Desktop/Main/Pages/ViewerPage.axaml

@@ -5,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 ViewerPage() {
-			InitializeComponent();
-		}
 
-		private void InitializeComponent() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			AvaloniaXamlLoader.Load(this);
+public sealed partial class ViewerPage : UserControl {
-		}
+	public ViewerPage() {
+		InitializeComponent();
 	}
 }

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,96 +7,83 @@ 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.Server.Database.Export.Strategy;
-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 ();
-		
-		public bool DatabaseToolFilterModeKeep { get; set; } = true;
-		public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
-		private bool hasFilters = false;
+sealed partial class ViewerPageModel : ObservableObject, IDisposable {
+	public static readonly ConcurrentBag<string> TemporaryFiles = [];
 
-		public bool HasFilters {
+	private static readonly FilePickerFileType[] ViewerFileTypes = [
-			get => hasFilters;
+		FileDialogs.CreateFilter("Discord History Viewer", ["html"])
-			set => Change(ref hasFilters, value);
+	];
-		}
 
-		private MessageFilterPanelModel FilterModel { get; }
+	public bool DatabaseToolFilterModeKeep { get; set; } = true;
+	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
-		private readonly Window window;
+	[ObservableProperty]
-		private readonly IDatabaseFile db;
+	private bool hasFilters = false;
 
-		[Obsolete("Designer")]
+	public MessageFilterPanelModel FilterModel { get; }
-		public ViewerPageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-		public ViewerPageModel(Window window, IDatabaseFile db) {
+	private readonly Window window;
-			this.window = window;
+	private readonly State state;
-			this.db = db;
 
-			FilterModel = new MessageFilterPanelModel(window, db, "Will export");
+	[Obsolete("Designer")]
-			FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
+	public ViewerPageModel() : this(null!, State.Dummy) {}
-		}
 
-		public void Dispose() {
+	public ViewerPageModel(Window window, State state) {
-			FilterModel.Dispose();
+		this.window = window;
-		}
+		this.state = state;
 
-		private void OnFilterPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		FilterModel = new MessageFilterPanelModel(window, state, "Will export");
-			HasFilters = FilterModel.HasAnyFilters;
+		FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
-		}
+	}
 
-		private async Task WriteViewerFile(string path, IViewerExportStrategy strategy) {
+	public void Dispose() {
-			const string ArchiveTag = "/*[ARCHIVE]*/";
+		FilterModel.Dispose();
+	}
 
-			string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
+	private void OnFilterPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-			string viewerTemplate = indexFile.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
+		HasFilters = FilterModel.HasAnyFilters;
-			                                 .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
+	}
+
+	public async void OnClickOpenViewer() {
+		try {
+			var fullPath = await PrepareTemporaryViewerFile();
 			
-			int viewerArchiveTagStart = viewerTemplate.IndexOf(ArchiveTag);
+			string jsConstants = $"""
-			int viewerArchiveTagEnd = viewerArchiveTagStart + ArchiveTag.Length;
+			                      window.DHT_SERVER_URL = "{HttpUtility.JavaScriptStringEncode("http://127.0.0.1:" + ServerConfiguration.Port)}";
+			                      window.DHT_SERVER_TOKEN = "{HttpUtility.JavaScriptStringEncode(ServerConfiguration.Token)}";
+			                      """;
 
-			string jsonTempFile = path + ".tmp";
+			await ProgressDialog.ShowIndeterminate(window, "Open Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(fullPath, jsConstants)));
-
+			
-			await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
+			Process.Start(new ProcessStartInfo(fullPath) {
-				await ViewerJsonExport.Generate(jsonStream, strategy, db, FilterModel.CreateFilter());
+				UseShellExecute = true
-
+			});
-				char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
+		} catch (Exception e) {
-				jsonStream.Position = 0;
+			await Dialog.ShowOk(window, "Open Viewer", "Could not create or save viewer: " + e.Message);
-
-				await using (var outputStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
-				await using (var outputWriter = new StreamWriter(outputStream, Encoding.UTF8)) {
-					await outputWriter.WriteAsync(viewerTemplate[..viewerArchiveTagStart]);
-
-					using (var jsonReader = new StreamReader(jsonStream, Encoding.UTF8)) {
-						int readBytes;
-						while ((readBytes = await jsonReader.ReadAsync(jsonBuffer, 0, jsonBuffer.Length)) > 0) {
-							string jsonChunk = new string(jsonBuffer, 0, readBytes);
-							await outputWriter.WriteAsync(HttpUtility.JavaScriptStringEncode(jsonChunk));
-						}
-					}
-
-					await outputWriter.WriteAsync(viewerTemplate[viewerArchiveTagEnd..]);
-				}
-			}
-
-			File.Delete(jsonTempFile);
 		}
+	}
 
-		public async void OnClickOpenViewer() {
+	private async Task<string> PrepareTemporaryViewerFile() {
+		return await Task.Run(() => {
 			string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
-			string filenameBase = Path.GetFileNameWithoutExtension(db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
+			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)) {
@@ -106,45 +92,87 @@ namespace DHT.Desktop.Main.Pages {
 			}
 
 			TemporaryFiles.Add(fullPath);
-			
-			Directory.CreateDirectory(rootPath);
-			await WriteViewerFile(fullPath, new LiveViewerExportStrategy(ServerManager.Port, ServerManager.Token));
 
-			Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
+			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;
 		}
 
-		public async void OnClickSaveViewer() {
+		try {
-			var dialog = new SaveFileDialog {
+			await ProgressDialog.ShowIndeterminate(window, "Save Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(path, string.Empty)));
-				Title = "Save Viewer",
+		} catch (Exception e) {
-				InitialFileName = Path.GetFileNameWithoutExtension(db.Path) + ".html",
+			await Dialog.ShowOk(window, "Save Viewer", "Could not create or save viewer: " + e.Message);
-				Directory = Path.GetDirectoryName(db.Path),
+		}
-				Filters = new List<FileDialogFilter> {
+	}
-					new() {
+
-						Name = "Discord History Viewer",
+	private async Task WriteViewerFile(string path, string jsConstants) {
-						Extensions = { "html" }
+		const string ArchiveTag = "/*[ARCHIVE]*/";
+
+		string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
+		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);
+		int viewerArchiveTagEnd = viewerArchiveTagStart + ArchiveTag.Length;
+
+		string jsonTempFile = path + ".tmp";
+
+		await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
+			await ViewerJsonExport.Generate(jsonStream, state.Db, FilterModel.CreateFilter());
+
+			char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
+			jsonStream.Position = 0;
+
+			await using (var outputStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
+			await using (var outputWriter = new StreamWriter(outputStream, Encoding.UTF8)) {
+				await outputWriter.WriteAsync(viewerTemplate[..viewerArchiveTagStart]);
+
+				using (var jsonReader = new StreamReader(jsonStream, Encoding.UTF8)) {
+					int readBytes;
+					while ((readBytes = await jsonReader.ReadAsync(jsonBuffer, 0, jsonBuffer.Length)) > 0) {
+						string jsonChunk = new string(jsonBuffer, 0, readBytes);
+						await outputWriter.WriteAsync(HttpUtility.JavaScriptStringEncode(jsonChunk));
 					}
 				}
-			}.ShowAsync(window);
 
-			string? path = await dialog;
+				await outputWriter.WriteAsync(viewerTemplate[viewerArchiveTagEnd..]);
-			if (!string.IsNullOrEmpty(path)) {
-				await WriteViewerFile(path, StandaloneViewerExportStrategy.Instance);
 			}
 		}
 
-		public async void OnClickApplyFiltersToDatabase() {
+		File.Delete(jsonTempFile);
-			var filter = FilterModel.CreateFilter();
+	}
 
-			if (DatabaseToolFilterModeKeep) {
+	public async Task OnClickApplyFiltersToDatabase() {
-				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?")) {
+		var filter = FilterModel.CreateFilter();
-					db.RemoveMessages(filter, FilterRemovalMode.KeepMatching);
+		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", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
+				await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
 			}
-			else if (DatabaseToolFilterModeRemove) {
+		}
-				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
+		else if (DatabaseToolFilterModeRemove) {
-					db.RemoveMessages(filter, FilterRemovalMode.RemoveMatching);
+			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
-				}
+				await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
 			}
 		}
 	}
+
+	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 MainContentScreen() {
-			InitializeComponent();
-		}
 
-		private void InitializeComponent() {
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-			AvaloniaXamlLoader.Load(this);
+public sealed partial class MainContentScreen : UserControl {
-		}
+	public MainContentScreen() {
+		InitializeComponent();
 	}
 }

app/Desktop/Main/Screens/MainContentScreenModel.cs

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

app/Desktop/Main/Screens/WelcomeScreen.axaml

@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:screens="clr-namespace:DHT.Desktop.Main.Screens"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Screens.WelcomeScreen">
+             x:Class="DHT.Desktop.Main.Screens.WelcomeScreen"
+             x:DataType="screens:WelcomeScreenModel">
 
     <Design.DataContext>
         <screens:WelcomeScreenModel />
@@ -31,7 +32,7 @@
             <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button Command="{Binding OpenOrCreateDatabase}">Open or Create Database</Button>
+                <Button Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
                 <Button Command="{Binding ShowAboutDialog}">About</Button>
                 <Button Command="{Binding Exit}">Exit</Button>
             </StackPanel>

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

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

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -1,73 +1,119 @@
 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 {
-		public string Version => Program.Version;
 
-		public IDatabaseFile? Db { get; private set; }
+sealed partial class WelcomeScreenModel : ObservableObject {
-		public bool HasDatabase => Db != null;
+	public string Version => Program.Version;
+	
+	[ObservableProperty(Setter = Access.Private)]
+	private bool isOpenOrCreateDatabaseButtonEnabled = true;
+	
+	public event EventHandler<IDatabaseFile>? DatabaseSelected; 
+	
+	private readonly Window window;
 
+	private string? dbFilePath;
+
+	[Obsolete("Designer")]
+	public WelcomeScreenModel() : this(null!) {}
+
+	public WelcomeScreenModel(Window window) {
+		this.window = window;
+	}
+
+	public async Task OpenOrCreateDatabase() {
+		IsOpenOrCreateDatabaseButtonEnabled = false;
+		try {
+			var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
+			if (path != null) {
+				await OpenOrCreateDatabaseFromPath(path);
+			}
+		} finally {
+			IsOpenOrCreateDatabaseButtonEnabled = true;
+		}
+	}
+
+	public async Task OpenOrCreateDatabaseFromPath(string path) {
+		dbFilePath = path;
+		
+		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
+		if (db != null) {
+			DatabaseSelected?.Invoke(this, db);
+		}
+	}
+
+	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
 		private readonly Window window;
-
+		
-		private string? dbFilePath;
+		public SchemaUpgradeCallbacks(Window window) {
-
-		[Obsolete("Designer")]
-		public WelcomeScreenModel() : this(null!) {}
-
-		public WelcomeScreenModel(Window window) {
 			this.window = window;
 		}
 
-		public async void OpenOrCreateDatabase() {
+		public async Task<bool> CanUpgrade() {
-			var dialog = DatabaseGui.NewOpenOrCreateDatabaseFileDialog();
-			dialog.Directory = Path.GetDirectoryName(dbFilePath);
-
-			string? path = await dialog.ShowAsync(window);
-			if (!string.IsNullOrWhiteSpace(path)) {
-				await OpenOrCreateDatabaseFromPath(path);
-			}
-		}
-
-		public async Task OpenOrCreateDatabaseFromPath(string path) {
-			if (Db != null) {
-				Db = null;
-			}
-
-			dbFilePath = path;
-			Db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, CheckCanUpgradeDatabase);
-
-			OnPropertyChanged(nameof(Db));
-			OnPropertyChanged(nameof(HasDatabase));
-		}
-
-		private async Task<bool> CheckCanUpgradeDatabase() {
 			return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
 		}
 
-		public void CloseDatabase() {
+		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));
+			}
+			
+			await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
 		}
 
-		public async void ShowAboutDialog() {
+		private sealed class ProgressReporter : ISchemaUpgradeCallbacks.IProgressReporter {
-			await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(this.window);
+			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 void Exit() {
+			public async Task NextVersion() {
-			window.Close();
+				await callbacks[0].Update("Upgrading schema version...", versionProgress++, versionSteps);
-		}
+				await HideChildren(0);
+			}
 
-		public void Dispose() {
+			public async Task MainWork(string message, int finishedItems, int totalItems) {
-			Db?.Dispose();
+				await callbacks[1].Update(message, finishedItems, totalItems);
-			Db = null;
+				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();
+	}
 }

app/Desktop/Program.cs

@@ -1,39 +1,54 @@
-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; }
 
-		static Program() {
+static class Program {
-			var assembly = Assembly.GetExecutingAssembly();
+	public static string Version { get; }
-			
+	public static CultureInfo Culture { get; }
-			Version = assembly.GetName().Version?.ToString() ?? "";
+	public static ResourceLoader Resources { get; }
-			while (Version.EndsWith(".0")) {
+	public static Arguments Arguments { get; }
-				Version = Version[..^2];
-			}
 
-			Culture = CultureInfo.CurrentCulture;
+	static Program() {
-			CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
+		var assembly = Assembly.GetExecutingAssembly();
-			CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
+
-			CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+		Version = assembly.GetName().Version?.ToString() ?? "";
-			CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
+		while (Version.EndsWith(".0")) {
-			
+			Version = Version[..^2];
-			Resources = new ResourceLoader(assembly);
 		}
 
-		public static void Main(string[] args) {
+		Culture = CultureInfo.CurrentCulture;
+		CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
+		CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
+		CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+		CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
+
+		Resources = new ResourceLoader(assembly);
+		Arguments = new Arguments(Environment.GetCommandLineArgs());
+	}
+
+	public static void Main(string[] args) {
+		if (Arguments.Console && OperatingSystem.IsWindows()) {
+			WindowsConsole.AllocConsole();
+		}
+
+		try {
 			BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-		}
+		} finally {
-
+			if (Arguments.Console && OperatingSystem.IsWindows()) {
-		private static AppBuilder BuildAvaloniaApp() {
+				WindowsConsole.FreeConsole();
-			return AppBuilder.Configure<App>()
+			}
-			                 .UsePlatformDetect()
-			                 .LogToTrace();
 		}
 	}
+
+	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,24 +62,74 @@ 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) {
+		if (props && Array.isArray(props.children)) {
-			for (let i = 3; i < props.children.length; i++) {
+			for (const child of props.children) {
-				const childProps = props.children[i].props;
+				if (!(child instanceof Object)) {
+					continue;
+				}
 				
-				if (childProps && "message" in childProps && "channel" in childProps) {
+				const childProps = child.props;
-					return childProps;
+				if (childProps instanceof Object && "message" in childProps) {
+					return childProps.message;
 				}
 			}
 		}
@@ -113,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));
@@ -137,7 +170,7 @@ class DISCORD {
 	 */
 	static getSelectedChannel() {
 		try {
-			let obj;
+			let obj = null;
 			
 			try {
 				for (const child of DOM.getReactProps(DOM.queryReactClass("chatContent")).children) {
@@ -148,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") {
@@ -168,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) {
@@ -185,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;
 				}
 				
@@ -197,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"
 				};
 				
@@ -211,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 {
@@ -238,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;
 			}
 			
@@ -268,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

@@ -48,6 +48,16 @@ const STATE = (function() {
 		});
 	};
 	
+	const getDate = function(date) {
+		if (date instanceof Date) {
+			return date;
+		}
+		else {
+			// noinspection JSUnresolvedReference
+			return date.toDate();
+		}
+	};
+	
 	const trackingStateChangedListeners = [];
 	let isTracking = false;
 	
@@ -69,8 +79,8 @@ const STATE = (function() {
 	 * @property {String} channel_id
 	 * @property {DiscordUser} author
 	 * @property {String} content
-	 * @property {Timestamp} timestamp
+	 * @property {Date} timestamp
-	 * @property {Timestamp|null} editedTimestamp
+	 * @property {Date|null} editedTimestamp
 	 * @property {DiscordAttachment[]} attachments
 	 * @property {Object[]} embeds
 	 * @property {DiscordMessageReaction[]} [reactions]
@@ -106,11 +116,6 @@ const STATE = (function() {
 	 * @property {Boolean} animated
 	 */
 	
-	/**
-	 * @name Timestamp
-	 * @property {Function} toDate
-	 */
-	
 	return {
 		setup(port, token) {
 			serverPort = port;
@@ -174,12 +179,10 @@ const STATE = (function() {
 		},
 		
 		/**
-		 * @param {String} channelId
 		 * @param {DiscordMessage[]} discordMessageArray
 		 */
-		async addDiscordMessages(channelId, discordMessageArray) {
+		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;
@@ -225,12 +228,12 @@ const STATE = (function() {
 					sender: msg.author.id,
 					channel: msg.channel_id,
 					text: msg.content,
-					timestamp: msg.timestamp.toDate().getTime()
+					timestamp: getDate(msg.timestamp).getTime()
 				};
 				
 				if (msg.editedTimestamp !== null) {
 					// noinspection JSUnusedGlobalSymbols
-					obj.editTimestamp = msg.editedTimestamp.toDate().getTime();
+					obj.editTimestamp = getDate(msg.editedTimestamp).getTime();
 				}
 				
 				if (msg.messageReference !== null) {

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,33 +66,38 @@ 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) });
 		}
 	};
 	
@@ -123,8 +146,9 @@ 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
@@ -165,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(""));
 		},
 		
@@ -197,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 : "????";
@@ -218,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);
@@ -240,14 +265,16 @@ const DISCORD = (function() {
 					}
 					
 					return value.map(attachment => {
+						const url = fileUrlProcessor(attachment.url);
+						
 						if (!DISCORD.isImageAttachment(attachment) || !SETTINGS.enableImagePreviews) {
-							return templateAttachmentDownload.apply(attachment);
+							return templateAttachmentDownload.apply({ url, name: attachment.name });
 						}
 						else if ("width" in attachment && "height" in attachment) {
-							return templateEmbedImageWithSize.apply({ url: attachment.url, src: attachment.url, width: attachment.width, height: attachment.height });
+							return templateEmbedImageWithSize.apply({ url, src: url, width: attachment.width, height: attachment.height });
 						}
 						else {
-							return templateEmbedImage.apply({ url: attachment.url, src: attachment.url });
+							return templateEmbedImage.apply({ url, src: url });
 						}
 					}).join("");
 				}
@@ -263,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;
@@ -275,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/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 ulong EnqueuedSize { get; internal set; }
 
-		public int SuccessfulCount { get; internal set; }
+public sealed class DownloadStatusStatistics {
-		public ulong SuccessfulSize { get; internal set; }
+	public int PendingCount { get; internal init; }
+	public ulong PendingTotalSize { get; internal init; }
+	public int PendingWithUnknownSizeCount { get; internal init; }
 
-		public int FailedCount { get; internal set; }
+	public int SuccessfulCount { get; internal init; }
-		public ulong FailedSize { get; internal set; }
+	public ulong SuccessfulTotalSize { get; internal init; }
+	public int SuccessfulWithUnknownSizeCount { get; internal init; }
 
-		public int SkippedCount { get; internal set; }
+	public int FailedCount { get; internal init; }
-		public ulong SkippedSize { get; internal set; }
+	public ulong FailedTotalSize { get; internal init; }
-	}
+	public int FailedWithUnknownSizeCount { get; internal init; }
+	
+	public int SkippedCount { get; internal init; }
+	public ulong SkippedTotalSize { get; internal init; }
+	public int SkippedWithUnknownSizeCount { get; internal init; }
 }

app/Server/Data/Attachment.cs

@@ -1,11 +1,12 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
-	public readonly struct Attachment {
+
-		public ulong Id { get; internal init; }
+public readonly struct Attachment {
-		public string Name { get; internal init; }
+	public ulong Id { get; internal init; }
-		public string? Type { get; internal init; }
+	public string Name { get; internal init; }
-		public string Url { get; internal init; }
+	public string? Type { get; internal init; }
-		public ulong Size { get; internal init; }
+	public string NormalizedUrl { get; internal init; }
-		public int? Width { get; internal init; }
+	public string DownloadUrl { get; internal init; }
-		public int? Height { 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,11 +1,11 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
-	public readonly struct Channel {
+
-		public ulong Id { get; init; }
+public readonly struct Channel {
-		public ulong Server { get; init; }
+	public ulong Id { get; init; }
-		public string Name { get; init; }
+	public ulong Server { get; init; }
-		public ulong? ParentId { get; init; }
+	public string Name { get; init; }
-		public int? Position { get; init; }
+	public ulong? ParentId { get; init; }
-		public string? Topic { get; init; }
+	public int? Position { get; init; }
-		public bool? Nsfw { get; init; }
+	public string? Topic { get; init; }
-	}
+	public bool? Nsfw { get; init; }
 }

app/Server/Data/Download.cs

@@ -1,30 +1,17 @@
-using System;
+namespace DHT.Server.Data;
-using System.Net;
 
-namespace DHT.Server.Data {
+public sealed class Download {
-	public readonly struct Download {
+	public string NormalizedUrl { get; }
-		internal static Download NewSuccess(string url, byte[] data) {
+	public string DownloadUrl { get; }
-			return new Download(url, DownloadStatus.Success, (ulong) Math.Max(data.LongLength, 0), data);
+	public DownloadStatus Status { get; }
-		}
+	public string? Type { get; }
+	public ulong? Size { get; }
 
-		internal static Download NewFailure(string url, HttpStatusCode? statusCode, ulong size) {
+	internal Download(string normalizedUrl, string downloadUrl, DownloadStatus status, string? type, ulong? size) {
-			return new Download(url, statusCode.HasValue ? (DownloadStatus) (int) statusCode : DownloadStatus.GenericError, size);
+		NormalizedUrl = normalizedUrl;
-		}
+		DownloadUrl = downloadUrl;
-
+		Status = status;
-		public string Url { get; }
+		Type = type;
-		public DownloadStatus Status { get; }
+		Size = size;
-		public ulong Size { get; }
-		public byte[]? Data { get; }
-
-		internal Download(string url, DownloadStatus status, ulong size, byte[]? data = null) {
-			Url = url;
-			Status = status;
-			Size = size;
-			Data = data;
-		}
-
-		internal Download WithData(byte[] data) {
-			return new Download(Url, Status, Size, data);
-		}
 	}
 }

app/Server/Data/DownloadStatus.cs

@@ -1,12 +1,14 @@
 using System.Net;
 
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
-	/// <summary>
+
-	/// Extends <see cref="HttpStatusCode"/> with custom status codes in the range 0-99.
+/// <summary>
-	/// </summary>
+/// Extends <see cref="HttpStatusCode"/> with custom status codes in the range 0-99.
-	public enum DownloadStatus {
+/// </summary>
-		Enqueued = 0,
+public enum DownloadStatus {
-		GenericError = 1,
+	Pending = 0,
-		Success = HttpStatusCode.OK
+	GenericError = 1,
-	}
+	Downloading = 2,
+	LastCustomCode = 99,
+	Success = HttpStatusCode.OK
 }