Release v38.0

Closes #226

README.md

@@ -19,7 +19,7 @@ Folder organization:
 * `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
 
@@ -50,6 +50,6 @@ Run the `app/build.sh` script, and read the [Distribution](#distribution) sectio
 
 #### 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.

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

@@ -7,6 +7,7 @@
         <entry key="Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Dialogs/Message/MessageDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Dialogs/Progress/ProgressDialog.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Dialogs/TextBox/TextBoxDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/AboutWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/AttachmentFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/MessageFilterPanel.axaml" value="Desktop/Desktop.csproj" />

app/Desktop/App.axaml

@@ -6,8 +6,8 @@
 
     <Application.Styles>
 
-        <FluentTheme Mode="Light" />
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
+        <FluentTheme />
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml" />
 
         <Style Selector="Button, CheckBox, RadioButton, Expander /template/ ToggleButton#ExpanderHeader">
             <Setter Property="Cursor" Value="Hand" />
@@ -33,72 +33,24 @@
         <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
             <Setter Property="BorderThickness" Value="1" />
         </Style>
-        <Style Selector="TextBox:disabled"><!-- TODO bug in Avalonia (https://github.com/AvaloniaUI/Avalonia/pull/7792) -->
-            <Setter Property="Foreground" Value="{DynamicResource TextControlForegroundDisabled}" />
+        <Style Selector="TextBox:error DataValidationErrors">
+            <Style.Resources>
+                <ControlTemplate x:Key="InlineDataValidationContentTemplate" TargetType="DataValidationErrors">
+                    <ContentPresenter Name="PART_ContentPresenter"
+                                      Padding="{TemplateBinding Padding}"
+                                      Background="{TemplateBinding Background}"
+                                      BorderThickness="{TemplateBinding BorderThickness}"
+                                      CornerRadius="{TemplateBinding CornerRadius}"
+                                      Content="{TemplateBinding Content}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}" />
+                </ControlTemplate>
+            </Style.Resources>
+            <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
         </Style>
 
-        <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
-            <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="Template">
-                <ControlTemplate>
-                    <Border x:Name="ToggleButtonBackground">
-                        <Grid ColumnDefinitions="Auto,*" RowDefinitions="35">
-                            <Border x:Name="ExpandCollapseChevronBorder"
-                                    Grid.Column="0"
-                                    Width="35"
-                                    Height="35"
-                                    Margin="2,0"
-                                    RenderTransformOrigin="50%,50%">
-                                <Path x:Name="ExpandCollapseChevron"
-                                      HorizontalAlignment="Center"
-                                      VerticalAlignment="Center"
-                                      RenderTransformOrigin="50%,50%"
-                                      Stretch="None"
-                                      Stroke="{DynamicResource ExpanderChevronForeground}"
-                                      StrokeThickness="1" />
-                                <Border.RenderTransform>
-                                    <RotateTransform />
-                                </Border.RenderTransform>
-                            </Border>
-                            <ContentPresenter x:Name="PART_ContentPresenter"
-                                              Grid.Column="1"
-                                              Margin="0"
-                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              VerticalContentAlignment="Center"
-                                              Background="Transparent"
-                                              BorderBrush="Transparent"
-                                              BorderThickness="0"
-                                              Content="{TemplateBinding Content}"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              TextBlock.Foreground="{DynamicResource ExpanderForeground}" />
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter>
-        </Style>
-        <Style Selector="Expander:expanded /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-            <Style.Animations>
-                <Animation FillMode="Both" Duration="0:0:0.0625">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="180" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="180" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="Expander:not(:expanded) /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-            <Style.Animations>
-                <Animation FillMode="Both" Duration="0:0:0.0625">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="0" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="0" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
+        <Style Selector="Expander">
+            <Setter Property="MinHeight" Value="40" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
         
     </Application.Styles>
@@ -157,12 +109,26 @@
         
         <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
         <Thickness x:Key="ExpanderContentPadding">12</Thickness>
-        <SolidColorBrush x:Key="ExpanderBorderBrush" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderBackground" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderForeground" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPressed" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushDisabled" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="#536794" />
+        <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed" Color="#47587F" />
+        <SolidColorBrush x:Key="ExpanderHeaderBackgroundDisabled" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderForegroundPointerOver" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderForegroundPressed" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderForegroundDisabled" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent" />
+        <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="#536794" />
+        <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="#47587F" />
+        <SolidColorBrush x:Key="ExpanderChevronBackgroundDisabled" Color="Transparent" />
         <SolidColorBrush x:Key="ExpanderChevronForeground" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderDropDownBorderBrush" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronForegroundPointerOver" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronForegroundPressed" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronForegroundDisabled" Color="#FFFFFF" />
 
     </Application.Resources>
 

app/Desktop/App.axaml.cs

@@ -1,20 +1,21 @@
+using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main;
 
-namespace DHT.Desktop {
-	sealed class App : Application {
+namespace DHT.Desktop;
+
+sealed class App : Application {
 	public override void Initialize() {
 		AvaloniaXamlLoader.Load(this);
 	}
 
 	public override void OnFrameworkInitializationCompleted() {
 		if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
-				desktop.MainWindow = new MainWindow(new Arguments(desktop.Args));
+			desktop.MainWindow = new MainWindow(new Arguments(desktop.Args ?? Array.Empty<string>()));
 		}
 
 		base.OnFrameworkInitializationCompleted();
 	}
-	}
 }

app/Desktop/Arguments.cs

@@ -1,8 +1,9 @@
 using System;
 using DHT.Utils.Logging;
 
-namespace DHT.Desktop {
-	sealed class Arguments {
+namespace DHT.Desktop;
+
+sealed class Arguments {
 	private static readonly Log Log = Log.ForType<Arguments>();
 
 	public static Arguments Empty => new(Array.Empty<string>());
@@ -61,5 +62,4 @@ namespace DHT.Desktop {
 			}
 		}
 	}
-	}
 }

app/Desktop/Common/BytesValueConverter.cs

@@ -2,14 +2,29 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace DHT.Desktop.Common {
-	sealed class BytesValueConverter : IValueConverter {
-		private static readonly string[] Units = {
-			"B",
-			"kB",
-			"MB",
-			"GB",
-			"TB"
+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;
@@ -17,13 +32,7 @@ namespace DHT.Desktop.Common {
 	private static string Convert(ulong size) {
 		int power = size == 0L ? 0 : (int) Math.Log(size, Scale);
 		int unit = power >= Units.Length ? Units.Length - 1 : power;
-			if (unit == 0) {
-				return string.Format(Program.Culture, "{0:n0}", size) + " " + Units[unit];
-			}
-			else {
-				double humanReadableSize = size / Math.Pow(Scale, unit);
-				return string.Format(Program.Culture, "{0:n0}", humanReadableSize) + " " + Units[unit];
-			}
+		return Units[unit].Format(unit == 0 ? size : size / Math.Pow(Scale, unit));
 	}
 
 	public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
@@ -41,5 +50,4 @@ namespace DHT.Desktop.Common {
 	public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
 		throw new NotSupportedException();
 	}
-	}
 }

app/Desktop/Common/DatabaseGui.cs

@@ -3,39 +3,42 @@ 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.Utils.Logging;
 
-namespace DHT.Desktop.Common {
-	static class DatabaseGui {
+namespace DHT.Desktop.Common;
+
+static class DatabaseGui {
 	private static readonly Log Log = Log.ForType(typeof(DatabaseGui));
 
 	private const string DatabaseFileInitialName = "archive.dht";
 
-		private static readonly List<FileDialogFilter> DatabaseFileDialogFilter = new() {
-			new FileDialogFilter {
-				Name = "Discord History Tracker Database",
-				Extensions = { "dht" }
-			}
+	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = new List<FilePickerFileType> {
+		FileDialogs.CreateFilter("Discord History Tracker Database", new [] { "dht" })
 	};
 
-		public static OpenFileDialog NewOpenDatabaseFileDialog() {
-			return new OpenFileDialog {
+	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
+		return await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Database File",
-				InitialFileName = DatabaseFileInitialName,
-				Filters = DatabaseFileDialogFilter
-			};
+			FileTypeFilter = DatabaseFileDialogFilter,
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
+			AllowMultiple = true
+		});
 	}
 
-		public static SaveFileDialog NewOpenOrCreateDatabaseFileDialog() {
-			return new SaveFileDialog {
+	public static async Task<string?> NewOpenOrCreateDatabaseFileDialog(Window window, string? suggestedDirectory) {
+		return await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
 			Title = "Open or Create Database File",
-				InitialFileName = DatabaseFileInitialName,
-				Filters = DatabaseFileDialogFilter
-			};
+			FileTypeChoices = DatabaseFileDialogFilter,
+			SuggestedFileName = DatabaseFileInitialName,
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
+			ShowOverwritePrompt = false
+		});
 	}
 
 	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, Func<Task<bool>> checkCanUpgradeDatabase) {
@@ -62,5 +65,4 @@ namespace DHT.Desktop.Common {
 	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,8 +2,9 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;
 
-namespace DHT.Desktop.Common {
-	sealed class NumberValueConverter : IValueConverter {
+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);
 	}
@@ -11,5 +12,4 @@ namespace DHT.Desktop.Common {
 	public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
 		throw new NotSupportedException();
 	}
-	}
 }

app/Desktop/Common/TextFormat.cs

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

app/Desktop/Desktop.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
     <Nullable>enable</Nullable>
     <AssemblyName>DiscordHistoryTracker</AssemblyName>
     <RootNamespace>DHT.Desktop</RootNamespace>
@@ -21,16 +20,23 @@
     <DebugType>none</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.14" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.14" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.14" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.5" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.5" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
   </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" />

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -34,7 +34,7 @@
 
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
-            <ItemsRepeater Items="{Binding Items}">
+            <ItemsRepeater ItemsSource="{Binding Items}">
                 <ItemsRepeater.ItemTemplate>
                     <DataTemplate>
                         <CheckBox IsChecked="{Binding Checked}">

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

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

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -4,8 +4,9 @@ using System.ComponentModel;
 using System.Linq;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Dialogs.CheckBox {
-	class CheckBoxDialogModel : BaseModel {
+namespace DHT.Desktop.Dialogs.CheckBox;
+
+class CheckBoxDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 
 	private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
@@ -55,9 +56,9 @@ namespace DHT.Desktop.Dialogs.CheckBox {
 			UpdateBulkButtons();
 		}
 	}
-	}
+}
 
-	sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
+sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
 	public new IReadOnlyList<CheckBoxItem<T>> Items { get; }
 
 	public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.Checked);
@@ -66,5 +67,4 @@ namespace DHT.Desktop.Dialogs.CheckBox {
 		this.Items = new List<CheckBoxItem<T>>(items);
 		base.Items = this.Items;
 	}
-	}
 }

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

@@ -1,7 +1,8 @@
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Dialogs.CheckBox {
-	class CheckBoxItem : BaseModel {
+namespace DHT.Desktop.Dialogs.CheckBox;
+
+class CheckBoxItem : BaseModel {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 
@@ -11,14 +12,13 @@ namespace DHT.Desktop.Dialogs.CheckBox {
 		get => isChecked;
 		set => Change(ref isChecked, value);
 	}
-	}
+}
 
-	sealed class CheckBoxItem<T> : CheckBoxItem {
+sealed class CheckBoxItem<T> : CheckBoxItem {
 	public new T Item { get; }
 
 	public CheckBoxItem(T item) {
 		this.Item = item;
 		base.Item = item;
 	}
-	}
 }

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -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,8 +2,9 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;
 
-namespace DHT.Desktop.Dialogs.Message {
-	static class Dialog {
+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));
@@ -70,5 +71,4 @@ namespace DHT.Desktop.Dialogs.Message {
 
 		return result.ToYesNoCancel();
 	}
-	}
 }

app/Desktop/Dialogs/Message/DialogResult.cs

@@ -1,7 +1,8 @@
 using System;
 
-namespace DHT.Desktop.Dialogs.Message {
-	static class DialogResult {
+namespace DHT.Desktop.Dialogs.Message;
+
+static class DialogResult {
 	public enum All {
 		Ok,
 		Yes,
@@ -55,5 +56,4 @@ namespace DHT.Desktop.Dialogs.Message {
 			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no/cancel.")
 		};
 	}
-	}
 }

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

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

app/Desktop/Dialogs/Message/MessageDialogModel.cs

@@ -1,5 +1,6 @@
-namespace DHT.Desktop.Dialogs.Message {
-	sealed class MessageDialogModel {
+namespace DHT.Desktop.Dialogs.Message;
+
+sealed class MessageDialogModel {
 	public string Title { get; init; } = "";
 	public string Message { get; init; } = "";
 
@@ -7,5 +8,4 @@ namespace DHT.Desktop.Dialogs.Message {
 	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,7 @@
 using System.Threading.Tasks;
 
-namespace DHT.Desktop.Dialogs.Progress {
-	interface IProgressCallback {
+namespace DHT.Desktop.Dialogs.Progress;
+
+interface IProgressCallback {
 	Task Update(string message, int finishedItems, int totalItems);
-	}
 }

app/Desktop/Dialogs/Progress/ProgressDialog.axaml

@@ -7,7 +7,7 @@
         x:Class="DHT.Desktop.Dialogs.Progress.ProgressDialog"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Opened="Loaded"
+        Opened="OnOpened"
         Closing="OnClosing"
         Width="500" SizeToContent="Height" CanResize="False"
         WindowStartupLocation="CenterOwner">

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

@@ -1,40 +1,30 @@
 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 {
-	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class ProgressDialog : Window {
+namespace DHT.Desktop.Dialogs.Progress;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class ProgressDialog : Window {
 	private bool isFinished = false;
 
 	public ProgressDialog() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
 	}
 
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-
-		public void OnClosing(object? sender, CancelEventArgs e) {
-			e.Cancel = !isFinished;
-		}
-
-		public void Loaded(object? sender, EventArgs e) {
+	public void OnOpened(object? sender, EventArgs e) {
 		if (DataContext is ProgressDialogModel model) {
 			Task.Run(model.StartTask).ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
 		}
 	}
 
+	public void OnClosing(object? sender, WindowClosingEventArgs e) {
+		e.Cancel = !isFinished;
+	}
+
 	private void OnFinished(Task task) {
 		isFinished = true;
 		Close();
 	}
-	}
 }

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -4,8 +4,9 @@ using Avalonia.Threading;
 using DHT.Desktop.Common;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Dialogs.Progress {
-	sealed class ProgressDialogModel : BaseModel {
+namespace DHT.Desktop.Dialogs.Progress;
+
+sealed class ProgressDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 
 	private string message = "";
@@ -61,5 +62,4 @@ namespace DHT.Desktop.Dialogs.Progress {
 			});
 		}
 	}
-	}
 }

app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml

@@ -0,0 +1,56 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.TextBox"
+        mc:Ignorable="d" d:DesignWidth="500"
+        x:Class="DHT.Desktop.Dialogs.TextBox.TextBoxDialog"
+        Title="{Binding Title}"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Width="500" SizeToContent="Height" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Window.DataContext>
+        <namespace:TextBoxDialogModel />
+    </Window.DataContext>
+
+    <Window.Styles>
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+        <Style Selector="Panel.buttons Button">
+            <Setter Property="MinWidth" Value="80" />
+            <Setter Property="Margin" Value="8 0 0 0" />
+        </Style>
+    </Window.Styles>
+
+    <StackPanel Margin="20">
+        <ScrollViewer MaxHeight="400">
+            <StackPanel Spacing="10">
+                <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
+                <ItemsRepeater ItemsSource="{Binding Items}">
+                    <ItemsRepeater.ItemTemplate>
+                        <DataTemplate>
+                            <DockPanel Margin="0 5 25 0">
+                                <TextBox Name="Input" Text="{Binding Value}" Width="180" VerticalAlignment="Top" DockPanel.Dock="Right" />
+                                <Label Target="Input" VerticalAlignment="Center" DockPanel.Dock="Left">
+                                    <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
+                                </Label>
+                            </DockPanel>
+                        </DataTemplate>
+                    </ItemsRepeater.ItemTemplate>
+                </ItemsRepeater>
+            </StackPanel>
+        </ScrollViewer>
+        <Panel Classes="buttons">
+            <WrapPanel Classes="right">
+                <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
+                <Button Click="ClickCancel">Cancel</Button>
+            </WrapPanel>
+        </Panel>
+    </StackPanel>
+
+</Window>

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

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

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using DHT.Utils.Models;
+
+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>();
+
+	public IReadOnlyList<TextBoxItem> Items {
+		get => items;
+
+		protected set {
+			foreach (var item in items) {
+				item.ErrorsChanged -= OnItemErrorsChanged;
+			}
+
+			items = value;
+
+			foreach (var item in items) {
+				item.ErrorsChanged += OnItemErrorsChanged;
+			}
+		}
+	}
+		
+	public bool HasErrors => Items.Any(static item => !item.IsValid);
+
+	private void OnItemErrorsChanged(object? sender, DataErrorsChangedEventArgs e) {
+		OnPropertyChanged(nameof(HasErrors));
+	}
+}
+
+sealed class TextBoxDialogModel<T> : TextBoxDialogModel {
+	public new IReadOnlyList<TextBoxItem<T>> Items { get; }
+
+	public IEnumerable<TextBoxItem<T>> ValidItems => Items.Where(static item => item.IsValid);
+
+	public TextBoxDialogModel(IEnumerable<TextBoxItem<T>> items) {
+		this.Items = new List<TextBoxItem<T>>(items);
+		base.Items = this.Items;
+	}
+}

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

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

app/Desktop/Discord/DiscordAppSettings.cs

@@ -9,8 +9,9 @@ using DHT.Utils.Logging;
 using static System.Environment.SpecialFolder;
 using static System.Environment.SpecialFolderOption;
 
-namespace DHT.Desktop.Discord {
-	static class DiscordAppSettings {
+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";
@@ -39,7 +40,9 @@ namespace DHT.Desktop.Discord {
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
 			return AreDevToolsEnabled(await ReadSettingsJson());
-			} catch (Exception) {
+		} catch (Exception e) {
+			Log.Error("Cannot read settings file.");
+			Log.Error(e);
 			return null;
 		}
 	}
@@ -115,5 +118,4 @@ namespace DHT.Desktop.Discord {
 		await using var stream = new FileStream(JsonFilePath, FileMode.Truncate, FileAccess.Write, FileShare.None);
 		await JsonSerializer.SerializeAsync(stream, json, new JsonSerializerOptions { WriteIndented = true });
 	}
-	}
 }

app/Desktop/Discord/SettingsJsonResult.cs

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

app/Desktop/Main/AboutWindow.axaml

@@ -46,7 +46,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 {
-	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class AboutWindow : Window {
+namespace DHT.Desktop.Main;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class AboutWindow : Window {
 	public AboutWindow() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
 	}
 }

app/Desktop/Main/AboutWindowModel.cs

@@ -1,7 +1,8 @@
 using System.Diagnostics;
 
-namespace DHT.Desktop.Main {
-	sealed class AboutWindowModel {
+namespace DHT.Desktop.Main;
+
+sealed class AboutWindowModel {
 	public void ShowOfficialWebsite() {
 		OpenUrl("https://dht.chylex.com");
 	}
@@ -29,5 +30,4 @@ namespace DHT.Desktop.Main {
 	private static void OpenUrl(string url) {
 		Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
 	}
-	}
 }

app/Desktop/Main/Controls/AttachmentFilterPanel.axaml

@@ -36,7 +36,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/AttachmentFilterPanel.axaml.cs

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

app/Desktop/Main/Controls/AttachmentFilterPanelModel.cs

@@ -7,9 +7,10 @@ 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, int Scale);
+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),
@@ -26,7 +27,7 @@ namespace DHT.Desktop.Main.Controls {
 	public string FilterStatisticsText { get; private set; } = "";
 
 	private bool limitSize = false;
-		private int maximumSize = 0;
+	private ulong maximumSize = 0L;
 	private Unit maximumSizeUnit = AllUnits[0];
 
 	public bool LimitSize {
@@ -34,7 +35,7 @@ namespace DHT.Desktop.Main.Controls {
 		set => Change(ref limitSize, value);
 	}
 
-		public int MaximumSize {
+	public ulong MaximumSize {
 		get => maximumSize;
 		set => Change(ref maximumSize, value);
 	}
@@ -116,10 +117,13 @@ namespace DHT.Desktop.Main.Controls {
 		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/MessageFilterPanel.axaml.cs

@@ -1,19 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
-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");
+namespace DHT.Desktop.Main.Controls;
 
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class MessageFilterPanel : UserControl {
 	public MessageFilterPanel() {
 		InitializeComponent();
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
 
 		var culture = Program.Culture;
 		foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
@@ -30,5 +23,4 @@ namespace DHT.Desktop.Main.Controls {
 			model.EndDate = EndDatePicker.SelectedDate;
 		}
 	}
-	}
 }

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -14,8 +14,9 @@ using DHT.Server.Database;
 using DHT.Utils.Models;
 using DHT.Utils.Tasks;
 
-namespace DHT.Desktop.Main.Controls {
-	sealed class MessageFilterPanelModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main.Controls;
+
+sealed class MessageFilterPanelModel : BaseModel, IDisposable {
 	private static readonly HashSet<string> FilterProperties = new () {
 		nameof(FilterByDate),
 		nameof(StartDate),
@@ -169,7 +170,7 @@ namespace DHT.Desktop.Main.Controls {
 		var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
 		var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
 
-			FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 0 ? "." : "s.");
+		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
 		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 
@@ -281,5 +282,4 @@ namespace DHT.Desktop.Main.Controls {
 
 		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
 	}
-	}
 }

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

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -6,8 +6,9 @@ using DHT.Server.Database;
 using DHT.Server.Service;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Controls {
-	sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main.Controls;
+
+sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
 	private string inputPort;
 
 	public string InputPort {
@@ -112,5 +113,4 @@ namespace DHT.Desktop.Main.Controls {
 		InputPort = ServerManager.Port.ToString();
 		InputToken = ServerManager.Token;
 	}
-	}
 }

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

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -2,8 +2,9 @@ using System;
 using DHT.Server.Database;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Controls {
-	sealed class StatusBarModel : BaseModel {
+namespace DHT.Desktop.Main.Controls;
+
+sealed class StatusBarModel : BaseModel {
 	public DatabaseStatistics DatabaseStatistics { get; }
 
 	private Status status = Status.Stopped;
@@ -41,5 +42,4 @@ namespace DHT.Desktop.Main.Controls {
 		Stopping,
 		Stopped
 	}
-	}
 }

app/Desktop/Main/MainWindow.axaml.cs

@@ -1,31 +1,23 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main.Pages;
 using JetBrains.Annotations;
 
-namespace DHT.Desktop.Main {
-	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class MainWindow : Window {
+namespace DHT.Desktop.Main;
+
+[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+public sealed partial class MainWindow : Window {
 	[UsedImplicitly]
 	public MainWindow() {
-			InitializeComponent(Arguments.Empty);
+		InitializeComponent();
+		DataContext = new MainWindowModel(this, Arguments.Empty);
 	}
 
 	internal MainWindow(Arguments args) {
-			InitializeComponent(args);
-		}
-
-		private void InitializeComponent(Arguments args) {
-			AvaloniaXamlLoader.Load(this);
+		InitializeComponent();
 		DataContext = new MainWindowModel(this, args);
-
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
 	}
 
 	public void OnClosed(object? sender, EventArgs e) {
@@ -41,5 +33,4 @@ namespace DHT.Desktop.Main {
 			}
 		}
 	}
-	}
 }

app/Desktop/Main/MainWindowModel.cs

@@ -10,8 +10,9 @@ using DHT.Desktop.Server;
 using DHT.Server.Database;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main {
-	sealed class MainWindowModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main;
+
+sealed class MainWindowModel : BaseModel, IDisposable {
 	private const string DefaultTitle = "Discord History Tracker";
 
 	public string Title { get; private set; } = DefaultTitle;
@@ -112,5 +113,4 @@ namespace DHT.Desktop.Main {
 		db?.Dispose();
 		db = null;
 	}
-	}
 }

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

app/Desktop/Main/Pages/AdvancedPageModel.cs

@@ -6,8 +6,9 @@ using DHT.Desktop.Server;
 using DHT.Server.Database;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class AdvancedPageModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main.Pages;
+
+sealed class AdvancedPageModel : BaseModel, IDisposable {
 	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
 
 	private readonly Window window;
@@ -35,5 +36,4 @@ namespace DHT.Desktop.Main.Pages {
 		db.Vacuum();
 		await Dialog.ShowOk(window, "Vacuum Database", "Done.");
 	}
-	}
 }

app/Desktop/Main/Pages/AttachmentsPage.axaml

@@ -38,7 +38,7 @@
         <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="Attachments" Binding="{Binding Items, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />

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

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

app/Desktop/Main/Pages/AttachmentsPageModel.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Threading;
+using Avalonia.Threading;
 using DHT.Desktop.Common;
 using DHT.Desktop.Main.Controls;
 using DHT.Server.Data;
@@ -11,8 +13,9 @@ using DHT.Server.Download;
 using DHT.Utils.Models;
 using DHT.Utils.Tasks;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class AttachmentsPageModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main.Pages;
+
+sealed class AttachmentsPageModel : BaseModel, IDisposable {
 	private static readonly DownloadItemFilter EnqueuedItemFilter = new() {
 		IncludeStatuses = new HashSet<DownloadStatus> {
 			DownloadStatus.Enqueued
@@ -87,6 +90,9 @@ namespace DHT.Desktop.Main.Pages {
 				downloadStatisticsComputer.Recompute();
 			}
 		}
+		else if (e.PropertyName == nameof(DatabaseStatistics.TotalDownloads)) {
+			downloadStatisticsComputer.Recompute();
+		}
 	}
 
 	private void EnqueueDownloadItems() {
@@ -130,9 +136,9 @@ namespace DHT.Desktop.Main.Pages {
 	}
 
 	private void DownloadThreadOnOnItemFinished(object? sender, DownloadItem e) {
-			++doneItemsCount;
+		Interlocked.Increment(ref doneItemsCount);
 
-			UpdateDownloadMessage();
+		Dispatcher.UIThread.Invoke(UpdateDownloadMessage);
 		downloadStatisticsComputer.Recompute();
 	}
 
@@ -172,7 +178,6 @@ namespace DHT.Desktop.Main.Pages {
 		};
 
 		db.RemoveDownloadItems(allExceptFailedFilter, FilterRemovalMode.KeepMatching);
-			downloadStatisticsComputer.Recompute();
 
 		if (IsDownloading) {
 			EnqueueDownloadItems();
@@ -197,5 +202,4 @@ namespace DHT.Desktop.Main.Pages {
 			State = state;
 		}
 	}
-	}
 }

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -24,6 +24,7 @@
         <WrapPanel>
             <Button Command="{Binding OpenDatabaseFolder}">Open Database Folder</Button>
             <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
+            <Button Command="{Binding ImportLegacyArchive}">Import Legacy Archive(s)...</Button>
         </WrapPanel>
     </StackPanel>
 

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

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

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -1,18 +1,28 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
+using DHT.Desktop.Dialogs.TextBox;
+using DHT.Server.Data;
 using DHT.Server.Database;
+using DHT.Server.Database.Import;
 using DHT.Utils.Logging;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class DatabasePageModel : BaseModel {
+namespace DHT.Desktop.Main.Pages; 
+
+sealed class DatabasePageModel : BaseModel {
 	private static readonly Log Log = Log.ForType<DatabasePageModel>();
 
 	public IDatabaseFile Db { get; }
@@ -56,13 +66,13 @@ namespace DHT.Desktop.Main.Pages {
 		}
 	}
 
-		public async void MergeWithDatabase() {
-			var fileDialog = DatabaseGui.NewOpenDatabaseFileDialog();
-			fileDialog.Directory = Path.GetDirectoryName(Db.Path);
-			fileDialog.AllowMultiple = true;
+	public void CloseDatabase() {
+		DatabaseClosed?.Invoke(this, EventArgs.Empty);
+	}
 
-			string[]? paths = await fileDialog.ShowAsync(window);
-			if (paths == null || paths.Length == 0) {
+	public async void MergeWithDatabase() {
+		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		if (paths.Length == 0) {
 			return;
 		}
 
@@ -74,10 +84,6 @@ namespace DHT.Desktop.Main.Pages {
 		await progressDialog.ShowDialog(window);
 	}
 
-		public void CloseDatabase() {
-			DatabaseClosed?.Invoke(this, EventArgs.Empty);
-		}
-
 	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		int total = paths.Length;
 
@@ -91,8 +97,94 @@ namespace DHT.Desktop.Main.Pages {
 			return DialogResult.YesNo.Yes == upgradeResult;
 		}
 
-			var oldStatistics = target.Statistics.Clone();
-			var oldMessageCount = target.CountMessages();
+		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 paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+			Title = "Open Legacy DHT Archive",
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
+			AllowMultiple = true
+		});
+			
+		if (paths.Length == 0) {
+			return;
+		}
+
+		ProgressDialog progressDialog = new ProgressDialog();
+		progressDialog.DataContext = new ProgressDialogModel(async callback => await ImportLegacyArchiveFromPaths(Db, paths, progressDialog, callback)) {
+			Title = "Legacy Archive Import"
+		};
+
+		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;
@@ -102,56 +194,52 @@ namespace DHT.Desktop.Main.Pages {
 			++finished;
 
 			if (!File.Exists(path)) {
-					await Dialog.ShowOk(dialog, "Database Error", "Database '" + Path.GetFileName(path) + "' no longer exists.");
-					continue;
-				}
-
-				IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, CheckCanUpgradeDatabase);
-				if (db == null) {
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
 				continue;
 			}
 
 			try {
-					target.AddFrom(db);
+				if (await performImport(path)) {
+					++successful;
+				}
 			} catch (Exception ex) {
 				Log.Error(ex);
-					await Dialog.ShowOk(dialog, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be merged: " + ex.Message);
-					continue;
-				} finally {
-					db.Dispose();
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
-
-				++successful;
 		}
 
 		await callback.Update("Done", finished, total);
 
 		if (successful == 0) {
-				await Dialog.ShowOk(dialog, "Database Merge", "Nothing was merged.");
+			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
 			return;
 		}
 
-			var newStatistics = target.Statistics;
+		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 newMessages = target.CountMessages() - oldMessageCount;
+		long newUsers = newStatistics.TotalUsers - oldStatistics.TotalUsers;
+		long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
 
 		StringBuilder message = new StringBuilder();
 		message.Append("Processed ");
 
-			if (successful == total) {
-				message.Append(successful.Pluralize("database file"));
+		if (successfulItems == totalItems) {
+			message.Append(successfulItems.Pluralize(itemName));
 		}
 		else {
-				message.Append(successful.Format()).Append(" out of ").Append(total.Pluralize("database file"));
+			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
 		}
 
 		message.Append(" and added:\n\n  \u2022 ");
 		message.Append(newServers.Pluralize("server")).Append("\n  \u2022 ");
 		message.Append(newChannels.Pluralize("channel")).Append("\n  \u2022 ");
+		message.Append(newUsers.Pluralize("user")).Append("\n  \u2022 ");
 		message.Append(newMessages.Pluralize("message"));
 
-			await Dialog.ShowOk(dialog, "Database Merge", message.ToString());
-		}
+		return message.ToString();
 	}
 }

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

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

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -63,7 +63,7 @@ namespace DHT.Desktop.Main.Pages {
 			var server = new DHT.Server.Data.Server {
 				Id = RandomId(rand),
 				Name = RandomName("s"),
-				Type = ServerType.Server
+				Type = ServerType.Server,
 			};
 
 			var channels = Enumerable.Range(0, channelCount).Select(i => new Channel {
@@ -73,14 +73,14 @@ namespace DHT.Desktop.Main.Pages {
 				ParentId = null,
 				Position = i,
 				Topic = RandomText(rand, 10),
-				Nsfw = rand.Next(4) == 0
+				Nsfw = rand.Next(4) == 0,
 			}).ToArray();
 
 			var users = Enumerable.Range(0, userCount).Select(_ => new User {
 				Id = RandomId(rand),
 				Name = RandomName("u"),
 				AvatarUrl = null,
-				Discriminator = rand.Next(0, 9999).ToString()
+				Discriminator = rand.Next(0, 9999).ToString(),
 			}).ToArray();
 
 			db.AddServer(server);
@@ -97,7 +97,7 @@ namespace DHT.Desktop.Main.Pages {
 				int hourOffset = batchIndex;
 
 				var messages = Enumerable.Range(0, Math.Min(messageCount, BatchSize)).Select(i => {
-					DateTimeOffset time = now.AddHours(hourOffset).AddMinutes((i * 60.0) / BatchSize);
+					DateTimeOffset time = now.AddHours(hourOffset).AddMinutes(i * 60.0 / BatchSize);
 					DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(1, 60)) : null;
 
 					var timeMillis = time.ToUnixTimeMilliseconds();
@@ -113,7 +113,7 @@ namespace DHT.Desktop.Main.Pages {
 						RepliedToId = null,
 						Attachments = ImmutableArray<Attachment>.Empty,
 						Embeds = ImmutableArray<Embed>.Empty,
-						Reactions = ImmutableArray<Reaction>.Empty
+						Reactions = ImmutableArray<Reaction>.Empty,
 					};
 				}).ToArray();
 
@@ -161,7 +161,7 @@ namespace DHT.Desktop.Main.Pages {
 			"vanilla",
 			"watercress", "watermelon",
 			"yam",
-			"zucchini"
+			"zucchini",
 		};
 
 		private static string RandomText(Random rand, int maxWords) {

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

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

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using System.Web;
-using Avalonia;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
@@ -9,8 +8,9 @@ using DHT.Desktop.Server;
 using DHT.Utils.Models;
 using static DHT.Desktop.Program;
 
-namespace DHT.Desktop.Main.Pages {
-	sealed class TrackingPageModel : BaseModel {
+namespace DHT.Desktop.Main.Pages;
+
+sealed class TrackingPageModel : BaseModel {
 	private bool areDevToolsEnabled;
 
 	private bool AreDevToolsEnabled {
@@ -61,7 +61,7 @@ namespace DHT.Desktop.Main.Pages {
 		                         .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;
+		var clipboard = window.Clipboard;
 		if (clipboard == null) {
 			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
 			return false;
@@ -113,5 +113,4 @@ namespace DHT.Desktop.Main.Pages {
 				throw new ArgumentOutOfRangeException();
 		}
 	}
-	}
 }

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

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
@@ -8,17 +7,22 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Controls;
+using DHT.Desktop.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 {
-	sealed class ViewerPageModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main.Pages;
+
+sealed class ViewerPageModel : BaseModel, IDisposable {
 	public static readonly ConcurrentBag<string> TemporaryFiles = new ();
 
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
@@ -55,7 +59,7 @@ namespace DHT.Desktop.Main.Pages {
 		HasFilters = FilterModel.HasAnyFilters;
 	}
 
-		private async Task WriteViewerFile(string path) {
+	private async Task WriteViewerFile(string path, IViewerExportStrategy strategy) {
 		const string ArchiveTag = "/*[ARCHIVE]*/";
 
 		string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
@@ -68,7 +72,7 @@ namespace DHT.Desktop.Main.Pages {
 		string jsonTempFile = path + ".tmp";
 
 		await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
-				await ViewerJsonExport.Generate(jsonStream, db, FilterModel.CreateFilter());
+			await ViewerJsonExport.Generate(jsonStream, strategy, db, FilterModel.CreateFilter());
 
 			char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
 			jsonStream.Position = 0;
@@ -106,27 +110,25 @@ namespace DHT.Desktop.Main.Pages {
 		TemporaryFiles.Add(fullPath);
 
 		Directory.CreateDirectory(rootPath);
-			await WriteViewerFile(fullPath);
+		await WriteViewerFile(fullPath, new LiveViewerExportStrategy(ServerManager.Port, ServerManager.Token));
 
 		Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
 	}
 
-		public async void OnClickSaveViewer() {
-			var dialog = new SaveFileDialog {
-				Title = "Save Viewer",
-				InitialFileName = Path.GetFileNameWithoutExtension(db.Path) + ".html",
-				Directory = Path.GetDirectoryName(db.Path),
-				Filters = new List<FileDialogFilter> {
-					new() {
-						Name = "Discord History Viewer",
-						Extensions = { "html" }
-					}
-				}
-			}.ShowAsync(window);
+	private static readonly FilePickerFileType[] ViewerFileTypes = {
+		FileDialogs.CreateFilter("Discord History Viewer", new string[] { "html" }),
+	};
 	
-			string? path = await dialog;
-			if (!string.IsNullOrEmpty(path)) {
-				await WriteViewerFile(path);
+	public async void OnClickSaveViewer() {
+		string? path = await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
+			Title = "Save Viewer",
+			FileTypeChoices = ViewerFileTypes,
+			SuggestedFileName = Path.GetFileNameWithoutExtension(db.Path) + ".html",
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(db.Path)),
+		});
+
+		if (path != null) {
+			await WriteViewerFile(path, StandaloneViewerExportStrategy.Instance);
 		}
 	}
 
@@ -144,5 +146,4 @@ namespace DHT.Desktop.Main.Pages {
 			}
 		}
 	}
-	}
 }

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

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -9,8 +9,9 @@ using DHT.Server.Database;
 using DHT.Server.Service;
 using DHT.Utils.Logging;
 
-namespace DHT.Desktop.Main.Screens {
-	sealed class MainContentScreenModel : IDisposable {
+namespace DHT.Desktop.Main.Screens;
+
+sealed class MainContentScreenModel : IDisposable {
 	private static readonly Log Log = Log.ForType<MainContentScreenModel>();
 
 	public DatabasePage DatabasePage { get; }
@@ -115,5 +116,4 @@ namespace DHT.Desktop.Main.Screens {
 		Log.Error(ex);
 		await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
 	}
-	}
 }

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

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -7,8 +7,9 @@ using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Screens {
-	sealed class WelcomeScreenModel : BaseModel, IDisposable {
+namespace DHT.Desktop.Main.Screens;
+
+sealed class WelcomeScreenModel : BaseModel, IDisposable {
 	public string Version => Program.Version;
 
 	public IDatabaseFile? Db { get; private set; }
@@ -26,11 +27,8 @@ namespace DHT.Desktop.Main.Screens {
 	}
 
 	public async void OpenOrCreateDatabase() {
-			var dialog = DatabaseGui.NewOpenOrCreateDatabaseFileDialog();
-			dialog.Directory = Path.GetDirectoryName(dbFilePath);
-
-			string? path = await dialog.ShowAsync(window);
-			if (!string.IsNullOrWhiteSpace(path)) {
+		var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
+		if (path != null) {
 			await OpenOrCreateDatabaseFromPath(path);
 		}
 	}
@@ -69,5 +67,4 @@ namespace DHT.Desktop.Main.Screens {
 		Db?.Dispose();
 		Db = null;
 	}
-	}
 }

app/Desktop/Program.cs

@@ -3,8 +3,9 @@ using System.Reflection;
 using Avalonia;
 using DHT.Utils.Resources;
 
-namespace DHT.Desktop {
-	static class Program {
+namespace DHT.Desktop;
+
+static class Program {
 	public static string Version { get; }
 	public static CultureInfo Culture { get; }
 	public static ResourceLoader Resources { get; }
@@ -33,7 +34,7 @@ namespace DHT.Desktop {
 	private static AppBuilder BuildAvaloniaApp() {
 		return AppBuilder.Configure<App>()
 		                 .UsePlatformDetect()
+		                 .WithInterFont()
 		                 .LogToTrace();
 	}
-	}
 }

app/Desktop/Server/ServerManager.cs

@@ -2,8 +2,9 @@ using System;
 using DHT.Server.Database;
 using DHT.Server.Service;
 
-namespace DHT.Desktop.Server {
-	sealed class ServerManager : IDisposable {
+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);
 
@@ -46,5 +47,4 @@ namespace DHT.Desktop.Server {
 			instance = null;
 		}
 	}
-	}
 }

app/Directory.build.props

@@ -0,0 +1,8 @@
+<Project>
+  
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>11</LangVersion>
+  </PropertyGroup>
+  
+</Project>

app/Resources/Tracker/scripts/discord.js

@@ -9,7 +9,7 @@ class DISCORD {
 	}
 	
 	static getMessageElements() {
-		return this.getMessageOuterElement().querySelectorAll("[class*='message-']");
+		return this.getMessageOuterElement().querySelectorAll("[class*='message_']");
 	}
 	
 	static hasMoreMessages() {
@@ -91,13 +91,15 @@ class DISCORD {
 	static getMessageElementProps(ele) {
 		const props = DOM.getReactProps(ele);
 		
-		if (props.children && props.children.length >= 4) {
-			const childProps = props.children[3].props;
+		if (props.children && props.children.length) {
+			for (let i = 3; i < props.children.length; i++) {
+				const childProps = props.children[i].props;
 				
-			if ("message" in childProps && "channel" in childProps) {
+				if (childProps && "message" in childProps && "channel" in childProps) {
 					return childProps;
 				}
 			}
+		}
 		
 		return null;
 	}
@@ -110,16 +112,20 @@ class DISCORD {
 			const messages = [];
 			
 			for (const ele of this.getMessageElements()) {
+				try {
 					const props = this.getMessageElementProps(ele);
 					
 					if (props != null) {
 						messages.push(props.message);
 					}
+				} catch (e) {
+					console.error("[DHT] Error extracing message data, skipping it.", e, ele, DOM.tryGetReactProps(ele));
+				}
 			}
 			
 			return messages;
 		} catch (e) {
-			console.error(e);
+			console.error("[DHT] Error retrieving messages.", e);
 			return [];
 		}
 	}
@@ -162,7 +168,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) {
@@ -191,9 +197,22 @@ class DISCORD {
 				return { server, channel };
 			}
 			else if (obj.guild_id) {
+				let guild;
+				
+				for (const child of DOM.getReactProps(document.querySelector("nav header [class*='headerContent_']")).children) {
+					if (child && child.props && child.props.guild) {
+						guild = child.props.guild;
+						break;
+					}
+				}
+				
+				if (!guild || typeof guild.name !== "string" || obj.guild_id !== guild.id) {
+					return null;
+				}
+				
 				const server = {
-					"id": obj.guild_id,
-					"name": document.querySelector("nav header h1[class*='name-']").innerText,
+					"id": guild.id,
+					"name": guild.name,
 					"type": "SERVER"
 				};
 				
@@ -232,10 +251,10 @@ class DISCORD {
 		
 		if (dms) {
 			const currentChannel = DOM.queryReactClass("selected", dms);
-			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel-']");
+			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel_']");
 			const nextChannel = currentChannelContainer && currentChannelContainer.nextElementSibling;
 			
-			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel-")) {
+			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel_")) {
 				return false;
 			}
 			
@@ -262,7 +281,7 @@ class DISCORD {
 			let nextChannel = null;
 			
 			for (let index = 0; index < allTextChannels.length - 1; index++) {
-				if (allTextChannels[index].className.includes("selected-")) {
+				if (allTextChannels[index].className.includes("selected_")) {
 					nextChannel = allTextChannels[index + 1];
 					break;
 				}

app/Resources/Tracker/scripts/dom.js

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

app/Resources/Tracker/scripts/state.js

@@ -251,6 +251,11 @@ const STATE = (function() {
 							mapped.type = attachment.content_type;
 						}
 						
+						if (attachment.width && attachment.height) {
+							mapped.width = attachment.width;
+							mapped.height = attachment.height;
+						}
+						
 						return mapped;
 					});
 				}

app/Resources/Tracker/styles/controller.css

@@ -1,9 +1,5 @@
-#app-mount div[class*="app-"] {
-  margin-bottom: 48px !important;
-}
-
-#app-mount div[class*="app-"] > div[class*="app-"] {
-  margin-bottom: 0 !important;
+#app-mount {
+  height: calc(100% - 48px) !important;
 }
 
 #dht-ctrl {

app/Resources/Viewer/scripts/discord.js

@@ -1,7 +1,7 @@
 const DISCORD = (function() {
 	const regex = {
 		formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
-		formatItalic: /(.)?\*([\s\S]+?)\*(?!\*)/g,
+		formatItalic: /(.)?([_*])([\s\S]+?)\2(?!\2)/g,
 		formatUnderline: /__([\s\S]+?)__(?!_)/g,
 		formatStrike: /~~([\s\S]+?)~~(?!~)/g,
 		formatCodeInline: /(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/g,
@@ -9,7 +9,7 @@ const DISCORD = (function() {
 		formatUrl: /(\b(?:https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig,
 		formatUrlNoEmbed: /<(\b(?:https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])>/ig,
 		specialEscapedBacktick: /\\`/g,
-		specialEscapedSingle: /\\([*\\])/g,
+		specialEscapedSingle: /\\([*_\\])/g,
 		specialEscapedDouble: /\\__|_\\_|\\_\\_|\\~~|~\\~|\\~\\~/g,
 		specialUnescaped: /([*_~\\])/g,
 		mentionRole: /&lt;@&(\d+?)&gt;/g,
@@ -26,6 +26,7 @@ const DISCORD = (function() {
 	let templateUserAvatar;
 	let templateAttachmentDownload;
 	let templateEmbedImage;
+	let templateEmbedImageWithSize;
 	let templateEmbedRich;
 	let templateEmbedRichNoDescription;
 	let templateEmbedUrl;
@@ -46,8 +47,8 @@ const DISCORD = (function() {
 				.replace(regex.specialEscapedSingle, escapeHtmlMatch)
 				.replace(regex.specialEscapedDouble, full => full.replace(/\\/g, "").replace(/(.)/g, escapeHtmlMatch))
 				.replace(regex.formatBold, "<b>$1</b>")
-				.replace(regex.formatItalic, (full, pre, match) => pre === "\\" ? full : (pre || "") + "<i>" + match + "</i>")
 				.replace(regex.formatUnderline, "<u>$1</u>")
+				.replace(regex.formatItalic, (full, pre, char, match) => pre === "\\" ? full : (pre || "") + "<i>" + match + "</i>")
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		
@@ -64,6 +65,25 @@ const DISCORD = (function() {
 		return "<p>" + processed + "</p>";
 	};
 	
+	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 });
+		}
+		else {
+			return templateEmbedImage.apply({ url, src: image.url });
+		}
+	};
+	
+	const isImageUrl = function(url) {
+		const dot = url.pathname.lastIndexOf(".");
+		const ext = dot === -1 ? "" : url.pathname.substring(dot).toLowerCase();
+		return ext === ".png" || ext === ".gif" || ext === ".jpg" || ext === ".jpeg";
+	};
+	
 	return {
 		setup() {
 			templateChannelServer = new TEMPLATE([
@@ -109,12 +129,17 @@ const DISCORD = (function() {
 			
 			// noinspection HtmlUnknownTarget
 			templateAttachmentDownload = new TEMPLATE([
-				"<a href='{url}' class='embed download'>Download {filename}</a>"
+				"<a href='{url}' class='embed download'>Download {name}</a>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
 			templateEmbedImage = new TEMPLATE([
-				"<a href='{url}' class='embed thumbnail'><img src='{src}' alt='(image attachment not found)'></a><br>"
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
+			].join(""));
+			
+			// noinspection HtmlUnknownTarget
+			templateEmbedImageWithSize = new TEMPLATE([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
@@ -145,10 +170,20 @@ const DISCORD = (function() {
 			].join(""));
 		},
 		
+		handleImageLoad(ele) {
+			ele.parentElement.classList.remove("loading");
+		},
+		
+		handleImageLoadError(ele) {
+			// noinspection JSUnusedGlobalSymbols
+			ele.onerror = null;
+			ele.parentElement.classList.remove("loading");
+			ele.setAttribute("alt", "(image attachment not found)");
+		},
+		
 		isImageAttachment(attachment) {
-			const dot = attachment.url.lastIndexOf(".");
-			const ext = dot === -1 ? "" : attachment.url.substring(dot).toLowerCase();
-			return ext === ".png" || ext === ".gif" || ext === ".jpg" || ext === ".jpeg";
+			const url = DOM.tryParseUrl(attachment.url);
+			return url != null && isImageUrl(url);
 		},
 		
 		getChannelHTML(channel) { // noinspection FunctionWithInconsistentReturnsJS
@@ -183,10 +218,10 @@ const DISCORD = (function() {
 							return templateEmbedUnsupported.apply(embed);
 						}
 						else if ("image" in embed && embed.image.url) {
-							return SETTINGS.enableImagePreviews ? templateEmbedImage.apply({ url: embed.url, src: embed.image.url }) : "";
+							return getImageEmbed(embed.url, embed.image);
 						}
 						else if ("thumbnail" in embed && embed.thumbnail.url) {
-							return SETTINGS.enableImagePreviews ? templateEmbedImage.apply({ url: embed.url, src: embed.thumbnail.url }) : "";
+							return getImageEmbed(embed.url, embed.thumbnail);
 						}
 						else if ("title" in embed && "description" in embed) {
 							return templateEmbedRich.apply(embed);
@@ -205,16 +240,14 @@ const DISCORD = (function() {
 					}
 					
 					return value.map(attachment => {
-						if (this.isImageAttachment(attachment) && SETTINGS.enableImagePreviews) {
-							return templateEmbedImage.apply({ url: attachment.url, src: attachment.url });
+						if (!DISCORD.isImageAttachment(attachment) || !SETTINGS.enableImagePreviews) {
+							return templateAttachmentDownload.apply(attachment);
+						}
+						else if ("width" in attachment && "height" in attachment) {
+							return templateEmbedImageWithSize.apply({ url: attachment.url, src: attachment.url, width: attachment.width, height: attachment.height });
 						}
 						else {
-							const sliced = attachment.url.split("/");
-							
-							return templateAttachmentDownload.apply({
-								"url": attachment.url,
-								"filename": sliced[sliced.length - 1]
-							});
+							return templateEmbedImage.apply({ url: attachment.url, src: attachment.url });
 						}
 					}).join("");
 				}

app/Resources/Viewer/scripts/dom.js

@@ -51,4 +51,15 @@ class DOM {
 		const date = new Date(timestamp);
 		return date.toLocaleDateString() + ", " + date.toLocaleTimeString();
 	};
+	
+	/**
+	 * Parses a url string into a URL object and returns it. If the parsing fails, returns null.
+	 */
+	static tryParseUrl(url) {
+		try {
+			return new URL(url);
+		} catch (ignore) {
+			return null;
+		}
+	}
 }

app/Resources/Viewer/styles/messages.css

@@ -107,11 +107,25 @@
 }
 
 .message .thumbnail {
+  position: relative;
   max-width: calc(100% - 20px);
   max-height: 320px;
 }
 
+.message .thumbnail.loading::after {
+  content: "";
+  background: rgba(0, 0, 0, 0.75)
+              url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
+              no-repeat center center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
 .message .thumbnail img {
+  width: auto;
   max-width: 100%;
   max-height: 320px;
   border-radius: 3px;

app/Server/Data/Aggregations/DownloadStatusStatistics.cs

@@ -1,5 +1,6 @@
-namespace DHT.Server.Data.Aggregations {
-	public sealed class DownloadStatusStatistics {
+namespace DHT.Server.Data.Aggregations;
+
+public sealed class DownloadStatusStatistics {
 	public int EnqueuedCount { get; internal set; }
 	public ulong EnqueuedSize { get; internal set; }
 
@@ -11,5 +12,4 @@ namespace DHT.Server.Data.Aggregations {
 
 	public int SkippedCount { get; internal set; }
 	public ulong SkippedSize { get; internal set; }
-	}
 }

app/Server/Data/Attachment.cs

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

app/Server/Data/Channel.cs

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

app/Server/Data/Download.cs

@@ -1,12 +1,9 @@
 using System;
 using System.Net;
 
-namespace DHT.Server.Data {
-	public readonly struct Download {
-		internal static Download NewEnqueued(string url, ulong size) {
-			return new Download(url, DownloadStatus.Enqueued, size);
-		}
+namespace DHT.Server.Data;
 
+public readonly struct Download {
 	internal static Download NewSuccess(string url, byte[] data) {
 		return new Download(url, DownloadStatus.Success, (ulong) Math.Max(data.LongLength, 0), data);
 	}
@@ -20,11 +17,14 @@ namespace DHT.Server.Data {
 	public ulong Size { get; }
 	public byte[]? Data { get; }
 
-		private Download(string url, DownloadStatus status, ulong size, byte[]? data = null) {
+	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,12 @@
 using System.Net;
 
-namespace DHT.Server.Data {
-	/// <summary>
-	/// Extends <see cref="HttpStatusCode"/> with custom status codes in the range 0-99.
-	/// </summary>
-	public enum DownloadStatus {
+namespace DHT.Server.Data;
+
+/// <summary>
+/// Extends <see cref="HttpStatusCode"/> with custom status codes in the range 0-99.
+/// </summary>
+public enum DownloadStatus {
 	Enqueued = 0,
 	GenericError = 1,
 	Success = HttpStatusCode.OK
-	}
 }

app/Server/Data/DownloadedAttachment.cs

@@ -0,0 +1,6 @@
+namespace DHT.Server.Data;
+
+public readonly struct DownloadedAttachment {
+	public string? Type { get; internal init; }
+	public byte[] Data { get; internal init; }
+}

app/Server/Data/Embed.cs

@@ -1,5 +1,5 @@
-namespace DHT.Server.Data {
-	public readonly struct Embed {
+namespace DHT.Server.Data;
+
+public readonly struct Embed {
 	public string Json { get; internal init; }
-	}
 }

app/Server/Data/EmojiFlags.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace DHT.Server.Data {
-	[Flags]
-	public enum EmojiFlags : ushort {
+namespace DHT.Server.Data;
+
+[Flags]
+public enum EmojiFlags : ushort {
 	None = 0,
 	Animated = 0b1
-	}
 }

app/Server/Data/Filters/AttachmentFilter.cs

@@ -1,6 +1,7 @@
-namespace DHT.Server.Data.Filters {
-	public sealed class AttachmentFilter {
-		public long? MaxBytes { get; set; } = null;
+namespace DHT.Server.Data.Filters;
+
+public sealed class AttachmentFilter {
+	public ulong? MaxBytes { get; set; } = null;
 
 	public DownloadItemRules? DownloadItemRule { get; set; } = null;
 
@@ -11,5 +12,4 @@ namespace DHT.Server.Data.Filters {
 		OnlyNotPresent,
 		OnlyPresent
 	}
-	}
 }

app/Server/Data/Filters/DownloadItemFilter.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 
-namespace DHT.Server.Data.Filters {
-	public sealed class DownloadItemFilter {
-		public HashSet<DownloadStatus>? IncludeStatuses { get; set; } = null;
-		public HashSet<DownloadStatus>? ExcludeStatuses { get; set; } = null;
+namespace DHT.Server.Data.Filters;
+
+public sealed class DownloadItemFilter {
+	public HashSet<DownloadStatus>? IncludeStatuses { get; init; } = null;
+	public HashSet<DownloadStatus>? ExcludeStatuses { get; init; } = null;
 
 	public bool IsEmpty => IncludeStatuses == null && ExcludeStatuses == null;
-	}
 }

app/Server/Data/Filters/FilterRemovalMode.cs

@@ -1,6 +1,6 @@
-namespace DHT.Server.Data.Filters {
-	public enum FilterRemovalMode {
+namespace DHT.Server.Data.Filters;
+
+public enum FilterRemovalMode {
 	KeepMatching,
 	RemoveMatching
-	}
 }

app/Server/Data/Filters/MessageFilter.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 
-namespace DHT.Server.Data.Filters {
-	public sealed class MessageFilter {
+namespace DHT.Server.Data.Filters;
+
+public sealed class MessageFilter {
 	public DateTime? StartDate { get; set; } = null;
 	public DateTime? EndDate { get; set; } = null;
 
@@ -15,5 +16,4 @@ namespace DHT.Server.Data.Filters {
 	                       ChannelIds == null &&
 	                       UserIds == null &&
 	                       MessageIds == null;
-	}
 }

app/Server/Data/Message.cs

@@ -1,7 +1,8 @@
 using System.Collections.Immutable;
 
-namespace DHT.Server.Data {
-	public readonly struct Message {
+namespace DHT.Server.Data;
+
+public readonly struct Message {
 	public ulong Id { get; init; }
 	public ulong Sender { get; init; }
 	public ulong Channel { get; init; }
@@ -12,5 +13,4 @@ namespace DHT.Server.Data {
 	public ImmutableArray<Attachment> Attachments { get; init; }
 	public ImmutableArray<Embed> Embeds { get; init; }
 	public ImmutableArray<Reaction> Reactions { get; init; }
-	}
 }

app/Server/Data/Reaction.cs

@@ -1,8 +1,8 @@
-namespace DHT.Server.Data {
-	public readonly struct Reaction {
+namespace DHT.Server.Data;
+
+public readonly struct Reaction {
 	public ulong? EmojiId { get; internal init; }
 	public string? EmojiName { get; internal init; }
 	public EmojiFlags EmojiFlags { get; internal init; }
 	public int Count { get; internal init; }
-	}
 }

app/Server/Data/Server.cs

@@ -1,7 +1,7 @@
-namespace DHT.Server.Data {
-	public readonly struct Server {
+namespace DHT.Server.Data;
+
+public readonly struct Server {
 	public ulong Id { get; init; }
 	public string Name { get; init; }
 	public ServerType? Type { get; init; }
-	}
 }

app/Server/Data/ServerType.cs

@@ -1,11 +1,12 @@
-namespace DHT.Server.Data {
-	public enum ServerType {
+namespace DHT.Server.Data;
+
+public enum ServerType {
 	Server,
 	Group,
 	DirectMessage
-	}
+}
 
-	public static class ServerTypes {
+public static class ServerTypes {
 	public static ServerType? FromString(string? str) {
 		return str switch {
 			"SERVER" => ServerType.Server,
@@ -24,6 +25,15 @@ namespace DHT.Server.Data {
 		};
 	}
 
+	public static string ToNiceString(ServerType? type) {
+		return type switch {
+			ServerType.Server        => "Server",
+			ServerType.Group         => "Group",
+			ServerType.DirectMessage => "DM",
+			_                        => "Unknown"
+		};
+	}
+
 	internal static string ToJsonViewerString(ServerType? type) {
 		return type switch {
 			ServerType.Server        => "server",
@@ -32,5 +42,4 @@ namespace DHT.Server.Data {
 			_                        => "unknown"
 		};
 	}
-	}
 }

app/Server/Data/User.cs

@@ -1,8 +1,8 @@
-namespace DHT.Server.Data {
-	public readonly struct User {
+namespace DHT.Server.Data;
+
+public readonly struct User {
 	public ulong Id { get; init; }
 	public string Name { get; init; }
 	public string? AvatarUrl { get; init; }
 	public string? Discriminator { get; init; }
-	}
 }

app/Server/Database/DatabaseExtensions.cs

@@ -1,16 +1,29 @@
-namespace DHT.Server.Database {
-	public static class DatabaseExtensions {
+using System.Collections.Generic;
+using DHT.Server.Data;
+
+namespace DHT.Server.Database;
+
+public static class DatabaseExtensions {
 	public static void AddFrom(this IDatabaseFile target, IDatabaseFile source) {
-			foreach (var server in source.GetAllServers()) {
-				target.AddServer(server);
-			}
-
-			foreach (var channel in source.GetAllChannels()) {
-				target.AddChannel(channel);
-			}
-
+		target.AddServers(source.GetAllServers());
+		target.AddChannels(source.GetAllChannels());
 		target.AddUsers(source.GetAllUsers().ToArray());
 		target.AddMessages(source.GetMessages().ToArray());
+
+		foreach (var download in source.GetDownloadsWithoutData()) {
+			target.AddDownload(download.Status == DownloadStatus.Success ? source.GetDownloadWithData(download) : download);
+		}
+	}
+
+	internal static void AddServers(this IDatabaseFile target, IEnumerable<Data.Server> servers) {
+		foreach (var server in servers) {
+			target.AddServer(server);
+		}
+	}
+
+	internal static void AddChannels(this IDatabaseFile target, IEnumerable<Channel> channels) {
+		foreach (var channel in channels) {
+			target.AddChannel(channel);
 		}
 	}
 }

app/Server/Database/DatabaseStatistics.cs

@@ -1,12 +1,18 @@
 using DHT.Utils.Models;
 
-namespace DHT.Server.Database {
-	public sealed class DatabaseStatistics : BaseModel {
+namespace DHT.Server.Database;
+
+/// <summary>
+/// A live view of database statistics.
+/// Some of the totals are computed asynchronously and may not reflect the most recent version of the database, or may not be available at all until computed for the first time.
+/// </summary>
+public sealed class DatabaseStatistics : BaseModel {
 	private long totalServers;
 	private long totalChannels;
 	private long totalUsers;
 	private long? totalMessages;
 	private long? totalAttachments;
+	private long? totalDownloads;
 
 	public long TotalServers {
 		get => totalServers;
@@ -33,14 +39,8 @@ namespace DHT.Server.Database {
 		internal set => Change(ref totalAttachments, value);
 	}
 
-		public DatabaseStatistics Clone() {
-			return new DatabaseStatistics {
-				totalServers = totalServers,
-				totalChannels = totalChannels,
-				totalUsers = TotalUsers,
-				totalMessages = totalMessages,
-				totalAttachments = totalAttachments
-			};
-		}
+	public long? TotalDownloads {
+		get => totalDownloads;
+		internal set => Change(ref totalDownloads, value);
 	}
 }

app/Server/Database/DatabaseStatisticsSnapshot.cs

@@ -0,0 +1,11 @@
+namespace DHT.Server.Database;
+
+/// <summary>
+/// A complete snapshot of database statistics at a particular point in time.
+/// </summary>
+public readonly struct DatabaseStatisticsSnapshot {
+	public long TotalServers { get; internal init; }
+	public long TotalChannels { get; internal init; }
+	public long TotalUsers { get; internal init; }
+	public long TotalMessages { get; internal init; }
+}

app/Server/Database/DummyDatabaseFile.cs

@@ -1,11 +1,14 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using DHT.Server.Data;
 using DHT.Server.Data.Aggregations;
 using DHT.Server.Data.Filters;
 using DHT.Server.Download;
 
-namespace DHT.Server.Database {
-	public sealed class DummyDatabaseFile : IDatabaseFile {
+namespace DHT.Server.Database;
+
+[SuppressMessage("ReSharper", "ArrangeObjectCreationWhenTypeNotEvident")]
+public sealed class DummyDatabaseFile : IDatabaseFile {
 	public static DummyDatabaseFile Instance { get; } = new();
 
 	public string Path => "";
@@ -13,6 +16,10 @@ namespace DHT.Server.Database {
 
 	private DummyDatabaseFile() {}
 
+	public DatabaseStatisticsSnapshot SnapshotStatistics() {
+		return new();
+	}
+
 	public void AddServer(Data.Server server) {}
 
 	public List<Data.Server> GetAllServers() {
@@ -41,13 +48,29 @@ namespace DHT.Server.Database {
 		return new();
 	}
 
+	public HashSet<ulong> GetMessageIds(MessageFilter? filter = null) {
+		return new();
+	}
+
 	public void RemoveMessages(MessageFilter filter, FilterRemovalMode mode) {}
 
 	public int CountAttachments(AttachmentFilter? filter = null) {
 		return new();
 	}
 
-		public void AddDownloads(IEnumerable<Data.Download> downloads) {}
+	public List<Data.Download> GetDownloadsWithoutData() {
+		return new();
+	}
+
+	public Data.Download GetDownloadWithData(Data.Download download) {
+		return download;
+	}
+
+	public DownloadedAttachment? GetDownloadedAttachment(string url) {
+		return null;
+	}
+
+	public void AddDownload(Data.Download download) {}
 
 	public void EnqueueDownloadItems(AttachmentFilter? filter = null) {}
 
@@ -64,5 +87,4 @@ namespace DHT.Server.Database {
 	public void Vacuum() {}
 
 	public void Dispose() {}
-	}
 }

app/Server/Database/Exceptions/DatabaseTooNewException.cs

@@ -1,13 +1,13 @@
 using System;
 using DHT.Server.Database.Sqlite;
 
-namespace DHT.Server.Database.Exceptions {
-	public sealed class DatabaseTooNewException : Exception {
+namespace DHT.Server.Database.Exceptions;
+
+public sealed class DatabaseTooNewException : Exception {
 	public int DatabaseVersion { get; }
 	public int CurrentVersion => Schema.Version;
 
 	internal DatabaseTooNewException(int databaseVersion) : base("Database is too new: " + databaseVersion + " > " + Schema.Version) {
 		this.DatabaseVersion = databaseVersion;
 	}
-	}
 }

app/Server/Database/Exceptions/InvalidDatabaseVersionException.cs

@@ -1,11 +1,11 @@
 using System;
 
-namespace DHT.Server.Database.Exceptions {
-	public sealed class InvalidDatabaseVersionException : Exception {
+namespace DHT.Server.Database.Exceptions;
+
+public sealed class InvalidDatabaseVersionException : Exception {
 	public string Version { get; }
 
 	internal InvalidDatabaseVersionException(string version) : base("Invalid database version: " + version) {
 		this.Version = version;
 	}
-	}
 }

app/Server/Database/Export/Strategy/IViewerExportStrategy.cs

@@ -0,0 +1,7 @@
+using DHT.Server.Data;
+
+namespace DHT.Server.Database.Export.Strategy;
+
+public interface IViewerExportStrategy {
+	string GetAttachmentUrl(Attachment attachment);
+}

app/Server/Database/Export/Strategy/LiveViewerExportStrategy.cs

@@ -0,0 +1,18 @@
+using System.Net;
+using DHT.Server.Data;
+
+namespace DHT.Server.Database.Export.Strategy;
+
+public sealed class LiveViewerExportStrategy : IViewerExportStrategy {
+	private readonly string safePort;
+	private readonly string safeToken;
+
+	public LiveViewerExportStrategy(ushort port, string token) {
+		this.safePort = port.ToString();
+		this.safeToken = WebUtility.UrlEncode(token);
+	}
+
+	public string GetAttachmentUrl(Attachment attachment) {
+		return "http://127.0.0.1:" + safePort + "/get-attachment/" + WebUtility.UrlEncode(attachment.Url) + "?token=" + safeToken;
+	}
+}

app/Server/Database/Export/Strategy/StandaloneViewerExportStrategy.cs

@@ -0,0 +1,13 @@
+using DHT.Server.Data;
+
+namespace DHT.Server.Database.Export.Strategy;
+
+public sealed class StandaloneViewerExportStrategy : IViewerExportStrategy {
+	public static StandaloneViewerExportStrategy Instance { get; } = new ();
+
+	private StandaloneViewerExportStrategy() {}
+
+	public string GetAttachmentUrl(Attachment attachment) {
+		return attachment.Url;
+	}
+}

app/Server/Database/Export/ViewerJsonExport.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -5,13 +6,15 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
+using DHT.Server.Database.Export.Strategy;
 using DHT.Utils.Logging;
 
-namespace DHT.Server.Database.Export {
-	public static class ViewerJsonExport {
+namespace DHT.Server.Database.Export;
+
+public static class ViewerJsonExport {
 	private static readonly Log Log = Log.ForType(typeof(ViewerJsonExport));
 
-		public static async Task Generate(Stream stream, IDatabaseFile db, MessageFilter? filter = null) {
+	public static async Task Generate(Stream stream, IViewerExportStrategy strategy, IDatabaseFile db, MessageFilter? filter = null) {
 		var perf = Log.Start();
 
 		var includedUserIds = new HashSet<ulong>();
@@ -41,7 +44,7 @@ namespace DHT.Server.Database.Export {
 
 		var value = new {
 			meta = new { users, userindex, servers, channels },
-				data = GenerateMessageList(includedMessages, userIndices)
+			data = GenerateMessageList(includedMessages, userIndices, strategy),
 		};
 
 		perf.Step("Generate value object");
@@ -55,7 +58,7 @@ namespace DHT.Server.Database.Export {
 		perf.End();
 	}
 
-		private static object GenerateUserList(IDatabaseFile db, HashSet<ulong> userIds, out List<string> userindex, out Dictionary<ulong, object> userIndices) {
+	private static Dictionary<string, object> GenerateUserList(IDatabaseFile db, HashSet<ulong> userIds, out List<string> userindex, out Dictionary<ulong, object> userIndices) {
 		var users = new Dictionary<string, object>();
 		userindex = new List<string>();
 		userIndices = new Dictionary<ulong, object>();
@@ -87,7 +90,7 @@ namespace DHT.Server.Database.Export {
 		return users;
 	}
 
-		private static object GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, out Dictionary<ulong, object> serverIndices) {
+	private static List<object> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, out Dictionary<ulong, object> serverIndices) {
 		var servers = new List<object>();
 		serverIndices = new Dictionary<ulong, object>();
 
@@ -100,20 +103,20 @@ namespace DHT.Server.Database.Export {
 			serverIndices[id] = servers.Count;
 			servers.Add(new Dictionary<string, object> {
 				["name"] = server.Name,
-					["type"] = ServerTypes.ToJsonViewerString(server.Type)
+				["type"] = ServerTypes.ToJsonViewerString(server.Type),
 			});
 		}
 
 		return servers;
 	}
 
-		private static object GenerateChannelList(List<Channel> includedChannels, Dictionary<ulong, object> serverIndices) {
+	private static Dictionary<string, object> GenerateChannelList(List<Channel> includedChannels, Dictionary<ulong, object> serverIndices) {
 		var channels = new Dictionary<string, object>();
 
 		foreach (var channel in includedChannels) {
 			var obj = new Dictionary<string, object> {
 				["server"] = serverIndices[channel.Server],
-					["name"] = channel.Name
+				["name"] = channel.Name,
 			};
 
 			if (channel.ParentId != null) {
@@ -138,7 +141,7 @@ namespace DHT.Server.Database.Export {
 		return channels;
 	}
 
-		private static object GenerateMessageList(List<Message> includedMessages, Dictionary<ulong, object> userIndices) {
+	private static Dictionary<string, Dictionary<string, object>> GenerateMessageList( List<Message> includedMessages, Dictionary<ulong, object> userIndices, IViewerExportStrategy strategy) {
 		var data = new Dictionary<string, Dictionary<string, object>>();
 
 		foreach (var grouping in includedMessages.GroupBy(static message => message.Channel)) {
@@ -148,7 +151,7 @@ namespace DHT.Server.Database.Export {
 			foreach (var message in grouping) {
 				var obj = new Dictionary<string, object> {
 					["u"] = userIndices[message.Sender],
-						["t"] = message.Timestamp
+					["t"] = message.Timestamp,
 				};
 
 				if (!string.IsNullOrEmpty(message.Text)) {
@@ -164,8 +167,18 @@ namespace DHT.Server.Database.Export {
 				}
 
 				if (!message.Attachments.IsEmpty) {
-						obj["a"] = message.Attachments.Select(static attachment => new Dictionary<string, object> {
-							{ "url", attachment.Url }
+					obj["a"] = message.Attachments.Select(attachment => {
+						var a = new Dictionary<string, object> {
+							{ "url", strategy.GetAttachmentUrl(attachment) },
+							{ "name", Uri.TryCreate(attachment.Url, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.Url },
+						};
+
+						if (attachment is { Width: not null, Height: not null }) {
+							a["width"] = attachment.Width;
+							a["height"] = attachment.Height;
+						}
+
+						return a;
 					}).ToArray();
 				}
 
@@ -188,7 +201,7 @@ namespace DHT.Server.Database.Export {
 						r["a"] = reaction.EmojiFlags.HasFlag(EmojiFlags.Animated);
 						r["c"] = reaction.Count;
 						return r;
-						});
+					}).ToArray();
 				}
 
 				channelData[message.Id.ToString()] = obj;
@@ -199,5 +212,4 @@ namespace DHT.Server.Database.Export {
 
 		return data;
 	}
-	}
 }

app/Server/Database/Export/ViewerJsonSnowflakeSerializer.cs

@@ -2,8 +2,9 @@ using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace DHT.Server.Database.Export {
-	sealed class ViewerJsonSnowflakeSerializer : JsonConverter<ulong> {
+namespace DHT.Server.Database.Export;
+
+sealed class ViewerJsonSnowflakeSerializer : JsonConverter<ulong> {
 	public override ulong Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
 		return ulong.Parse(reader.GetString()!);
 	}
@@ -11,5 +12,4 @@ namespace DHT.Server.Database.Export {
 	public override void Write(Utf8JsonWriter writer, ulong value, JsonSerializerOptions options) {
 		writer.WriteStringValue(value.ToString());
 	}
-	}
 }

app/Server/Database/IDatabaseFile.cs

@@ -5,10 +5,12 @@ using DHT.Server.Data.Aggregations;
 using DHT.Server.Data.Filters;
 using DHT.Server.Download;
 
-namespace DHT.Server.Database {
-	public interface IDatabaseFile : IDisposable {
+namespace DHT.Server.Database;
+
+public interface IDatabaseFile : IDisposable {
 	string Path { get; }
 	DatabaseStatistics Statistics { get; }
+	DatabaseStatisticsSnapshot SnapshotStatistics();
 
 	void AddServer(Data.Server server);
 	List<Data.Server> GetAllServers();
@@ -22,16 +24,20 @@ namespace DHT.Server.Database {
 	void AddMessages(Message[] messages);
 	int CountMessages(MessageFilter? filter = null);
 	List<Message> GetMessages(MessageFilter? filter = null);
+	HashSet<ulong> GetMessageIds(MessageFilter? filter = null);
 	void RemoveMessages(MessageFilter filter, FilterRemovalMode mode);
 
 	int CountAttachments(AttachmentFilter? filter = null);
 
-		void AddDownloads(IEnumerable<Data.Download> downloads);
+	void AddDownload(Data.Download download);
+	List<Data.Download> GetDownloadsWithoutData();
+	Data.Download GetDownloadWithData(Data.Download download);
+	DownloadedAttachment? GetDownloadedAttachment(string url);
+
 	void EnqueueDownloadItems(AttachmentFilter? filter = null);
 	List<DownloadItem> GetEnqueuedDownloadItems(int count);
 	void RemoveDownloadItems(DownloadItemFilter? filter, FilterRemovalMode mode);
 	DownloadStatusStatistics GetDownloadStatusStatistics();
 
 	void Vacuum();
-	}
 }