Remove orphaned servers, channels, users, and attachments after removing messages

.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.
-2. Run the `app/build.wsl.sh` script.
-3. Read the [Distribution](#distribution) section below.
+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)
 
-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.
-2. Run the `app/build.sh` script.
-3. Read the [Distribution](#distribution) section below.
+1. Install the `zip` package from your repository
+
+Run the `app/build.sh` script, and read the [Distribution](#distribution) section below.
 
 #### Distribution
 
-The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires 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

@@ -54,22 +54,6 @@
             <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/Desktop.csproj

@@ -23,10 +23,7 @@
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
-    <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
   </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,11 +1,11 @@
 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 = [];
@@ -28,10 +28,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);
@@ -49,7 +46,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) {

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();
 	}
@@ -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) {
-		return itme.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
+	private static string ToLocalPath(this IStorageFile file) {
+		return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
 	}
 	
-	private static string[] ToLocalPaths(this IReadOnlyList<IStorageItem> items) {
-		return items.Select(ToLocalPath).ToArray();
+	private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
+		return files.Select(ToLocalPath).ToArray();
 	}
 }

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 Classes="right">
+        <WrapPanel>
             <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/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

@@ -2,46 +2,63 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class ProgressDialog : Window {
-	private static readonly Log Log = Log.ForType<ProgressDialog>();
-	
 	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 Task progressTask = Task.CompletedTask;
 	

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -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();

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 {
-	[Notify]
+sealed partial class ProgressItem : ObservableObject {
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(Opacity))]
+	private bool isVisible = false;
+	
+	public double Opacity => IsVisible ? 1.0 : 0.0;
+	
 	private string message = "";
 	
-	[Notify]
+	public string Message {
+		get => message;
+		set {
+			SetProperty(ref message, value);
+			IsVisible = !string.IsNullOrEmpty(value);
+		}
+	}
+	
+	[ObservableProperty]
 	private string items = "";
 	
-	[Notify]
-	private long progress = 0L;
+	[ObservableProperty]
+	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,11 +1,11 @@
 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; } = "";
 	
@@ -27,11 +27,10 @@ partial class TextBoxDialogModel {
 		}
 	}
 	
-	[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 => 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/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="360"
         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="360" 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,44 @@
 
     <StackPanel Orientation="Vertical" Margin="20" Spacing="12">
 
-        <StackPanel Orientation="Vertical" Spacing="3">
-            <TextBlock TextWrapping="Wrap">Discord History Tracker was created by chylex.</TextBlock>
-            <TextBlock>It is available under the MIT license.</TextBlock>
-        </StackPanel>
+        <TextBlock VerticalAlignment="Center">
+            Discord History Tracker was created by chylex and released under the MIT license.
+        </TextBlock>
 
-        <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,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">MVVM Toolkit</TextBlock>
             <TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryCommunityToolkit}">GitHub</Button>
 
             <TextBlock Grid.Row="5" Grid.Column="0">SQLite</TextBlock>
             <TextBlock Grid.Row="5" Grid.Column="1">Public Domain</TextBlock>
-            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Website</Button>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</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="0">Rx.NET</TextBlock>
             <TextBlock Grid.Row="7" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryPropertyChangedSourceGenerator}">GitHub</Button>
+            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
         </Grid>
 
     </StackPanel>

app/Desktop/Main/AboutWindowModel.cs

@@ -20,11 +20,11 @@ sealed class AboutWindowModel {
 	}
 	
 	public void ShowLibraryAvalonia() {
-		SystemUtils.OpenUrl("https://github.com/AvaloniaUI/Avalonia");
+		SystemUtils.OpenUrl("https://www.nuget.org/packages/Avalonia");
 	}
 	
-	public void ShowLibraryPropertyChangedSourceGenerator() {
-		SystemUtils.OpenUrl("https://github.com/canton7/PropertyChanged.SourceGenerator");
+	public void ShowLibraryCommunityToolkit() {
+		SystemUtils.OpenUrl("https://github.com/CommunityToolkit/dotnet");
 	}
 	
 	public void ShowLibrarySqlite() {

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -5,17 +5,17 @@ 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, IAsyncDisposable {
 	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
 	
 	public sealed record Unit(string Name, uint Scale);
@@ -32,16 +32,15 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 		nameof(MaximumSizeUnit),
 	];
 	
-	[Notify(Setter.Private)]
-	private string filterStatisticsText = "";
+	public string FilterStatisticsText { get; private set; } = "";
 	
-	[Notify]
+	[ObservableProperty]
 	private bool limitSize = false;
 	
-	[Notify]
+	[ObservableProperty]
 	private ulong maximumSize = 0UL;
 	
-	[Notify]
+	[ObservableProperty]
 	private Unit maximumSizeUnit = AllUnits[0];
 	
 	public IEnumerable<Unit> Units => AllUnits;
@@ -152,7 +151,9 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 	private void UpdateFilterStatisticsText() {
 		string matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
 		string 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/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),
@@ -30,38 +30,37 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		nameof(IncludedUsers),
 	];
 	
+	public string FilterStatisticsText { get; private set; } = "";
+	
 	public event PropertyChangedEventHandler? FilterPropertyChanged;
 	
 	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
 	
-	[Notify]
-	private string filterStatisticsText = "";
-	
-	[Notify]
+	[ObservableProperty]
 	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;
@@ -182,7 +181,9 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 	private void UpdateFilterStatisticsText() {
 		string exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
 		string totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+		
 		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 	
 	public async Task OpenChannelFilterDialog() {

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,27 +2,27 @@ 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 {
-	[Notify(Setter.Private)]
+sealed partial class StatusBarModel : ObservableObject, IDisposable {
+	[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",
@@ -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,25 +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.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;

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:
@@ -74,28 +73,15 @@ sealed class DatabasePageModel {
 	
 	public async Task MergeWithDatabase() {
 		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
-		if (paths.Length == 0) {
-			return;
+		if (paths.Length > 0) {
+			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
+		}
 	}
 	
-		const string Title = "Database Merge";
-		
-		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) {
+	private static async Task 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() {
-			return Task.FromResult<InitialDatabaseSettings?>(null);
+		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
+			this.total = total;
+			this.dialog = dialog;
 		}
 		
 		public async Task<bool> CanUpgrade() {
@@ -150,28 +139,15 @@ sealed class DatabasePageModel {
 			AllowMultiple = true,
 		});
 		
-		if (paths.Length == 0) {
-			return;
+		if (paths.Length > 0) {
+			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
+		}
 	}
 	
-		const string Title = "Legacy Archive Import";
-		
-		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) {
+	private static async Task 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 => {
@@ -215,7 +191,7 @@ 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);
 		
@@ -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);
-		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,16 +239,7 @@ sealed class DatabasePageModel {
 		}
 	}
 	
-	private sealed record ImportResult(DatabaseStatistics OldStatistics, DatabaseStatistics NewStatistics, int SuccessfulItems, int TotalItems);
-	
-	private static string GetImportDialogMessage(ImportResult? result, string itemName) {
-		if (result == null) {
-			return "Nothing was imported.";
-		}
-		
-		var oldStatistics = result.OldStatistics;
-		var newStatistics = result.NewStatistics;
-		
+	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
 		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
 		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
 		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
@@ -280,11 +248,11 @@ sealed class DatabasePageModel {
 		var message = new StringBuilder();
 		message.Append("Processed ");
 		
-		if (result.SuccessfulItems == result.TotalItems) {
-			message.Append(result.SuccessfulItems.Pluralize(itemName));
+		if (successfulItems == totalItems) {
+			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/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, finishedItems: 0, batchCount);
 		
 		var rand = new Random();
 		var server = new DHT.Server.Data.Server {

app/Desktop/Main/Pages/DownloadsPage.axaml

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

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -1,51 +1,40 @@
 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, IAsyncDisposable {
 	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)]
-	private bool hasSuccessfulDownloads;
-	
-	[Notify(Setter.Private)]
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
 	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 +48,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 +55,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) {
-		this.window = window;
+	public DownloadsPageModel(State state) {
 		this.state = state;
 		
 		FilterModel = new DownloadItemFilterPanelModel(state);
@@ -146,14 +133,15 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 	private void OnDownloadStateChanged() {
 		RecomputeDownloadStatistics();
 		
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsDownloading)));
+		OnPropertyChanged(nameof(ToggleDownloadButtonText));
+		OnPropertyChanged(nameof(IsDownloading));
 	}
 	
 	private void OnItemFinished(DownloadItem item) {
 		RecomputeDownloadStatistics();
 	}
 	
-	public async Task OnClickRetryFailed() {
+	public async Task OnClickRetryFailedDownloads() {
 		IsRetryingFailedDownloads = true;
 		
 		try {
@@ -170,96 +158,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 (Download download in state.Db.Downloads.FindAllDownloadableUrls()) {
-					reachableNormalizedUrls.Add(download.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 +175,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/TrackingPageModel.cs

@@ -4,27 +4,28 @@ using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
-using PropertyChanged.SourceGenerator;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class TrackingPageModel {
-	[Notify(Setter.Private)]
+sealed partial class TrackingPageModel : ObservableObject {
+	[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) {

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -3,6 +3,7 @@ using System.ComponentModel;
 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;
@@ -12,17 +13,16 @@ 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; }
@@ -61,7 +61,6 @@ sealed partial class ViewerPageModel : IDisposable {
 	}
 	
 	public async Task OnClickApplyFiltersToDatabase() {
-		try {
 		MessageFilter filter = FilterModel.CreateFilter();
 		long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
 		
@@ -75,10 +74,6 @@ 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) {

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -49,7 +49,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);

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -5,24 +5,23 @@ 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.Data.Settings;
 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;
@@ -53,22 +52,21 @@ sealed partial class WelcomeScreenModel {
 	public async Task OpenOrCreateDatabaseFromPath(string path) {
 		dbFilePath = path;
 		
+		bool isNew = !File.Exists(path);
+		
 		IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
-		if (db != null) {
-			DatabaseSelected?.Invoke(this, db);
+		if (db == null) {
+			return;
 		}
+		
+		if (isNew && await Dialog.ShowYesNo(window, "Automatic Downloads", "Do you want to automatically download files hosted on Discord? You can change this later in the Downloads tab.") == DialogResult.YesNo.Yes) {
+			await db.Settings.Set(SettingsKey.DownloadsAutoStart, value: true);
+		}
+		
+		DatabaseSelected?.Invoke(this, db);
 	}
 	
 	private sealed class SchemaUpgradeCallbacks(Window window) : ISchemaUpgradeCallbacks {
-		public async Task<InitialDatabaseSettings?> GetInitialDatabaseSettings() {
-			var model = new NewDatabaseSettingsDialogModel();
-			
-			var dialog = new NewDatabaseSettingsDialog { DataContext = model };
-			await dialog.ShowDialog(window);
-			
-			return new InitialDatabaseSettings(model.SeparateFileForDownloads, model.DownloadsAutoStart);
-		}
-		
 		public async Task<bool> CanUpgrade() {
 			return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
 		}
@@ -112,9 +110,7 @@ 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 latestVersion = await ProgressDialog.ShowIndeterminate<Version?>(window, "Check Updates", "Checking for updates...", async _ => {
 			var client = new HttpClient(new SocketsHttpHandler {
 				AutomaticDecompression = DecompressionMethods.None,
 				AllowAutoRedirect = false,
@@ -125,19 +121,27 @@ sealed partial class WelcomeScreenModel {
 			client.MaxResponseContentBufferSize = 1024;
 			client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
 			
-				return await client.GetStringAsync(Program.Website + "/version");
-			});
+			string response;
+			try {
+				response = await client.GetStringAsync(Program.Website + "/version");
 			} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
 				await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
-			return;
+				return null;
 			} catch (Exception e) {
 				Log.Error(e);
 				await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
-			return;
+				return null;
 			}
 			
 			if (!System.Version.TryParse(response, out Version? latestVersion)) {
 				await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
+				return null;
+			}
+			
+			return latestVersion;
+		});
+		
+		if (latestVersion == null) {
 			return;
 		}
 		

app/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
   
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <LangVersion>13</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <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/Server/Data/Settings/SettingsKey.cs

@@ -3,7 +3,6 @@ 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");

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]));
-	}
-	
-	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];
+		writer.WritePropertyName(value.Id.ToString());
 	}
 }

app/Server/Database/Export/ViewerJson.cs

@@ -30,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; }
@@ -55,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; }
@@ -80,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;
 
@@ -20,12 +18,12 @@ static class ViewerJsonExport {
 	public static async Task GetMetadata(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
 		Perf perf = Log.Start();
 		
-		var includedChannels = new List<DiscordChannel>();
+		var includedChannels = new List<Channel>();
 		var includedServerIds = new HashSet<ulong>();
 		
 		HashSet<ulong>? channelIdFilter = filter?.ChannelIds;
 		
-		await foreach (DiscordChannel channel in db.Channels.Get(cancellationToken)) {
+		await foreach (Channel channel in db.Channels.Get(cancellationToken)) {
 			if (channelIdFilter == null || channelIdFilter.Contains(channel.Id)) {
 				includedChannels.Add(channel);
 				includedServerIds.Add(channel.Server);
@@ -55,30 +53,11 @@ static class ViewerJsonExport {
 		
 		ReadOnlyMemory<byte> newLine = "\n"u8.ToArray();
 		
-		Channel<Message> channel = Channel.CreateBounded<Message>(new BoundedChannelOptions(32) {
-			SingleWriter = true,
-			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 foreach (ViewerJson.JsonMessage message in GenerateMessageList(db, filter, cancellationToken)) {
+			await JsonSerializer.SerializeAsync(stream, message, ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
 			await stream.WriteAsync(newLine, cancellationToken);
 		}
 		
-		await writerTask;
-		
 		perf.Step("Generate and serialize messages to JSON");
 		perf.End();
 	}
@@ -114,14 +93,14 @@ static class ViewerJsonExport {
 		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 (Channel 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,
@@ -131,15 +110,16 @@ static class ViewerJsonExport {
 		return channels;
 	}
 	
-	private static ViewerJson.JsonMessage ToJsonMessage(Message message) {
-		return new ViewerJson.JsonMessage {
+	private static async IAsyncEnumerable<ViewerJson.JsonMessage> GenerateMessageList(IDatabaseFile db, MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
+		await foreach (Message 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 {
@@ -158,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,
 				}).ToArray(),
 			};
 		}
+	}
 }

app/Server/Database/Repositories/IDownloadRepository.cs

@@ -20,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);
 	
@@ -32,10 +32,6 @@ public interface IDownloadRepository {
 	
 	Task<int> RetryFailed(CancellationToken cancellationToken = default);
 	
-	Task Remove(ICollection<string> normalizedUrls);
-	
-	IAsyncEnumerable<Data.Download> FindAllDownloadableUrls(CancellationToken cancellationToken = default);
-	
 	internal sealed class Dummy : IDownloadRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
 		
@@ -51,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>();
 		}
 		
@@ -74,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<Data.Download> FindAllDownloadableUrls(CancellationToken cancellationToken) {
-			return AsyncEnumerable.Empty<Data.Download>();
-		}
 	}
 }

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

@@ -18,8 +18,6 @@ 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;
@@ -73,25 +71,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();
 			
@@ -107,7 +87,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) {
@@ -127,10 +107,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 				);
 				
 				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);
 			}
 			
@@ -201,10 +181,10 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		};
 	}
 	
-	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()) {
@@ -234,7 +214,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);
 		}
 		
@@ -269,7 +249,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);
 		}
 		
@@ -341,62 +321,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<Data.Download> FindAllDownloadableUrls([EnumeratorCancellation] CancellationToken cancellationToken = default) {
-		await using var conn = await pool.Take();
-		
-		await using (var cmd = conn.Command("SELECT normalized_url, download_url, type, size FROM attachments")) {
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-			
-			while (await reader.ReadAsync(cancellationToken)) {
-				yield return DownloadLinkExtractor.FromAttachment(reader.GetString(0), reader.GetString(1), reader.IsDBNull(2) ? null : reader.GetString(2), reader.GetUint64(3));
-			}
-		}
-		
-		await using (var cmd = conn.Command("SELECT json FROM message_embeds")) {
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-			
-			while (await reader.ReadAsync(cancellationToken)) {
-				var result = await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0));
-				if (result is not null) {
-					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)) {
-				yield return DownloadLinkExtractor.FromUserAvatar(reader.GetUint64(0), reader.GetString(1));
-			}
-		}
-		
-		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)) {
-				yield return DownloadLinkExtractor.FromEmoji(reader.GetUint64(0), (EmojiFlags) reader.GetInt16(1));
-			}
-		}
-	}
 }

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

@@ -43,14 +43,10 @@ sealed class SqliteSettingsRepository(SqliteConnectionPool pool) : ISettingsRepo
 	}
 	
 	public async Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue) {
-		await using var conn = await pool.Take();
-		return await Get(conn, key, defaultValue);
-	}
-	
-	public static async Task<T?> Get<T>(ISqliteConnection conn, SettingsKey<T> key, T? defaultValue) {
 		string? value;
 		
-		await using (var cmd = conn.Command("SELECT value FROM metadata WHERE key = :key")) {
+		await using (var conn = await pool.Take()) {
+			await using var cmd = conn.Command("SELECT value FROM metadata WHERE key = :key");
 			cmd.AddAndSet(":key", SqliteType.Text, key.Key);
 			
 			await using var reader = await cmd.ExecuteReaderAsync();

app/Server/Database/Sqlite/Schema/ISchemaUpgradeCallbacks.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Threading.Tasks;
-using DHT.Server.Database.Sqlite.Utils;
 
 namespace DHT.Server.Database.Sqlite.Schema;
 
 public interface ISchemaUpgradeCallbacks {
-	Task<InitialDatabaseSettings?> GetInitialDatabaseSettings();
 	Task<bool> CanUpgrade();
 	Task Start(int versionSteps, Func<IProgressReporter, Task> doUpgrade);
 	

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -1,46 +1,42 @@
-using System.Collections.Generic;
+using System;
 using System.Threading.Tasks;
-using DHT.Server.Data.Settings;
 using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Repositories;
 using DHT.Server.Database.Sqlite.Schema;
 using DHT.Server.Database.Sqlite.Utils;
-using DHT.Utils.Logging;
+using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite;
 
 public sealed class SqliteDatabaseFile : IDatabaseFile {
-	private static readonly Log Log = Log.ForType<SqliteDatabaseFile>();
-	
 	private const int DefaultPoolSize = 5;
 	
 	public static async Task<SqliteDatabaseFile?> OpenOrCreate(string path, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
-		var connectionString = new SqliteConnectionStringFactory(path);
-		var attachedDatabaseCollector = new AttachedDatabaseCollector(path);
+		var connectionString = new SqliteConnectionStringBuilder {
+			DataSource = path,
+			Mode = SqliteOpenMode.ReadWriteCreate,
+		};
 		
+		var pool = await SqliteConnectionPool.Create(connectionString, DefaultPoolSize);
 		bool wasOpened;
-		await using (var conn = await CustomSqliteConnection.OpenUnpooled(connectionString)) {
-			wasOpened = await new SqliteSchema(conn).Setup(attachedDatabaseCollector, schemaUpgradeCallbacks);
+		
+		try {
+			await using var conn = await pool.Take();
+			wasOpened = await new SqliteSchema(conn).Setup(schemaUpgradeCallbacks);
+		} catch (Exception) {
+			await pool.DisposeAsync();
+			throw;
 		}
 		
 		if (wasOpened) {
-			var pool = await SqliteConnectionPool.Create(connectionString, DefaultPoolSize, attachedDatabaseCollector);
 			return new SqliteDatabaseFile(path, pool);
 		}
 		else {
+			await pool.DisposeAsync();
 			return null;
 		}
 	}
 	
-	private sealed class AttachedDatabaseCollector(string path) : ISqliteAttachedDatabaseCollector {
-		public async IAsyncEnumerable<AttachedDatabase> GetAttachedDatabases(ISqliteConnection conn) {
-			bool useSeparateFileForDownloads = await SqliteSettingsRepository.Get(conn, SettingsKey.SeparateFileForDownloads, defaultValue: false);
-			if (useSeparateFileForDownloads) {
-				yield return new AttachedDatabase(path + "_downloads", SqliteDownloadRepository.Schema);
-			}
-		}
-	}
-	
 	public string Path { get; }
 	
 	public ISettingsRepository Settings => settings;
@@ -82,21 +78,6 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 	
 	public async Task Vacuum() {
 		await using var conn = await pool.Take();
-		
-		Perf perf = Log.Start();
 		await conn.ExecuteAsync("VACUUM");
-		perf.Step("Vacuum main schema");
-		
-		await VacuumAttachedDatabase(conn, perf, SqliteDownloadRepository.Schema);
-		
-		perf.End();
-		return;
-		
-		static async Task VacuumAttachedDatabase(ISqliteConnection conn, Perf perf, string schema) {
-			if (conn.HasAttachedDatabase(schema)) {
-				await conn.ExecuteAsync("VACUUM " + schema);
-				perf.Step("Vacuum " + schema + " schema");
-			}
-		}
 	}
 }

app/Server/Database/Sqlite/SqliteSchema.cs

@@ -1,32 +1,28 @@
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Threading.Tasks;
-using DHT.Server.Data.Settings;
 using DHT.Server.Database.Exceptions;
-using DHT.Server.Database.Sqlite.Repositories;
 using DHT.Server.Database.Sqlite.Schema;
 using DHT.Server.Database.Sqlite.Utils;
 using DHT.Utils.Logging;
-using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite;
 
-sealed class SqliteSchema(CustomSqliteConnection conn) {
+sealed class SqliteSchema {
 	internal const int Version = 10;
 	
 	private static readonly Log Log = Log.ForType<SqliteSchema>();
 	
-	public async Task<bool> Setup(ISqliteAttachedDatabaseCollector attachedDatabaseCollector, ISchemaUpgradeCallbacks callbacks) {
+	private readonly ISqliteConnection conn;
+	
+	public SqliteSchema(ISqliteConnection conn) {
+		this.conn = conn;
+	}
+	
+	public async Task<bool> Setup(ISchemaUpgradeCallbacks callbacks) {
 		await conn.ExecuteAsync("CREATE TABLE IF NOT EXISTS metadata (key TEXT PRIMARY KEY, value TEXT)");
 		
 		string? dbVersionStr = await conn.ExecuteReaderAsync("SELECT value FROM metadata WHERE key = 'version'", static reader => reader?.GetString(0));
 		if (dbVersionStr == null) {
-			if (await callbacks.GetInitialDatabaseSettings() is {} initialSettings) {
-				await ApplyInitialSettings(initialSettings);
-				await AttachAdditionalDatabasesIfNecessary(attachedDatabaseCollector);
-			}
-			
 			await InitializeSchemas();
 		}
 		else if (!int.TryParse(dbVersionStr, out int dbVersion) || dbVersion < 1) {
@@ -41,44 +37,12 @@ sealed class SqliteSchema(CustomSqliteConnection conn) {
 				return false;
 			}
 			
-			await AttachAdditionalDatabasesIfNecessary(attachedDatabaseCollector);
 			await callbacks.Start(Version - dbVersion, async reporter => await UpgradeSchemas(dbVersion, reporter));
 		}
 		
 		return true;
 	}
 	
-	private async Task ApplyInitialSettings(InitialDatabaseSettings initialSettings) {
-		await using var cmd = conn.Command("INSERT INTO metadata (key, value) VALUES (:key, :value)");
-		cmd.Add("key", SqliteType.Text);
-		cmd.Add("value", SqliteType.Text);
-		
-		static async Task ApplySetting<T>(SqliteCommand cmd, SettingsKey<T> key, T value) {
-			cmd.Set("key", key.Key);
-			cmd.Set("value", key.ToString(value));
-			await cmd.ExecuteNonQueryAsync();
-		}
-		
-		if (initialSettings.SeparateFileForDownloads) {
-			await ApplySetting(cmd, SettingsKey.SeparateFileForDownloads, value: true);
-		}
-		
-		if (initialSettings.DownloadsAutoStart) {
-			await ApplySetting(cmd, SettingsKey.DownloadsAutoStart, value: true);
-		}
-	}
-	
-	[SuppressMessage("ReSharper", "WithExpressionModifiesAllMembers")]
-	private async Task AttachAdditionalDatabasesIfNecessary(ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
-		await foreach (var attachedDatabase in attachedDatabaseCollector.GetAttachedDatabases(conn)) {
-			if (!File.Exists(attachedDatabase.Path)) {
-				await using CustomSqliteConnection _ = await CustomSqliteConnection.OpenUnpooled(conn.ConnectionStringFactory with { Path = attachedDatabase.Path });
-			}
-			
-			await conn.AttachDatabase(attachedDatabase);
-		}
-	}
-	
 	private async Task InitializeSchemas() {
 		await conn.ExecuteAsync("""
 		                        CREATE TABLE users (
@@ -178,10 +142,8 @@ sealed class SqliteSchema(CustomSqliteConnection conn) {
 	}
 	
 	internal static async Task CreateDownloadTables(ISqliteConnection conn) {
-		string schema = conn.HasAttachedDatabase(SqliteDownloadRepository.Schema) ? SqliteDownloadRepository.Schema : "main";
-		
-		await conn.ExecuteAsync($"""
-		                         CREATE TABLE {schema}.download_metadata (
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE download_metadata (
 		                        	normalized_url TEXT NOT NULL PRIMARY KEY,
 		                        	download_url   TEXT NOT NULL,
 		                        	status         INTEGER NOT NULL,
@@ -190,8 +152,8 @@ sealed class SqliteSchema(CustomSqliteConnection conn) {
 		                        )
 		                        """);
 		
-		await conn.ExecuteAsync($"""
-		                         CREATE TABLE {schema}.download_blobs (
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE download_blobs (
 		                        	normalized_url TEXT NOT NULL PRIMARY KEY,
 		                        	blob           BLOB NOT NULL,
 		                        	FOREIGN KEY (normalized_url) REFERENCES download_metadata (normalized_url) ON UPDATE CASCADE ON DELETE CASCADE

app/Server/Database/Sqlite/Utils/AttachedDatabase.cs

@@ -1,3 +0,0 @@
-namespace DHT.Server.Database.Sqlite.Utils;
-
-sealed record AttachedDatabase(string Path, string Schema);

app/Server/Database/Sqlite/Utils/CustomSqliteConnection.cs

@@ -1,91 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using System.Data.Common;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Data.Sqlite;
-
-namespace DHT.Server.Database.Sqlite.Utils;
-
-class CustomSqliteConnection : ISqliteConnection {
-	internal static async Task<CustomSqliteConnection> OpenUnpooled(SqliteConnectionStringFactory connectionStringFactory) {
-		SqliteConnection conn = new SqliteConnection(connectionStringFactory.Create());
-		await conn.OpenAsync();
-		
-		CustomSqliteConnection custom = new CustomSqliteConnection(connectionStringFactory, conn);
-		await custom.Setup(CancellationToken.None);
-		
-		return custom;
-	}
-	
-	internal SqliteConnectionStringFactory ConnectionStringFactory { get; }
-	public SqliteConnection InnerConnection { get; }
-	
-	private ImmutableHashSet<string> attachedDatabases = [];
-	private DbTransaction? activeTransaction;
-	
-	protected CustomSqliteConnection(SqliteConnectionStringFactory connectionStringFactory, SqliteConnection innerConnection) {
-		this.ConnectionStringFactory = connectionStringFactory;
-		this.InnerConnection = innerConnection;
-	}
-	
-	internal async Task Setup(CancellationToken cancellationToken) {
-		await this.ExecuteAsync("PRAGMA journal_mode=WAL", cancellationToken);
-		await this.ExecuteAsync("PRAGMA foreign_keys=ON", cancellationToken);
-	}
-	
-	[SuppressMessage("ReSharper", "WithExpressionModifiesAllMembers")]
-	internal async Task AttachDatabase(AttachedDatabase attachedDatabase) {
-		await this.ExecuteAsync("ATTACH DATABASE '" + attachedDatabase.Path.Replace("'", "''") + "' AS " + attachedDatabase.Schema);
-		ImmutableInterlocked.Update(ref attachedDatabases, static (set, schema) => set.Add(schema), attachedDatabase.Schema);
-	}
-	
-	public bool HasAttachedDatabase(string schema) {
-		return attachedDatabases.Contains(schema);
-	}
-	
-	public async Task BeginTransactionAsync() {
-		if (activeTransaction != null) {
-			throw new InvalidOperationException("A transaction is already active.");
-		}
-		
-		activeTransaction = await InnerConnection.BeginTransactionAsync();
-	}
-	
-	public async Task CommitTransactionAsync() {
-		if (activeTransaction == null) {
-			throw new InvalidOperationException("No active transaction to commit.");
-		}
-		
-		await activeTransaction.CommitAsync();
-		await activeTransaction.DisposeAsync();
-		activeTransaction = null;
-	}
-	
-	public async Task RollbackTransactionAsync() {
-		if (activeTransaction == null) {
-			throw new InvalidOperationException("No active transaction to rollback.");
-		}
-		
-		await activeTransaction.RollbackAsync();
-		await activeTransaction.DisposeAsync();
-		activeTransaction = null;
-	}
-	
-	public void AssignActiveTransaction(SqliteCommand command) {
-		command.Transaction = (SqliteTransaction?) activeTransaction;
-	}
-	
-	public async ValueTask DisposeAsync() {
-		if (activeTransaction != null) {
-			await RollbackTransactionAsync();
-		}
-		
-		await DisposeConnection();
-	}
-	
-	private protected virtual async ValueTask DisposeConnection() {
-		await InnerConnection.DisposeAsync();
-	}
-}

app/Server/Database/Sqlite/Utils/ISqliteAttachedDatabaseCollector.cs

@@ -1,7 +0,0 @@
-using System.Collections.Generic;
-
-namespace DHT.Server.Database.Sqlite.Utils;
-
-interface ISqliteAttachedDatabaseCollector {
-	IAsyncEnumerable<AttachedDatabase> GetAttachedDatabases(ISqliteConnection conn);
-}

app/Server/Database/Sqlite/Utils/ISqliteConnection.cs

@@ -7,8 +7,6 @@ namespace DHT.Server.Database.Sqlite.Utils;
 interface ISqliteConnection : IAsyncDisposable {
 	SqliteConnection InnerConnection { get; }
 	
-	bool HasAttachedDatabase(string schema);
-	
 	Task BeginTransactionAsync();
 	Task CommitTransactionAsync();
 	Task RollbackTransactionAsync();

app/Server/Database/Sqlite/Utils/InitialDatabaseSettings.cs

@@ -1,3 +0,0 @@
-namespace DHT.Server.Database.Sqlite.Utils;
-
-public sealed record InitialDatabaseSettings(bool SeparateFileForDownloads, bool DownloadsAutoStart);

app/Server/Database/Sqlite/Utils/SqliteConnectionPool.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Utils.Collections;
@@ -9,13 +9,16 @@ using Microsoft.Data.Sqlite;
 namespace DHT.Server.Database.Sqlite.Utils;
 
 sealed class SqliteConnectionPool : IAsyncDisposable {
-	public static async Task<SqliteConnectionPool> Create(SqliteConnectionStringFactory connectionStringFactory, int poolSize, ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
-		SqliteConnectionPool pool = new SqliteConnectionPool(poolSize, attachedDatabaseCollector);
-		await pool.InitializePooledConnections(connectionStringFactory);
+	public static async Task<SqliteConnectionPool> Create(SqliteConnectionStringBuilder connectionStringBuilder, int poolSize) {
+		var pool = new SqliteConnectionPool(poolSize);
+		await pool.InitializePooledConnections(connectionStringBuilder);
 		return pool;
 	}
 	
-	private readonly ISqliteAttachedDatabaseCollector attachedDatabaseCollector;
+	private static string GetConnectionString(SqliteConnectionStringBuilder connectionStringBuilder) {
+		connectionStringBuilder.Pooling = false;
+		return connectionStringBuilder.ToString();
+	}
 	
 	private readonly int poolSize;
 	private readonly List<PooledConnection> all;
@@ -24,35 +27,24 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
 	private readonly CancellationTokenSource disposalTokenSource = new ();
 	private readonly CancellationToken disposalToken;
 	
-	private SqliteConnectionPool(int poolSize, ISqliteAttachedDatabaseCollector attachedDatabaseCollector) {
-		this.attachedDatabaseCollector = attachedDatabaseCollector;
-		
+	private SqliteConnectionPool(int poolSize) {
 		this.poolSize = poolSize;
 		this.all = new List<PooledConnection>(poolSize);
 		this.free = new ConcurrentPool<PooledConnection>(poolSize);
-		
 		this.disposalToken = disposalTokenSource.Token;
 	}
 	
-	private async Task InitializePooledConnections(SqliteConnectionStringFactory connectionStringFactory) {
-		string connectionString = connectionStringFactory.Create();
-		
-		List<AttachedDatabase> attachedDatabases = [];
+	private async Task InitializePooledConnections(SqliteConnectionStringBuilder connectionStringBuilder) {
+		string connectionString = GetConnectionString(connectionStringBuilder);
 		
 		for (int i = 0; i < poolSize; i++) {
-			SqliteConnection innerConnection = new SqliteConnection(connectionString);
-			await innerConnection.OpenAsync(disposalToken);
+			var conn = new SqliteConnection(connectionString);
+			conn.Open();
 			
-			PooledConnection pooledConnection = new PooledConnection(this, connectionStringFactory, innerConnection);
-			await pooledConnection.Setup(disposalToken);
+			var pooledConnection = new PooledConnection(this, conn);
 			
-			if (i == 0) {
-				attachedDatabases = await attachedDatabaseCollector.GetAttachedDatabases(pooledConnection).ToListAsync(disposalToken);
-			}
-			
-			foreach (var attachedDatabase in attachedDatabases) {
-				await pooledConnection.AttachDatabase(attachedDatabase);
-			}
+			await pooledConnection.ExecuteAsync("PRAGMA journal_mode=WAL", disposalToken);
+			await pooledConnection.ExecuteAsync("PRAGMA foreign_keys=ON", disposalToken);
 			
 			all.Add(pooledConnection);
 			await free.Push(pooledConnection, disposalToken);
@@ -82,8 +74,48 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
 		disposalTokenSource.Dispose();
 	}
 	
-	private sealed class PooledConnection(SqliteConnectionPool pool, SqliteConnectionStringFactory connectionStringFactory, SqliteConnection innerConnection) : CustomSqliteConnection(connectionStringFactory, innerConnection) {
-		private protected override async ValueTask DisposeConnection() {
+	private sealed class PooledConnection(SqliteConnectionPool pool, SqliteConnection conn) : ISqliteConnection {
+		public SqliteConnection InnerConnection { get; } = conn;
+		
+		private DbTransaction? activeTransaction;
+		
+		public async Task BeginTransactionAsync() {
+			if (activeTransaction != null) {
+				throw new InvalidOperationException("A transaction is already active.");
+			}
+			
+			activeTransaction = await InnerConnection.BeginTransactionAsync();
+		}
+		
+		public async Task CommitTransactionAsync() {
+			if (activeTransaction == null) {
+				throw new InvalidOperationException("No active transaction to commit.");
+			}
+			
+			await activeTransaction.CommitAsync();
+			await activeTransaction.DisposeAsync();
+			activeTransaction = null;
+		}
+		
+		public async Task RollbackTransactionAsync() {
+			if (activeTransaction == null) {
+				throw new InvalidOperationException("No active transaction to rollback.");
+			}
+			
+			await activeTransaction.RollbackAsync();
+			await activeTransaction.DisposeAsync();
+			activeTransaction = null;
+		}
+		
+		public void AssignActiveTransaction(SqliteCommand command) {
+			command.Transaction = (SqliteTransaction?) activeTransaction;
+		}
+		
+		public async ValueTask DisposeAsync() {
+			if (activeTransaction != null) {
+				await RollbackTransactionAsync();
+			}
+			
 			await pool.Return(this);
 		}
 	}

app/Server/Database/Sqlite/Utils/SqliteConnectionStringFactory.cs

@@ -1,15 +0,0 @@
-using Microsoft.Data.Sqlite;
-
-namespace DHT.Server.Database.Sqlite.Utils;
-
-sealed record SqliteConnectionStringFactory(string Path) {
-	public string Create() {
-		var builder = new SqliteConnectionStringBuilder {
-			DataSource = Path,
-			Mode = SqliteOpenMode.ReadWriteCreate,
-			Pooling = false,
-		};
-		
-		return builder.ToString();
-	}
-}

app/Server/Download/DownloadExporter.cs

@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using DHT.Server.Data;
-using DHT.Server.Data.Filters;
-using DHT.Server.Database;
-using DHT.Utils.Logging;
-using DHT.Utils.Tasks;
-using Channel = System.Threading.Channels.Channel;
-
-namespace DHT.Server.Download;
-
-public sealed partial class DownloadExporter(IDatabaseFile db, string folderPath) {
-	private static readonly Log Log = Log.ForType<DownloadExporter>();
-	
-	private const int Concurrency = 3;
-	
-	private static Channel<Data.Download> CreateExportChannel() {
-		return Channel.CreateBounded<Data.Download>(new BoundedChannelOptions(Concurrency * 4) {
-			SingleWriter = true,
-			SingleReader = false,
-			AllowSynchronousContinuations = true,
-			FullMode = BoundedChannelFullMode.Wait,
-		});
-	}
-	
-	public interface IProgressReporter {
-		Task ReportProgress(long processedCount, long totalCount);
-	}
-	
-	public readonly record struct Result(long SuccessfulCount, long FailedCount) {
-		internal static Result Combine(Result left, Result right) {
-			return new Result(left.SuccessfulCount + right.SuccessfulCount, left.FailedCount + right.FailedCount);
-		}
-	}
-	
-	public async Task<Result> Export(IProgressReporter reporter) {
-		DownloadItemFilter filter = new DownloadItemFilter {
-			IncludeStatuses = [DownloadStatus.Success]
-		};
-		
-		long totalCount = await db.Downloads.Count(filter);
-		
-		Channel<Data.Download> channel = CreateExportChannel();
-		ExportRunner exportRunner = new ExportRunner(db, folderPath, channel.Reader, reporter, totalCount);
-		
-		using CancellableTask progressTask = CancellableTask.Run(exportRunner.RunReportTask);
-		
-		List<Task<Result>> readerTasks = [];
-		for (int reader = 0; reader < Concurrency; reader++) {
-			readerTasks.Add(Task.Run(exportRunner.RunExportTask, CancellationToken.None));
-		}
-		
-		await foreach (Data.Download download in db.Downloads.Get(filter).WithCancellation(CancellationToken.None)) {
-			await channel.Writer.WriteAsync(download, CancellationToken.None);
-		}
-		
-		channel.Writer.Complete();
-		
-		Result result = (await Task.WhenAll(readerTasks)).Aggregate(Result.Combine);
-		
-		progressTask.Cancel();
-		await progressTask.Task;
-		
-		return result;
-	}
-	
-	private sealed partial class ExportRunner(IDatabaseFile db, string folderPath, ChannelReader<Data.Download> reader, IProgressReporter reporter, long totalCount) {
-		private long processedCount;
-		
-		public async Task RunReportTask(CancellationToken cancellationToken) {
-			try {
-				while (true) {
-					await reporter.ReportProgress(processedCount, totalCount);
-					await Task.Delay(TimeSpan.FromMilliseconds(25), cancellationToken);
-				}
-			} catch (OperationCanceledException) {
-				await reporter.ReportProgress(processedCount, totalCount);
-			}
-		}
-		
-		public async Task<Result> RunExportTask() {
-			long successfulCount = 0L;
-			long failedCount = 0L;
-			
-			await foreach (Data.Download download in reader.ReadAllAsync()) {
-				bool success;
-				try {
-					success = await db.Downloads.GetDownloadData(download.NormalizedUrl, stream => CopyToFile(download.NormalizedUrl, stream));
-				} catch (FileAlreadyExistsException) {
-					success = false;
-				} catch (Exception e) {
-					Log.Error(e);
-					success = false;
-				}
-				
-				if (success) {
-					++successfulCount;
-				}
-				else {
-					++failedCount;
-				}
-				
-				Interlocked.Increment(ref processedCount);
-			}
-			
-			return new Result(successfulCount, failedCount);
-		}
-		
-		private async Task CopyToFile(string normalizedUrl, Stream blobStream) {
-			string fileName = UrlToFileName(normalizedUrl);
-			string filePath = Path.Combine(folderPath, fileName);
-			
-			if (File.Exists(filePath)) {
-				Log.Error("Skipping existing file: " + fileName);
-				throw FileAlreadyExistsException.Instance;
-			}
-			
-			await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.Read);
-			await blobStream.CopyToAsync(fileStream);
-		}
-		
-		[GeneratedRegex("[^a-zA-Z0-9_.-]")]
-		private static partial Regex DisallowedFileNameCharactersRegex();
-		
-		private static string UrlToFileName(string url) {
-			static string UriToFileName(Uri uri) {
-				string fileName = uri.AbsolutePath.TrimStart('/');
-				
-				if (uri.Query.Length > 0) {
-					int periodIndex = fileName.LastIndexOf('.');
-					return fileName.Insert(periodIndex == -1 ? fileName.Length : periodIndex, uri.Query.TrimEnd('&'));
-				}
-				else {
-					return fileName;
-				}
-			}
-			
-			string fileName = Uri.TryCreate(url, UriKind.Absolute, out var uri) ? UriToFileName(uri) : url;
-			return DisallowedFileNameCharactersRegex().Replace(fileName, "_");
-		}
-	}
-	
-	private sealed class FileAlreadyExistsException : Exception {
-		public static FileAlreadyExistsException Instance { get; } = new ();
-	}
-}

app/Server/Download/DownloadLinkExtractor.cs

@@ -28,11 +28,7 @@ static class DownloadLinkExtractor {
 	}
 	
 	public static Data.Download FromAttachment(Attachment attachment) {
-		return FromAttachment(attachment.NormalizedUrl, attachment.DownloadUrl, attachment.Type, attachment.Size);
-	}
-	
-	public static Data.Download FromAttachment(string normalizedUrl, string downloadUrl, string? type, ulong size) {
-		return new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Pending, type, size);
+		return new Data.Download(attachment.NormalizedUrl, attachment.DownloadUrl, DownloadStatus.Pending, attachment.Type, attachment.Size);
 	}
 	
 	public static async Task<Data.Download?> TryFromEmbedJson(Stream jsonStream) {

app/Utils/Tasks/CancellableTask.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace DHT.Utils.Tasks;
-
-public sealed class CancellableTask : IDisposable {
-	public static CancellableTask Run(Func<CancellationToken, Task> action) {
-		return new CancellableTask(action);
-	}
-	
-	public Task Task { get; }
-	
-	private readonly CancellationTokenSource cancellationTokenSource = new ();
-	
-	private CancellableTask(Func<CancellationToken, Task> action) {
-		CancellationToken cancellationToken = cancellationTokenSource.Token;
-		Task = Task.Run(() => action(cancellationToken));
-	}
-	
-	public void Cancel() {
-		cancellationTokenSource.Cancel();
-	}
-	
-	public void Dispose() {
-		cancellationTokenSource.Dispose();
-	}
-}

app/Utils/Tasks/DelayedThrottledTask.cs

@@ -55,10 +55,7 @@ public sealed class DelayedThrottledTask<T> : IDisposable {
 	}
 	
 	public void Dispose() {
-		try {
-			cancellationTokenSource.Cancel();
-		} catch (ObjectDisposedException) {}
-		
 		taskChannel.Writer.Complete();
+		cancellationTokenSource.Cancel();
 	}
 }

app/Version.cs

@@ -8,5 +8,5 @@ using DHT.Utils;
 namespace DHT.Utils;
 
 static class Version {
-	public const string Tag = "46.0.0.0";
+	public const string Tag = "44.0.0.0";
 }

app/build.bat

@@ -0,0 +1,15 @@
+@echo off
+set list=win-x64 linux-x64 osx-x64
+
+rmdir /S /Q bin
+
+(for %%a in (%list%) do (
+  dotnet publish Desktop -c Release -r %%a -o ./bin/%%a --self-contained true
+  powershell "Compress-Archive -Path ./bin/%%a/* -DestinationPath ./bin/%%a.zip -CompressionLevel Optimal"
+))
+
+dotnet publish Desktop -c Release -o ./bin/portable -p:PublishSingleFile=false -p:PublishTrimmed=false --self-contained false
+powershell "Compress-Archive -Path ./bin/portable/* -DestinationPath ./bin/portable.zip -CompressionLevel Optimal"
+
+echo Done
+pause

app/build.sh

@@ -1,49 +1,25 @@
 #!/bin/bash
 set -e
 
-export TZ=UTC
-
 if [ ! -f "DiscordHistoryTracker.sln" ]; then
 	echo "Missing DiscordHistoryTracker.sln in working directory!"
 	exit 1
 fi
 
 makezip() {
-  BIN_PATH="$(pwd)/bin"
-
-  pushd "$BIN_PATH/$1"
-
-  find . -type d -exec chmod 755 {} \;
-  find . -type f -exec chmod 644 {} \;
-
-  chmod -f 755 DiscordHistoryTracker || true
-  chmod -f 755 DiscordHistoryTracker.exe || true
-
-  find . -type f | sort | zip -9 -X "$BIN_PATH/$1.zip" -@
-
+	pushd "./bin/$1"
+	zip -9 -r "../$1.zip" .
 	popd
 }
 
 rm -rf "./bin"
 
-dedicated_runtimes=(win-x64 linux-x64)
-skipped_portable_runtimes=(browser-wasm linux-mips64 linux-s390x linux-ppc64le)
+configurations=(win-x64 linux-x64 osx-x64)
 
-# Dedicated Runtimes
-
-for cfg in "${dedicated_runtimes[@]}"; do
+for cfg in ${configurations[@]}; do
 	dotnet publish Desktop -c Release -r "$cfg" -o "./bin/$cfg" --self-contained true
 	makezip "$cfg"
 done
 
-# Portable
-
 dotnet publish Desktop -c Release -o "./bin/portable" -p:PublishSingleFile=false -p:PublishTrimmed=false --self-contained false
-
-rm "./bin/portable/DiscordHistoryTracker"
-
-for runtime in "${skipped_portable_runtimes[@]}"; do
-  rm -rf "./bin/portable/runtimes/$runtime"
-done
-
 makezip "portable"

app/build.wsl.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-set -e
-
-export TZ=UTC
-
-if [ ! -f "DiscordHistoryTracker.sln" ]; then
-  echo "Missing DiscordHistoryTracker.sln in working directory!"
-  exit 1
-fi
-
-makezip() {
-  TMP_PATH="/tmp/dht-build"
-  BIN_PATH="$(pwd)/bin"
-
-  rm -rf "$TMP_PATH"
-  cp -r "$BIN_PATH/$1/" "$TMP_PATH"
-  pushd "$TMP_PATH"
-
-  find . -type d -exec chmod 755 {} \;
-  find . -type f -exec chmod 644 {} \;
-
-  chmod -f 755 DiscordHistoryTracker || true
-  chmod -f 755 DiscordHistoryTracker.exe || true
-
-  find . -type f | sort | zip -9 -X "$BIN_PATH/$1.zip" -@
-
-  popd
-  rm -rf "$TMP_PATH"
-}
-
-rm -rf "./bin"
-
-dedicated_runtimes=(win-x64 linux-x64)
-skipped_portable_runtimes=(browser-wasm linux-mips64 linux-s390x linux-ppc64le)
-
-# Dedicated Runtimes
-
-for cfg in "${dedicated_runtimes[@]}"; do
-  "/mnt/c/Program Files/dotnet/dotnet.exe" publish Desktop -c Release -r "$cfg" -o "./bin/$cfg" --self-contained true
-  makezip "$cfg"
-done
-
-# Portable
-
-"/mnt/c/Program Files/dotnet/dotnet.exe" publish Desktop -c Release -o "./bin/portable" -p:PublishSingleFile=false -p:PublishTrimmed=false --self-contained false
-
-rm "./bin/portable/DiscordHistoryTracker.exe"
-
-for runtime in "${skipped_portable_runtimes[@]}"; do
-  rm -rf "./bin/portable/runtimes/$runtime"
-done
-
-makezip "portable"

app/global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "9.0.0",
+        "version": "8.0.0",
         "rollForward": "latestMinor"
     }
 }