Rewrite tracker to use Discord client functions instead of React properties

.github/FUNDING.yml

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

README.md

@@ -18,7 +18,7 @@ Folder organization:
 * `app/` contains a Visual Studio solution for the desktop app
 * `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 9 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
+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
 
@@ -28,18 +28,18 @@ To build a `Release` version of the desktop app, follow the instructions for you
 
 #### Release – Windows (64-bit)
 
-1. Install Debian in WSL and open a terminal in the project folder.
+1. Install [Powershell 5](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) or newer (on Windows 10, the included version of Powershell should be enough)
-2. Run the `app/build.wsl.sh` script.
-3. Read the [Distribution](#distribution) section below.
 
-Note: The build script expects `dotnet.exe` to be installed in `C:\Program Files\dotnet`.
+Run the `app/build.bat` script, and read the [Distribution](#distribution) section below.
 
 #### Release – Other Operating Systems
 
-1. Install the `zip` package from your repository.
+1. Install the `zip` package from your repository
-2. Run the `app/build.sh` script.
+
-3. Read the [Distribution](#distribution) section below.
+Run the `app/build.sh` script, and read the [Distribution](#distribution) section below.
 
 #### Distribution
 
-The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires the ASP.NET Core Runtime 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 the executable. Since .NET 8 fixed several issues with publishing Windows executables on Linux, I recommend using Linux to build the app for all operating systems.

app/.editorconfig

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

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

@@ -13,7 +13,6 @@
         <entry key="Desktop/Main/Controls/MessageFilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/ServerConfigurationPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/AdvancedPage.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Pages/DatabasePage.axaml" value="Desktop/Desktop.csproj" />

app/Desktop/App.axaml

@@ -51,26 +51,9 @@
 
         <Style Selector="Expander">
             <Setter Property="MinHeight" Value="40" />
-            <Setter Property="Padding" Value="12" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
         
-        <Style Selector="Panel.buttons">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right">
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
-        <Style Selector="Panel.buttons Button">
-            <Setter Property="MinWidth" Value="80" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.left Button">
-            <Setter Property="Margin" Value="0 0 8 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right Button">
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
-
     </Application.Styles>
 
     <Application.Resources>

app/Desktop/Arguments.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using DHT.Utils.Logging;
 
@@ -8,7 +9,7 @@ sealed class Arguments {
 
 	private const int FirstArgument = 1;
 
-	public static Arguments Empty => new ([]);
+	public static Arguments Empty => new (Array.Empty<string>());
 
 	public bool Console { get; }
 	public string? DatabaseFile { get; }
@@ -50,7 +51,7 @@ sealed class Arguments {
 					continue;
 
 				case "-port": {
-					if (!ushort.TryParse(value, out ushort port)) {
+					if (!ushort.TryParse(value, out var port)) {
 						Log.Warn("Invalid port number: " + value);
 					}
 					else {
@@ -65,7 +66,7 @@ sealed class Arguments {
 					continue;
 				
 				case "-concurrentdownloads":
-					if (!ulong.TryParse(value, out ulong concurrentDownloads) || concurrentDownloads == 0) {
+					if (!ulong.TryParse(value, out var concurrentDownloads) || concurrentDownloads == 0) {
 						Log.Warn("Invalid concurrent downloads count: " + value);
 					}
 					else if (concurrentDownloads > 10) {

app/Desktop/Common/DatabaseGui.cs

@@ -20,7 +20,7 @@ static class DatabaseGui {
 	private const string DatabaseFileInitialName = "archive.dht";
 
 	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = [
-		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"]),
+		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"])
 	];
 
 	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
@@ -28,7 +28,7 @@ static class DatabaseGui {
 			Title = "Open Database File",
 			FileTypeFilter = DatabaseFileDialogFilter,
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			AllowMultiple = true,
+			AllowMultiple = true
 		});
 	}
 
@@ -38,7 +38,7 @@ static class DatabaseGui {
 			FileTypeChoices = DatabaseFileDialogFilter,
 			SuggestedFileName = DatabaseFileInitialName,
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
-			ShowOverwritePrompt = false,
+			ShowOverwritePrompt = false
 		});
 	}
 

app/Desktop/Common/SystemUtils.cs

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

app/Desktop/Desktop.csproj

@@ -15,18 +15,15 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.2.3" />
+    <PackageReference Include="Avalonia" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
-    <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.1">
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
   </ItemGroup>
   
   <ItemGroup>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -15,6 +15,24 @@
         <namespace:CheckBoxDialogModel />
     </Window.DataContext>
 
+    <Window.Styles>
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+        <Style Selector="Panel.buttons Button">
+            <Setter Property="MinWidth" Value="80" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.left Button">
+            <Setter Property="Margin" Value="0 0 8 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right Button">
+            <Setter Property="Margin" Value="8 0 0 0" />
+        </Style>
+    </Window.Styles>
+
     <StackPanel Margin="20">
         <ScrollViewer MaxHeight="400">
             <ItemsRepeater ItemsSource="{Binding Items}">

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -1,26 +1,27 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-partial class CheckBoxDialogModel {
+class CheckBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 
-	private IReadOnlyList<CheckBoxItem> items = [];
+	private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
 
 	public IReadOnlyList<CheckBoxItem> Items {
 		get => items;
 
 		protected set {
-			foreach (CheckBoxItem item in items) {
+			foreach (var item in items) {
 				item.PropertyChanged -= OnItemPropertyChanged;
 			}
 
 			items = value;
 
-			foreach (CheckBoxItem item in items) {
+			foreach (var item in items) {
 				item.PropertyChanged += OnItemPropertyChanged;
 			}
 		}
@@ -28,10 +29,7 @@ partial class CheckBoxDialogModel {
 
 	private bool pauseCheckEvents = false;
 
-	[DependsOn(nameof(Items))]
 	public bool AreAllSelected => Items.All(static item => item.IsChecked);
-	
-	[DependsOn(nameof(Items))]
 	public bool AreNoneSelected => Items.All(static item => !item.IsChecked);
 
 	public void SelectAll() => SetAllChecked(true);
@@ -40,7 +38,7 @@ partial class CheckBoxDialogModel {
 	private void SetAllChecked(bool isChecked) {
 		pauseCheckEvents = true;
 
-		foreach (CheckBoxItem item in Items) {
+		foreach (var item in Items) {
 			item.IsChecked = isChecked;
 		}
 
@@ -49,7 +47,8 @@ partial class CheckBoxDialogModel {
 	}
 
 	private void UpdateBulkButtons() {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(Items)));
+		OnPropertyChanged(nameof(AreAllSelected));
+		OnPropertyChanged(nameof(AreNoneSelected));
 	}
 
 	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
@@ -66,6 +65,6 @@ sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
 
 	public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
 		this.Items = new List<CheckBoxItem<T>>(items);
-		base.Items = Items;
+		base.Items = this.Items;
 	}
 }

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

@@ -1,12 +1,12 @@
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-partial class CheckBoxItem {
+partial class CheckBoxItem : ObservableObject {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 
-	[Notify]
+	[ObservableProperty]
 	private bool isChecked = false;
 }
 

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -8,10 +8,6 @@ using Avalonia.Platform.Storage;
 namespace DHT.Desktop.Dialogs.File;
 
 static class FileDialogs {
-	public static async Task<string[]> OpenFolders(this IStorageProvider storageProvider, FolderPickerOpenOptions options) {
-		return (await storageProvider.OpenFolderPickerAsync(options)).ToLocalPaths();
-	}
-	
 	public static async Task<string[]> OpenFiles(this IStorageProvider storageProvider, FilePickerOpenOptions options) {
 		return (await storageProvider.OpenFilePickerAsync(options)).ToLocalPaths();
 	}
@@ -22,7 +18,7 @@ static class FileDialogs {
 
 	public static FilePickerFileType CreateFilter(string name, string[] extensions) {
 		return new FilePickerFileType(name) {
-			Patterns = extensions.Select(static ext => "*." + ext).ToArray(),
+			Patterns = extensions.Select(static ext => "*." + ext).ToArray()
 		};
 	}
 
@@ -30,11 +26,11 @@ static class FileDialogs {
 		return suggestedDirectory == null ? Task.FromResult<IStorageFolder?>(null) : window.StorageProvider.TryGetFolderFromPathAsync(suggestedDirectory);
 	}
 
-	private static string ToLocalPath(this IStorageItem itme) {
+	private static string ToLocalPath(this IStorageFile file) {
-		return itme.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
+		return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
 	}
 
-	private static string[] ToLocalPaths(this IReadOnlyList<IStorageItem> items) {
+	private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
-		return items.Select(ToLocalPath).ToArray();
+		return files.Select(ToLocalPath).ToArray();
 	}
 }

app/Desktop/Dialogs/Message/Dialog.cs

@@ -15,8 +15,8 @@ static class Dialog {
 			DataContext = new MessageDialogModel {
 				Title = title,
 				Message = message,
-				IsOkVisible = true,
+				IsOkVisible = true
-			},
+			}
 		}.ShowDialog<DialogResult.All>(owner);
 	}
 
@@ -30,8 +30,8 @@ static class Dialog {
 				Title = title,
 				Message = message,
 				IsOkVisible = true,
-				IsCancelVisible = true,
+				IsCancelVisible = true
-			},
+			}
 		}.ShowDialog<DialogResult.All?>(owner);
 
 		return result.ToOkCancel();
@@ -47,8 +47,8 @@ static class Dialog {
 				Title = title,
 				Message = message,
 				IsYesVisible = true,
-				IsNoVisible = true,
+				IsNoVisible = true
-			},
+			}
 		}.ShowDialog<DialogResult.All?>(owner);
 
 		return result.ToYesNo();
@@ -65,8 +65,8 @@ static class Dialog {
 				Message = message,
 				IsYesVisible = true,
 				IsNoVisible = true,
-				IsCancelVisible = true,
+				IsCancelVisible = true
-			},
+			}
 		}.ShowDialog<DialogResult.All?>(owner);
 
 		return result.ToYesNoCancel();

app/Desktop/Dialogs/Message/DialogResult.cs

@@ -7,26 +7,26 @@ static class DialogResult {
 		Ok,
 		Yes,
 		No,
-		Cancel,
+		Cancel
 	}
 
 	public enum OkCancel {
 		Closed,
 		Ok,
-		Cancel,
+		Cancel
 	}
 
 	public enum YesNo {
 		Closed,
 		Yes,
-		No,
+		No
 	}
 
 	public enum YesNoCancel {
 		Closed,
 		Yes,
 		No,
-		Cancel,
+		Cancel
 	}
 
 	public static OkCancel ToOkCancel(this All? result) {
@@ -34,7 +34,7 @@ static class DialogResult {
 			null       => OkCancel.Closed,
 			All.Ok     => OkCancel.Ok,
 			All.Cancel => OkCancel.Cancel,
-			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to ok/cancel."),
+			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to ok/cancel.")
 		};
 	}
 
@@ -43,7 +43,7 @@ static class DialogResult {
 			null    => YesNo.Closed,
 			All.Yes => YesNo.Yes,
 			All.No  => YesNo.No,
-			_       => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no."),
+			_       => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no.")
 		};
 	}
 
@@ -53,7 +53,7 @@ static class DialogResult {
 			All.Yes    => YesNoCancel.Yes,
 			All.No     => YesNoCancel.No,
 			All.Cancel => YesNoCancel.Cancel,
-			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no/cancel."),
+			_          => throw new ArgumentException("Cannot convert dialog result " + result + " to yes/no/cancel.")
 		};
 	}
 }

app/Desktop/Dialogs/Message/MessageDialog.axaml

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

app/Desktop/Dialogs/Progress/DelayedProgressDialog.cs

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

app/Desktop/Dialogs/Progress/IProgressCallback.cs

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

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

@@ -7,42 +7,59 @@ namespace DHT.Desktop.Dialogs.Progress;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class ProgressDialog : Window {
-	private static readonly TimeSpan MinimumShowDuration = TimeSpan.FromMilliseconds(500);
-	
 	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
+		var taskCompletionSource = new TaskCompletionSource();
 		var dialog = new ProgressDialog();
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => await action(dialog, callbacks[0]));
+		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
+			try {
+				await action(dialog, callbacks[0]);
+				taskCompletionSource.SetResult();
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
+		});
+		
 		await dialog.ShowProgressDialog(owner);
+		await taskCompletionSource.Task;
 	}
 	
-	internal static async Task<T> Show<T>(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task<T>> action) {
+	internal static async Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
+		var taskCompletionSource = new TaskCompletionSource();
+		var dialog = new ProgressDialog();
+		
+		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
+			await callbacks[0].UpdateIndeterminate(message);
+			try {
+				await action(dialog);
+				taskCompletionSource.SetResult();
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
+		});
+		
+		await dialog.ShowProgressDialog(owner);
+		await taskCompletionSource.Task;
+	}
+	
+	internal static async Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
 		var taskCompletionSource = new TaskCompletionSource<T>();
 		var dialog = new ProgressDialog();
 
 		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			taskCompletionSource.SetResult(await action(dialog, callbacks[0]));
+			await callbacks[0].UpdateIndeterminate(message);
+			try {
+				taskCompletionSource.SetResult(await action(dialog));
+			} catch (Exception e) {
+				taskCompletionSource.SetException(e);
+			}
 		});
 		
 		await dialog.ShowProgressDialog(owner);
 		return await taskCompletionSource.Task;
 	}
 
-	internal static Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
-		return Show(owner, title, async (dialog, callback) => {
-			await callback.UpdateIndeterminate(message);
-			await action(dialog);
-		});
-	}
-	
-	internal static Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
-		return Show<T>(owner, title, async (dialog, callback) => {
-			await callback.UpdateIndeterminate(message);
-			return await action(dialog);
-		});
-	}
-	
 	private bool isFinished = false;
-	private DateTime startTime = DateTime.Now;
 	private Task progressTask = Task.CompletedTask;
 
 	public ProgressDialog() {
@@ -50,8 +67,6 @@ public sealed partial class ProgressDialog : Window {
 	}
 
 	public void OnOpened(object? sender, EventArgs e) {
-		startTime = DateTime.Now;
-		
 		if (DataContext is ProgressDialogModel model) {
 			progressTask = Task.Run(model.StartTask);
 			progressTask.ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
@@ -62,14 +77,8 @@ public sealed partial class ProgressDialog : Window {
 		e.Cancel = !isFinished;
 	}
 
-	private async Task OnFinished(Task task) {
+	private void OnFinished(Task task) {
 		isFinished = true;
-		
-		TimeSpan elapsedTime = DateTime.Now - startTime;
-		if (elapsedTime < MinimumShowDuration) {
-			await Task.Delay(MinimumShowDuration - elapsedTime);
-		}
-		
 		Close();
 	}
 

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -10,7 +10,7 @@ namespace DHT.Desktop.Dialogs.Progress;
 sealed class ProgressDialogModel {
 	public string Title { get; init; } = "";
 
-	public IReadOnlyList<ProgressItem> Items { get; } = [];
+	public IReadOnlyList<ProgressItem> Items { get; } = Array.Empty<ProgressItem>();
 
 	private readonly TaskRunner? task;
 
@@ -20,7 +20,7 @@ sealed class ProgressDialogModel {
 	public ProgressDialogModel(string title, TaskRunner task, int progressItems = 1) {
 		this.Title = title;
 		this.task = task;
-		this.Items = Enumerable.Range(start: 0, progressItems).Select(static _ => new ProgressItem()).ToArray();
+		this.Items = Enumerable.Range(0, progressItems).Select(static _ => new ProgressItem()).ToArray();
 	}
 
 	internal async Task StartTask() {
@@ -38,7 +38,7 @@ sealed class ProgressDialogModel {
 			this.item = item;
 		}
 
-		public async Task Update(string message, long finishedItems, long totalItems) {
+		public async Task Update(string message, int finishedItems, int totalItems) {
 			await Dispatcher.UIThread.InvokeAsync(() => {
 				item.Message = message;
 				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
@@ -57,7 +57,7 @@ sealed class ProgressDialogModel {
 		}
 
 		public Task Hide() {
-			return Update(string.Empty, finishedItems: 0, totalItems: 0);
+			return Update(string.Empty, 0, 0);
 		}
 	}
 }

app/Desktop/Dialogs/Progress/ProgressItem.cs

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

app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml

@@ -15,6 +15,19 @@
         <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">

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -1,37 +1,37 @@
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.TextBox;
 
-partial class TextBoxDialogModel {
+class TextBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
 
-	private IReadOnlyList<TextBoxItem> items = [];
+	private IReadOnlyList<TextBoxItem> items = Array.Empty<TextBoxItem>();
 
 	public IReadOnlyList<TextBoxItem> Items {
 		get => items;
 
 		protected set {
-			foreach (TextBoxItem item in items) {
+			foreach (var item in items) {
 				item.ErrorsChanged -= OnItemErrorsChanged;
 			}
 
 			items = value;
 
-			foreach (TextBoxItem item in items) {
+			foreach (var item in items) {
 				item.ErrorsChanged += OnItemErrorsChanged;
 			}
 		}
 	}
 		
-	[DependsOn(nameof(Items))]
 	public bool HasErrors => Items.Any(static item => !item.IsValid);
 
 	private void OnItemErrorsChanged(object? sender, DataErrorsChangedEventArgs e) {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(Items)));
+		OnPropertyChanged(nameof(HasErrors));
 	}
 }
 

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

@@ -1,23 +1,26 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
-using PropertyChanged.SourceGenerator;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.TextBox;
 
-partial class TextBoxItem : INotifyDataErrorInfo {
+class TextBoxItem : ObservableObject, INotifyDataErrorInfo {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 		
 	public Func<string, bool> ValidityCheck { get; init; } = static _ => true;
 	public bool IsValid => ValidityCheck(Value);
 
-	[Notify]
 	private string value = string.Empty;
 
-	private void OnValueChanged() {
+	public string Value {
+		get => this.value;
+		set {
+			SetProperty(ref this.value, value);
 			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Value)));
 		}
+	}
 
 	public IEnumerable GetErrors(string? propertyName) {
 		if (propertyName == nameof(Value) && !IsValid) {

app/Desktop/Discord/DiscordAppSettings.cs

@@ -39,7 +39,7 @@ static class DiscordAppSettings {
 
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-			JsonObject settingsJson = await ReadSettingsJson();
+			var settingsJson = await ReadSettingsJson();
 			return AreDevToolsEnabled(settingsJson);
 		} catch (Exception e) {
 			Log.Error("Cannot read settings file.");
@@ -49,7 +49,7 @@ static class DiscordAppSettings {
 	}
 
 	private static bool AreDevToolsEnabled(JsonObject json) {
-		return json.TryGetPropertyValue(JsonKeyDevTools, out JsonNode? node) && node?.GetValueKind() == JsonValueKind.True;
+		return json.TryGetPropertyValue(JsonKeyDevTools, out var node) && node?.GetValueKind() == JsonValueKind.True;
 	}
 
 	public static async Task<SettingsJsonResult> ConfigureDevTools(bool enable) {
@@ -89,7 +89,7 @@ static class DiscordAppSettings {
 
 			if (File.Exists(JsonBackupFilePath)) {
 				try {
-					File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
+					File.Move(JsonBackupFilePath, JsonFilePath, true);
 					Log.Info("Restored settings file from backup.");
 				} catch (Exception e2) {
 					Log.Error("Cannot restore settings file from backup.");

app/Desktop/Discord/SettingsJsonResult.cs

@@ -6,5 +6,5 @@ enum SettingsJsonResult {
 	FileNotFound,
 	ReadError,
 	InvalidJson,
-	WriteError,
+	WriteError
 }

app/Desktop/Main/AboutWindow.axaml

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

app/Desktop/Main/AboutWindowModel.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -1,47 +1,41 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Server;
 using DHT.Server.Data.Filters;
-using DHT.Server.Data.Settings;
-using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
+sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposable {
-	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
-	
 	public sealed record Unit(string Name, uint Scale);
 
 	private static readonly Unit[] AllUnits = [
-		new Unit("B", Scale: 1),
+		new Unit("B", 1),
-		new Unit("kB", Scale: 1024),
+		new Unit("kB", 1024),
-		new Unit("MB", Scale: 1024 * 1024)
+		new Unit("MB", 1024 * 1024)
 	];
 
 	private static readonly HashSet<string> FilterProperties = [
 		nameof(LimitSize),
 		nameof(MaximumSize),
-		nameof(MaximumSizeUnit),
+		nameof(MaximumSizeUnit)
 	];
 
-	[Notify(Setter.Private)]
+	public string FilterStatisticsText { get; private set; } = "";
-	private string filterStatisticsText = "";
 
-	[Notify]
+	[ObservableProperty]
 	private bool limitSize = false;
 	
-	[Notify]
+	[ObservableProperty]
-	private ulong maximumSize = 0UL;
+	private ulong maximumSize = 0L;
 	
-	[Notify]
+	[ObservableProperty]
 	private Unit maximumSizeUnit = AllUnits[0];
 
 	public IEnumerable<Unit> Units => AllUnits;
@@ -49,9 +43,6 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 	private readonly State state;
 	private readonly string verb;
 
-	private readonly DelayedThrottledTask<FilterSettings> saveFilterSettingsTask;
-	private bool isLoadingFilterSettings;
-	
 	private readonly RestartableTask<long> downloadItemCountTask;
 	private long? matchingItemCount;
 	
@@ -65,8 +56,6 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 		this.state = state;
 		this.verb = verb;
 
-		this.saveFilterSettingsTask = new DelayedThrottledTask<FilterSettings>(Log, TimeSpan.FromSeconds(5), SaveFilterSettings);
-		
 		this.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
 		this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
 
@@ -75,51 +64,13 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 		PropertyChanged += OnPropertyChanged;
 	}
 
-	public async Task Initialize() {
+	public void Dispose() {
-		isLoadingFilterSettings = true;
-		
-		LimitSize = await state.Db.Settings.Get(SettingsKey.DownloadsLimitSize, LimitSize);
-		MaximumSize = await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSize, MaximumSize);
-		
-		if (await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSizeUnit, defaultValue: null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
-			MaximumSizeUnit = unitValue;
-		}
-		
-		isLoadingFilterSettings = false;
-	}
-	
-	public async ValueTask DisposeAsync() {
-		saveFilterSettingsTask.Dispose();
-		
 		downloadItemCountTask.Cancel();
 		downloadItemCountSubscription.Dispose();
-		
-		await SaveFilterSettings(new FilterSettings(this));
-	}
-	
-	private sealed record FilterSettings(bool LimitSize, ulong MaximumSize, Unit MaximumSizeUnit) {
-		public FilterSettings(DownloadItemFilterPanelModel model) : this(model.LimitSize, model.MaximumSize, model.MaximumSizeUnit) {}
-	}
-	
-	private async Task SaveFilterSettings(FilterSettings settings) {
-		try {
-			await state.Db.Settings.Set(async setter => {
-				await setter.Set(SettingsKey.DownloadsLimitSize, settings.LimitSize);
-				await setter.Set(SettingsKey.DownloadsMaximumSize, settings.MaximumSize);
-				await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
-			});
-		} catch (Exception e) {
-			Log.Error("Could not save download filter settings");
-			Log.Error(e);
-		}
 	}
 
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
 		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
-			if (!isLoadingFilterSettings) {
-				saveFilterSettingsTask.Post(new FilterSettings(this));
-			}
-			
 			UpdateFilterStatistics();
 		}
 	}
@@ -131,7 +82,7 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 	
 
 	private void UpdateFilterStatistics() {
-		DownloadItemFilter filter = CreateFilter();
+		var filter = CreateFilter();
 		if (filter.IsEmpty) {
 			downloadItemCountTask.Cancel();
 			matchingItemCount = totalItemCount;
@@ -150,9 +101,11 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 	}
 
 	private void UpdateFilterStatisticsText() {
-		string matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
+		var matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
-		string totalItemCountStr = totalItemCount?.Format() ?? "(...)";
+		var totalItemCountStr = totalItemCount?.Format() ?? "(...)";
+
 		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 
 	public DownloadItemFilter CreateFilter() {

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

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using Avalonia.Controls;
 
 namespace DHT.Desktop.Main.Controls;
@@ -9,8 +8,8 @@ public sealed partial class MessageFilterPanel : UserControl {
 	public MessageFilterPanel() {
 		InitializeComponent();
 
-		CultureInfo culture = Program.Culture;
+		var culture = Program.Culture;
-		foreach (CalendarDatePicker picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
+		foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
 			picker.FirstDayOfWeek = culture.DateTimeFormat.FirstDayOfWeek;
 			picker.SelectedDateFormat = CalendarDatePickerFormat.Custom;
 			picker.CustomDateFormatString = culture.DateTimeFormat.ShortDatePattern;

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.CheckBox;
 using DHT.Desktop.Dialogs.Message;
@@ -15,11 +16,10 @@ using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
 using DHT.Utils.Tasks;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class MessageFilterPanelModel : IDisposable {
+sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 	private static readonly HashSet<string> FilterProperties = [
 		nameof(FilterByDate),
 		nameof(StartDate),
@@ -27,41 +27,40 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		nameof(FilterByChannel),
 		nameof(IncludedChannels),
 		nameof(FilterByUser),
-		nameof(IncludedUsers),
+		nameof(IncludedUsers)
 	];
 
+	public string FilterStatisticsText { get; private set; } = "";
+
 	public event PropertyChangedEventHandler? FilterPropertyChanged;
 
 	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
 
-	[Notify]
+	[ObservableProperty]
-	private string filterStatisticsText = "";
-	
-	[Notify]
 	private bool filterByDate = false;
 
-	[Notify]
+	[ObservableProperty]
 	private DateTime? startDate = null;
 
-	[Notify]
+	[ObservableProperty]
 	private DateTime? endDate = null;
 
-	[Notify]
+	[ObservableProperty]
 	private bool filterByChannel = false;
 
-	[Notify]
+	[ObservableProperty]
 	private HashSet<ulong>? includedChannels = null;
 
-	[Notify]
+	[ObservableProperty]
 	private bool filterByUser = false;
 
-	[Notify]
+	[ObservableProperty]
 	private HashSet<ulong>? includedUsers = null;
 
-	[Notify]
+	[ObservableProperty]
 	private string channelFilterLabel = "";
 
-	[Notify]
+	[ObservableProperty]
 	private string userFilterLabel = "";
 
 	private readonly Window window;
@@ -161,7 +160,7 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 	}
 
 	private void UpdateFilterStatistics() {
-		MessageFilter filter = CreateFilter();
+		var filter = CreateFilter();
 		if (filter.IsEmpty) {
 			exportedMessageCountTask.Cancel();
 			exportedMessageCount = totalMessageCount;
@@ -180,24 +179,26 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 	}
 
 	private void UpdateFilterStatisticsText() {
-		string exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
+		var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
-		string totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+		var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+
 		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 
 	public async Task OpenChannelFilterDialog() {
 		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
 			var items = new List<CheckBoxItem<ulong>>();
-			Dictionary<ulong, DHT.Server.Data.Server> servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
+			var servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
 
-			await foreach (Channel channel in state.Db.Channels.Get()) {
+			await foreach (var channel in state.Db.Channels.Get()) {
-				ulong channelId = channel.Id;
+				var channelId = channel.Id;
-				string channelName = channel.Name;
+				var channelName = channel.Name;
 
 				string title;
 				if (servers.TryGetValue(channel.Server, out var server)) {
 					var titleBuilder = new StringBuilder();
-					ServerType? serverType = server.Type;
+					var serverType = server.Type;
 
 					titleBuilder.Append('[')
 					            .Append(ServerTypes.ToString(serverType))
@@ -220,7 +221,7 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 
 				items.Add(new CheckBoxItem<ulong>(channelId) {
 					Title = title,
-					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId),
+					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId)
 				});
 			}
 
@@ -237,7 +238,7 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 			return;
 		}
 
-		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
+		var result = await OpenIdFilterDialog(Title, items);
 		if (result != null) {
 			IncludedChannels = result;
 		}
@@ -247,10 +248,13 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
 			var checkBoxItems = new List<CheckBoxItem<ulong>>();
 
-			await foreach (User user in state.Db.Users.Get()) {
+			await foreach (var user in state.Db.Users.Get()) {
+				var name = user.Name;
+				var discriminator = user.Discriminator;
+
 				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
-					Title = user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})",
+					Title = discriminator == null ? name : name + " #" + discriminator,
-					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id),
+					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
 				});
 			}
 
@@ -267,7 +271,7 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 			return;
 		}
 
-		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
+		var result = await OpenIdFilterDialog(Title, items);
 		if (result != null) {
 			IncludedUsers = result;
 		}
@@ -277,7 +281,7 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
 
 		var model = new CheckBoxDialogModel<ulong>(items) {
-			Title = title,
+			Title = title
 		};
 
 		var dialog = new CheckBoxDialog { DataContext = model };

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

@@ -16,10 +16,6 @@
             <Setter Property="FontFamily" Value="Consolas,Courier" />
             <Setter Property="FontSize" Value="15" />
         </Style>
-        <Style Selector="Label">
-            <Setter Property="Margin" Value="0 5" />
-            <Setter Property="Padding" Value="0" />
-        </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Orientation" Value="Vertical" />
             <Setter Property="Margin" Value="0 0 10 10" />
@@ -29,7 +25,7 @@
     <StackPanel>
         <Button Command="{Binding OnClickToggleServerButton}" Content="{Binding ToggleServerButtonText}" IsEnabled="{Binding IsToggleServerButtonEnabled}" />
         <TextBlock TextWrapping="Wrap" Margin="0 15">
-            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script or connection code again.
+            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script again.
         </TextBlock>
         <WrapPanel>
             <StackPanel>

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -1,30 +1,30 @@
 using System;
-using System.ComponentModel;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Service;
 using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class ServerConfigurationPanelModel : IDisposable {
+sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
 	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
 	
-	[Notify]
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
 	private string inputPort;
 
-	[Notify]
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
 	private string inputToken;
 
-	[DependsOn(nameof(InputPort), nameof(InputToken))]
 	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
 
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isToggleServerButtonEnabled = true;
 
 	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
@@ -53,7 +53,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 	}
 
 	private void UpdateServerStatus() {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(ToggleServerButtonText)));
+		OnPropertyChanged(nameof(ToggleServerButtonText));
 	}
 
 	private async Task StartServer() {
@@ -106,7 +106,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 		ServerConfiguration.Port = port;
 		ServerConfiguration.Token = inputToken;
 		
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(HasMadeChanges)));
+		OnPropertyChanged(nameof(HasMadeChanges));
 		
 		await StartServer();
 	}

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -2,32 +2,32 @@ using System;
 using System.Reactive.Linq;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Server;
 using DHT.Server.Service;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class StatusBarModel : IDisposable {
+sealed partial class StatusBarModel : ObservableObject, IDisposable {
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private long? serverCount;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private long? channelCount;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private long? messageCount;
 
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
 	private ServerManager.Status serverStatus;
 
-	[DependsOn(nameof(ServerStatus))]
+	public string ServerStatusText => serverStatus switch {
-	public string ServerStatusText => ServerStatus switch {
 		ServerManager.Status.Starting => "STARTING",
 		ServerManager.Status.Started  => "READY",
 		ServerManager.Status.Stopping => "STOPPING",
 		ServerManager.Status.Stopped  => "STOPPED",
-		_                             => "",
+		_                             => ""
 	};
 
 	private readonly State state;
@@ -45,7 +45,7 @@ sealed partial class StatusBarModel : IDisposable {
 		channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newChannelCount => ChannelCount = newChannelCount);
 		messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newMessageCount => MessageCount = newMessageCount);
 
-		state.Server.StatusChanged += OnStateServerStatusChanged;
+		state.Server.StatusChanged += OnServerStatusChanged;
 		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
 	}
 
@@ -54,10 +54,10 @@ sealed partial class StatusBarModel : IDisposable {
 		channelCountSubscription.Dispose();
 		messageCountSubscription.Dispose();
 		
-		state.Server.StatusChanged -= OnStateServerStatusChanged;
+		state.Server.StatusChanged -= OnServerStatusChanged;
 	}
 
-	private void OnStateServerStatusChanged(object? sender, ServerManager.Status e) {
+	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
 		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
 	}
 }

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml

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

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

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

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialogModel.cs

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

app/Desktop/Main/MainWindowModel.cs

@@ -3,26 +3,25 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Screens;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Database;
 using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main;
 
-sealed partial class MainWindowModel : IAsyncDisposable {
+sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	private const string DefaultTitle = "Discord History Tracker";
 
 	private static readonly Log Log = Log.ForType<MainWindowModel>();
 
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private string title = DefaultTitle;
 
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private UserControl currentScreen;
 
 	private readonly WelcomeScreen welcomeScreen;
@@ -47,7 +46,7 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
 		currentScreen = welcomeScreen;
 
-		string? dbFile = args.DatabaseFile;
+		var dbFile = args.DatabaseFile;
 		if (!string.IsNullOrWhiteSpace(dbFile)) {
 			async void OnWindowOpened(object? o, EventArgs eventArgs) {
 				window.Opened -= OnWindowOpened;
@@ -96,8 +95,6 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 		mainContentScreenModel = new MainContentScreenModel(window, state);
 		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
 		
-		await mainContentScreenModel.Initialize();
-		
 		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
 		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
 
@@ -105,33 +102,29 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 	}
 
 	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
-		await DisposeContent();
+		if (mainContentScreenModel != null) {
+			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
+			mainContentScreenModel.Dispose();
+			mainContentScreenModel = null;
+		}
+
+		await DisposeState();
 
 		Title = DefaultTitle;
 		CurrentScreen = welcomeScreen;
 
-		await DisposeState();
-		
 		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
 	}
 
-	private async Task DisposeContent() {
-		if (mainContentScreenModel != null) {
-			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
-			await mainContentScreenModel.DisposeAsync();
-			mainContentScreenModel = null;
-		}
-	}
-	
 	private async Task DisposeState() {
 		if (state != null) {
-			await DelayedProgressDialog.Await(() => state.DisposeAsync().AsTask(), TimeSpan.FromMilliseconds(200), window, "Close Database", "Please wait for the database to close...");
+			await state.DisposeAsync();
 			state = null;
 		}
 	}
 
 	public async ValueTask DisposeAsync() {
-		await DisposeContent();
+		mainContentScreenModel?.Dispose();
 		await DisposeState();
 	}
 }

app/Desktop/Main/Pages/AdvancedPage.axaml

@@ -16,5 +16,11 @@
         <Expander Header="Internal Server Configuration" IsExpanded="True">
             <controls:ServerConfigurationPanel DataContext="{Binding ServerConfigurationModel}" />
         </Expander>
+        <Expander Header="Database Tools" IsExpanded="True">
+            <StackPanel Orientation="Vertical" Spacing="10">
+                <TextBlock TextWrapping="Wrap">Recreates the database to remove any traces of deleted data, which frees up space and prevents forensic recovery.</TextBlock>
+                <Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>
+            </StackPanel>
+        </Expander>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/AdvancedPageModel.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Threading.Tasks;
 using Avalonia.Controls;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Server;
 
@@ -8,14 +11,26 @@ namespace DHT.Desktop.Main.Pages;
 sealed class AdvancedPageModel : IDisposable {
 	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
 	
+	private readonly Window window;
+	private readonly State state;
+
 	[Obsolete("Designer")]
 	public AdvancedPageModel() : this(null!, State.Dummy) {}
 
 	public AdvancedPageModel(Window window, State state) {
+		this.window = window;
+		this.state = state;
+
 		ServerConfigurationModel = new ServerConfigurationPanelModel(window, state);
 	}
 
 	public void Dispose() {
 		ServerConfigurationModel.Dispose();
 	}
+
+	public async Task VacuumDatabase() {
+		const string Title = "Vacuum Database";
+		await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => state.Db.Vacuum());
+		await Dialog.ShowOk(window, Title, "Done.");
+	}
 }

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -27,12 +27,6 @@
             <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
             <Button Command="{Binding ImportLegacyArchive}">Import Legacy Archive(s)...</Button>
         </WrapPanel>
-        <Expander Header="Advanced Tools" Margin="0 15 0 0">
-            <StackPanel Orientation="Vertical" Spacing="10">
-                <TextBlock TextWrapping="Wrap">Recreate the database to free up space after deleting data.</TextBlock>
-                <Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>
-            </StackPanel>
-        </Expander>
     </StackPanel>
 
 </UserControl>

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -19,7 +19,6 @@ using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Server.Database.Import;
 using DHT.Server.Database.Sqlite.Schema;
-using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Main.Pages;
@@ -55,11 +54,11 @@ sealed class DatabasePageModel {
 				break;
 
 			case PlatformID.Unix:
-				Process.Start("xdg-open", [ folder ]);
+				Process.Start("xdg-open", new string[] { folder });
 				break;
 
 			case PlatformID.MacOSX:
-				Process.Start("open", [ folder ]);
+				Process.Start("open", new string[] { folder });
 				break;
 
 			default:
@@ -73,29 +72,16 @@ sealed class DatabasePageModel {
 	}
 
 	public async Task MergeWithDatabase() {
-		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
-		if (paths.Length == 0) {
+		if (paths.Length > 0) {
-			return;
+			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
+		}
 	}
 
-		const string Title = "Database Merge";
+	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-		
-		ImportResult? result;
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "database file"));
-	}
-	
-	private static async Task<ImportResult?> MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
 
-		return await PerformImport(target, paths, dialog, callback, "Database Merge", async path => {
+		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
 			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
 
 			if (db == null) {
@@ -111,11 +97,14 @@ sealed class DatabasePageModel {
 		});
 	}
 
-	private sealed class SchemaUpgradeCallbacks(ProgressDialog dialog, int total) : ISchemaUpgradeCallbacks {
+	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
+		private readonly ProgressDialog dialog;
+		private readonly int total;
 		private bool? decision;
 
-		public Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
-			return Task.FromResult<InitialDatabaseSettings?>(null);
+			this.total = total;
+			this.dialog = dialog;
 		}
 
 		public async Task<bool> CanUpgrade() {
@@ -144,34 +133,21 @@ sealed class DatabasePageModel {
 	}
 
 	public async Task ImportLegacyArchive() {
-		string[] paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+		var paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Legacy DHT Archive",
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
-			AllowMultiple = true,
+			AllowMultiple = true
 		});
 
-		if (paths.Length == 0) {
+		if (paths.Length > 0) {
-			return;
+			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
+		}
 	}
 
-		const string Title = "Legacy Archive Import";
+	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
-		
-		ImportResult? result;
-		try {
-			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, GetImportDialogMessage(result, "archive file"));
-	}
-	
-	private static async Task<ImportResult?> ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var fakeSnowflake = new FakeSnowflake();
 
-		return await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", async path => {
+		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 => {
@@ -191,16 +167,16 @@ sealed class DatabasePageModel {
 
 		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
 
-		foreach (DHT.Server.Data.Server server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
+		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,
+				ValidityCheck = IsValidSnowflake
 			});
 		}
 
 		var model = new TextBoxDialogModel<DHT.Server.Data.Server>(items) {
 			Title = "Imported Server IDs",
-			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID.",
+			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID."
 		};
 
 		var dialog = new TextBoxDialog { DataContext = model };
@@ -215,9 +191,9 @@ sealed class DatabasePageModel {
 		            .ToDictionary(static item => item.Item, static item => ulong.Parse(item.Value));
 	}
 
-	private static async Task<ImportResult?> PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string dialogTitle, Func<string, Task<bool>> performImport) {
+	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;
-		DatabaseStatistics oldStatistics = await DatabaseStatistics.Take(target);
+		var oldStatistics = await DatabaseStatistics.Take(target);
 
 		int successful = 0;
 		int finished = 0;
@@ -227,7 +203,7 @@ sealed class DatabasePageModel {
 			++finished;
 
 			if (!File.Exists(path)) {
-				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' no longer exists.");
 				continue;
 			}
 
@@ -237,18 +213,19 @@ sealed class DatabasePageModel {
 				}
 			} catch (Exception ex) {
 				Log.Error(ex);
-				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
+				await Dialog.ShowOk(dialog, errorDialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
 		}
 
 		await callback.Update("Done", finished, total);
 
 		if (successful == 0) {
-			return null;
+			await Dialog.ShowOk(dialog, neutralDialogTitle, "Nothing was imported.");
+			return;
 		}
 
-		DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
+		var newStatistics = await DatabaseStatistics.Take(target);
-		return new ImportResult(oldStatistics, newStatistics, successful, total);
+		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
 	}
 
 	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
@@ -262,29 +239,20 @@ sealed class DatabasePageModel {
 		}
 	}
 
-	private sealed record ImportResult(DatabaseStatistics OldStatistics, DatabaseStatistics NewStatistics, int SuccessfulItems, int TotalItems);
+	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
-	
-	private static string GetImportDialogMessage(ImportResult? result, string itemName) {
-		if (result == null) {
-			return "Nothing was imported.";
-		}
-		
-		var oldStatistics = result.OldStatistics;
-		var newStatistics = result.NewStatistics;
-		
 		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
 		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
 		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
 		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
 
-		var message = new StringBuilder();
+		StringBuilder message = new StringBuilder();
 		message.Append("Processed ");
 
-		if (result.SuccessfulItems == result.TotalItems) {
+		if (successfulItems == totalItems) {
-			message.Append(result.SuccessfulItems.Pluralize(itemName));
+			message.Append(successfulItems.Pluralize(itemName));
 		}
 		else {
-			message.Append(result.SuccessfulItems.Format()).Append(" out of ").Append(result.TotalItems.Pluralize(itemName));
+			message.Append(successfulItems.Format()).Append(" out of ").Append(totalItems.Pluralize(itemName));
 		}
 
 		message.Append(" and added:\n\n  \u2022 ");
@@ -295,18 +263,4 @@ sealed class DatabasePageModel {
 
 		return message.ToString();
 	}
-	
-	public async Task VacuumDatabase() {
-		const string Title = "Vacuum Database";
-		
-		try {
-			await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
-			return;
-		}
-		
-		await Dialog.ShowOk(window, Title, "Done.");
-	}
 }

app/Desktop/Main/Pages/DebugPage.axaml

@@ -16,10 +16,6 @@
             <Setter Property="FontFamily" Value="Consolas,Courier" />
             <Setter Property="FontSize" Value="15" />
         </Style>
-        <Style Selector="Label">
-            <Setter Property="Margin" Value="0 5" />
-            <Setter Property="Padding" Value="0" />
-        </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Orientation" Value="Vertical" />
             <Setter Property="Margin" Value="0 0 10 10" />

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -51,7 +51,7 @@ sealed class DebugPageModel {
 
 	private async Task GenerateRandomData(int channelCount, int userCount, int messageCount, IProgressCallback callback) {
 		int batchCount = (messageCount + BatchSize - 1) / BatchSize;
-		await callback.Update("Adding messages in batches of " + BatchSize, finishedItems: 0, totalItems: batchCount);
+		await callback.Update("Adding messages in batches of " + BatchSize, 0, batchCount);
 
 		var rand = new Random();
 		var server = new DHT.Server.Data.Server {
@@ -60,46 +60,45 @@ sealed class DebugPageModel {
 			Type = ServerType.Server,
 		};
 
-		Channel[] channels = Enumerable.Range(start: 0, channelCount).Select(i => new Channel {
+		var channels = Enumerable.Range(0, channelCount).Select(i => new Channel {
 			Id = RandomId(rand),
 			Server = server.Id,
 			Name = RandomName("c"),
 			ParentId = null,
 			Position = i,
-			Topic = RandomText(rand, maxWords: 10),
+			Topic = RandomText(rand, 10),
 			Nsfw = rand.Next(4) == 0,
 		}).ToArray();
 
-		User[] users = Enumerable.Range(start: 0, userCount).Select(_ => new User {
+		var users = Enumerable.Range(0, userCount).Select(_ => new User {
 			Id = RandomId(rand),
 			Name = RandomName("u"),
-			DisplayName = RandomName("u"),
+			AvatarUrl = null,
-			AvatarHash = null,
+			Discriminator = rand.Next(0, 9999).ToString(),
-			Discriminator = rand.Next(minValue: 0, maxValue: 9999).ToString(),
 		}).ToArray();
 
 		await state.Db.Users.Add(users);
 		await state.Db.Servers.Add([server]);
 		await state.Db.Channels.Add(channels);
 
-		DateTimeOffset now = DateTimeOffset.Now;
+		var now = DateTimeOffset.Now;
 		int batchIndex = 0;
 
 		while (messageCount > 0) {
 			int hourOffset = batchIndex;
 
-			Message[] messages = Enumerable.Range(start: 0, Math.Min(messageCount, BatchSize)).Select(i => {
+			var messages = Enumerable.Range(0, Math.Min(messageCount, BatchSize)).Select(i => {
 				DateTimeOffset time = now.AddHours(hourOffset).AddMinutes(i * 60.0 / BatchSize);
-				DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(minValue: 1, maxValue: 60)) : null;
+				DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(1, 60)) : null;
 
-				long timeMillis = time.ToUnixTimeMilliseconds();
+				var timeMillis = time.ToUnixTimeMilliseconds();
-				long? editMillis = edit?.ToUnixTimeMilliseconds();
+				var editMillis = edit?.ToUnixTimeMilliseconds();
 
 				return new Message {
 					Id = (ulong) timeMillis,
 					Sender = RandomBiasedIndex(rand, users).Id,
 					Channel = RandomBiasedIndex(rand, channels).Id,
-					Text = RandomText(rand, maxWords: 100),
+					Text = RandomText(rand, 100),
 					Timestamp = timeMillis,
 					EditTimestamp = editMillis,
 					RepliedToId = null,
@@ -153,12 +152,12 @@ sealed class DebugPageModel {
 		"vanilla",
 		"watercress", "watermelon",
 		"yam",
-		"zucchini",
+		"zucchini"
 	];
 
 	private static string RandomText(Random rand, int maxWords) {
-		int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), y: 3));
+		int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), 3));
-		return string.Join(separator: ' ', Enumerable.Range(start: 0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
+		return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
 	}
 }
 #else

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -13,8 +13,8 @@
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="WrapPanel > Button">
+        <Style Selector="Expander">
-            <Setter Property="Margin" Value="0 0 10 10" />
+            <Setter Property="Margin" Value="0 5 0 0" />
         </Style>
         <Style Selector="DataGridColumnHeader">
             <Setter Property="FontWeight" Value="Medium" />
@@ -30,18 +30,10 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Orientation="Vertical">
+    <StackPanel Orientation="Vertical" Spacing="20">
-        <WrapPanel Orientation="Horizontal">
         <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-            <Button Command="{Binding OnClickRetryFailed}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed</Button>
-            <Button Command="{Binding OnClickDeleteOrphaned}">Delete Orphaned</Button>
-            <Button Command="{Binding OnClickExportAll}" IsEnabled="{Binding HasSuccessfulDownloads}">Export All...</Button>
-        </WrapPanel>
-        <StackPanel Orientation="Vertical" Spacing="20" Margin="0 10 0 0">
         <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
-            <TextBlock TextWrapping="Wrap">
+        <StackPanel Orientation="Vertical" Spacing="12">
-                Downloading state and filter settings are remembered per-database.
-            </TextBlock>
             <Expander Header="Download Status" IsExpanded="True">
                 <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
                     <DataGrid.Columns>
@@ -51,6 +43,9 @@
                     </DataGrid.Columns>
                 </DataGrid>
             </Expander>
+            <StackPanel Orientation="Horizontal" Spacing="10">
+                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
+            </StackPanel>
         </StackPanel>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/DownloadsPageModel.cs

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

app/Desktop/Main/Pages/TrackingPage.axaml

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

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

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -9,36 +8,24 @@ namespace DHT.Desktop.Main.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class TrackingPage : UserControl {
-	private readonly HashSet<Button> copyingButtons = new (ReferenceEqualityComparer.Instance);
+	private bool isCopyingScript;
 
 	public TrackingPage() {
 		InitializeComponent();
 	}
 
 	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
-		await HandleCopyButton(CopyTrackingScript, "Script Copied!", static model => model.OnClickCopyTrackingScript());
-	}
-	
-	public async void CopyConnectionScriptButton_OnClick(object? sender, RoutedEventArgs e) {
-		await HandleCopyButton(CopyConnectionCode, "Code Copied!", static model => model.OnClickCopyConnectionCode());
-	}
-	
-	private async Task HandleCopyButton(Button button, string copiedText, Func<TrackingPageModel, Task<bool>> onClick) {
 		if (DataContext is TrackingPageModel model) {
-			object? originalText = button.Content;
+			var originalText = CopyTrackingScript.Content;
-			button.MinWidth = button.Bounds.Width;
+			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;
 
-			if (await onClick(model) && copyingButtons.Add(button)) {
+			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
-				button.IsEnabled = false;
+				isCopyingScript = true;
-				button.Content = copiedText;
+				CopyTrackingScript.Content = "Script Copied!";
 
-				try {
 				await Task.Delay(TimeSpan.FromSeconds(2));
-				} finally {
+				CopyTrackingScript.Content = originalText;
-					copyingButtons.Remove(button);
+				isCopyingScript = false;
-					button.IsEnabled = true;
-					button.Content = originalText;
-				}
 			}
 		}
 	}

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,32 +1,28 @@
 using System;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-using Avalonia.Input.Platform;
+using CommunityToolkit.Mvvm.ComponentModel;
-using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
-using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class TrackingPageModel {
+sealed partial class TrackingPageModel : ObservableObject {
-	private static readonly Log Log = Log.ForType<TrackingPageModel>();
+	[ObservableProperty(Setter = Access.Private)]
+	private bool isCopyTrackingScriptButtonEnabled = true;
 
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
 	private bool? areDevToolsEnabled = null;
 
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
 	private bool isToggleAppDevToolsButtonEnabled = false;
 
-	public string OpenDevToolsShortcutText { get; } = OperatingSystem.IsMacOS() ? "Cmd+Shift+I" : "Ctrl+Shift+I";
-	
-	[DependsOn(nameof(AreDevToolsEnabled), nameof(IsToggleAppDevToolsButtonEnabled))]
 	public string ToggleAppDevToolsButtonText {
 		get {
 			if (!AreDevToolsEnabled.HasValue) {
@@ -37,7 +33,7 @@ sealed partial class TrackingPageModel {
 				return "Unavailable";
 			}
 
-			return (AreDevToolsEnabled.Value ? "Disable" : "Enable") + " " + OpenDevToolsShortcutText;
+			return AreDevToolsEnabled.Value ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
 		}
 	}
 
@@ -53,9 +49,32 @@ sealed partial class TrackingPageModel {
 	}
 
 	public async Task<bool> OnClickCopyTrackingScript() {
-		string url = ServerConfiguration.HttpHost + $"/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
+		IsCopyTrackingScriptButtonEnabled = false;
+
+		try {
+			return await CopyTrackingScript();
+		} finally {
+			IsCopyTrackingScriptButtonEnabled = true;
+		}
+	}
+
+	private async Task<bool> CopyTrackingScript() {
+		string url = $"http://127.0.0.1:{ServerConfiguration.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
 		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
-		return await TryCopy(script, "Copy Tracking Script");
+
+		var clipboard = window.Clipboard;
+		if (clipboard == null) {
+			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
+			return false;
+		}
+
+		try {
+			await clipboard.SetTextAsync(script);
+			return true;
+		} catch {
+			await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
+			return false;
+		}
 	}
 
 	private async Task InitializeDevToolsToggle() {
@@ -83,11 +102,11 @@ sealed partial class TrackingPageModel {
 		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
 			case SettingsJsonResult.Success:
 				AreDevToolsEnabled = newState;
-				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
+				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
 				break;
 
 			case SettingsJsonResult.AlreadySet:
-				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " is already " + (newState ? "enabled." : "disabled."));
+				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
 				AreDevToolsEnabled = newState;
 				break;
 
@@ -111,44 +130,4 @@ sealed partial class TrackingPageModel {
 				throw new ArgumentOutOfRangeException();
 		}
 	}
-	
-	public async Task OnClickInstallOrUpdateUserscript() {
-		try {
-			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/get-userscript/dht.user.js");
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Install or Update Userscript", "Could not open the browser: " + e.Message);
-		}
-	}
-	
-	[GeneratedRegex("^[a-zA-Z0-9]{1,100}$")]
-	private static partial Regex ConnectionCodeTokenRegex();
-	
-	public async Task<bool> OnClickCopyConnectionCode() {
-		const string Title = "Copy Connection Code";
-		
-		if (ConnectionCodeTokenRegex().IsMatch(ServerConfiguration.Token)) {
-			return await TryCopy(ServerConfiguration.Port + ":" + ServerConfiguration.Token, Title);
-		}
-		else {
-			await Dialog.ShowOk(window, Title, "The internal server token cannot be used to create a connection code.\n\nCheck the 'Advanced' tab and ensure the token is 1-100 characters long, and only contains plain letters and numbers.");
-			return false;
-		}
-	}
-	
-	private async Task<bool> TryCopy(string script, string errorDialogTitle) {
-		IClipboard? clipboard = window.Clipboard;
-		if (clipboard == null) {
-			await Dialog.ShowOk(window, errorDialogTitle, "Clipboard is not available on this system.");
-			return false;
-		}
-		
-		try {
-			await clipboard.SetTextAsync(script);
-			return true;
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
-			return false;
-		}
-	}
 }

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,8 +1,10 @@
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
@@ -11,18 +13,14 @@ using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Data.Filters;
 using DHT.Server.Service.Viewer;
-using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class ViewerPageModel : IDisposable {
+sealed partial class ViewerPageModel : ObservableObject, IDisposable {
-	private static readonly Log Log = Log.ForType<ViewerPageModel>();
-	
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
-	[Notify]
+	[ObservableProperty]
 	private bool hasFilters = false;
 
 	public MessageFilterPanelModel FilterModel { get; }
@@ -51,18 +49,21 @@ sealed partial class ViewerPageModel : IDisposable {
 
 	public async void OnClickOpenViewer() {
 		try {
+			string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
 			string serverToken = ServerConfiguration.Token;
 			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
-			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
+			
+			Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId)) {
+				UseShellExecute = true
+			});
 		} catch (Exception e) {
 			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
 		}
 	}
 
 	public async Task OnClickApplyFiltersToDatabase() {
-		try {
+		var filter = FilterModel.CreateFilter();
-			MessageFilter filter = FilterModel.CreateFilter();
+		var messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
-			long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
 
 		if (DatabaseToolFilterModeKeep) {
 			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
@@ -74,28 +75,9 @@ sealed partial class ViewerPageModel : IDisposable {
 				await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
 			}
 		}
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
-		}
 	}
 
 	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {
-		await ProgressDialog.Show(window, "Apply Filters", async (_, callback) => {
+		await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Removing messages...", _ => state.Db.Messages.Remove(filter, removalMode));
-			await callback.UpdateIndeterminate("Removing messages...");
-			Log.Info("Removed messages: " + await state.Db.Messages.Remove(filter, removalMode));
-			
-			await callback.UpdateIndeterminate("Cleaning up attachments...");
-			Log.Info("Removed orphaned attachments: " + await state.Db.Messages.RemoveUnreachableAttachments());
-			
-			await callback.UpdateIndeterminate("Cleaning up users...");
-			Log.Info("Removed orphaned users: " + await state.Db.Users.RemoveUnreachable());
-			
-			await callback.UpdateIndeterminate("Cleaning up channels...");
-			Log.Info("Removed orphaned channels: " + await state.Db.Channels.RemoveUnreachable());
-			
-			await callback.UpdateIndeterminate("Cleaning up servers...");
-			Log.Info("Removed orphaned servers: " + await state.Db.Servers.RemoveUnreachable());
-		});
 	}
 }

app/Desktop/Main/Screens/MainContentScreen.axaml

@@ -40,13 +40,13 @@
         <Style Selector="TabItem:pointerover /template/ Border">
             <Setter Property="Background" Value="#455785" />
         </Style>
-        <Style Selector="TabItem:pointerover /template/ ContentPresenter">
+        <Style Selector="TabItem:pointerover > TextBlock">
             <Setter Property="Foreground" Value="#E9E9E9" />
         </Style>
         <Style Selector="TabItem:selected:pointerover /template/ Border">
             <Setter Property="Background" Value="#FFFFFF" />
         </Style>
-        <Style Selector="TabItem:selected:pointerover /template/ ContentPresenter">
+        <Style Selector="TabItem:selected:pointerover > TextBlock">
             <Setter Property="Foreground" Value="#1A2234" />
         </Style>
         <Style Selector="TabItem:selected">
@@ -56,11 +56,9 @@
         <Style Selector="TabItem:selected /template/ Border#PART_SelectedPipe">
             <Setter Property="IsVisible" Value="False" />
         </Style>
-        <Style Selector="TabItem:disabled /template/ ContentPresenter">
+        <Style Selector="TabItem:disabled > TextBlock">
             <Setter Property="Foreground" Value="#B2B2B2" />
-        </Style>
+            <Setter Property="TextDecorations" Value="Strikethrough" />
-        <Style Selector="TabItem:disabled /template/ ContentPresenter">
-            <Setter Property="AccessText.TextDecorations" Value="Strikethrough" />
         </Style>
         <Style Selector="TabItem.first">
             <Setter Property="Margin" Value="0 13 0 0" />

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Main.Pages;
@@ -7,7 +6,7 @@ using DHT.Server;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed class MainContentScreenModel : IAsyncDisposable {
+sealed class MainContentScreenModel : IDisposable {
 	public DatabasePage DatabasePage { get; }
 	private DatabasePageModel DatabasePageModel { get; }
 
@@ -35,8 +34,12 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 	public StatusBarModel StatusBarModel { get; }
 
 	public event EventHandler? DatabaseClosed {
-		add => DatabasePageModel.DatabaseClosed += value;
+		add {
-		remove => DatabasePageModel.DatabaseClosed -= value;
+			DatabasePageModel.DatabaseClosed += value;
+		}
+		remove {
+			DatabasePageModel.DatabaseClosed -= value;
+		}
 	}
 
 	[Obsolete("Designer")]
@@ -49,7 +52,7 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 		TrackingPageModel = new TrackingPageModel(window);
 		TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
 
-		DownloadsPageModel = new DownloadsPageModel(window, state);
+		DownloadsPageModel = new DownloadsPageModel(state);
 		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
 
 		ViewerPageModel = new ViewerPageModel(window, state);
@@ -68,12 +71,8 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 		StatusBarModel = new StatusBarModel(state);
 	}
 
-	public async Task Initialize() {
+	public void Dispose() {
-		await DownloadsPageModel.Initialize();
+		DownloadsPageModel.Dispose();
-	}
-	
-	public async ValueTask DisposeAsync() {
-		await DownloadsPageModel.DisposeAsync();
 		ViewerPageModel.Dispose();
 		AdvancedPageModel.Dispose();
 		StatusBarModel.Dispose();

app/Desktop/Main/Screens/WelcomeScreen.axaml

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

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -1,28 +1,21 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
-using DHT.Desktop.Main.Dialogs;
 using DHT.Server.Database;
 using DHT.Server.Database.Sqlite.Schema;
-using DHT.Server.Database.Sqlite.Utils;
-using DHT.Utils.Logging;
-using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed partial class WelcomeScreenModel {
+sealed partial class WelcomeScreenModel : ObservableObject {
-	private static readonly Log Log = Log.ForType<WelcomeScreenModel>();
-	
 	public string Version => Program.Version;
 	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isOpenOrCreateDatabaseButtonEnabled = true;
 	
 	public event EventHandler<IDatabaseFile>? DatabaseSelected; 
@@ -41,7 +34,7 @@ sealed partial class WelcomeScreenModel {
 	public async Task OpenOrCreateDatabase() {
 		IsOpenOrCreateDatabaseButtonEnabled = false;
 		try {
-			string? path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
+			var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
 			if (path != null) {
 				await OpenOrCreateDatabaseFromPath(path);
 			}
@@ -53,20 +46,17 @@ sealed partial class WelcomeScreenModel {
 	public async Task OpenOrCreateDatabaseFromPath(string path) {
 		dbFilePath = path;
 		
-		IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
+		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
 		if (db != null) {
 			DatabaseSelected?.Invoke(this, db);
 		}
 	}
 
-	private sealed class SchemaUpgradeCallbacks(Window window) : ISchemaUpgradeCallbacks {
+	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
-		public async Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
+		private readonly Window window;
-			var model = new NewDatabaseSettingsDialogModel();
 		
-			var dialog = new NewDatabaseSettingsDialog { DataContext = model };
+		public SchemaUpgradeCallbacks(Window window) {
-			await dialog.ShowDialog(window);
+			this.window = window;
-			
-			return new InitialDatabaseSettings(model.SeparateFileForDownloads, model.DownloadsAutoStart);
 		}
 
 		public async Task<bool> CanUpgrade() {
@@ -85,9 +75,17 @@ sealed partial class WelcomeScreenModel {
 			await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
 		}
 
-		private sealed class ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) : ISchemaUpgradeCallbacks.IProgressReporter {
+		private sealed class ProgressReporter : ISchemaUpgradeCallbacks.IProgressReporter {
+			private readonly IReadOnlyList<IProgressCallback> callbacks;
+			
+			private readonly int versionSteps;
 			private int versionProgress = 0;
 			
+			public ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) {
+				this.callbacks = callbacks;
+				this.versionSteps = versionSteps;
+			}
+
 			public async Task NextVersion() {
 				await callbacks[0].Update("Upgrading schema version...", versionProgress++, versionSteps);
 				await HideChildren(0);
@@ -111,47 +109,6 @@ sealed partial class WelcomeScreenModel {
 		}
 	}
 
-	public async Task CheckUpdates() {
-		string response;
-		try {
-			response = await ProgressDialog.ShowIndeterminate<string>(window, "Check Updates", "Checking for updates...", static async _ => {
-				var client = new HttpClient(new SocketsHttpHandler {
-					AutomaticDecompression = DecompressionMethods.None,
-					AllowAutoRedirect = false,
-					UseCookies = false,
-				});
-				
-				client.Timeout = TimeSpan.FromSeconds(30);
-				client.MaxResponseContentBufferSize = 1024;
-				client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
-				
-				return await client.GetStringAsync(Program.Website + "/version");
-			});
-		} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
-			await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
-			return;
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
-			return;
-		}
-		
-		if (!System.Version.TryParse(response, out Version? latestVersion)) {
-			await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
-			return;
-		}
-		
-		if (Program.AssemblyVersion >= latestVersion) {
-			await Dialog.ShowOk(window, "Check Updates", "You are using the latest version.");
-			return;
-		}
-		
-		if (await Dialog.ShowYesNo(window, "Check Updates", "A newer version is available: v" + Program.VersionToString(latestVersion) + "\nVisit the official website and close the app?") == DialogResult.YesNo.Yes) {
-			SystemUtils.OpenUrl(Program.Website);
-			Exit();
-		}
-	}
-	
 	public async Task ShowAboutDialog() {
 		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
 	}

app/Desktop/Program.cs

@@ -9,18 +9,17 @@ namespace DHT.Desktop;
 
 static class Program {
 	public static string Version { get; }
-	public static Version AssemblyVersion { get; }
 	public static CultureInfo Culture { get; }
 	public static ResourceLoader Resources { get; }
 	public static Arguments Arguments { get; }
 
-	public const string Website = "https://dht.chylex.com";
-	
 	static Program() {
 		var assembly = Assembly.GetExecutingAssembly();
 
-		AssemblyVersion = assembly.GetName().Version ?? new Version(major: 0, minor: 0, build: 0, revision: 0);
+		Version = assembly.GetName().Version?.ToString() ?? "";
-		Version = VersionToString(AssemblyVersion);
+		while (Version.EndsWith(".0")) {
+			Version = Version[..^2];
+		}
 
 		Culture = CultureInfo.CurrentCulture;
 		CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
@@ -32,16 +31,6 @@ static class Program {
 		Arguments = new Arguments(Environment.GetCommandLineArgs());
 	}
 
-	public static string VersionToString(Version version) {
-		string versionStr = version.ToString();
-		
-		while (versionStr.EndsWith(".0")) {
-			versionStr = versionStr[..^2];
-		}
-		
-		return versionStr;
-	}
-	
 	public static void Main(string[] args) {
 		if (Arguments.Console && OperatingSystem.IsWindows()) {
 			WindowsConsole.AllocConsole();

app/Desktop/Server/ServerConfiguration.cs

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

app/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
   
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>13</LangVersion>
+    <LangVersion>12</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
@@ -21,13 +21,12 @@
   <PropertyGroup>
     <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
     <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>full</TrimMode>
+    <TrimMode>partial</TrimMode>
     <EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
     <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
     <EventSourceSupport>false</EventSourceSupport>
     <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
     <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
-    <XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
   </PropertyGroup>
   
   <PropertyGroup>
@@ -40,7 +39,6 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugSymbols>false</DebugSymbols>
     <DebugType>none</DebugType>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
   
   <PropertyGroup>

app/Resources/Schemas/track-users.yml

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

app/Resources/Tracker/bootstrap.js

@@ -133,7 +133,6 @@
 	STATE.onTrackingStateChanged(enabled => {
 		if (enabled) {
 			GUI.setStatus("Starting");
-			GUI.createTrackingStyles();
 			hasJustStarted = true;
 			
 			if (!starter()) {
@@ -143,7 +142,6 @@
 		}
 		else {
 			isSending = false;
-			GUI.deleteTrackingStyles();
 		}
 	});
 	

app/Resources/Tracker/loader/dht.user.js

@@ -1,273 +0,0 @@
-// ==UserScript==
-// @name         Discord History Tracker
-// @license      MIT
-// @namespace    https://chylex.com
-// @homepageURL  https://dht.chylex.com/
-// @supportURL   https://github.com/chylex/Discord-History-Tracker/issues
-// @include      https://discord.com/*
-// @run-at       document-idle
-// @grant        none
-// @noframes
-// ==/UserScript==
-
-function startMutationObserver(callback) {
-	let hasDebounceStarted = false;
-	
-	function handleMutations(mutations, observer) {
-		if (hasDebounceStarted) {
-			return;
-		}
-		
-		hasDebounceStarted = true;
-		window.setTimeout(() => {
-			hasDebounceStarted = false;
-			callback(observer);
-		}, 20);
-	}
-	
-	new MutationObserver(handleMutations).observe(document.body, { childList: true, subtree: true });
-}
-
-startMutationObserver(observer => {
-	const triggerButton = installConnectDialogButton();
-	if (triggerButton === null) {
-		return;
-	}
-	
-	observer.disconnect();
-	
-	startMutationObserver(() => {
-		if (!triggerButton.isConnected) {
-			getHelpIcon()?.parentElement.parentElement.insertAdjacentElement("afterend", triggerButton);
-		}
-	});
-});
-
-function installConnectDialogButton() {
-	const helpIcon = getHelpIcon();
-	if (!helpIcon) {
-		return null;
-	}
-	
-	const helpIconWrapper = helpIcon.parentElement;
-	const helpIconLink = helpIconWrapper.parentElement;
-	
-	helpIconLink.insertAdjacentHTML("afterend", `
-<div id="dht-connector-show-dialog" role="button" class="${helpIconWrapper.getAttribute("class")}">
-  <svg viewBox="0 0 24 20" fill="currentColor" class="${helpIcon.getAttribute("class")}" style="width: auto;">
-    <path d="M7.446,9.924c-0,0.846 -0.105,1.593 -0.315,2.234c-0.21,0.644 -0.497,1.181 -0.86,1.615c-0.365,0.431 -0.795,0.761 -1.292,0.982c-0.494,0.22 -1.029,0.332 -1.605,0.332l-3.374,-0l0,-10.174l3.021,0c0.645,0 1.239,0.1 1.781,0.296c0.542,0.198 1.011,0.501 1.4,0.911c0.391,0.408 0.695,0.928 0.914,1.56c0.22,0.629 0.33,1.378 0.33,2.244Zm-1.765,-0c0,-0.592 -0.067,-1.1 -0.198,-1.524c-0.134,-0.422 -0.318,-0.77 -0.554,-1.042c-0.236,-0.272 -0.518,-0.473 -0.848,-0.604c-0.332,-0.128 -0.697,-0.195 -1.096,-0.195l-1.237,-0l0,6.882l1.483,0c0.351,0 0.676,-0.076 0.977,-0.224c0.298,-0.15 0.556,-0.372 0.776,-0.668c0.22,-0.295 0.389,-0.663 0.513,-1.101c0.122,-0.439 0.184,-0.947 0.184,-1.524Z"/>
-    <path d="M14.147,15.087l-0,-4.362l-3.637,-0l-0,4.362l-1.748,-0l-0,-10.174l1.748,0l-0,4.052l3.637,-0l-0,-4.052l1.75,0l0,10.174l-1.75,-0Z"/>
-    <path d="M21.297,6.559l-0,8.528l-1.748,-0l-0,-8.528l-2.699,-0l0,-1.646l7.15,0l0,1.646l-2.703,-0Z"/>
-  </svg>
-</div>
-`);
-	
-	const button = document.getElementById("dht-connector-show-dialog");
-	button.addEventListener("click", showConnectDialog);
-	return button;
-}
-
-function getHelpIcon() {
-	return document.querySelector("div[class*='bar_'] a[href$='://support.discord.com'] > div[class*='clickable'] > svg");
-}
-
-function showConnectDialog() {
-	if (window.DHT_LOADED) {
-		alert("Discord History Tracker is already loaded.");
-		return;
-	}
-	
-	const dialogElement = document.createElement("dialog");
-	dialogElement.id = "dht-connector-dialog";
-	dialogElement.innerHTML = `
-<form id="dht-connector-dialog-form">
-  <label for="dht-connector-dialog-input-code">Connection Code</label>
-  <input id="dht-connector-dialog-input-code" type="text">
-  <p id="dht-connector-dialog-input-error"></p>
-  
-  <div id="dht-connector-dialog-buttons">
-    <button type="submit" id="dht-connector-dialog-button-connect">Connect</button>
-    <button type="button" id="dht-connector-dialog-button-close">Cancel</button>
-  </div>
-</form>
-<style>
-  #dht-connector-dialog {
-    width: 300px;
-    padding: 18px;
-    font-size: 16px;
-    border: none;
-    border-radius: 8px;
-    background-color: #313338;
-  }
-  
-  #dht-connector-dialog::backdrop {
-    background-color: rgba(0, 0, 0, 0.6);
-  }
-  
-  #dht-connector-dialog label {
-    display: block;
-    margin: 0 0 9px;
-    font-weight: 500;
-    letter-spacing: .02em;
-    color: #fbfbfb;
-  }
-  
-  #dht-connector-dialog-input-error {
-    margin: 11px 1px;
-    color: #ff484c;
-    font-size: 15px;
-    font-weight: 500;
-  }
-  
-  #dht-connector-dialog input[type="text"] {
-    box-sizing: border-box;
-    width: 100%;
-    padding: 12px 10px;
-    border: 1px solid rgba(151, 151, 159, 0.2);
-    border-radius: 8px;
-    color: #efeff0;
-    background-color: #1d1d21;
-  }
-  
-  #dht-connector-dialog-buttons {
-    margin-top: 15px;
-    display: flex;
-    justify-content: end;
-    gap: 12px;
-  }
-  
-  #dht-connector-dialog button {
-    padding: 8px 16px;
-    border: none;
-    border-radius: 8px;
-    font-size: 14px;
-    font-weight: 500;
-    color: #fff;
-    background-color: #5865f2;
-    transition: background-color 200ms ease, color 200ms ease;
-  }
-  
-  #dht-connector-dialog button:hover {
-    background-color: #4752c4;
-  }
-  
-  #dht-connector-dialog button[disabled] {
-    cursor: not-allowed;
-    opacity: 0.5;
-  }
-</style>
-	`;
-	
-	document.body.insertAdjacentElement("beforeend", dialogElement);
-	
-	const formElement = document.getElementById("dht-connector-dialog-form");
-	const codeErrorElement = document.getElementById("dht-connector-dialog-input-error");
-	const codeInputElement = document.getElementById("dht-connector-dialog-input-code");
-	const connectButtonElement = document.getElementById("dht-connector-dialog-button-connect");
-	const closeButtonElement = document.getElementById("dht-connector-dialog-button-close");
-	
-	dialogElement.addEventListener("close", function() {
-		dialogElement.remove();
-	});
-	
-	closeButtonElement.addEventListener("click", function() {
-		dialogElement.close();
-	});
-	
-	codeInputElement.addEventListener("paste", function() {
-		setTimeout(async function() {
-			const code = parseConnectionCode(codeInputElement.value);
-			if (code !== null) {
-				await onSubmit(code);
-			}
-		}, 0);
-	});
-	
-	formElement.addEventListener("submit", async function(e) {
-		e.preventDefault();
-		
-		const code = parseConnectionCode(codeInputElement.value);
-		if (code === null) {
-			codeErrorElement.innerText = "Code is not valid.";
-		}
-		else {
-			await onSubmit(code);
-		}
-	});
-	
-	let isSubmitting = false;
-	
-	async function onSubmit(code) {
-		if (isSubmitting) {
-			return;
-		}
-		
-		isSubmitting = true;
-		connectButtonElement.setAttribute("disabled", "");
-		try {
-			await loadTrackingScript(code);
-		} catch (e) {
-			onError("Could not load tracking script.", e);
-		} finally {
-			isSubmitting = false;
-			connectButtonElement.removeAttribute("disabled");
-		}
-	}
-	
-	async function loadTrackingScript(code) {
-		const trackingScript = await getTrackingScript(code.port, code.token);
-		
-		if (dialogElement.isConnected) {
-			// noinspection DynamicallyGeneratedCodeJS
-			eval(trackingScript);
-			dialogElement.close();
-		}
-	}
-	
-	function onError(message, e) {
-		console.error(message, e);
-		codeErrorElement.innerText = message;
-	}
-	
-	dialogElement.showModal();
-}
-
-/**
- * @param {string} code
- * @return {?{port: number, token: string}}
- */
-function parseConnectionCode(code) {
-	if (code.length > 5 + 1 + 100) {
-		return null;
-	}
-	
-	const match = code.match(/^(\d{1,5}):([a-zA-Z0-9]{1,100})$/);
-	if (!match) {
-		return null;
-	}
-	
-	const port = Number(match[1]);
-	if (port < 0 || port > 65535) {
-		return null;
-	}
-	
-	return { port, token: match[2] };
-}
-
-async function getTrackingScript(port, token) {
-	const url = "http://127.0.0.1:" + port + "/get-tracking-script?token=" + encodeURIComponent(token);
-	const response = await fetch(url, {
-		credentials: "omit",
-		signal: AbortSignal.timeout(2000),
-	});
-	
-	if (!response.ok) {
-		throw response.status + " " + response.statusText;
-	}
-	
-	if (response.headers.get("X-DHT") !== "1") {
-		throw "Invalid response";
-	}
-	
-	return await response.text();
-}

app/Resources/Tracker/scripts/discord.js

@@ -42,14 +42,14 @@ class DISCORD {
 	 * @type {Object}
 	 * @property {function(String): ?DiscordGuild} getGuild
 	 */
-	static #guildStore = WEBPACK.findModule("guildStore", WEBPACK.filterByProps("getGuild", "getGuilds", "getGuildIds"));
+	static #guildStore = WEBPACK.findModule(WEBPACK.filterByProps("getGuild", "getGuilds", "getGuildIds"));
 	
 	/**
 	 * @type {Object}
 	 * @property {function(String): Boolean} isOptInEnabled
 	 * @property {function(String): Set<String>} getOptedInChannels
 	 */
-	static #guildSettings = WEBPACK.findModule("guildSettings", WEBPACK.filterByProps("isOptInEnabled", "getOptedInChannels"));
+	static #guildSettings = WEBPACK.findModule(WEBPACK.filterByProps("isOptInEnabled", "getOptedInChannels"));
 	
 	/**
 	 * @type {Object}
@@ -57,7 +57,7 @@ class DISCORD {
 	 * @property {function(String): Array<DiscordChannel>} getMutableGuildChannelsForGuild
 	 * @property {function(): Array<DiscordChannel>} getSortedPrivateChannels
 	 */
-	static #channelStore = WEBPACK.findModule("channelStore", WEBPACK.filterByProps("getChannel", "getMutableGuildChannelsForGuild", "getSortedPrivateChannels"));
+	static #channelStore = WEBPACK.findModule(WEBPACK.filterByProps("getChannel", "getMutableGuildChannelsForGuild", "getSortedPrivateChannels"));
 	
 	/**
 	 * @type {function(BigInt, Object): Boolean}
@@ -85,9 +85,9 @@ class DISCORD {
 	static #selectPrivateChannel = WEBPACK.findFunction("selectPrivateChannel", [ "selectChannel" ]);
 	
 	/**
-	 * @type {function(String, Object, String=null): void}
+	 * @type {function(String, String, String=null): void}
 	 */
-	static #transitionToGuildSync = WEBPACK.findFunction("transitionToGuildSync");
+	static #transitionToGuild = WEBPACK.findFunction("transitionToGuild", [ "transitionTo" ]);
 	
 	static isCompatible() {
 		return !!this.#guildStore
@@ -98,7 +98,7 @@ class DISCORD {
 			&& !!this.#jumpToMessage
 			&& !!this.#getCurrentlySelectedChannelId
 			&& !!this.#selectPrivateChannel
-			&& !!this.#transitionToGuildSync;
+			&& !!this.#transitionToGuild;
 	}
 	
 	static getMessageOuterElement() {
@@ -117,25 +117,24 @@ class DISCORD {
 		}
 	}
 	
-	static getMessagesFromSelectedChannel() {
-		const channelId = this.#getCurrentlySelectedChannelId();
-		return channelId ? this.#getMessages(channelId) : null;
-	}
-	
 	/**
 	 * Calls the provided function with a list of messages whenever the currently loaded messages change.
-	 * @param callback {function(server: ?DiscordGuild, channel: DiscordChannel, messages: Array<DiscordMessage>, hasMoreBefore: boolean)}
 	 */
 	static setupMessageCallback(callback) {
 		const previousMessages = new Set();
 		
 		const onMessageElementsChanged = force => {
-			const messages = this.getMessagesFromSelectedChannel();
+			const channelId = this.#getCurrentlySelectedChannelId();
+			if (!channelId) {
+				return false;
+			}
+			
+			const messages = this.#getMessages(channelId);
 			if (!messages || !messages.ready || messages.loadingMore) {
 				return false;
 			}
 			
-			const channel = this.#channelStore.getChannel(messages.channelId);
+			const channel = this.#channelStore.getChannel(channelId);
 			if (!channel) {
 				return false;
 			}
@@ -245,13 +244,14 @@ class DISCORD {
 				.filter(channel => this.CHANNEL_TYPE.isNavigableGuildChannel(channel.type) && isChannelOptedIn(channel) && this.#hasPermission(this.PERMISSION.VIEW_CHANNEL, channel))
 				.sort((a, b) => a.position - b.position);
 			
+			debugger;
 			const currentIndex = guildChannels.findIndex(channel => channel.id === currentChannel.id);
 			
 			if (currentIndex === -1 || currentIndex === guildChannels.length - 1) {
 				return false;
 			}
 			
-			this.#transitionToGuildSync(guildId, {}, guildChannels[currentIndex + 1].id);
+			this.#transitionToGuild(guildId, guildChannels[currentIndex + 1].id);
 			return true;
 		}
 	}

app/Resources/Tracker/scripts/dom.js

@@ -1,8 +1,6 @@
 class DOM {
 	/**
 	 * Returns a child element by its ID. Parent defaults to the entire document.
-	 * @param {string} id
-	 * @param {HTMLElement?} [parent]
 	 * @returns {HTMLElement}
 	 */
 	static id(id, parent) {
@@ -11,9 +9,6 @@ class DOM {
 	
 	/**
 	 * Returns the first child element containing the specified obfuscated class. Parent defaults to the entire document.
-	 * @param {string} cls
-	 * @param {HTMLElement?} [parent]
-	 * @returns {HTMLElement}
 	 */
 	static queryReactClass(cls, parent) {
 		return (parent || document).querySelector(`[class*="${cls}_"]`);

app/Resources/Tracker/scripts/gui.js

@@ -2,17 +2,14 @@
 const GUI = (function() {
 	let controller = null;
 	let settings = null;
-	let trackingStyles = null;
 	
 	const stateChangedEvent = () => {
 		if (settings) {
 			settings.ui.cbAutoscroll.checked = SETTINGS.autoscroll;
-			settings.ui.cbHidePreviewsWhileAutoscrolling.checked = SETTINGS.hidePreviewsWhileAutoscrolling;
 			settings.ui.optsAfterFirstMsg[SETTINGS.afterFirstMsg].checked = true;
 			settings.ui.optsAfterSavedMsg[SETTINGS.afterSavedMsg].checked = true;
 			
 			const autoscrollDisabled = !SETTINGS.autoscroll;
-			settings.ui.cbHidePreviewsWhileAutoscrolling.disabled = autoscrollDisabled;
 			Object.values(settings.ui.optsAfterFirstMsg).forEach(ele => ele.disabled = autoscrollDisabled);
 			Object.values(settings.ui.optsAfterSavedMsg).forEach(ele => ele.disabled = autoscrollDisabled);
 		}
@@ -57,7 +54,6 @@ const GUI = (function() {
 			
 			controller.ui.btnClose.addEventListener("click", () => {
 				this.hideController();
-				this.deleteTrackingStyles();
 				window.DHT_ON_UNLOAD.forEach(f => f());
 				delete window.DHT_ON_UNLOAD;
 				delete window.DHT_LOADED;
@@ -88,7 +84,6 @@ const GUI = (function() {
 			const radio = (type, id, label) => "<label><input id='dht-cfg-" + type + "-" + id + "' name='dht-" + type + "' type='radio'> " + label + "</label><br>";
 			const html = `
 <label><input id='dht-cfg-autoscroll' type='checkbox'> Autoscroll</label><br>
-<label><input id='dht-cfg-hide-previews-while-autoscrolling' type='checkbox'> Hide previews to improve browser performance</label><br>
 <br>
 <label>After reaching the first message in channel...</label><br>
 ${radio("afm", "nothing", "Continue Tracking")}
@@ -98,7 +93,8 @@ ${radio("afm", "switch", "Switch to Next Channel")}
 <label>After reaching a previously saved message...</label><br>
 ${radio("asm", "nothing", "Continue Tracking")}
 ${radio("asm", "pause", "Pause Tracking")}
-${radio("asm", "switch", "Switch to Next Channel")}`;
+${radio("asm", "switch", "Switch to Next Channel")}
+<p id='dht-cfg-note'>It is recommended to disable link and image previews to avoid putting unnecessary strain on your browser.</p>`;
 			
 			settings = {
 				styles: DOM.createStyle(`/*[CSS-SETTINGS]*/`),
@@ -111,10 +107,9 @@ ${radio("asm", "switch", "Switch to Next Channel")}`;
 			});
 			
 			settings.ui = {
-				/** @type {HTMLInputElement} */ cbAutoscroll: DOM.id("dht-cfg-autoscroll"),
+				cbAutoscroll: DOM.id("dht-cfg-autoscroll"),
-				/** @type {HTMLInputElement} */ cbHidePreviewsWhileAutoscrolling: DOM.id("dht-cfg-hide-previews-while-autoscrolling"),
+				optsAfterFirstMsg: {},
-				/** @type {Object.<number, HTMLInputElement>} */ optsAfterFirstMsg: {},
+				optsAfterSavedMsg: {}
-				/** @type {Object.<number, HTMLInputElement>} */ optsAfterSavedMsg: {}
 			};
 			
 			settings.ui.optsAfterFirstMsg[CONSTANTS.AUTOSCROLL_ACTION_NOTHING] = DOM.id("dht-cfg-afm-nothing");
@@ -129,10 +124,6 @@ ${radio("asm", "switch", "Switch to Next Channel")}`;
 				SETTINGS.autoscroll = settings.ui.cbAutoscroll.checked;
 			});
 			
-			settings.ui.cbHidePreviewsWhileAutoscrolling.addEventListener("change", () => {
-				SETTINGS.hidePreviewsWhileAutoscrolling = settings.ui.cbHidePreviewsWhileAutoscrolling.checked;
-			});
-			
 			Object.keys(settings.ui.optsAfterFirstMsg).forEach(key => {
 				settings.ui.optsAfterFirstMsg[key].addEventListener("click", () => {
 					SETTINGS.afterFirstMsg = key;
@@ -161,29 +152,6 @@ ${radio("asm", "switch", "Switch to Next Channel")}`;
 			if (controller) {
 				controller.ui.textStatus.innerText = state;
 			}
-		},
-		
-		createTrackingStyles() {
-			if (trackingStyles) {
-				return;
-			}
-			
-			let style = "";
-			
-			if (SETTINGS.autoscroll && SETTINGS.hidePreviewsWhileAutoscrolling) {
-				style += `div[id^="message-accessories-"] { display: none; }`;
-			}
-			
-			if (style.length > 0) {
-				trackingStyles = DOM.createStyle(style);
-			}
-		},
-		
-		deleteTrackingStyles() {
-			if (trackingStyles) {
-				DOM.removeElement(trackingStyles);
-				trackingStyles = null;
-			}
 		}
 	};
 })();

app/Resources/Tracker/scripts/settings.js

@@ -35,28 +35,17 @@ const SETTINGS = (function() {
 		obj[name] = value;
 	};
 	
-	const defaults = {
-		"_autoscroll": true,
-		"_hidePreviewsWhileAutoscrolling": true,
-		"_afterFirstMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
-		"_afterSavedMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
-	};
-	
 	let loaded = DOM.loadFromCookie("DHT_SETTINGS");
-	let hasChanged = false;
 	
 	if (!loaded) {
-		loaded = defaults;
+		loaded = {
+			"_autoscroll": true,
+			"_afterFirstMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE,
+			"_afterSavedMsg": CONSTANTS.AUTOSCROLL_ACTION_PAUSE
+		};
+		
 		IS_FIRST_RUN = true;
 	}
-	else {
-		for (const property in defaults) {
-			if (!(property in loaded)) {
-				loaded[property] = defaults[property];
-				hasChanged = true;
-			}
-		}
-	}
 	
 	const root = {
 		onSettingsChanged(callback) {
@@ -65,11 +54,10 @@ const SETTINGS = (function() {
 	};
 	
 	defineTriggeringProperty(root, "autoscroll", loaded._autoscroll);
-	defineTriggeringProperty(root, "hidePreviewsWhileAutoscrolling", loaded._hidePreviewsWhileAutoscrolling);
 	defineTriggeringProperty(root, "afterFirstMsg", loaded._afterFirstMsg);
 	defineTriggeringProperty(root, "afterSavedMsg", loaded._afterSavedMsg);
 	
-	if (IS_FIRST_RUN || hasChanged) {
+	if (IS_FIRST_RUN) {
 		saveSettings();
 	}
 	

app/Resources/Tracker/scripts/state.js

@@ -142,19 +142,11 @@ const STATE = (function() {
 			if (DISCORD.CHANNEL_TYPE.isPrivate(channelInfo.type)) {
 				server.id = channelInfo.id;
 				server.name = channel.name = getPrivateChannelName(channelInfo);
-				
-				if (channelInfo.icon) {
-					server.icon = channelInfo.icon;
-				}
 			}
 			else if (serverInfo) {
 				server.id = serverInfo.id;
 				server.name = serverInfo.name;
 				channel.name = channelInfo.name;
-				
-				if (serverInfo.icon) {
-					server.icon = serverInfo.icon;
-				}
 			}
 			else {
 				return;
@@ -202,10 +194,6 @@ const STATE = (function() {
 						name: user.username
 					};
 					
-					if (user.globalName) {
-						obj.displayName = user.globalName;
-					}
-					
 					if (user.avatar) {
 						obj.avatar = user.avatar;
 					}
@@ -294,7 +282,7 @@ const STATE = (function() {
 				}
 				
 				if (msg.reactions.length > 0) {
-					obj.reactions = msg.reactions.filter(reaction => reaction.count > 0).map(reaction => {
+					obj.reactions = msg.reactions.map(reaction => {
 						const emoji = reaction.emoji;
 						
 						const mapped = {

app/Resources/Tracker/scripts/types.js

@@ -2,7 +2,6 @@
  * @name DiscordGuild
  * @property {String} id
  * @property {String} name
- * @property {String|null|undefined} [icon]
  */
 
 /**
@@ -15,7 +14,6 @@
  * @property {Number} [position]
  * @property {String} [topic]
  * @property {Boolean} [nsfw]
- * @property {String|null|undefined} [icon]
  * @property {DiscordUser[]} [rawRecipients]
  */
 
@@ -24,7 +22,6 @@
  * @property {String} id
  * @property {String} username
  * @property {String} discriminator
- * @property {String} [globalName]
  * @property {String} [avatar]
  * @property {Boolean} [bot]
  */
@@ -75,7 +72,6 @@
 /**
  * @name MessageData
  * @type {Object}
- * @property {String} channelId
  * @property {Boolean} ready
  * @property {Boolean} loadingMore
  * @property {Boolean} hasMoreAfter

app/Resources/Tracker/scripts/webpack.js

@@ -80,19 +80,14 @@ class WEBPACK {
 		return results;
 	}
 	
-	static findModule(name, filter) {
+	static findModule(filter) {
 		const modules = this.findModules(filter);
-		if (modules.length === 1) {
+		return modules.length === 1 ? modules[0] : null;
-			return modules[0];
-		}
-		
-		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length);
-		return null;
 	}
 	
 	static findFunction(name, additionalRequiredProps) {
 		const searchedProps = additionalRequiredProps ? [name, ...additionalRequiredProps] : [name];
-		const matchingModule = this.findModule("containing function " + name, this.filterByPropsWithPredicate(prop => typeof (prop) === "function", ...searchedProps));
+		const matchingModule = this.findModule(this.filterByPropsWithPredicate(prop => typeof(prop) === "function", ...searchedProps));
 		return matchingModule == null ? null : matchingModule[name].bind(matchingModule);
 	}
 }

app/Resources/Tracker/styles/settings.css

@@ -18,13 +18,11 @@
   height: 262px;
   margin-left: -400px;
   margin-top: -131px;
-  line-height: 120%;
   padding: 8px;
   background-color: #fff;
   z-index: 1000002;
 }
 
-#dht-cfg label {
+#dht-cfg-note {
-  display: inline-block;
+  margin-top: 22px;
-  margin: 1px 0;
 }

app/Resources/Viewer/index.html

@@ -25,8 +25,6 @@
     <div id="menu">
       <button id="btn-settings">Settings</button>
       
-      <div class="splitter"></div>
-      
       <div> <!-- needed to stop the select from messing up -->
         <select id="opt-messages-per-page">
           <option value="50">50 messages per page&nbsp;</option>

app/Resources/Viewer/scripts/bootstrap.mjs

@@ -1,7 +1,6 @@
 import discord from "./discord.mjs";
 import gui from "./gui.mjs";
 import state from "./state.mjs";
-import "./polyfills.mjs";
 
 window.DISCORD = discord;
 

app/Resources/Viewer/scripts/discord.mjs

@@ -80,7 +80,7 @@ export default (function() {
 		processed = processed
 			.replace(regex.formatUrl, "<a href='$1' target='_blank' rel='noreferrer'>$1</a>")
 			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + state.getChannelName(match) + "</span>")
-			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='" + state.getUserName(match) + "'>@" + state.getUserDisplayName(match) + "</span>")
+			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (state.getUserTag(match) || "????") + "'>@" + state.getUserName(match) + "</span>")
 			.replace(regex.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
 			.replace(regex.customEmojiAnimated, (full, m1, m2) => getEmoji(m1, m2, animatedEmojiExtension));
 		
@@ -129,7 +129,7 @@ export default (function() {
 			templateMessageNoAvatar = new template([
 				"<div>",
 				"<div class='reply-message'>{reply}</div>",
-				"<h2><strong class='username' title='{user.name}'>{user.displayName}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
+				"<h2><strong class='username' title='#{user.tag}'>{user.name}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
 				"<div class='message'>{contents}{embeds}{attachments}</div>",
 				"{reactions}",
 				"</div>"
@@ -141,7 +141,7 @@ export default (function() {
 				"<div class='avatar-wrapper'>",
 				"<div class='avatar'>{avatar}</div>",
 				"<div>",
-				"<h2><strong class='username' title='{user.name}'>{user.displayName}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
+				"<h2><strong class='username' title='#{user.tag}'>{user.name}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
 				"<div class='message'>{contents}{embeds}{attachments}</div>",
 				"{reactions}",
 				"</div>",
@@ -227,8 +227,8 @@ export default (function() {
 				if (property === "avatar") {
 					return value ? templateUserAvatar.apply(getAvatarUrlObject(value)) : "";
 				}
-				else if (property === "user.displayName") {
+				else if (property === "user.tag") {
-					return value ? value : message.user.name;
+					return value ? value : "????";
 				}
 				else if (property === "timestamp") {
 					return dom.getHumanReadableTime(value);
@@ -292,7 +292,7 @@ export default (function() {
 						return value === null ? "<span class='reply-contents reply-missing'>(replies to an unknown message)</span>" : "";
 					}
 					
-					const user = "<span class='reply-username' title='" + value.user.name + "'>" + (value.user.displayName ?? value.user.name) + "</span>";
+					const user = "<span class='reply-username' title='#" + (value.user.tag ? value.user.tag : "????") + "'>" + value.user.name + "</span>";
 					const avatar = settings.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
 					const contents = value.contents ? "<span class='reply-contents'>" + processMessageContents(value.contents) + "</span>" : "";
 					

app/Resources/Viewer/scripts/gui.mjs

@@ -243,11 +243,10 @@ export default (function() {
 			
 			const options = [];
 			
-			for (const id of Object.keys(users)) {
+			for (const key of Object.keys(users)) {
-				const user = users[id];
 				const option = document.createElement("option");
-				option.value = id;
+				option.value = key;
-				option.text = user.displayName ? `${user.displayName} (${user.name})` : user.name;
+				option.text = users[key].name;
 				options.push(option);
 			}
 			

app/Resources/Viewer/scripts/polyfills.mjs

@@ -1,35 +0,0 @@
-// https://gist.github.com/MattiasBuelens/496fc1d37adb50a733edd43853f2f60e/088f061ab79b296f29225467ae9ba86ff990195d
-
-ReadableStream.prototype.values ??= function({ preventCancel = false } = {}) {
-	const reader = this.getReader();
-	return {
-		async next() {
-			try {
-				const result = await reader.read();
-				if (result.done) {
-					reader.releaseLock();
-				}
-				return result;
-			} catch (e) {
-				reader.releaseLock();
-				throw e;
-			}
-		},
-		async return(value) {
-			if (!preventCancel) {
-				const cancelPromise = reader.cancel(value);
-				reader.releaseLock();
-				await cancelPromise;
-			}
-			else {
-				reader.releaseLock();
-			}
-			return { done: true, value };
-		},
-		[Symbol.asyncIterator]() {
-			return this;
-		}
-	};
-};
-
-ReadableStream.prototype[Symbol.asyncIterator] ??= ReadableStream.prototype.values;

app/Resources/Viewer/scripts/state.mjs

@@ -316,16 +316,16 @@ export default (function() {
 			return (channelObj && channelObj.name) || channel;
 		},
 		
+		getUserTag(user) {
+			const userObj = loadedFileMeta.users[user];
+			return (userObj && userObj.tag) || "????";
+		},
+		
 		getUserName(user) {
 			const userObj = loadedFileMeta.users[user];
 			return (userObj && userObj.name) || user;
 		},
 		
-		getUserDisplayName(user) {
-			const userObj = loadedFileMeta.users[user];
-			return (userObj && (userObj.displayName || userObj.name)) || user;
-		},
-		
 		selectChannel(channel) {
 			currentPage = 1;
 			selectedChannel = channel;

app/Resources/Viewer/styles/menu.css

@@ -1,16 +1,15 @@
 #menu {
+  width: 100%;
+  height: 48px;
   display: flex;
   flex-direction: row;
-  align-items: stretch;
-  gap: 8px;
-  padding: 8px;
   background-color: #17181c;
   border-bottom: 1px dotted #5d626b;
 }
 
 #menu .splitter {
-  flex: 0 0 1px;
+  width: 1px;
-  margin: 9px 1px;
+  margin: 9px 4px;
   background-color: #5d626b;
 }
 
@@ -24,8 +23,7 @@
 }
 
 #menu button, #menu select, #menu input[type="text"] {
-  height: 31px;
+  margin: 8px;
-  padding: 0 10px;
   background-color: #7289da;
   color: #fff;
   text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.75);
@@ -33,25 +31,28 @@
 
 #menu button {
   font-size: 17px;
+  padding: 0 12px;
   border: 0;
   cursor: pointer;
-  white-space: nowrap;
 }
 
 #menu select {
   font-size: 14px;
+  padding: 6px;
   border: 0;
   cursor: pointer;
 }
 
 #menu input[type="text"] {
   font-size: 14px;
+  padding: 7px 12px;
   border: 0;
 }
 
 #menu .nav {
   display: flex;
   flex-direction: row;
+  margin: 0 8px;
 }
 
 #menu .nav > button {
@@ -65,7 +66,7 @@
 }
 
 #menu .nav > button, #menu .nav > p {
-  margin: 0 1px;
+  margin: 8px 1px;
 }
 
 #opt-filter-list > select, #opt-filter-list > input {
@@ -75,7 +76,3 @@
 #opt-filter-list > .active {
   display: block;
 }
-
-#btn-about {
-  margin-left: auto;
-}

app/Resources/Viewer/styles/messages.css

@@ -1,7 +1,7 @@
 #messages {
   flex: 1 1 0;
   overflow-y: auto;
-  background-color: #36393e;
+  background-color: #36393E;
 }
 
 #messages > div {
@@ -38,7 +38,7 @@
 }
 
 #messages .username {
-  color: #fff;
+  color: #FFF;
   font-size: 15px;
   font-weight: 600;
   margin-right: 3px;
@@ -75,12 +75,12 @@
 }
 
 .message .link, .reply-message .link {
-  color: #7289da;
+  color: #7289DA;
   background-color: rgba(115, 139, 215, 0.1);
 }
 
 .message a, .reply-message a {
-  color: #0096cf;
+  color: #0096CF;
   text-decoration: none;
 }
 
@@ -131,7 +131,7 @@
 }
 
 .message code {
-  background-color: #2e3136;
+  background-color: #2E3136;
   border-radius: 5px;
   font-family: Menlo, Consolas, Monaco, monospace;
   font-size: 14px;
@@ -144,7 +144,7 @@
 
 .message code.block {
   display: block;
-  border: 2px solid #282b30;
+  border: 2px solid #282B30;
   margin-top: 6px;
   padding: 7px;
 }
@@ -198,7 +198,7 @@
 }
 
 .reply-username {
-  color: #fff;
+  color: #FFF;
   font-size: 12px;
   font-weight: 600;
   letter-spacing: 0;
@@ -218,7 +218,7 @@
 }
 
 .reply-contents code {
-  background-color: #2e3136;
+  background-color: #2E3136;
   font-family: Menlo, Consolas, Monaco, monospace;
   padding: 1px 2px;
 }

app/Server/Data/DownloadStatus.cs

@@ -10,5 +10,5 @@ public enum DownloadStatus {
 	GenericError = 1,
 	Downloading = 2,
 	LastCustomCode = 99,
-	Success = HttpStatusCode.OK,
+	Success = HttpStatusCode.OK
 }

app/Server/Data/EmojiFlags.cs

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

app/Server/Data/FileUrl.cs

@@ -1,9 +0,0 @@
-namespace DHT.Server.Data;
-
-public readonly record struct FileUrl(string NormalizedUrl, string DownloadUrl, string? Type) {
-	public FileUrl(string url, string? type) : this(url, url, type) {}
-	
-	public Download ToPendingDownload() {
-		return new Download(NormalizedUrl, DownloadUrl, DownloadStatus.Pending, Type, size: null);
-	}
-}

app/Server/Data/Filters/FilterRemovalMode.cs

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

app/Server/Data/Server.cs

@@ -1,12 +1,7 @@
-using DHT.Server.Download;
-
 namespace DHT.Server.Data;
 
 public readonly struct Server {
 	public ulong Id { get; init; }
 	public string Name { get; init; }
 	public ServerType? Type { get; init; }
-	public string? IconHash { get; init; }
-	
-	internal FileUrl? IconUrl => Type == null || IconHash == null ? null : DownloadLinkExtractor.ServerIcon(Type.Value, Id, IconHash);
 }

app/Server/Data/ServerType.cs

@@ -3,7 +3,7 @@ namespace DHT.Server.Data;
 public enum ServerType {
 	Server,
 	Group,
-	DirectMessage,
+	DirectMessage
 }
 
 public static class ServerTypes {
@@ -12,7 +12,7 @@ public static class ServerTypes {
 			"SERVER" => ServerType.Server,
 			"GROUP"  => ServerType.Group,
 			"DM"     => ServerType.DirectMessage,
-			_        => null,
+			_        => null
 		};
 	}
 
@@ -21,7 +21,7 @@ public static class ServerTypes {
 			ServerType.Server        => "SERVER",
 			ServerType.Group         => "GROUP",
 			ServerType.DirectMessage => "DM",
-			_                        => "UNKNOWN",
+			_                        => "UNKNOWN"
 		};
 	}
 
@@ -30,7 +30,7 @@ public static class ServerTypes {
 			ServerType.Server        => "Server",
 			ServerType.Group         => "Group",
 			ServerType.DirectMessage => "DM",
-			_                        => "Unknown",
+			_                        => "Unknown"
 		};
 	}
 
@@ -39,7 +39,7 @@ public static class ServerTypes {
 			ServerType.Server        => "server",
 			ServerType.Group         => "group",
 			ServerType.DirectMessage => "user",
-			_                        => "unknown",
+			_                        => "unknown"
 		};
 	}
 }

app/Server/Data/Settings/SettingsKey.cs

@@ -1,61 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace DHT.Server.Data.Settings;
-
-public static class SettingsKey {
-	public static Bool SeparateFileForDownloads { get; } = new ("separate_file_for_downloads");
-	public static Bool DownloadsAutoStart { get; } = new ("downloads_auto_start");
-	public static Bool DownloadsLimitSize { get; } = new ("downloads_limit_size");
-	public static UnsignedLong DownloadsMaximumSize { get; } = new ("downloads_maximum_size");
-	public static String DownloadsMaximumSizeUnit { get; } = new ("downloads_maximum_size_unit");
-	
-	public sealed class String(string key) : SettingsKey<string>(key) {
-		internal override bool FromString(string value, out string result) {
-			result = value;
-			return true;
-		}
-		
-		internal override string ToString(string value) {
-			return value;
-		}
-	}
-	
-	public sealed class Bool(string key) : SettingsKey<bool>(key) {
-		internal override bool FromString(string value, out bool result) {
-			switch (value) {
-				case "1":
-					result = true;
-					return true;
-				
-				case "0":
-					result = false;
-					return true;
-				
-				default:
-					result = false;
-					return false;
-			}
-		}
-		
-		internal override string ToString(bool value) {
-			return value ? "1" : "0";
-		}
-	}
-	
-	public sealed class UnsignedLong(string key) : SettingsKey<ulong>(key) {
-		internal override bool FromString(string value, out ulong result) {
-			return ulong.TryParse(value, out result);
-		}
-		
-		internal override string ToString(ulong value) {
-			return value.ToString();
-		}
-	}
-}
-
-public abstract class SettingsKey<T>(string key) {
-	internal string Key => key;
-	
-	internal abstract bool FromString(string value, [NotNullWhen(true)] out T result);
-	internal abstract string ToString(T value);
-}

app/Server/Data/User.cs

@@ -1,13 +1,8 @@
-using DHT.Server.Download;
-
 namespace DHT.Server.Data;
 
 public readonly struct User {
 	public ulong Id { get; init; }
 	public string Name { get; init; }
-	public string? DisplayName { get; init; }
+	public string? AvatarUrl { get; init; }
-	public string? AvatarHash { get; init; }
 	public string? Discriminator { get; init; }
-	
-	internal FileUrl? AvatarUrl => AvatarHash == null ? null : DownloadLinkExtractor.UserAvatar(Id, AvatarHash);
 }

app/Server/Database/DatabaseExtensions.cs

@@ -14,7 +14,7 @@ public static class DatabaseExtensions {
 		const int MessageBatchSize = 100;
 		List<Message> batchedMessages = new (MessageBatchSize);
 		
-		await foreach (Message message in source.Messages.Get()) {
+		await foreach (var message in source.Messages.Get()) {
 			batchedMessages.Add(message);
 
 			if (batchedMessages.Count >= MessageBatchSize) {
@@ -25,7 +25,7 @@ public static class DatabaseExtensions {
 		
 		await target.Messages.Add(batchedMessages);
 
-		await foreach (Data.Download download in source.Downloads.Get()) {
+		await foreach (var download in source.Downloads.Get()) {
 			if (download.Status != DownloadStatus.Success || !await source.Downloads.GetDownloadData(download.NormalizedUrl, stream => target.Downloads.AddDownload(download, stream))) {
 				await target.Downloads.AddDownload(download, stream: null);
 			}

app/Server/Database/DummyDatabaseFile.cs

@@ -10,7 +10,6 @@ sealed class DummyDatabaseFile : IDatabaseFile {
 
 	public string Path => "";
 	
-	public ISettingsRepository Settings { get; } = new ISettingsRepository.Dummy();
 	public IUserRepository Users { get; } = new IUserRepository.Dummy();
 	public IServerRepository Servers { get; } = new IServerRepository.Dummy();
 	public IChannelRepository Channels { get; } = new IChannelRepository.Dummy();

app/Server/Database/Export/SnowflakeJsonSerializer.cs

@@ -1,20 +1,16 @@
 using System;
-using System.Buffers.Text;
-using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace DHT.Server.Database.Export;
 
 sealed class SnowflakeJsonSerializer : JsonConverter<Snowflake> {
-	private const int MaxUlongStringLength = 20;
-	
 	public override Snowflake Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
 		return new Snowflake(ulong.Parse(reader.GetString()!));
 	}
 
 	public override void Write(Utf8JsonWriter writer, Snowflake value, JsonSerializerOptions options) {
-		writer.WriteStringValue(Format(value, stackalloc byte[MaxUlongStringLength]));
+		writer.WriteStringValue(value.Id.ToString());
 	}
 
 	public override Snowflake ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
@@ -22,14 +18,6 @@ sealed class SnowflakeJsonSerializer : JsonConverter<Snowflake> {
 	}
 
 	public override void WriteAsPropertyName(Utf8JsonWriter writer, Snowflake value, JsonSerializerOptions options) {
-		writer.WritePropertyName(Format(value, stackalloc byte[MaxUlongStringLength]));
+		writer.WritePropertyName(value.Id.ToString());
-	}
-	
-	private static ReadOnlySpan<byte> Format(Snowflake value, Span<byte> destination) {
-		if (!Utf8Formatter.TryFormat(value.Id, destination, out int bytesWritten)) {
-			Debug.Fail("Failed to format Snowflake value.");
-		}
-		
-		return destination[..bytesWritten];
 	}
 }

app/Server/Database/Export/ViewerJson.cs

@@ -14,18 +14,15 @@ static class ViewerJson {
 		public required string Name { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public string? DisplayName { get; init; }
+		public string? Avatar { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public string? Avatar { get; init; }
+		public string? Tag { get; init; }
 	}
 
 	public sealed class JsonServer {
 		public required string Name { get; init; }
 		public required string Type { get; init; }
-		
-		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public string? IconUrl { get; init; }
 	}
 
 	public sealed class JsonChannel {
@@ -33,7 +30,7 @@ static class ViewerJson {
 		public required string Name { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public Snowflake? Parent { get; init; }
+		public string? Parent { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
 		public int? Position { get; init; }
@@ -58,7 +55,7 @@ static class ViewerJson {
 		public long? Te { get; init; }
 
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public Snowflake? R { get; init; }
+		public string? R { get; init; }
 
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
 		public JsonMessageAttachment[]? A { get; init; }
@@ -83,7 +80,7 @@ static class ViewerJson {
 
 	public sealed class JsonMessageReaction {
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public Snowflake? Id { get; init; }
+		public string? Id { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
 		public string? N { get; init; }

app/Server/Database/Export/ViewerJsonExport.cs

@@ -2,15 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Threading;
-using System.Threading.Channels;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
 using DHT.Utils.Logging;
-using Channel = System.Threading.Channels.Channel;
-using DiscordChannel = DHT.Server.Data.Channel;
 
 namespace DHT.Server.Database.Export;
 
@@ -18,28 +16,28 @@ static class ViewerJsonExport {
 	private static readonly Log Log = Log.ForType(typeof(ViewerJsonExport));
 
 	public static async Task GetMetadata(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
-		Perf perf = Log.Start();
+		var perf = Log.Start();
 
-		var includedChannels = new List<DiscordChannel>();
+		var includedChannels = new List<Channel>();
 		var includedServerIds = new HashSet<ulong>();
 
-		HashSet<ulong>? channelIdFilter = filter?.ChannelIds;
+		var channelIdFilter = filter?.ChannelIds;
 
-		await foreach (DiscordChannel channel in db.Channels.Get(cancellationToken)) {
+		await foreach (var channel in db.Channels.Get(cancellationToken)) {
 			if (channelIdFilter == null || channelIdFilter.Contains(channel.Id)) {
 				includedChannels.Add(channel);
 				includedServerIds.Add(channel.Server);
 			}
 		}
 
-		Dictionary<Snowflake, ViewerJson.JsonUser> users = await GenerateUserList(db, cancellationToken);
+		var users = await GenerateUserList(db, cancellationToken);
-		Dictionary<Snowflake, ViewerJson.JsonServer> servers = await GenerateServerList(db, includedServerIds, cancellationToken);
+		var servers = await GenerateServerList(db, includedServerIds, cancellationToken);
-		Dictionary<Snowflake, ViewerJson.JsonChannel> channels = GenerateChannelList(includedChannels);
+		var channels = GenerateChannelList(includedChannels);
 
 		var meta = new ViewerJson.JsonMeta {
 			Users = users,
 			Servers = servers,
-			Channels = channels,
+			Channels = channels
 		};
 
 		perf.Step("Collect database data");
@@ -51,34 +49,15 @@ static class ViewerJsonExport {
 	}
 
 	public static async Task GetMessages(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
-		Perf perf = Log.Start();
+		var perf = Log.Start();
 
 		ReadOnlyMemory<byte> newLine = "\n"u8.ToArray();
 		
-		Channel<Message> channel = Channel.CreateBounded<Message>(new BoundedChannelOptions(32) {
+		await foreach(var message in GenerateMessageList(db, filter, cancellationToken)) {
-			SingleWriter = true,
+			await JsonSerializer.SerializeAsync(stream, message, ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
-			SingleReader = true,
-			AllowSynchronousContinuations = true,
-			FullMode = BoundedChannelFullMode.Wait,
-		});
-		
-		Task writerTask = Task.Run(async () => {
-			try {
-				await foreach (Message message in db.Messages.Get(filter, cancellationToken)) {
-					await channel.Writer.WriteAsync(message, cancellationToken);
-				}
-			} finally {
-				channel.Writer.Complete();
-			}
-		}, cancellationToken);
-		
-		await foreach (Message message in channel.Reader.ReadAllAsync(cancellationToken)) {
-			await JsonSerializer.SerializeAsync(stream, ToJsonMessage(message), ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
 			await stream.WriteAsync(newLine, cancellationToken);
 		}
 
-		await writerTask;
-		
 		perf.Step("Generate and serialize messages to JSON");
 		perf.End();
 	}
@@ -86,11 +65,11 @@ static class ViewerJsonExport {
 	private static async Task<Dictionary<Snowflake, ViewerJson.JsonUser>> GenerateUserList(IDatabaseFile db, CancellationToken cancellationToken) {
 		var users = new Dictionary<Snowflake, ViewerJson.JsonUser>();
 
-		await foreach (User user in db.Users.Get(cancellationToken)) {
+		await foreach (var user in db.Users.Get(cancellationToken)) {
 			users[user.Id] = new ViewerJson.JsonUser {
 				Name = user.Name,
-				DisplayName = user.DisplayName,
+				Avatar = user.AvatarUrl,
-				Avatar = user.AvatarHash,
+				Tag = user.Discriminator
 			};
 		}
 
@@ -100,52 +79,52 @@ static class ViewerJsonExport {
 	private static async Task<Dictionary<Snowflake, ViewerJson.JsonServer>> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, CancellationToken cancellationToken) {
 		var servers = new Dictionary<Snowflake, ViewerJson.JsonServer>();
 
-		await foreach (Data.Server server in db.Servers.Get(cancellationToken)) {
+		await foreach (var server in db.Servers.Get(cancellationToken)) {
 			if (!serverIds.Contains(server.Id)) {
 				continue;
 			}
 
 			servers[server.Id] = new ViewerJson.JsonServer {
 				Name = server.Name,
-				Type = ServerTypes.ToJsonViewerString(server.Type),
+				Type = ServerTypes.ToJsonViewerString(server.Type)
-				IconUrl = server.IconUrl?.DownloadUrl,
 			};
 		}
 
 		return servers;
 	}
 
-	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<DiscordChannel> includedChannels) {
+	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels) {
 		var channels = new Dictionary<Snowflake, ViewerJson.JsonChannel>();
 
-		foreach (DiscordChannel channel in includedChannels) {
+		foreach (var channel in includedChannels) {
 			channels[channel.Id] = new ViewerJson.JsonChannel {
 				Server = channel.Server,
 				Name = channel.Name,
-				Parent = channel.ParentId,
+				Parent = channel.ParentId?.ToString(),
 				Position = channel.Position,
 				Topic = channel.Topic,
-				Nsfw = channel.Nsfw,
+				Nsfw = channel.Nsfw
 			};
 		}
 
 		return channels;
 	}
 
-	private static ViewerJson.JsonMessage ToJsonMessage(Message message) {
+	private static async IAsyncEnumerable<ViewerJson.JsonMessage> GenerateMessageList(IDatabaseFile db, MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
-		return new ViewerJson.JsonMessage {
+		await foreach (var message in db.Messages.Get(filter, cancellationToken)) {
+			yield return new ViewerJson.JsonMessage {
 				Id = message.Id,
 				C = message.Channel,
 				U = message.Sender,
 				T = message.Timestamp,
 				M = string.IsNullOrEmpty(message.Text) ? null : message.Text,
 				Te = message.EditTimestamp,
-			R = message.RepliedToId,
+				R = message.RepliedToId?.ToString(),
 
 				A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
 					var a = new ViewerJson.JsonMessageAttachment {
 						Url = attachment.DownloadUrl,
-					Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out Uri? uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl,
+						Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl
 					};
 
 					if (attachment is { Width: not null, Height: not null }) {
@@ -159,11 +138,12 @@ static class ViewerJsonExport {
 				E = message.Embeds.IsEmpty ? null : message.Embeds.Select(static embed => embed.Json).ToArray(),
 
 				Re = message.Reactions.IsEmpty ? null : message.Reactions.Select(static reaction => new ViewerJson.JsonMessageReaction {
-				Id = reaction.EmojiId,
+					Id = reaction.EmojiId?.ToString(),
 					N = reaction.EmojiName,
 					A = reaction.EmojiFlags.HasFlag(EmojiFlags.Animated),
-				C = reaction.Count,
+					C = reaction.Count
-			}).ToArray(),
+				}).ToArray()
 			};
 		}
 	}
+}

app/Server/Database/IDatabaseFile.cs

@@ -7,7 +7,6 @@ namespace DHT.Server.Database;
 public interface IDatabaseFile : IAsyncDisposable {
 	string Path { get; }
 
-	ISettingsRepository Settings { get; }
 	IUserRepository Users { get; }
 	IServerRepository Servers { get; }
 	IChannelRepository Channels { get; }

app/Server/Database/Import/FakeSnowflake.cs

@@ -11,7 +11,7 @@ public sealed class FakeSnowflake {
 	private ulong id;
 
 	public FakeSnowflake() {
-		ulong unixMillis = (ulong) (DateTime.UtcNow.Subtract(DateTime.UnixEpoch).Ticks / TimeSpan.TicksPerMillisecond);
+		var unixMillis = (ulong) (DateTime.UtcNow.Subtract(DateTime.UnixEpoch).Ticks / TimeSpan.TicksPerMillisecond);
 		this.id = (unixMillis - DiscordEpoch) << 22;
 	}
 

app/Server/Database/Import/LegacyArchiveImport.cs

@@ -10,31 +10,34 @@ using DHT.Server.Data;
 using DHT.Utils.Collections;
 using DHT.Utils.Http;
 using DHT.Utils.Logging;
+using Microsoft.AspNetCore.StaticFiles;
 
 namespace DHT.Server.Database.Import;
 
 public static class LegacyArchiveImport {
 	private static readonly Log Log = Log.ForType(typeof(LegacyArchiveImport));
 
+	private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
+
 	public static async Task<bool> Read(Stream stream, IDatabaseFile db, FakeSnowflake fakeSnowflake, Func<Data.Server[], Task<Dictionary<Data.Server, ulong>?>> askForServerIds) {
-		Perf perf = Log.Start();
+		var perf = Log.Start();
-		JsonElement root = await JsonSerializer.DeserializeAsync(stream, JsonElementContext.Default.JsonElement);
+		var root = await JsonSerializer.DeserializeAsync(stream, JsonElementContext.Default.JsonElement);
 
 		try {
-			JsonElement meta = root.RequireObject("meta");
+			var meta = root.RequireObject("meta");
-			JsonElement data = root.RequireObject("data");
+			var data = root.RequireObject("data");
 
 			perf.Step("Deserialize JSON");
 
-			User[] users = ReadUserList(meta);
+			var users = ReadUserList(meta);
-			Data.Server[] servers = ReadServerList(meta, fakeSnowflake);
+			var servers = ReadServerList(meta, fakeSnowflake);
 
 			var newServersOnly = new HashSet<Data.Server>(servers);
-			Dictionary<ulong, Data.Server> oldServersById = await db.Servers.Get().ToDictionaryAsync(static server => server.Id, static server => server);
+			var oldServersById = await db.Servers.Get().ToDictionaryAsync(static server => server.Id, static server => server);
-			Dictionary<ulong, Channel> oldChannelsById = await db.Channels.Get().ToDictionaryAsync(static channel => channel.Id, static channel => channel);
+			var oldChannelsById = await db.Channels.Get().ToDictionaryAsync(static channel => channel.Id, static channel => channel);
 
-			foreach ((ulong channelId, int serverIndex) in ReadChannelToServerIndexMapping(meta, servers)) {
+			foreach (var (channelId, serverIndex) in ReadChannelToServerIndexMapping(meta, servers)) {
-				if (oldChannelsById.TryGetValue(channelId, out Channel oldChannel) && oldServersById.TryGetValue(oldChannel.Server, out Data.Server oldServer) && newServersOnly.Remove(servers[serverIndex])) {
+				if (oldChannelsById.TryGetValue(channelId, out var oldChannel) && oldServersById.TryGetValue(oldChannel.Server, out var oldServer) && newServersOnly.Remove(servers[serverIndex])) {
 					servers[serverIndex] = oldServer;
 				}
 			}
@@ -42,27 +45,27 @@ public static class LegacyArchiveImport {
 			perf.Step("Read server and user list");
 
 			if (newServersOnly.Count > 0) {
-				Dictionary<Data.Server, ulong>? askedServerIds = await askForServerIds(newServersOnly.ToArray());
+				var askedServerIds = await askForServerIds(newServersOnly.ToArray());
 				if (askedServerIds == null) {
 					return false;
 				}
 
 				perf.Step("Ask for server IDs");
 
-				for (int i = 0; i < servers.Length; i++) {
+				for (var i = 0; i < servers.Length; i++) {
-					Data.Server server = servers[i];
+					var server = servers[i];
-					if (askedServerIds.TryGetValue(server, out ulong serverId)) {
+					if (askedServerIds.TryGetValue(server, out var serverId)) {
 						servers[i] = server with { Id = serverId };
 					}
 				}
 			}
 
-			Channel[] channels = ReadChannelList(meta, servers);
+			var channels = ReadChannelList(meta, servers);
 
 			perf.Step("Read channel list");
 
-			HashSet<ulong> oldMessageIds = await db.Messages.GetIds().ToHashSetAsync();
+			var oldMessageIds = await db.Messages.GetIds().ToHashSetAsync();
-			Message[] newMessages = channels.SelectMany(channel => ReadMessages(data, channel, users, fakeSnowflake))
+			var newMessages = channels.SelectMany(channel => ReadMessages(data, channel, users, fakeSnowflake))
 			                          .Where(message => !oldMessageIds.Contains(message.Id))
 			                          .ToArray();
 
@@ -89,21 +92,21 @@ public static class LegacyArchiveImport {
 			return ulong.Parse(element.GetString() ?? throw new JsonException("Expected key 'meta.userindex[" + index + "]' to be a string."));
 		}
 
-		Dictionary<ulong, int> userindex = meta.RequireArray("userindex", "meta")
+		var userindex = meta.RequireArray("userindex", "meta")
 		                    .Select(static (item, index) => (ParseUserIndex(item, index), index))
 		                    .ToDictionary();
 
 		var users = new User[userindex.Count];
 
-		foreach (JsonProperty item in meta.RequireObject("users", "meta").EnumerateObject()) {
+		foreach (var item in meta.RequireObject("users", "meta").EnumerateObject()) {
-			string path = UsersPath + "." + item.Name;
+			var path = UsersPath + "." + item.Name;
-			ulong userId = ulong.Parse(item.Name);
+			var userId = ulong.Parse(item.Name);
-			JsonElement userObj = item.Value;
+			var userObj = item.Value;
 
 			users[userindex[userId]] = new User {
 				Id = userId,
 				Name = userObj.RequireString("name", path),
-				AvatarHash = userObj.HasKey("avatar") ? userObj.RequireString("avatar", path) : null,
+				AvatarUrl = userObj.HasKey("avatar") ? userObj.RequireString("avatar", path) : null,
 				Discriminator = userObj.HasKey("tag") ? userObj.RequireString("tag", path) : null,
 			};
 		}
@@ -125,9 +128,9 @@ public static class LegacyArchiveImport {
 
 	private static Dictionary<ulong, int> ReadChannelToServerIndexMapping(JsonElement meta, Data.Server[] servers) {
 		return meta.RequireObject("channels", "meta").EnumerateObject().Select(item => {
-			string path = ChannelsPath + "." + item.Name;
+			var path = ChannelsPath + "." + item.Name;
-			ulong channelId = ulong.Parse(item.Name);
+			var channelId = ulong.Parse(item.Name);
-			JsonElement channelObj = item.Value;
+			var channelObj = item.Value;
 
 			return (channelId, channelObj.RequireInt("server", path, min: 0, max: servers.Length - 1));
 		}).ToDictionary();
@@ -135,13 +138,13 @@ public static class LegacyArchiveImport {
 
 	private static Channel[] ReadChannelList(JsonElement meta, Data.Server[] servers) {
 		return meta.RequireObject("channels", "meta").EnumerateObject().Select(item => {
-			string path = ChannelsPath + "." + item.Name;
+			var path = ChannelsPath + "." + item.Name;
-			ulong channelId = ulong.Parse(item.Name);
+			var channelId = ulong.Parse(item.Name);
-			JsonElement channelObj = item.Value;
+			var channelObj = item.Value;
 
 			return new Channel {
 				Id = channelId,
-				Server = servers[channelObj.RequireInt("server", path, min: 0, servers.Length - 1)].Id,
+				Server = servers[channelObj.RequireInt("server", path, min: 0, max: servers.Length - 1)].Id,
 				Name = channelObj.RequireString("name", path),
 				Position = channelObj.HasKey("position") ? channelObj.RequireInt("position", path, min: 0) : null,
 				Topic = channelObj.HasKey("topic") ? channelObj.RequireString("topic", path) : null,
@@ -153,18 +156,18 @@ public static class LegacyArchiveImport {
 	private static Message[] ReadMessages(JsonElement data, Channel channel, User[] users, FakeSnowflake fakeSnowflake) {
 		const string DataPath = "data";
 
-		ulong channelId = channel.Id;
+		var channelId = channel.Id;
-		string channelIdStr = channelId.ToString();
+		var channelIdStr = channelId.ToString();
 
-		JsonElement? messagesObj = data.HasKey(channelIdStr) ? data.RequireObject(channelIdStr, DataPath) : null;
+		var messagesObj = data.HasKey(channelIdStr) ? data.RequireObject(channelIdStr, DataPath) : (JsonElement?) null;
 		if (messagesObj == null) {
 			return [];
 		}
 
 		return messagesObj.Value.EnumerateObject().Select(item => {
-			string path = DataPath + "." + item.Name;
+			var path = DataPath + "." + item.Name;
-			ulong messageId = ulong.Parse(item.Name);
+			var messageId = ulong.Parse(item.Name);
-			JsonElement messageObj = item.Value;
+			var messageObj = item.Value;
 
 			return new Message {
 				Id = messageId,
@@ -186,7 +189,7 @@ public static class LegacyArchiveImport {
 		return attachmentsArray.Select(attachmentObj => {
 			string url = attachmentObj.RequireString("url", path);
 			string name = url[(url.LastIndexOf('/') + 1)..];
-			string? type = MimeTypes.TryGetByFileExtension(name, out var mimeType) ? mimeType : null;
+			string? type = ContentTypeProvider.TryGetContentType(name, out var contentType) ? contentType : null;
 
 			return new Attachment {
 				Id = fakeSnowflake.Next(),
@@ -213,19 +216,19 @@ public static class LegacyArchiveImport {
 				Type = type,
 				Title = type == "rich" && embedObj.HasKey("t") ? embedObj.RequireString("t", path) : null,
 				Description = type == "rich" && embedObj.HasKey("d") ? embedObj.RequireString("d", path) : null,
-				Image = type == "image" ? new DiscordEmbedLegacyJson.ImageJson { Url = url } : null,
+				Image = type == "image" ? new DiscordEmbedLegacyJson.ImageJson { Url = url } : null
 			};
 
 			return new Embed {
-				Json = JsonSerializer.Serialize(embed, DiscordEmbedLegacyJsonContext.Default.DiscordEmbedLegacyJson),
+				Json = JsonSerializer.Serialize(embed, DiscordEmbedLegacyJsonContext.Default.DiscordEmbedLegacyJson)
 			};
 		});
 	}
 
 	private static IEnumerable<Reaction> ReadMessageReactions(JsonElement.ArrayEnumerator reactionsArray, string path) {
 		return reactionsArray.Select(reactionObj => {
-			ulong? id = reactionObj.HasKey("id") ? reactionObj.RequireSnowflake("id", path) : (ulong?) null;
+			var id = reactionObj.HasKey("id") ? reactionObj.RequireSnowflake("id", path) : (ulong?) null;
-			string? name = reactionObj.HasKey("n") ? reactionObj.RequireString("n", path) : null;
+			var name = reactionObj.HasKey("n") ? reactionObj.RequireString("n", path) : null;
 
 			if (id == null && name == null) {
 				throw new JsonException("Expected key '" + path + ".id' and/or '" + path + ".n' to be present.");

app/Server/Database/Repositories/IChannelRepository.cs

@@ -17,8 +17,6 @@ public interface IChannelRepository {
 	
 	IAsyncEnumerable<Channel> Get(CancellationToken cancellationToken = default);
 
-	Task<int> RemoveUnreachable();
-	
 	internal sealed class Dummy : IChannelRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
 
@@ -33,9 +31,5 @@ public interface IChannelRepository {
 		public IAsyncEnumerable<Channel> Get(CancellationToken cancellationToken) {
 			return AsyncEnumerable.Empty<Channel>();
 		}
-		
-		public Task<int> RemoveUnreachable() {
-			return Task.FromResult(0);
-		}
 	}
 }

app/Server/Database/Repositories/IDownloadRepository.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using DHT.Server.Data;
 using DHT.Server.Data.Aggregations;
 using DHT.Server.Data.Filters;
 using DHT.Server.Download;
@@ -21,7 +20,7 @@ public interface IDownloadRepository {
 	
 	Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken = default);
 	
-	IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter = null);
+	IAsyncEnumerable<Data.Download> Get();
 
 	Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor);
 	
@@ -33,10 +32,6 @@ public interface IDownloadRepository {
 	
 	Task<int> RetryFailed(CancellationToken cancellationToken = default);
 
-	Task Remove(ICollection<string> normalizedUrls);
-	
-	IAsyncEnumerable<FileUrl> FindReachableFiles(CancellationToken cancellationToken = default);
-	
 	internal sealed class Dummy : IDownloadRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
 
@@ -52,7 +47,7 @@ public interface IDownloadRepository {
 			return Task.FromResult(new DownloadStatusStatistics());
 		}
 
-		public IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter) {
+		public IAsyncEnumerable<Data.Download> Get() {
 			return AsyncEnumerable.Empty<Data.Download>();
 		}
 
@@ -75,13 +70,5 @@ public interface IDownloadRepository {
 		public Task<int> RetryFailed(CancellationToken cancellationToken) {
 			return Task.FromResult(0);
 		}
-		
-		public Task Remove(ICollection<string> normalizedUrls) {
-			return Task.CompletedTask;
-		}
-		
-		public IAsyncEnumerable<FileUrl> FindReachableFiles(CancellationToken cancellationToken) {
-			return AsyncEnumerable.Empty<FileUrl>();
-		}
 	}
 }

app/Server/Database/Repositories/IMessageRepository.cs

@@ -20,9 +20,7 @@ public interface IMessageRepository {
 	
 	IAsyncEnumerable<ulong> GetIds(MessageFilter? filter = null);
 	
-	Task<int> Remove(MessageFilter filter, FilterRemovalMode mode);
+	Task Remove(MessageFilter filter, FilterRemovalMode mode);
-	
-	Task<int> RemoveUnreachableAttachments();
 
 	internal sealed class Dummy : IMessageRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
@@ -43,12 +41,8 @@ public interface IMessageRepository {
 			return AsyncEnumerable.Empty<ulong>();
 		}
 
-		public Task<int> Remove(MessageFilter filter, FilterRemovalMode mode) {
+		public Task Remove(MessageFilter filter, FilterRemovalMode mode) {
-			return Task.FromResult(0);
+			return Task.CompletedTask;
-		}
-		
-		public Task<int> RemoveUnreachableAttachments() {
-			return Task.FromResult(0);
 		}
 	}
 }

app/Server/Database/Repositories/IServerRepository.cs

@@ -16,8 +16,6 @@ public interface IServerRepository {
 	
 	IAsyncEnumerable<Data.Server> Get(CancellationToken cancellationToken = default);
 
-	Task<int> RemoveUnreachable();
-	
 	internal sealed class Dummy : IServerRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
 
@@ -32,9 +30,5 @@ public interface IServerRepository {
 		public IAsyncEnumerable<Data.Server> Get(CancellationToken cancellationToken) {
 			return AsyncEnumerable.Empty<Data.Server>();
 		}
-		
-		public Task<int> RemoveUnreachable() {
-			return Task.FromResult(0);
-		}
 	}
 }

app/Server/Database/Repositories/ISettingsRepository.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DHT.Server.Data.Settings;
-
-namespace DHT.Server.Database.Repositories;
-
-public interface ISettingsRepository {
-	Task Set<T>(SettingsKey<T> key, T value);
-	
-	Task Set(Func<ISetter, Task> setter);
-	
-	Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue);
-	
-	interface ISetter {
-		Task Set<T>(SettingsKey<T> key, T value);
-	}
-	
-	internal sealed class Dummy : ISettingsRepository {
-		public Task Set<T>(SettingsKey<T> key, T value) {
-			return Task.CompletedTask;
-		}
-		
-		public Task Set(Func<ISetter, Task> setter) {
-			return Task.CompletedTask;
-		}
-		
-		public Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue) {
-			return Task.FromResult(defaultValue);
-		}
-	}
-}

app/Server/Database/Repositories/IUserRepository.cs

@@ -17,8 +17,6 @@ public interface IUserRepository {
 	
 	IAsyncEnumerable<User> Get(CancellationToken cancellationToken = default);
 
-	Task<int> RemoveUnreachable();
-	
 	internal sealed class Dummy : IUserRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
 
@@ -33,9 +31,5 @@ public interface IUserRepository {
 		public IAsyncEnumerable<User> Get(CancellationToken cancellationToken) {
 			return AsyncEnumerable.Empty<User>();
 		}
-		
-		public Task<int> RemoveUnreachable() {
-			return Task.FromResult(0);
-		}
 	}
 }

app/Server/Database/Sqlite/Repositories/SqliteChannelRepository.cs

@@ -30,10 +30,10 @@ sealed class SqliteChannelRepository : BaseSqliteRepository, IChannelRepository
 				("parent_id", SqliteType.Integer),
 				("position", SqliteType.Integer),
 				("topic", SqliteType.Text),
-				("nsfw", SqliteType.Integer),
+				("nsfw", SqliteType.Integer)
 			]);
 
-			foreach (Channel channel in channels) {
+			foreach (var channel in channels) {
 				cmd.Set(":id", channel.Id);
 				cmd.Set(":server", channel.Server);
 				cmd.Set(":name", channel.Name);
@@ -73,14 +73,4 @@ sealed class SqliteChannelRepository : BaseSqliteRepository, IChannelRepository
 			};
 		}
 	}
-	
-	public async Task<int> RemoveUnreachable() {
-		int removed;
-		await using (var conn = await pool.Take()) {
-			removed = await conn.ExecuteAsync("DELETE FROM channels WHERE id NOT IN (SELECT DISTINCT channel_id FROM messages)");
-		}
-		
-		UpdateTotalCount();
-		return removed;
-	}
 }

app/Server/Database/Sqlite/Repositories/SqliteDownloadRepository.cs

@@ -18,11 +18,9 @@ namespace DHT.Server.Database.Sqlite.Repositories;
 sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRepository(Log), IDownloadRepository {
 	private static readonly Log Log = Log.ForType<SqliteDownloadRepository>();
 
-	public const string Schema = "downloads";
-	
 	internal sealed class NewDownloadCollector : IAsyncDisposable {
 		private readonly SqliteDownloadRepository repository;
-		private bool hasChanged = false;
+		private bool hasAdded = false;
 
 		private readonly SqliteCommand metadataCmd;
 
@@ -33,16 +31,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 				"""
 				INSERT INTO download_metadata (normalized_url, download_url, status, type, size)
 				VALUES (:normalized_url, :download_url, :status, :type, :size)
-				ON CONFLICT (normalized_url)
+				ON CONFLICT DO NOTHING
-				DO UPDATE SET
-					download_url = excluded.download_url,
-					type = IFNULL(excluded.type, type),
-					size = IFNULL(excluded.size, size)
-				WHERE status != :success
-				  AND (download_url != excluded.download_url
-				    OR (excluded.type IS NOT NULL AND type IS NOT excluded.type)
-				    OR (excluded.size IS NOT NULL AND size IS NOT excluded.size)
-				  )
 				"""
 			);
 			metadataCmd.Add(":normalized_url", SqliteType.Text);
@@ -50,7 +39,6 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			metadataCmd.Add(":status", SqliteType.Integer);
 			metadataCmd.Add(":type", SqliteType.Text);
 			metadataCmd.Add(":size", SqliteType.Integer);
-			metadataCmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
 		}
 
 		public async Task Add(Data.Download download) {
@@ -59,20 +47,11 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			metadataCmd.Set(":status", (int) download.Status);
 			metadataCmd.Set(":type", download.Type);
 			metadataCmd.Set(":size", download.Size);
-			hasChanged |= await metadataCmd.ExecuteNonQueryAsync() > 0;
+			hasAdded |= await metadataCmd.ExecuteNonQueryAsync() > 0;
-		}
-		
-		public Task AddIfNotNull(Data.Download? download) {
-			if (download != null) {
-				return Add(download);
-			}
-			else {
-				return Task.CompletedTask;
-			}
 		}
 
 		public void OnCommitted() {
-			if (hasChanged) {
+			if (hasAdded) {
 				repository.UpdateTotalCount();
 			}
 		}
@@ -82,25 +61,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		}
 	}
 
-	private static SqliteBlob BlobReference(ISqliteConnection conn, long rowid, bool readOnly) {
-		string schema = conn.HasAttachedDatabase(Schema) ? Schema : "main";
-		return new SqliteBlob(conn.InnerConnection, databaseName: schema, tableName: "download_blobs", columnName: "blob", rowid, readOnly);
-	}
-	
 	public async Task AddDownload(Data.Download item, Stream? stream) {
-		ulong? actualSize;
-		
-		if (stream is not null) {
-			actualSize = (ulong) stream.Length;
-			
-			if (actualSize != item.Size) {
-				Log.Warn("Download size differs from its metadata - metadata size: " + item.Size + " B, actual size: " + actualSize + " B, url: " + item.NormalizedUrl);
-			}
-		}
-		else {
-			actualSize = item.Size;
-		}
-		
 		await using (var conn = await pool.Take()) {
 			await conn.BeginTransactionAsync();
 			
@@ -116,7 +77,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			metadataCmd.Set(":download_url", item.DownloadUrl);
 			metadataCmd.Set(":status", (int) item.Status);
 			metadataCmd.Set(":type", item.Type);
-			metadataCmd.Set(":size", actualSize);
+			metadataCmd.Set(":size", item.Size);
 			await metadataCmd.ExecuteNonQueryAsync();
 
 			if (stream == null) {
@@ -129,17 +90,16 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 					"""
 					INSERT INTO download_blobs (normalized_url, blob)
 					VALUES (:normalized_url, ZEROBLOB(:blob_length))
-					ON CONFLICT (normalized_url)
+					ON CONFLICT (normalized_url) DO UPDATE SET blob = excluded.blob
-					DO UPDATE SET blob = excluded.blob
 					RETURNING rowid
 					"""
 				);
 				
 				upsertBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, item.NormalizedUrl);
-				upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, actualSize);
+				upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, item.Size);
 				long rowid = await upsertBlobCmd.ExecuteLongScalarAsync();
 
-				await using var blob = BlobReference(conn, rowid, readOnly: false);
+				await using var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid);
 				await stream.CopyToAsync(blob);
 			}
 
@@ -206,14 +166,14 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			FailedWithUnknownSizeCount = reader.GetInt32(8),
 			SkippedCount = reader.GetInt32(9),
 			SkippedTotalSize = reader.GetUint64(10),
-			SkippedWithUnknownSizeCount = reader.GetInt32(11),
+			SkippedWithUnknownSizeCount = reader.GetInt32(11)
 		};
 	}
 
-	public async IAsyncEnumerable<Data.Download> Get(DownloadItemFilter? filter) {
+	public async IAsyncEnumerable<Data.Download> Get() {
 		await using var conn = await pool.Take();
 
-		await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata" + filter.GenerateConditions().BuildWhereClause());
+		await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata");
 		await using var reader = await cmd.ExecuteReaderAsync();
 
 		while (await reader.ReadAsync()) {
@@ -235,7 +195,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		
 		long rowid;
 		
-		await using (SqliteDataReader reader = await cmd.ExecuteReaderAsync()) {
+		await using (var reader = await cmd.ExecuteReaderAsync()) {
 			if (!await reader.ReadAsync()) {
 				return false;
 			}
@@ -243,7 +203,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			rowid = reader.GetInt64(0);
 		}
 		
-		await using (var blob = BlobReference(conn, rowid, readOnly: true)) {
+		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
 			await dataProcessor(blob);
 		}
 
@@ -278,7 +238,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			rowid = reader.GetInt64(2);
 		}
 		
-		await using (var blob = BlobReference(conn, rowid, readOnly: true)) {
+		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
 			await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob, cancellationToken);
 		}
 
@@ -293,7 +253,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 
 		await using var conn = await pool.Take();
 
-		string sql = $"""
+		var sql = $"""
 		           SELECT normalized_url, download_url, type, size
 		           FROM download_metadata
 		           {filter.GenerateConditions().BuildWhereClause()}
@@ -301,7 +261,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		           """;
 
 		await using (var cmd = conn.Command(sql)) {
-			cmd.AddAndSet(":limit", SqliteType.Integer, Math.Max(val1: 0, count));
+			cmd.AddAndSet(":limit", SqliteType.Integer, Math.Max(0, count));
 
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 
@@ -310,7 +270,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 					NormalizedUrl = reader.GetString(0),
 					DownloadUrl = reader.GetString(1),
 					Type = reader.IsDBNull(2) ? null : reader.GetString(2),
-					Size = reader.IsDBNull(3) ? null : reader.GetUint64(3),
+					Size = reader.IsDBNull(3) ? null : reader.GetUint64(3)
 				});
 			}
 		}
@@ -321,7 +281,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
 			cmd.Add(":normalized_url", SqliteType.Text);
 
-			foreach (DownloadItem item in found) {
+			foreach (var item in found) {
 				cmd.Set(":normalized_url", item.NormalizedUrl);
 
 				if (await cmd.ExecuteNonQueryAsync(cancellationToken) == 1) {
@@ -350,82 +310,4 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
 		return await cmd.ExecuteNonQueryAsync(cancellationToken);
 	}
-	
-	public async Task Remove(ICollection<string> normalizedUrls) {
-		await using (var conn = await pool.Take()) {
-			await conn.BeginTransactionAsync();
-			
-			await using (var cmd = conn.Command("DELETE FROM download_metadata WHERE normalized_url = :normalized_url")) {
-				cmd.Add(":normalized_url", SqliteType.Text);
-				
-				foreach (string normalizedUrl in normalizedUrls) {
-					cmd.Set(":normalized_url", normalizedUrl);
-					await cmd.ExecuteNonQueryAsync();
-				}
-			}
-			
-			await conn.CommitTransactionAsync();
-		}
-		
-		UpdateTotalCount();
-	}
-	
-	public async IAsyncEnumerable<FileUrl> FindReachableFiles([EnumeratorCancellation] CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-		
-		await using (var cmd = conn.Command("SELECT type, normalized_url, download_url FROM attachments")) {
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-			
-			while (await reader.ReadAsync(cancellationToken)) {
-				string? type = reader.IsDBNull(0) ? null : reader.GetString(0);
-				string normalizedUrl = reader.GetString(1);
-				string downloadUrl = reader.GetString(2);
-				yield return new FileUrl(normalizedUrl, downloadUrl, type);
-			}
-		}
-		
-		await using (var cmd = conn.Command("SELECT json FROM message_embeds")) {
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-			
-			while (await reader.ReadAsync(cancellationToken)) {
-				if (await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0)) is {} result) {
-					yield return result;
-				}
-			}
-		}
-		
-		await using (var cmd = conn.Command("SELECT DISTINCT emoji_id, emoji_flags FROM message_reactions WHERE emoji_id IS NOT NULL")) {
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-			
-			while (await reader.ReadAsync(cancellationToken)) {
-				ulong emojiId = reader.GetUint64(0);
-				EmojiFlags emojiFlags = (EmojiFlags) reader.GetInt16(1);
-				yield return DownloadLinkExtractor.Emoji(emojiId, emojiFlags);
-			}
-		}
-		
-		await using (var cmd = conn.Command("SELECT id, type, icon_hash FROM servers WHERE icon_hash IS NOT NULL")) {
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-			
-			while (await reader.ReadAsync(cancellationToken)) {
-				ulong id = reader.GetUint64(0);
-				ServerType? type = ServerTypes.FromString(reader.GetString(1));
-				string iconHash = reader.GetString(2);
-				
-				if (DownloadLinkExtractor.ServerIcon(type, id, iconHash) is {} result) {
-					yield return result;
-				}
-			}
-		}
-		
-		await using (var cmd = conn.Command("SELECT id, avatar_url FROM users WHERE avatar_url IS NOT NULL")) {
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-			
-			while (await reader.ReadAsync(cancellationToken)) {
-				ulong id = reader.GetUint64(0);
-				string avatarHash = reader.GetString(1);
-				yield return DownloadLinkExtractor.UserAvatar(id, avatarHash);
-			}
-		}
-	}
 }