Release v41.1

Closes #249

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

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

app/Desktop/Arguments.cs

@@ -1,29 +1,30 @@
 using System;
+using System.Collections.Generic;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop;
 
 sealed class Arguments {
 	private static readonly Log Log = Log.ForType<Arguments>();
-	
+
 	private const int FirstArgument = 1;
 
-	public static Arguments Empty => new(Array.Empty<string>());
+	public static Arguments Empty => new (Array.Empty<string>());
 
 	public bool Console { get; }
 	public string? DatabaseFile { get; }
 	public ushort? ServerPort { get; }
 	public string? ServerToken { get; }
 
-	public Arguments(string[] args) {
+	public Arguments(IReadOnlyList<string> args) {
-		for (int i = FirstArgument; i < args.Length; i++) {
+		for (int i = FirstArgument; i < args.Count; i++) {
 			string key = args[i];
 
 			switch (key) {
 				case "-debug":
 					Log.IsDebugEnabled = true;
 					continue;
-				
+
 				case "-console":
 					Console = true;
 					continue;
@@ -35,7 +36,7 @@ sealed class Arguments {
 				value = key;
 				key = "-db";
 			}
-			else if (i >= args.Length - 1) {
+			else if (i >= args.Count - 1) {
 				Log.Warn("Missing value for command line argument: " + key);
 				continue;
 			}

app/Desktop/Common/BytesValueConverter.cs

@@ -19,17 +19,17 @@ sealed class BytesValueConverter : IValueConverter {
 		}
 	}
 
-	private static readonly Unit[] Units = {
+	private static readonly Unit[] Units = [
-		new ("B", decimalPlaces: 0),
+		new Unit("B", decimalPlaces: 0),
-		new ("kB", decimalPlaces: 0),
+		new Unit("kB", decimalPlaces: 0),
-		new ("MB", decimalPlaces: 1),
+		new Unit("MB", decimalPlaces: 1),
-		new ("GB", decimalPlaces: 1),
+		new Unit("GB", decimalPlaces: 1),
-		new ("TB", decimalPlaces: 1)
+		new Unit("TB", decimalPlaces: 1)
-	};
+	];
 
 	private const int Scale = 1000;
 
-	private static string Convert(ulong size) {
+	public static string Convert(ulong size) {
 		int power = size == 0L ? 0 : (int) Math.Log(size, Scale);
 		int unit = power >= Units.Length ? Units.Length - 1 : power;
 		return Units[unit].Format(unit == 0 ? size : size / Math.Pow(Scale, unit));

app/Desktop/Common/DatabaseGui.cs

@@ -1,17 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
-using Avalonia.Threading;
 using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Server.Database.Exceptions;
 using DHT.Server.Database.Sqlite;
-using DHT.Server.Database.Sqlite.Utils;
+using DHT.Server.Database.Sqlite.Schema;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Common;
@@ -45,15 +43,10 @@ static class DatabaseGui {
 	}
 
 	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
-		var prevSynchronizationContext = SynchronizationContext.Current;
-		SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
-		var taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
-		SynchronizationContext.SetSynchronizationContext(prevSynchronizationContext);
-		
 		IDatabaseFile? file = null;
 
 		try {
-			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks, taskScheduler);
+			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks);
 		} catch (InvalidDatabaseVersionException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
 		} catch (DatabaseTooNewException ex) {

app/Desktop/Desktop.csproj

@@ -23,6 +23,7 @@
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
   </ItemGroup>
   
   <ItemGroup>
@@ -31,10 +32,6 @@
   
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
-    <Compile Update="Dialogs\TextBox\TextBoxDialog.axaml.cs">
-      <DependentUpon>CheckBoxDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   
   <ItemGroup>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -38,7 +38,7 @@
             <ItemsRepeater ItemsSource="{Binding Items}">
                 <ItemsRepeater.ItemTemplate>
                     <DataTemplate>
-                        <CheckBox IsChecked="{Binding Checked}">
+                        <CheckBox IsChecked="{Binding IsChecked}">
                             <Label>
                                 <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
                             </Label>

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -2,11 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using DHT.Utils.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-class CheckBoxDialogModel : BaseModel {
+class CheckBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 
 	private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
@@ -29,8 +29,8 @@ class CheckBoxDialogModel : BaseModel {
 
 	private bool pauseCheckEvents = false;
 
-	public bool AreAllSelected => Items.All(static item => item.Checked);
+	public bool AreAllSelected => Items.All(static item => item.IsChecked);
-	public bool AreNoneSelected => Items.All(static item => !item.Checked);
+	public bool AreNoneSelected => Items.All(static item => !item.IsChecked);
 
 	public void SelectAll() => SetAllChecked(true);
 	public void SelectNone() => SetAllChecked(false);
@@ -39,7 +39,7 @@ class CheckBoxDialogModel : BaseModel {
 		pauseCheckEvents = true;
 
 		foreach (var item in Items) {
-			item.Checked = isChecked;
+			item.IsChecked = isChecked;
 		}
 
 		pauseCheckEvents = false;
@@ -52,16 +52,16 @@ class CheckBoxDialogModel : BaseModel {
 	}
 
 	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.Checked)) {
+		if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.IsChecked)) {
 			UpdateBulkButtons();
 		}
 	}
 }
 
 sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
-	public new IReadOnlyList<CheckBoxItem<T>> Items { get; }
+	private new IReadOnlyList<CheckBoxItem<T>> Items { get; }
 
-	public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.Checked);
+	public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.IsChecked);
 
 	public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
 		this.Items = new List<CheckBoxItem<T>>(items);

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

@@ -1,17 +1,13 @@
-using DHT.Utils.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-class CheckBoxItem : BaseModel {
+partial class CheckBoxItem : ObservableObject {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
 
+	[ObservableProperty]
 	private bool isChecked = false;
-
-	public bool Checked {
-		get => isChecked;
-		set => Change(ref isChecked, value);
-	}
 }
 
 sealed class CheckBoxItem<T> : CheckBoxItem {

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -4,11 +4,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Threading;
 using DHT.Desktop.Common;
-using DHT.Utils.Models;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
-sealed class ProgressDialogModel : BaseModel {
+sealed class ProgressDialogModel {
 	public string Title { get; init; } = "";
 
 	public IReadOnlyList<ProgressItem> Items { get; } = Array.Empty<ProgressItem>();

app/Desktop/Dialogs/Progress/ProgressItem.cs

@@ -1,18 +1,12 @@
-using DHT.Utils.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
-sealed class ProgressItem : BaseModel {
+sealed partial class ProgressItem : ObservableObject {
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(Opacity))]
 	private bool isVisible = false;
 
-	public bool IsVisible {
-		get => isVisible;
-		private set {
-			Change(ref isVisible, value);
-			OnPropertyChanged(nameof(Opacity));
-		}
-	}
-	
 	public double Opacity => IsVisible ? 1.0 : 0.0;
 
 	private string message = "";
@@ -20,29 +14,17 @@ sealed class ProgressItem : BaseModel {
 	public string Message {
 		get => message;
 		set {
-			Change(ref message, value);
+			SetProperty(ref message, value);
 			IsVisible = !string.IsNullOrEmpty(value);
 		}
 	}
 
+	[ObservableProperty]
 	private string items = "";
 
-	public string Items {
+	[ObservableProperty]
-		get => items;
-		set => Change(ref items, value);
-	}
-
 	private int progress = 0;
 
-	public int Progress {
+	[ObservableProperty]
-		get => progress;
-		set => Change(ref progress, value);
-	}
-	
 	private bool isIndeterminate;
-
-	public bool IsIndeterminate {
-		get => isIndeterminate;
-		set => Change(ref isIndeterminate, value);
-	}
 }

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -2,11 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using DHT.Utils.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace DHT.Desktop.Dialogs.TextBox;
 
-class TextBoxDialogModel : BaseModel {
+class TextBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
 
@@ -36,7 +36,7 @@ class TextBoxDialogModel : BaseModel {
 }
 
 sealed class TextBoxDialogModel<T> : TextBoxDialogModel {
-	public new IReadOnlyList<TextBoxItem<T>> Items { get; }
+	private new IReadOnlyList<TextBoxItem<T>> Items { get; }
 
 	public IEnumerable<TextBoxItem<T>> ValidItems => Items.Where(static item => item.IsValid);
 

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

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

app/Desktop/Discord/DiscordAppSettings.cs

@@ -39,7 +39,7 @@ static class DiscordAppSettings {
 
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
-			var settingsJson = await ReadSettingsJson().ConfigureAwait(false);
+			var settingsJson = await ReadSettingsJson();
 			return AreDevToolsEnabled(settingsJson);
 		} catch (Exception e) {
 			Log.Error("Cannot read settings file.");

app/Desktop/Discord/DiscordAppSettingsJsonContext.cs

@@ -5,4 +5,4 @@ namespace DHT.Desktop.Discord;
 
 [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, WriteIndented = true)]
 [JsonSerializable(typeof(JsonObject))]
-sealed partial class DiscordAppSettingsJsonContext : JsonSerializerContext {}
+sealed partial class DiscordAppSettingsJsonContext : JsonSerializerContext;

app/Desktop/Main/Controls/AttachmentFilterPanelModel.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

@@ -4,11 +4,11 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d"
-             x:Class="DHT.Desktop.Main.Controls.AttachmentFilterPanel"
+             x:Class="DHT.Desktop.Main.Controls.DownloadItemFilterPanel"
-             x:DataType="controls:AttachmentFilterPanelModel">
+             x:DataType="controls:DownloadItemFilterPanelModel">
 
     <Design.DataContext>
-        <controls:AttachmentFilterPanelModel />
+        <controls:DownloadItemFilterPanelModel />
     </Design.DataContext>
 
     <UserControl.Styles>

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

@@ -4,8 +4,8 @@ using Avalonia.Controls;
 namespace DHT.Desktop.Main.Controls;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class AttachmentFilterPanel : UserControl {
+public sealed partial class DownloadItemFilterPanel : UserControl {
-	public AttachmentFilterPanel() {
+	public DownloadItemFilterPanel() {
 		InitializeComponent();
 	}
 }

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Desktop.Common;
+using DHT.Server;
+using DHT.Server.Data.Filters;
+using DHT.Utils.Tasks;
+
+namespace DHT.Desktop.Main.Controls;
+
+sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposable {
+	public sealed record Unit(string Name, uint Scale);
+
+	private static readonly Unit[] AllUnits = [
+		new Unit("B", 1),
+		new Unit("kB", 1024),
+		new Unit("MB", 1024 * 1024)
+	];
+
+	private static readonly HashSet<string> FilterProperties = [
+		nameof(LimitSize),
+		nameof(MaximumSize),
+		nameof(MaximumSizeUnit)
+	];
+
+	public string FilterStatisticsText { get; private set; } = "";
+
+	[ObservableProperty]
+	private bool limitSize = false;
+	
+	[ObservableProperty]
+	private ulong maximumSize = 0L;
+	
+	[ObservableProperty]
+	private Unit maximumSizeUnit = AllUnits[0];
+
+	public IEnumerable<Unit> Units => AllUnits;
+
+	private readonly State state;
+	private readonly string verb;
+
+	private readonly RestartableTask<long> downloadItemCountTask;
+	private long? matchingItemCount;
+	
+	private readonly IDisposable downloadItemCountSubscription;
+	private long? totalItemCount;
+
+	[Obsolete("Designer")]
+	public DownloadItemFilterPanelModel() : this(State.Dummy) {}
+
+	public DownloadItemFilterPanelModel(State state, string verb = "Matches") {
+		this.state = state;
+		this.verb = verb;
+
+		this.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
+		this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
+
+		UpdateFilterStatistics();
+
+		PropertyChanged += OnPropertyChanged;
+	}
+
+	public void Dispose() {
+		downloadItemCountTask.Cancel();
+		downloadItemCountSubscription.Dispose();
+	}
+
+	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
+			UpdateFilterStatistics();
+		}
+	}
+	
+	private void OnDownloadItemCountChanged(long newItemCount) {
+		totalItemCount = newItemCount;
+		UpdateFilterStatistics();
+	}
+	
+
+	private void UpdateFilterStatistics() {
+		var filter = CreateFilter();
+		if (filter.IsEmpty) {
+			downloadItemCountTask.Cancel();
+			matchingItemCount = totalItemCount;
+			UpdateFilterStatisticsText();
+		}
+		else {
+			matchingItemCount = null;
+			UpdateFilterStatisticsText();
+			downloadItemCountTask.Restart(cancellationToken => state.Db.Downloads.Count(filter, cancellationToken));
+		}
+	}
+
+	private void SetMatchingCount(long matchingAttachmentCount) {
+		this.matchingItemCount = matchingAttachmentCount;
+		UpdateFilterStatisticsText();
+	}
+
+	private void UpdateFilterStatisticsText() {
+		var matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
+		var totalItemCountStr = totalItemCount?.Format() ?? "(...)";
+
+		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
+		OnPropertyChanged(nameof(FilterStatisticsText));
+	}
+
+	public DownloadItemFilter CreateFilter() {
+		DownloadItemFilter filter = new ();
+
+		if (LimitSize) {
+			try {
+				filter.MaxBytes = maximumSize * maximumSizeUnit.Scale;
+			} catch (ArithmeticException) {
+				// set no size limit, because the overflown size is larger than any file could possibly be
+			}
+		}
+
+		return filter;
+	}
+}

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -2,9 +2,12 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.CheckBox;
 using DHT.Desktop.Dialogs.Message;
@@ -12,13 +15,11 @@ using DHT.Desktop.Dialogs.Progress;
 using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
-using DHT.Server.Database;
-using DHT.Utils.Models;
 using DHT.Utils.Tasks;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed class MessageFilterPanelModel : BaseModel, IDisposable {
+sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 	private static readonly HashSet<string> FilterProperties = [
 		nameof(FilterByDate),
 		nameof(StartDate),
@@ -35,70 +36,48 @@ sealed class MessageFilterPanelModel : BaseModel, IDisposable {
 
 	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
 
+	[ObservableProperty]
 	private bool filterByDate = false;
+
+	[ObservableProperty]
 	private DateTime? startDate = null;
+
+	[ObservableProperty]
 	private DateTime? endDate = null;
+
+	[ObservableProperty]
 	private bool filterByChannel = false;
+
+	[ObservableProperty]
 	private HashSet<ulong>? includedChannels = null;
+
+	[ObservableProperty]
 	private bool filterByUser = false;
+
+	[ObservableProperty]
 	private HashSet<ulong>? includedUsers = null;
 
-	public bool FilterByDate {
+	[ObservableProperty]
-		get => filterByDate;
-		set => Change(ref filterByDate, value);
-	}
-
-	public DateTime? StartDate {
-		get => startDate;
-		set => Change(ref startDate, value);
-	}
-
-	public DateTime? EndDate {
-		get => endDate;
-		set => Change(ref endDate, value);
-	}
-
-	public bool FilterByChannel {
-		get => filterByChannel;
-		set => Change(ref filterByChannel, value);
-	}
-
-	public HashSet<ulong>? IncludedChannels {
-		get => includedChannels;
-		set => Change(ref includedChannels, value);
-	}
-
-	public bool FilterByUser {
-		get => filterByUser;
-		set => Change(ref filterByUser, value);
-	}
-
-	public HashSet<ulong>? IncludedUsers {
-		get => includedUsers;
-		set => Change(ref includedUsers, value);
-	}
-
 	private string channelFilterLabel = "";
 
-	public string ChannelFilterLabel {
+	[ObservableProperty]
-		get => channelFilterLabel;
-		set => Change(ref channelFilterLabel, value);
-	}
-
 	private string userFilterLabel = "";
 
-	public string UserFilterLabel {
-		get => userFilterLabel;
-		set => Change(ref userFilterLabel, value);
-	}
-
 	private readonly Window window;
 	private readonly State state;
 	private readonly string verb;
 
 	private readonly RestartableTask<long> exportedMessageCountTask;
 	private long? exportedMessageCount;
+	
+	private readonly IDisposable messageCountSubscription;
 	private long? totalMessageCount;
+	
+	private readonly IDisposable channelCountSubscription;
+	private long? totalChannelCount;
+	
+	private readonly IDisposable userCountSubscription;
+	private long? totalUserCount;
 
 	[Obsolete("Designer")]
 	public MessageFilterPanelModel() : this(null!, State.Dummy) {}
@@ -109,18 +88,24 @@ sealed class MessageFilterPanelModel : BaseModel, IDisposable {
 		this.verb = verb;
 
 		this.exportedMessageCountTask = new RestartableTask<long>(SetExportedMessageCount, TaskScheduler.FromCurrentSynchronizationContext());
+		
+		this.messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnMessageCountChanged);
+		this.channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnChannelCountChanged);
+		this.userCountSubscription = state.Db.Users.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnUserCountChanged);
 
 		UpdateFilterStatistics();
 		UpdateChannelFilterLabel();
 		UpdateUserFilterLabel();
-
+		
 		PropertyChanged += OnPropertyChanged;
-		state.Db.Statistics.PropertyChanged += OnDbStatisticsChanged;
 	}
 
 	public void Dispose() {
 		exportedMessageCountTask.Cancel();
-		state.Db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
+		
+		messageCountSubscription.Dispose();
+		channelCountSubscription.Dispose();
+		userCountSubscription.Dispose();
 	}
 
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
@@ -137,29 +122,41 @@ sealed class MessageFilterPanelModel : BaseModel, IDisposable {
 		}
 	}
 
-	private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+	private void OnMessageCountChanged(long newMessageCount) {
-		if (e.PropertyName == nameof(DatabaseStatistics.TotalMessages)) {
+		totalMessageCount = newMessageCount;
-			totalMessageCount = state.Db.Statistics.TotalMessages;
+		UpdateFilterStatistics();
-			UpdateFilterStatistics();
+	}
-		}
+
-		else if (e.PropertyName == nameof(DatabaseStatistics.TotalChannels)) {
+	private void OnChannelCountChanged(long newChannelCount) {
-			UpdateChannelFilterLabel();
+		totalChannelCount = newChannelCount;
-		}
+		UpdateChannelFilterLabel();
-		else if (e.PropertyName == nameof(DatabaseStatistics.TotalUsers)) {
+	}
-			UpdateUserFilterLabel();
+	
-		}
+	private void OnUserCountChanged(long newUserCount) {
+		totalUserCount = newUserCount;
+		UpdateUserFilterLabel();
 	}
 
 	private void UpdateChannelFilterLabel() {
-		long total = state.Db.Statistics.TotalChannels;
+		if (totalChannelCount.HasValue) {
-		long included = FilterByChannel && IncludedChannels != null ? IncludedChannels.Count : total;
+			long total = totalChannelCount.Value;
-		ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+			long included = FilterByChannel && IncludedChannels != null ? IncludedChannels.Count : total;
+			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+		}
+		else {
+			ChannelFilterLabel = "Loading...";
+		}
 	}
 
 	private void UpdateUserFilterLabel() {
-		long total = state.Db.Statistics.TotalUsers;
+		if (totalUserCount.HasValue) {
-		long included = FilterByUser && IncludedUsers != null ? IncludedUsers.Count : total;
+			long total = totalUserCount.Value;
-		UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
+			long included = FilterByUser && IncludedUsers != null ? IncludedUsers.Count : total;
+			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
+		}
+		else {
+			UserFilterLabel = "Loading...";
+		}
 	}
 
 	private void UpdateFilterStatistics() {
@@ -224,13 +221,13 @@ sealed class MessageFilterPanelModel : BaseModel, IDisposable {
 
 				items.Add(new CheckBoxItem<ulong>(channelId) {
 					Title = title,
-					Checked = IncludedChannels == null || IncludedChannels.Contains(channelId)
+					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId)
 				});
 			}
 
 			return items;
 		}
-		
+
 		const string Title = "Included Channels";
 
 		List<CheckBoxItem<ulong>> items;
@@ -257,7 +254,7 @@ sealed class MessageFilterPanelModel : BaseModel, IDisposable {
 
 				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
 					Title = discriminator == null ? name : name + " #" + discriminator,
-					Checked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
+					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
 				});
 			}
 
@@ -265,7 +262,7 @@ sealed class MessageFilterPanelModel : BaseModel, IDisposable {
 		}
 
 		const string Title = "Included Users";
-		
+
 		List<CheckBoxItem<ulong>> items;
 		try {
 			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -2,47 +2,31 @@ using System;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Service;
 using DHT.Utils.Logging;
-using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
+sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
 	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
 	
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
 	private string inputPort;
 
-	public string InputPort {
+	[ObservableProperty]
-		get => inputPort;
+	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
-		set {
-			Change(ref inputPort, value);
-			OnPropertyChanged(nameof(HasMadeChanges));
-		}
-	}
-
 	private string inputToken;
 
-	public string InputToken {
-		get => inputToken;
-		set {
-			Change(ref inputToken, value);
-			OnPropertyChanged(nameof(HasMadeChanges));
-		}
-	}
-
 	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
 
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isToggleServerButtonEnabled = true;
 
-	public bool IsToggleServerButtonEnabled {
-		get => isToggleServerButtonEnabled;
-		set => Change(ref isToggleServerButtonEnabled, value);
-	}
-
 	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
 
 	private readonly Window window;

app/Desktop/Main/Controls/StatusBar.axaml

@@ -45,17 +45,17 @@
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Servers</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalServers, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding ServerCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Channels</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalChannels, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding ChannelCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Messages</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalMessages, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding MessageCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
     </StackPanel>
 

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -1,15 +1,25 @@
 using System;
+using System.Reactive.Linq;
+using Avalonia.ReactiveUI;
 using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Server;
-using DHT.Server.Database;
 using DHT.Server.Service;
-using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed class StatusBarModel : BaseModel, IDisposable {
+sealed partial class StatusBarModel : ObservableObject, IDisposable {
-	public DatabaseStatistics DatabaseStatistics { get; }
+	[ObservableProperty(Setter = Access.Private)]
+	private long? serverCount;
+	
+	[ObservableProperty(Setter = Access.Private)]
+	private long? channelCount;
+	
+	[ObservableProperty(Setter = Access.Private)]
+	private long? messageCount;
 
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(ServerStatusText))]
 	private ServerManager.Status serverStatus;
 
 	public string ServerStatusText => serverStatus switch {
@@ -21,26 +31,33 @@ sealed class StatusBarModel : BaseModel, IDisposable {
 	};
 
 	private readonly State state;
+	private readonly IDisposable serverCountSubscription;
+	private readonly IDisposable channelCountSubscription;
+	private readonly IDisposable messageCountSubscription;
 
 	[Obsolete("Designer")]
 	public StatusBarModel() : this(State.Dummy) {}
 
 	public StatusBarModel(State state) {
 		this.state = state;
-		this.DatabaseStatistics = state.Db.Statistics;
+		
+		serverCountSubscription = state.Db.Servers.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newServerCount => ServerCount = newServerCount);
+		channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newChannelCount => ChannelCount = newChannelCount);
+		messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(newMessageCount => MessageCount = newMessageCount);
 
 		state.Server.StatusChanged += OnServerStatusChanged;
 		serverStatus = state.Server.IsRunning ? ServerManager.Status.Started : ServerManager.Status.Stopped;
 	}
 
 	public void Dispose() {
+		serverCountSubscription.Dispose();
+		channelCountSubscription.Dispose();
+		messageCountSubscription.Dispose();
+		
 		state.Server.StatusChanged -= OnServerStatusChanged;
 	}
 
 	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
-		Dispatcher.UIThread.InvokeAsync(() => {
+		Dispatcher.UIThread.InvokeAsync(() => ServerStatus = e);
-			serverStatus = e;
-			OnPropertyChanged(nameof(ServerStatusText));
-		});
 	}
 }

app/Desktop/Main/MainWindow.axaml

@@ -8,7 +8,7 @@
         x:DataType="main:MainWindowModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="800" Height="500"
+        Width="820" Height="520"
         MinWidth="520" MinHeight="300"
         WindowStartupLocation="CenterScreen"
         Closing="OnClosing">

app/Desktop/Main/MainWindowModel.cs

@@ -3,24 +3,26 @@ 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 DHT.Utils.Models;
 
 namespace DHT.Desktop.Main;
 
-sealed class MainWindowModel : BaseModel, IAsyncDisposable {
+sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	private const string DefaultTitle = "Discord History Tracker";
 
 	private static readonly Log Log = Log.ForType<MainWindowModel>();
 
-	public string Title { get; private set; } = DefaultTitle;
+	[ObservableProperty(Setter = Access.Private)]
+	private string title = DefaultTitle;
 
-	public UserControl CurrentScreen { get; private set; }
+	[ObservableProperty(Setter = Access.Private)]
+	private UserControl currentScreen;
 
 	private readonly WelcomeScreen welcomeScreen;
 	private readonly WelcomeScreenModel welcomeScreenModel;
@@ -41,7 +43,7 @@ sealed class MainWindowModel : BaseModel, IAsyncDisposable {
 		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
 
 		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
-		CurrentScreen = welcomeScreen;
+		currentScreen = welcomeScreen;
 
 		var dbFile = args.DatabaseFile;
 		if (!string.IsNullOrWhiteSpace(dbFile)) {
@@ -93,9 +95,6 @@ sealed class MainWindowModel : BaseModel, IAsyncDisposable {
 		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
 		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
 
-		OnPropertyChanged(nameof(Title));
-		OnPropertyChanged(nameof(CurrentScreen));
-
 		window.Focus();
 	}
 
@@ -112,9 +111,6 @@ sealed class MainWindowModel : BaseModel, IAsyncDisposable {
 		CurrentScreen = welcomeScreen;
 
 		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
-		
-		OnPropertyChanged(nameof(Title));
-		OnPropertyChanged(nameof(CurrentScreen));
 	}
 
 	private async Task DisposeState() {

app/Desktop/Main/Pages/AdvancedPageModel.cs

@@ -5,11 +5,10 @@ using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Server;
-using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed class AdvancedPageModel : BaseModel, IDisposable {
+sealed class AdvancedPageModel : IDisposable {
 	public ServerConfigurationPanelModel ServerConfigurationModel { get; }
 	
 	private readonly Window window;

app/Desktop/Main/Pages/AttachmentsPageModel.cs

@@ -1,249 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using Avalonia.ReactiveUI;
-using DHT.Desktop.Common;
-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.Database;
-using DHT.Utils.Logging;
-using DHT.Utils.Models;
-using DHT.Utils.Tasks;
-
-namespace DHT.Desktop.Main.Pages;
-
-sealed class AttachmentsPageModel : BaseModel, IDisposable {
-	private static readonly Log Log = Log.ForType<AttachmentsPageModel>();
-
-	private static readonly DownloadItemFilter EnqueuedItemFilter = new () {
-		IncludeStatuses = new HashSet<DownloadStatus> {
-			DownloadStatus.Enqueued,
-			DownloadStatus.Downloading
-		}
-	};
-
-	private bool isToggleDownloadButtonEnabled = true;
-
-	public bool IsToggleDownloadButtonEnabled {
-		get => isToggleDownloadButtonEnabled;
-		set => Change(ref isToggleDownloadButtonEnabled, value);
-	}
-
-	public string ToggleDownloadButtonText => IsDownloading ? "Stop Downloading" : "Start Downloading";
-
-	private bool isRetryingFailedDownloads = false;
-
-	public bool IsRetryingFailedDownloads {
-		get => isRetryingFailedDownloads;
-		set {
-			isRetryingFailedDownloads = value;
-			OnPropertyChanged(nameof(IsRetryFailedOnDownloadsButtonEnabled));
-		}
-	}
-
-	public bool IsRetryFailedOnDownloadsButtonEnabled => !IsRetryingFailedDownloads && HasFailedDownloads;
-
-	public string DownloadMessage { get; set; } = "";
-	public double DownloadProgress => totalItemsToDownloadCount is null or 0 ? 0.0 : 100.0 * doneItemsCount / totalItemsToDownloadCount.Value;
-
-	public AttachmentFilterPanelModel FilterModel { get; }
-
-	private readonly StatisticsRow statisticsEnqueued = new ("Enqueued");
-	private readonly StatisticsRow statisticsDownloaded = new ("Downloaded");
-	private readonly StatisticsRow statisticsFailed = new ("Failed");
-	private readonly StatisticsRow statisticsSkipped = new ("Skipped");
-
-	public List<StatisticsRow> StatisticsRows => [
-		statisticsEnqueued,
-		statisticsDownloaded,
-		statisticsFailed,
-		statisticsSkipped
-	];
-
-	public bool IsDownloading => state.Downloader.IsDownloading;
-	public bool HasFailedDownloads => statisticsFailed.Items > 0;
-
-	private readonly State state;
-	private readonly ThrottledTask<int> enqueueDownloadItemsTask;
-	private readonly ThrottledTask<DownloadStatusStatistics> downloadStatisticsTask;
-
-	private IDisposable? finishedItemsSubscription;
-	private int doneItemsCount;
-	private int totalEnqueuedItemCount;
-	private int? totalItemsToDownloadCount;
-
-	public AttachmentsPageModel() : this(State.Dummy) {}
-
-	public AttachmentsPageModel(State state) {
-		this.state = state;
-
-		FilterModel = new AttachmentFilterPanelModel(state);
-
-		enqueueDownloadItemsTask = new ThrottledTask<int>(OnItemsEnqueued, TaskScheduler.FromCurrentSynchronizationContext());
-		downloadStatisticsTask = new ThrottledTask<DownloadStatusStatistics>(UpdateStatistics, TaskScheduler.FromCurrentSynchronizationContext());
-		RecomputeDownloadStatistics();
-
-		state.Db.Statistics.PropertyChanged += OnDbStatisticsChanged;
-	}
-
-	public void Dispose() {
-		state.Db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
-		enqueueDownloadItemsTask.Dispose();
-		downloadStatisticsTask.Dispose();
-		finishedItemsSubscription?.Dispose();
-		FilterModel.Dispose();
-	}
-
-	private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
-		if (e.PropertyName == nameof(DatabaseStatistics.TotalAttachments)) {
-			if (IsDownloading) {
-				EnqueueDownloadItemsLater();
-			}
-			else {
-				RecomputeDownloadStatistics();
-			}
-		}
-		else if (e.PropertyName == nameof(DatabaseStatistics.TotalDownloads)) {
-			RecomputeDownloadStatistics();
-		}
-	}
-
-	private async Task EnqueueDownloadItems() {
-		OnItemsEnqueued(await state.Db.Downloads.EnqueueDownloadItems(CreateAttachmentFilter()));
-	}
-
-	private void EnqueueDownloadItemsLater() {
-		var filter = CreateAttachmentFilter();
-		enqueueDownloadItemsTask.Post(cancellationToken => state.Db.Downloads.EnqueueDownloadItems(filter, cancellationToken));
-	}
-
-	private void OnItemsEnqueued(int itemCount) {
-		totalEnqueuedItemCount += itemCount;
-		totalItemsToDownloadCount = totalEnqueuedItemCount;
-		UpdateDownloadMessage();
-		RecomputeDownloadStatistics();
-	}
-
-	private AttachmentFilter CreateAttachmentFilter() {
-		var filter = FilterModel.CreateFilter();
-		filter.DownloadItemRule = AttachmentFilter.DownloadItemRules.OnlyNotPresent;
-		return filter;
-	}
-
-	public async Task OnClickToggleDownload() {
-		IsToggleDownloadButtonEnabled = false;
-
-		if (IsDownloading) {
-			await state.Downloader.Stop();
-
-			finishedItemsSubscription?.Dispose();
-			finishedItemsSubscription = null;
-
-			RecomputeDownloadStatistics();
-
-			await state.Db.Downloads.RemoveDownloadItems(EnqueuedItemFilter, FilterRemovalMode.RemoveMatching);
-
-			doneItemsCount = 0;
-			totalEnqueuedItemCount = 0;
-			totalItemsToDownloadCount = null;
-			UpdateDownloadMessage();
-		}
-		else {
-			var finishedItems = await state.Downloader.Start();
-
-			finishedItemsSubscription = finishedItems.Select(static _ => true)
-			                                         .Buffer(TimeSpan.FromMilliseconds(100))
-			                                         .Select(static items => items.Count)
-			                                         .Where(static items => items > 0)
-			                                         .ObserveOn(AvaloniaScheduler.Instance)
-			                                         .Subscribe(OnItemsFinished);
-
-			await EnqueueDownloadItems();
-		}
-
-		OnPropertyChanged(nameof(ToggleDownloadButtonText));
-		OnPropertyChanged(nameof(IsDownloading));
-		IsToggleDownloadButtonEnabled = true;
-	}
-
-	private void OnItemsFinished(int finishedItemCount) {
-		doneItemsCount += finishedItemCount;
-		UpdateDownloadMessage();
-		RecomputeDownloadStatistics();
-	}
-
-	public async Task OnClickRetryFailedDownloads() {
-		IsRetryingFailedDownloads = true;
-
-		try {
-			var allExceptFailedFilter = new DownloadItemFilter {
-				IncludeStatuses = new HashSet<DownloadStatus> {
-					DownloadStatus.Enqueued,
-					DownloadStatus.Downloading,
-					DownloadStatus.Success
-				}
-			};
-
-			await state.Db.Downloads.RemoveDownloadItems(allExceptFailedFilter, FilterRemovalMode.KeepMatching);
-
-			if (IsDownloading) {
-				await EnqueueDownloadItems();
-			}
-		} catch (Exception e) {
-			Log.Error(e);
-		} finally {
-			IsRetryingFailedDownloads = false;
-		}
-	}
-
-	private void RecomputeDownloadStatistics() {
-		downloadStatisticsTask.Post(state.Db.Downloads.GetStatistics);
-	}
-
-	private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
-		var hadFailedDownloads = HasFailedDownloads;
-
-		statisticsEnqueued.Items = statusStatistics.EnqueuedCount;
-		statisticsEnqueued.Size = statusStatistics.EnqueuedSize;
-
-		statisticsDownloaded.Items = statusStatistics.SuccessfulCount;
-		statisticsDownloaded.Size = statusStatistics.SuccessfulSize;
-
-		statisticsFailed.Items = statusStatistics.FailedCount;
-		statisticsFailed.Size = statusStatistics.FailedSize;
-
-		statisticsSkipped.Items = statusStatistics.SkippedCount;
-		statisticsSkipped.Size = statusStatistics.SkippedSize;
-
-		OnPropertyChanged(nameof(StatisticsRows));
-
-		if (hadFailedDownloads != HasFailedDownloads) {
-			OnPropertyChanged(nameof(HasFailedDownloads));
-			OnPropertyChanged(nameof(IsRetryFailedOnDownloadsButtonEnabled));
-		}
-
-		UpdateDownloadMessage();
-	}
-
-	private void UpdateDownloadMessage() {
-		DownloadMessage = IsDownloading ? doneItemsCount.Format() + " / " + (totalItemsToDownloadCount?.Format() ?? "?") : "";
-
-		OnPropertyChanged(nameof(DownloadMessage));
-		OnPropertyChanged(nameof(DownloadProgress));
-	}
-
-	public sealed class StatisticsRow {
-		public string State { get; }
-		public int Items { get; set; }
-		public ulong? Size { get; set; }
-
-		public StatisticsRow(string state) {
-			State = state;
-		}
-	}
-}

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -18,13 +18,12 @@ using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Server.Database.Import;
-using DHT.Server.Database.Sqlite.Utils;
+using DHT.Server.Database.Sqlite.Schema;
 using DHT.Utils.Logging;
-using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed class DatabasePageModel : BaseModel {
+sealed class DatabasePageModel {
 	private static readonly Log Log = Log.ForType<DatabasePageModel>();
 
 	public IDatabaseFile Db { get; }
@@ -81,7 +80,7 @@ sealed class DatabasePageModel : BaseModel {
 
 	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
 		var schemaUpgradeCallbacks = new SchemaUpgradeCallbacks(dialog, paths.Length);
-		
+
 		await PerformImport(target, paths, dialog, callback, "Database Merge", "Database Error", "database file", async path => {
 			IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, schemaUpgradeCallbacks);
 
@@ -93,7 +92,7 @@ sealed class DatabasePageModel : BaseModel {
 				await target.AddFrom(db);
 				return true;
 			} finally {
-				db.Dispose();
+				await db.DisposeAsync();
 			}
 		});
 	}
@@ -102,7 +101,7 @@ sealed class DatabasePageModel : BaseModel {
 		private readonly ProgressDialog dialog;
 		private readonly int total;
 		private bool? decision;
-		
+
 		public SchemaUpgradeCallbacks(ProgressDialog dialog, int total) {
 			this.total = total;
 			this.dialog = dialog;
@@ -150,7 +149,7 @@ sealed class DatabasePageModel : BaseModel {
 
 		await PerformImport(target, paths, dialog, callback, "Legacy Archive Import", "Legacy Archive Error", "archive file", async path => {
 			await using var jsonStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
-				
+
 			return await LegacyArchiveImport.Read(jsonStream, target, fakeSnowflake, async servers => {
 				SynchronizationContext? prevSyncContext = SynchronizationContext.Current;
 				SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
@@ -165,7 +164,7 @@ sealed class DatabasePageModel : BaseModel {
 		static bool IsValidSnowflake(string value) {
 			return string.IsNullOrEmpty(value) || ulong.TryParse(value, out _);
 		}
-			
+
 		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
 
 		foreach (var server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
@@ -194,7 +193,7 @@ sealed class DatabasePageModel : BaseModel {
 
 	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
 		int total = paths.Length;
-		var oldStatistics = await target.SnapshotStatistics();
+		var oldStatistics = await DatabaseStatistics.Take(target);
 
 		int successful = 0;
 		int finished = 0;
@@ -225,15 +224,26 @@ sealed class DatabasePageModel : BaseModel {
 			return;
 		}
 
-		var newStatistics = await target.SnapshotStatistics();
+		var newStatistics = await DatabaseStatistics.Take(target);
 		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
 	}
 
-	private static string GetImportDialogMessage(DatabaseStatisticsSnapshot oldStatistics, DatabaseStatisticsSnapshot newStatistics, int successfulItems, int totalItems, string itemName) {
+	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
-		long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
+		public static async Task<DatabaseStatistics> Take(IDatabaseFile db) {
-		long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
+			return new DatabaseStatistics(
-		long newUsers = newStatistics.TotalUsers - oldStatistics.TotalUsers;
+				await db.Servers.Count(),
-		long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
+				await db.Channels.Count(),
+				await db.Users.Count(),
+				await db.Messages.Count()
+			);
+		}
+	}
+
+	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
+		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
+		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
+		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
+		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
 
 		StringBuilder message = new StringBuilder();
 		message.Append("Processed ");

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -9,10 +9,9 @@ using DHT.Desktop.Dialogs.Progress;
 using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Service;
-using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Pages {
-	sealed class DebugPageModel : BaseModel {
+	sealed class DebugPageModel {
 		public string GenerateChannels { get; set; } = "0";
 		public string GenerateUsers { get; set; } = "0";
 		public string GenerateMessages { get; set; } = "0";
@@ -129,7 +128,7 @@ namespace DHT.Desktop.Main.Pages {
 			return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
 		}
 
-		private static readonly string[] RandomWords = {
+		private static readonly string[] RandomWords = [
 			"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
 			"banana", "bean", "beechnut", "beet", "blackberry", "blackcurrant", "blueberry", "boysenberry", "bramble", "broccoli",
 			"cabbage", "cacao", "cantaloupe", "caper", "carambola", "carrot", "cauliflower", "celery", "chard", "cherry", "chokeberry", "citron", "clementine", "coconut", "corn", "crabapple", "cranberry", "cucumber", "currant",
@@ -152,8 +151,8 @@ namespace DHT.Desktop.Main.Pages {
 			"vanilla",
 			"watercress", "watermelon",
 			"yam",
-			"zucchini",
+			"zucchini"
-		};
+		];
 
 		private static string RandomText(Random rand, int maxWords) {
 			int wordCount = 1 + (int) Math.Floor(maxWords * Math.Pow(rand.NextDouble(), 3));
@@ -162,10 +161,8 @@ namespace DHT.Desktop.Main.Pages {
 	}
 }
 #else
-using DHT.Utils.Models;
-
 namespace DHT.Desktop.Main.Pages {
-	sealed class DebugPageModel : BaseModel {
+	sealed class DebugPageModel {
 		public string GenerateChannels { get; set; } = "0";
 		public string GenerateUsers { get; set; } = "0";
 		public string GenerateMessages { get; set; } = "0";

app/Desktop/Main/Pages/DownloadsPage.axaml

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

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

@@ -4,8 +4,8 @@ using Avalonia.Controls;
 namespace DHT.Desktop.Main.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-public sealed partial class AttachmentsPage : UserControl {
+public sealed partial class DownloadsPage : UserControl {
-	public AttachmentsPage() {
+	public DownloadsPage() {
 		InitializeComponent();
 	}
 }

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -0,0 +1,186 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using Avalonia.ReactiveUI;
+using CommunityToolkit.Mvvm.ComponentModel;
+using DHT.Desktop.Common;
+using DHT.Desktop.Main.Controls;
+using DHT.Server;
+using DHT.Server.Data.Aggregations;
+using DHT.Server.Data.Filters;
+using DHT.Server.Download;
+using DHT.Utils.Logging;
+using DHT.Utils.Tasks;
+
+namespace DHT.Desktop.Main.Pages;
+
+sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
+	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
+
+	[ObservableProperty(Setter = Access.Private)]
+	private bool isToggleDownloadButtonEnabled = true;
+
+	public string ToggleDownloadButtonText => IsDownloading ? "Stop Downloading" : "Start Downloading";
+
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
+	private bool isRetryingFailedDownloads = false;
+
+	[ObservableProperty(Setter = Access.Private)]
+	[NotifyPropertyChangedFor(nameof(IsRetryFailedOnDownloadsButtonEnabled))]
+	private bool hasFailedDownloads;
+
+	public bool IsRetryFailedOnDownloadsButtonEnabled => !IsRetryingFailedDownloads && HasFailedDownloads;
+
+	[ObservableProperty(Setter = Access.Private)]
+	private string downloadMessage = "";
+
+	public DownloadItemFilterPanelModel FilterModel { get; }
+
+	private readonly StatisticsRow statisticsPending = new ("Pending");
+	private readonly StatisticsRow statisticsDownloaded = new ("Downloaded");
+	private readonly StatisticsRow statisticsFailed = new ("Failed");
+	private readonly StatisticsRow statisticsSkipped = new ("Skipped");
+
+	public ObservableCollection<StatisticsRow> StatisticsRows { get; }
+
+	public bool IsDownloading => state.Downloader.IsDownloading;
+
+	private readonly State state;
+	private readonly ThrottledTask<DownloadStatusStatistics> downloadStatisticsTask;
+	private readonly IDisposable downloadItemCountSubscription;
+	
+	private IDisposable? finishedItemsSubscription;
+	private DownloadItemFilter? currentDownloadFilter;
+
+	public DownloadsPageModel() : this(State.Dummy) {}
+
+	public DownloadsPageModel(State state) {
+		this.state = state;
+
+		FilterModel = new DownloadItemFilterPanelModel(state);
+		
+		StatisticsRows = [
+			statisticsPending,
+			statisticsDownloaded,
+			statisticsFailed,
+			statisticsSkipped
+		];
+
+		downloadStatisticsTask = new ThrottledTask<DownloadStatusStatistics>(Log, UpdateStatistics, TaskScheduler.FromCurrentSynchronizationContext());
+		downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadCountChanged);
+
+		RecomputeDownloadStatistics();
+	}
+
+	public void Dispose() {
+		finishedItemsSubscription?.Dispose();
+		
+		downloadItemCountSubscription.Dispose();
+		downloadStatisticsTask.Dispose();
+
+		FilterModel.Dispose();
+	}
+
+	private void OnDownloadCountChanged(long newDownloadCount) {
+		RecomputeDownloadStatistics();
+	}
+
+	public async Task OnClickToggleDownload() {
+		IsToggleDownloadButtonEnabled = false;
+
+		if (IsDownloading) {
+			await state.Downloader.Stop();
+			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+
+			finishedItemsSubscription?.Dispose();
+			finishedItemsSubscription = null;
+			
+			currentDownloadFilter = null;
+		}
+		else {
+			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+			
+			var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
+			finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
+		}
+
+		RecomputeDownloadStatistics();
+
+		OnPropertyChanged(nameof(ToggleDownloadButtonText));
+		OnPropertyChanged(nameof(IsDownloading));
+		IsToggleDownloadButtonEnabled = true;
+	}
+
+	private void OnItemFinished(DownloadItem item) {
+		RecomputeDownloadStatistics();
+	}
+
+	public async Task OnClickRetryFailedDownloads() {
+		IsRetryingFailedDownloads = true;
+
+		try {
+			await state.Db.Downloads.RetryFailed();
+			RecomputeDownloadStatistics();
+		} catch (Exception e) {
+			Log.Error(e);
+		} finally {
+			IsRetryingFailedDownloads = false;
+		}
+	}
+
+	private void RecomputeDownloadStatistics() {
+		downloadStatisticsTask.Post(cancellationToken => state.Db.Downloads.GetStatistics(currentDownloadFilter ?? new DownloadItemFilter(), cancellationToken));
+	}
+
+	private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
+		statisticsPending.Items = statusStatistics.PendingCount;
+		statisticsPending.Size = statusStatistics.PendingTotalSize;
+		statisticsPending.HasFilesWithUnknownSize = statusStatistics.PendingWithUnknownSizeCount > 0;
+
+		statisticsDownloaded.Items = statusStatistics.SuccessfulCount;
+		statisticsDownloaded.Size = statusStatistics.SuccessfulTotalSize;
+		statisticsDownloaded.HasFilesWithUnknownSize = statusStatistics.SuccessfulWithUnknownSizeCount > 0;
+
+		statisticsFailed.Items = statusStatistics.FailedCount;
+		statisticsFailed.Size = statusStatistics.FailedTotalSize;
+		statisticsFailed.HasFilesWithUnknownSize = statusStatistics.FailedWithUnknownSizeCount > 0;
+		
+		statisticsSkipped.Items = statusStatistics.SkippedCount;
+		statisticsSkipped.Size = statusStatistics.SkippedTotalSize;
+		statisticsSkipped.HasFilesWithUnknownSize = statusStatistics.SkippedWithUnknownSizeCount > 0;
+
+		HasFailedDownloads = statusStatistics.FailedCount > 0;
+	}
+
+	[ObservableObject]
+	public sealed partial class StatisticsRow(string state) {
+		public string State { get; } = state;
+
+		[ObservableProperty]
+		private int items;
+
+		[ObservableProperty]
+		[NotifyPropertyChangedFor(nameof(SizeText))]
+		private ulong? size;
+		
+		[ObservableProperty]
+		[NotifyPropertyChangedFor(nameof(SizeText))]
+		private bool hasFilesWithUnknownSize;
+
+		public string SizeText {
+			get {
+				if (size == null) {
+					return "-";
+				}
+				else if (hasFilesWithUnknownSize) {
+					return "\u2265 " + BytesValueConverter.Convert(size.Value);
+				}
+				else {
+					return BytesValueConverter.Convert(size.Value);
+				}
+			}
+		}
+	}
+}

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -3,33 +3,25 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
-using DHT.Utils.Models;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed class TrackingPageModel : BaseModel {
+sealed partial class TrackingPageModel : ObservableObject {
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isCopyTrackingScriptButtonEnabled = true;
 
-	public bool IsCopyTrackingScriptButtonEnabled {
+	[ObservableProperty(Setter = Access.Private)]
-		get => isCopyTrackingScriptButtonEnabled;
+	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
-		set => Change(ref isCopyTrackingScriptButtonEnabled, value);
+	private bool? areDevToolsEnabled = null;
-	}
 
-	private bool? areDevToolsEnabled;
+	[ObservableProperty(Setter = Access.Private)]
-
+	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
-	private bool? AreDevToolsEnabled {
+	private bool isToggleAppDevToolsButtonEnabled = false;
-		get => areDevToolsEnabled;
-		set {
-			Change(ref areDevToolsEnabled, value);
-			OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
-		}
-	}
-
-	public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = false;
 
 	public string ToggleAppDevToolsButtonText {
 		get {
@@ -86,17 +78,15 @@ sealed class TrackingPageModel : BaseModel {
 	}
 
 	private async Task InitializeDevToolsToggle() {
-		bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
+		bool? devToolsEnabled = await Task.Run(DiscordAppSettings.AreDevToolsEnabled);
 
 		if (devToolsEnabled.HasValue) {
-			IsToggleAppDevToolsButtonEnabled = true;
 			AreDevToolsEnabled = devToolsEnabled.Value;
+			IsToggleAppDevToolsButtonEnabled = true;
 		}
 		else {
 			IsToggleAppDevToolsButtonEnabled = false;
 		}
-
-		OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
 	}
 
 	public async Task OnClickToggleAppDevTools() {

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
@@ -17,13 +18,11 @@ using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Data.Filters;
 using DHT.Server.Database.Export;
-using DHT.Server.Database.Export.Strategy;
-using DHT.Utils.Models;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed class ViewerPageModel : BaseModel, IDisposable {
+sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 	public static readonly ConcurrentBag<string> TemporaryFiles = [];
 
 	private static readonly FilePickerFileType[] ViewerFileTypes = [
@@ -33,13 +32,9 @@ sealed class ViewerPageModel : BaseModel, IDisposable {
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
+	[ObservableProperty]
 	private bool hasFilters = false;
 
-	public bool HasFilters {
-		get => hasFilters;
-		set => Change(ref hasFilters, value);
-	}
-
 	public MessageFilterPanelModel FilterModel { get; }
 
 	private readonly Window window;
@@ -67,12 +62,19 @@ sealed class ViewerPageModel : BaseModel, IDisposable {
 	public async void OnClickOpenViewer() {
 		try {
 			var fullPath = await PrepareTemporaryViewerFile();
-			var strategy = new LiveViewerExportStrategy(ServerConfiguration.Port, ServerConfiguration.Token);
+			
+			string jsConstants = $"""
+			                      window.DHT_SERVER_URL = "{HttpUtility.JavaScriptStringEncode("http://127.0.0.1:" + ServerConfiguration.Port)}";
+			                      window.DHT_SERVER_TOKEN = "{HttpUtility.JavaScriptStringEncode(ServerConfiguration.Token)}";
+			                      """;
 
-			await WriteViewerFile(fullPath, strategy);
+			await ProgressDialog.ShowIndeterminate(window, "Open Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(fullPath, jsConstants)));
-			Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
+			
+			Process.Start(new ProcessStartInfo(fullPath) {
+				UseShellExecute = true
+			});
 		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Open Viewer", "Could not save viewer: " + e.Message);
+			await Dialog.ShowOk(window, "Open Viewer", "Could not create or save viewer: " + e.Message);
 		}
 	}
 
@@ -110,17 +112,18 @@ sealed class ViewerPageModel : BaseModel, IDisposable {
 		}
 
 		try {
-			await WriteViewerFile(path, StandaloneViewerExportStrategy.Instance);
+			await ProgressDialog.ShowIndeterminate(window, "Save Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(path, string.Empty)));
 		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Save Viewer", "Could not save viewer: " + e.Message);
+			await Dialog.ShowOk(window, "Save Viewer", "Could not create or save viewer: " + e.Message);
 		}
 	}
 
-	private async Task WriteViewerFile(string path, IViewerExportStrategy strategy) {
+	private async Task WriteViewerFile(string path, string jsConstants) {
 		const string ArchiveTag = "/*[ARCHIVE]*/";
 
 		string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
-		string viewerTemplate = indexFile.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
+		string viewerTemplate = indexFile.Replace("/*[CONSTANTS]*/", jsConstants)
+		                                 .Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
 		                                 .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
 
 		int viewerArchiveTagStart = viewerTemplate.IndexOf(ArchiveTag);
@@ -129,7 +132,7 @@ sealed class ViewerPageModel : BaseModel, IDisposable {
 		string jsonTempFile = path + ".tmp";
 
 		await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
-			await ViewerJsonExport.Generate(jsonStream, strategy, state.Db, FilterModel.CreateFilter());
+			await ViewerJsonExport.Generate(jsonStream, state.Db, FilterModel.CreateFilter());
 
 			char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
 			jsonStream.Position = 0;

app/Desktop/Main/Screens/MainContentScreen.axaml

@@ -74,7 +74,7 @@
     <DockPanel>
         <Border Classes="statusBar" DockPanel.Dock="Bottom">
             <DockPanel>
-                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Attachments</TextBlock>
+                <TextBlock Classes="invisibleTabItem" DockPanel.Dock="Left">Downloads</TextBlock>
                 <controls:StatusBar DataContext="{Binding StatusBarModel}" DockPanel.Dock="Right" />
             </DockPanel>
         </Border>
@@ -94,9 +94,9 @@
                     <ContentPresenter Content="{Binding TrackingPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
-            <TabItem x:Name="TabAttachments" Header="Attachments" Grid.Row="2">
+            <TabItem x:Name="TabDownloads" Header="Downloads" Grid.Row="2">
                 <ScrollViewer>
-                    <ContentPresenter Content="{Binding AttachmentsPage}" Classes="page" />
+                    <ContentPresenter Content="{Binding DownloadsPage}" Classes="page" />
                 </ScrollViewer>
             </TabItem>
             <TabItem x:Name="TabViewer" Header="Viewer" Grid.Row="3">

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -13,8 +13,8 @@ sealed class MainContentScreenModel : IDisposable {
 	public TrackingPage TrackingPage { get; }
 	private TrackingPageModel TrackingPageModel { get; }
 
-	public AttachmentsPage AttachmentsPage { get; }
+	public DownloadsPage DownloadsPage { get; }
-	private AttachmentsPageModel AttachmentsPageModel { get; }
+	private DownloadsPageModel DownloadsPageModel { get; }
 
 	public ViewerPage ViewerPage { get; }
 	private ViewerPageModel ViewerPageModel { get; }
@@ -52,8 +52,8 @@ sealed class MainContentScreenModel : IDisposable {
 		TrackingPageModel = new TrackingPageModel(window);
 		TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
 
-		AttachmentsPageModel = new AttachmentsPageModel(state);
+		DownloadsPageModel = new DownloadsPageModel(state);
-		AttachmentsPage = new AttachmentsPage { DataContext = AttachmentsPageModel };
+		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
 
 		ViewerPageModel = new ViewerPageModel(window, state);
 		ViewerPage = new ViewerPage { DataContext = ViewerPageModel };
@@ -72,7 +72,7 @@ sealed class MainContentScreenModel : IDisposable {
 	}
 
 	public void Dispose() {
-		AttachmentsPageModel.Dispose();
+		DownloadsPageModel.Dispose();
 		ViewerPageModel.Dispose();
 		AdvancedPageModel.Dispose();
 		StatusBarModel.Dispose();

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -3,25 +3,21 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Server.Database;
-using DHT.Server.Database.Sqlite.Utils;
+using DHT.Server.Database.Sqlite.Schema;
-using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed class WelcomeScreenModel : BaseModel {
+sealed partial class WelcomeScreenModel : ObservableObject {
 	public string Version => Program.Version;
 	
+	[ObservableProperty(Setter = Access.Private)]
 	private bool isOpenOrCreateDatabaseButtonEnabled = true;
 	
-	public bool IsOpenOrCreateDatabaseButtonEnabled {
-		get => isOpenOrCreateDatabaseButtonEnabled;
-		set => Change(ref isOpenOrCreateDatabaseButtonEnabled, value);
-	}
-	
 	public event EventHandler<IDatabaseFile>? DatabaseSelected; 
 	
 	private readonly Window window;

app/NuGet.Config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="chylex's repository" value="https://nuget.chylex.com/feed/index.json" />
+  </packageSources>
+</configuration>

app/Resources/Tracker/scripts/state.js

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

app/Resources/Viewer/index.html

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

app/Resources/Viewer/scripts/discord.js

@@ -35,6 +35,23 @@ const DISCORD = (function() {
 	let templateReaction;
 	let templateReactionCustom;
 	
+	const fileUrlProcessor = function(serverUrl, serverToken) {
+		if (typeof serverUrl === "string" && typeof serverToken === "string") {
+			return url => serverUrl + "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
+		}
+		else {
+			return url => url;
+		}
+	}(
+		window["DHT_SERVER_URL"],
+		window["DHT_SERVER_TOKEN"]
+	);
+	
+	const getEmoji = function(name, id, extension) {
+		const tag = ":" + name + ":";
+		return "<img src='" + fileUrlProcessor("https://cdn.discordapp.com/emojis/" + id + "." + extension) + "' alt='" + tag + "' title='" + tag + "' class='emoji'>";
+	};
+	
 	const processMessageContents = function(contents) {
 		let processed = DOM.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
 		
@@ -54,29 +71,33 @@ const DISCORD = (function() {
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		
-		const animatedEmojiExtension = SETTINGS.enableAnimatedEmoji ? "gif" : "png";
+		const animatedEmojiExtension = SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
 		
 		// noinspection HtmlUnknownTarget
 		processed = processed
 			.replace(regex.formatUrl, "<a href='$1' target='_blank' rel='noreferrer'>$1</a>")
 			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + STATE.getChannelName(match) + "</span>")
 			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (STATE.getUserTag(match) || "????") + "'>@" + STATE.getUserName(match) + "</span>")
-			.replace(regex.customEmojiStatic, "<img src='https://cdn.discordapp.com/emojis/$2.png' alt=':$1:' title=':$1:' class='emoji'>")
+			.replace(regex.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
-			.replace(regex.customEmojiAnimated, "<img src='https://cdn.discordapp.com/emojis/$2." + animatedEmojiExtension + "' alt=':$1:' title=':$1:' class='emoji'>");
+			.replace(regex.customEmojiAnimated, (full, m1, m2) => getEmoji(m1, m2, animatedEmojiExtension));
 		
 		return "<p>" + processed + "</p>";
 	};
 	
+	const getAvatarUrlObject = function(avatar) {
+		return { url: fileUrlProcessor("https://cdn.discordapp.com/avatars/" + avatar.id + "/" + avatar.path + ".webp") };
+	};
+	
 	const getImageEmbed = function(url, image) {
 		if (!SETTINGS.enableImagePreviews) {
 			return "";
 		}
 		
 		if (image.width && image.height) {
-			return templateEmbedImageWithSize.apply({ url, src: image.url, width: image.width, height: image.height });
+			return templateEmbedImageWithSize.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url), width: image.width, height: image.height });
 		}
 		else {
-			return templateEmbedImage.apply({ url, src: image.url });
+			return templateEmbedImage.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url) });
 		}
 	};
 	
@@ -125,8 +146,9 @@ const DISCORD = (function() {
 				"</div>"
 			].join(""));
 			
+			// noinspection HtmlUnknownTarget
 			templateUserAvatar = new TEMPLATE([
-				"<img src='https://cdn.discordapp.com/avatars/{id}/{path}.webp?size=128' alt=''>"
+				"<img src='{url}' alt=''>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
@@ -167,8 +189,9 @@ const DISCORD = (function() {
 				"<span class='reaction-wrapper'><span class='reaction-emoji'>{n}</span><span class='count'>{c}</span></span>"
 			].join(""));
 			
+			// noinspection HtmlUnknownTarget
 			templateReactionCustom = new TEMPLATE([
-				"<span class='reaction-wrapper'><img src='https://cdn.discordapp.com/emojis/{id}.{ext}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
+				"<span class='reaction-wrapper'><img src='{url}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
 			].join(""));
 		},
 		
@@ -199,7 +222,7 @@ const DISCORD = (function() {
 		getMessageHTML(message) { // noinspection FunctionWithInconsistentReturnsJS
 			return (SETTINGS.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
 				if (property === "avatar") {
-					return value ? templateUserAvatar.apply(value) : "";
+					return value ? templateUserAvatar.apply(getAvatarUrlObject(value)) : "";
 				}
 				else if (property === "user.tag") {
 					return value ? value : "????";
@@ -220,10 +243,10 @@ const DISCORD = (function() {
 							return templateEmbedUnsupported.apply(embed);
 						}
 						else if ("image" in embed && embed.image.url) {
-							return getImageEmbed(embed.url, embed.image);
+							return getImageEmbed(fileUrlProcessor(embed.url), embed.image);
 						}
 						else if ("thumbnail" in embed && embed.thumbnail.url) {
-							return getImageEmbed(embed.url, embed.thumbnail);
+							return getImageEmbed(fileUrlProcessor(embed.url), embed.thumbnail);
 						}
 						else if ("title" in embed && "description" in embed) {
 							return templateEmbedRich.apply(embed);
@@ -242,14 +265,16 @@ const DISCORD = (function() {
 					}
 					
 					return value.map(attachment => {
+						const url = fileUrlProcessor(attachment.url);
+						
 						if (!DISCORD.isImageAttachment(attachment) || !SETTINGS.enableImagePreviews) {
-							return templateAttachmentDownload.apply(attachment);
+							return templateAttachmentDownload.apply({ url, name: attachment.name });
 						}
 						else if ("width" in attachment && "height" in attachment) {
-							return templateEmbedImageWithSize.apply({ url: attachment.url, src: attachment.url, width: attachment.width, height: attachment.height });
+							return templateEmbedImageWithSize.apply({ url, src: url, width: attachment.width, height: attachment.height });
 						}
 						else {
-							return templateEmbedImage.apply({ url: attachment.url, src: attachment.url });
+							return templateEmbedImage.apply({ url, src: url });
 						}
 					}).join("");
 				}
@@ -265,7 +290,7 @@ const DISCORD = (function() {
 					}
 					
 					const user = "<span class='reply-username' title='#" + (value.user.tag ? value.user.tag : "????") + "'>" + value.user.name + "</span>";
-					const avatar = SETTINGS.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(value.avatar) + "</span>" : "";
+					const avatar = SETTINGS.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
 					const contents = value.contents ? "<span class='reply-contents'>" + processMessageContents(value.contents) + "</span>" : "";
 					
 					return "<span class='jump' data-jump='" + value.id + "'>Jump to reply</span><span class='user'>" + avatar + user + "</span>" + contents;
@@ -277,9 +302,10 @@ const DISCORD = (function() {
 					
 					return "<div class='reactions'>" + value.map(reaction => {
 						if ("id" in reaction){
-							// noinspection JSUnusedGlobalSymbols, JSUnresolvedVariable
+							const ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
-							reaction.ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "png";
+							const url = fileUrlProcessor("https://cdn.discordapp.com/emojis/" + reaction.id + "." + ext);
-							return templateReactionCustom.apply(reaction);
+							// noinspection JSUnusedGlobalSymbols
+							return templateReactionCustom.apply({ url, n: reaction.n, c: reaction.c });
 						}
 						else {
 							return templateReaction.apply(reaction);

app/Server/Data/Aggregations/DownloadStatusStatistics.cs

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

app/Server/Data/Download.cs

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

app/Server/Data/DownloadStatus.cs

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

app/Server/Data/DownloadWithData.cs

@@ -0,0 +1,3 @@
+namespace DHT.Server.Data;
+
+public readonly record struct DownloadWithData(Download Download, byte[]? Data);

app/Server/Data/DownloadedAttachment.cs

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

app/Server/Data/Embeds/DiscordEmbedJson.cs

@@ -0,0 +1,17 @@
+namespace DHT.Server.Data.Embeds;
+
+sealed class DiscordEmbedJson {
+	public string? Type { get; set; }
+	public string? Url { get; set; }
+	
+	public JsonImage? Image { get; set; }
+	public JsonImage? Thumbnail { get; set; }
+	public JsonImage? Video { get; set; }
+
+	public sealed class JsonImage {
+		public string? Url { get; set; }
+		public string? ProxyUrl { get; set; }
+		public int? Width { get; set; }
+		public int? Height { get; set; }
+	}
+}

app/Server/Data/Embeds/DiscordEmbedJsonContext.cs

@@ -0,0 +1,7 @@
+using System.Text.Json.Serialization;
+
+namespace DHT.Server.Data.Embeds;
+
+[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.SnakeCaseLower, GenerationMode = JsonSourceGenerationMode.Default)]
+[JsonSerializable(typeof(DiscordEmbedJson))]
+sealed partial class DiscordEmbedJsonContext : JsonSerializerContext;

app/Server/Data/Filters/AttachmentFilter.cs

@@ -1,15 +0,0 @@
-namespace DHT.Server.Data.Filters;
-
-public sealed class AttachmentFilter {
-	public ulong? MaxBytes { get; set; } = null;
-
-	public DownloadItemRules? DownloadItemRule { get; set; } = null;
-
-	public bool IsEmpty => MaxBytes == null &&
-	                       DownloadItemRule == null;
-
-	public enum DownloadItemRules {
-		OnlyNotPresent,
-		OnlyPresent
-	}
-}

app/Server/Data/Filters/DownloadItemFilter.cs

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

app/Server/Database/DatabaseExtensions.cs

@@ -25,8 +25,8 @@ public static class DatabaseExtensions {
 		
 		await target.Messages.Add(batchedMessages);
 
-		await foreach (var download in source.Downloads.GetWithoutData()) {
+		await foreach (var download in source.Downloads.Get()) {
-			await target.Downloads.AddDownload(download.Status == DownloadStatus.Success ? await source.Downloads.HydrateWithData(download) : download);
+			await target.Downloads.AddDownload(await source.Downloads.HydrateWithData(download));
 		}
 	}
 }

app/Server/Database/DatabaseStatistics.cs

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

app/Server/Database/DatabaseStatisticsSnapshot.cs

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

app/Server/Database/DummyDatabaseFile.cs

@@ -9,7 +9,6 @@ sealed class DummyDatabaseFile : IDatabaseFile {
 	public static DummyDatabaseFile Instance { get; } = new ();
 
 	public string Path => "";
-	public DatabaseStatistics Statistics { get; } = new ();
 	
 	public IUserRepository Users { get; } = new IUserRepository.Dummy();
 	public IServerRepository Servers { get; } = new IServerRepository.Dummy();
@@ -19,13 +18,11 @@ sealed class DummyDatabaseFile : IDatabaseFile {
 	
 	private DummyDatabaseFile() {}
 
-	public Task<DatabaseStatisticsSnapshot> SnapshotStatistics() {
-		return Task.FromResult(new DatabaseStatisticsSnapshot());
-	}
-
 	public Task Vacuum() {
 		return Task.CompletedTask;
 	}
 
-	public void Dispose() {}
+	public ValueTask DisposeAsync() {
+		return ValueTask.CompletedTask;
+	}
 }

app/Server/Database/Exceptions/DatabaseTooNewException.cs

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

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

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

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

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

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

@@ -1,18 +0,0 @@
-using DHT.Server.Data;
-
-namespace DHT.Server.Database.Export.Strategy;
-
-public sealed class StandaloneViewerExportStrategy : IViewerExportStrategy {
-	public static StandaloneViewerExportStrategy Instance { get; } = new ();
-
-	private StandaloneViewerExportStrategy() {}
-
-	public string GetAttachmentUrl(Attachment attachment) {
-		// The normalized URL will not load files from Discord CDN once the time limit is enforced.
-		
-		// The downloaded URL would work, but only for a limited time, so it is better for the links to not work
-		// rather than give users a false sense of security.
-		
-		return attachment.NormalizedUrl;
-	}
-}

app/Server/Database/Export/ViewerJsonContext.cs

@@ -3,9 +3,9 @@ using System.Text.Json.Serialization;
 namespace DHT.Server.Database.Export;
 
 [JsonSourceGenerationOptions(
-	Converters = new [] { typeof(SnowflakeJsonSerializer) },
+	Converters = [typeof(SnowflakeJsonSerializer)],
 	PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
 	GenerationMode = JsonSourceGenerationMode.Default
 )]
 [JsonSerializable(typeof(ViewerJson))]
-sealed partial class ViewerJsonContext : JsonSerializerContext {}
+sealed partial class ViewerJsonContext : JsonSerializerContext;

app/Server/Database/Export/ViewerJsonExport.cs

@@ -6,7 +6,6 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
-using DHT.Server.Database.Export.Strategy;
 using DHT.Utils.Logging;
 
 namespace DHT.Server.Database.Export;
@@ -14,7 +13,7 @@ namespace DHT.Server.Database.Export;
 public static class ViewerJsonExport {
 	private static readonly Log Log = Log.ForType(typeof(ViewerJsonExport));
 
-	public static async Task Generate(Stream stream, IViewerExportStrategy strategy, IDatabaseFile db, MessageFilter? filter = null) {
+	public static async Task Generate(Stream stream, IDatabaseFile db, MessageFilter? filter = null) {
 		var perf = Log.Start();
 
 		var includedUserIds = new HashSet<ulong>();
@@ -49,7 +48,7 @@ public static class ViewerJsonExport {
 				Servers = servers,
 				Channels = channels
 			},
-			Data = GenerateMessageList(includedMessages, userIndices, strategy)
+			Data = GenerateMessageList(includedMessages, userIndices)
 		};
 
 		perf.Step("Generate value object");
@@ -125,7 +124,7 @@ public static class ViewerJsonExport {
 		return channels;
 	}
 
-	private static Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>> GenerateMessageList(List<Message> includedMessages, Dictionary<ulong, int> userIndices, IViewerExportStrategy strategy) {
+	private static Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>> GenerateMessageList(List<Message> includedMessages, Dictionary<ulong, int> userIndices) {
 		var data = new Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>>();
 
 		foreach (var grouping in includedMessages.GroupBy(static message => message.Channel)) {
@@ -142,9 +141,9 @@ public static class ViewerJsonExport {
 					Te = message.EditTimestamp,
 					R = message.RepliedToId?.ToString(),
 					
-					A = message.Attachments.IsEmpty ? null : message.Attachments.Select(attachment => {
+					A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
 						var a = new ViewerJson.JsonMessageAttachment {
-							Url = strategy.GetAttachmentUrl(attachment),
+							Url = attachment.DownloadUrl,
 							Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl
 						};
 

app/Server/Database/IDatabaseFile.cs

@@ -4,10 +4,8 @@ using DHT.Server.Database.Repositories;
 
 namespace DHT.Server.Database;
 
-public interface IDatabaseFile : IDisposable {
+public interface IDatabaseFile : IAsyncDisposable {
 	string Path { get; }
-	DatabaseStatistics Statistics { get; }
-	Task<DatabaseStatisticsSnapshot> SnapshotStatistics();
 
 	IUserRepository Users { get; }
 	IServerRepository Servers { get; }

app/Server/Database/Import/DiscordEmbedLegacyJsonContext.cs

@@ -4,4 +4,4 @@ namespace DHT.Server.Database.Import;
 
 [JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.SnakeCaseLower, GenerationMode = JsonSourceGenerationMode.Default)]
 [JsonSerializable(typeof(DiscordEmbedLegacyJson))]
-sealed partial class DiscordEmbedLegacyJsonContext : JsonSerializerContext {}
+sealed partial class DiscordEmbedLegacyJsonContext : JsonSerializerContext;

app/Server/Database/Repositories/IChannelRepository.cs

@@ -1,20 +1,33 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 
 namespace DHT.Server.Database.Repositories;
 
 public interface IChannelRepository {
+	IObservable<long> TotalCount { get; }
+	
 	Task Add(IReadOnlyList<Channel> channels);
 	
+	Task<long> Count(CancellationToken cancellationToken = default);
+	
 	IAsyncEnumerable<Channel> Get();
 
 	internal sealed class Dummy : IChannelRepository {
+		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
+
 		public Task Add(IReadOnlyList<Channel> channels) {
 			return Task.CompletedTask;
 		}
 
+		public Task<long> Count(CancellationToken cancellationToken) {
+			return Task.FromResult(0L);
+		}
+
 		public IAsyncEnumerable<Channel> Get() {
 			return AsyncEnumerable.Empty<Channel>();
 		}

app/Server/Database/Repositories/IDownloadRepository.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
@@ -10,59 +12,63 @@ using DHT.Server.Download;
 namespace DHT.Server.Database.Repositories;
 
 public interface IDownloadRepository {
-	Task<long> CountAttachments(AttachmentFilter? filter = null, CancellationToken cancellationToken = default);
+	IObservable<long> TotalCount { get; }
 
-	Task AddDownload(Data.Download download);
+	Task AddDownload(DownloadWithData item);
 
-	Task<DownloadStatusStatistics> GetStatistics(CancellationToken cancellationToken = default);
+	Task<long> Count(DownloadItemFilter filter, CancellationToken cancellationToken = default);
 	
-	IAsyncEnumerable<Data.Download> GetWithoutData();
+	Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken = default);
+	
+	IAsyncEnumerable<Data.Download> Get();
 
-	Task<Data.Download> HydrateWithData(Data.Download download);
+	Task<DownloadWithData> HydrateWithData(Data.Download download);
 
-	Task<DownloadedAttachment?> GetDownloadedAttachment(string normalizedUrl);
+	Task<DownloadWithData?> GetSuccessfulDownloadWithData(string normalizedUrl);
 
-	Task<int> EnqueueDownloadItems(AttachmentFilter? filter = null, CancellationToken cancellationToken = default);
+	IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, CancellationToken cancellationToken = default);
-
+	
-	IAsyncEnumerable<DownloadItem> PullEnqueuedDownloadItems(int count, CancellationToken cancellationToken = default);
+	Task MoveDownloadingItemsBackToQueue(CancellationToken cancellationToken = default);
-
+	
-	Task RemoveDownloadItems(DownloadItemFilter? filter, FilterRemovalMode mode);
+	Task<int> RetryFailed(CancellationToken cancellationToken = default);
 
 	internal sealed class Dummy : IDownloadRepository {
-		public Task<long> CountAttachments(AttachmentFilter? filter, CancellationToken cancellationToken) {
+		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
+
+		public Task AddDownload(DownloadWithData item) {
+			return Task.CompletedTask;
+		}
+
+		public Task<long> Count(DownloadItemFilter filter, CancellationToken cancellationToken) {
 			return Task.FromResult(0L);
 		}
 
-		public Task AddDownload(Data.Download download) {
+		public Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken) {
-			return Task.CompletedTask;
-		}
-
-		public Task<DownloadStatusStatistics> GetStatistics(CancellationToken cancellationToken) {
 			return Task.FromResult(new DownloadStatusStatistics());
 		}
 
-		public IAsyncEnumerable<Data.Download> GetWithoutData() {
+		public IAsyncEnumerable<Data.Download> Get() {
 			return AsyncEnumerable.Empty<Data.Download>();
 		}
 
-		public Task<Data.Download> HydrateWithData(Data.Download download) {
+		public Task<DownloadWithData> HydrateWithData(Data.Download download) {
-			return Task.FromResult(download);
+			return Task.FromResult(new DownloadWithData(download, Data: null));
 		}
 
-		public Task<DownloadedAttachment?> GetDownloadedAttachment(string normalizedUrl) {
+		public Task<DownloadWithData?> GetSuccessfulDownloadWithData(string normalizedUrl) {
-			return Task.FromResult<DownloadedAttachment?>(null);
+			return Task.FromResult<DownloadWithData?>(null);
 		}
 
-		public Task<int> EnqueueDownloadItems(AttachmentFilter? filter, CancellationToken cancellationToken) {
+		public IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, CancellationToken cancellationToken) {
-			return Task.FromResult(0);
-		}
-
-		public IAsyncEnumerable<DownloadItem> PullEnqueuedDownloadItems(int count, CancellationToken cancellationToken) {
 			return AsyncEnumerable.Empty<DownloadItem>();
 		}
 
-		public Task RemoveDownloadItems(DownloadItemFilter? filter, FilterRemovalMode mode) {
+		public Task MoveDownloadingItemsBackToQueue(CancellationToken cancellationToken) {
 			return Task.CompletedTask;
 		}
+
+		public Task<int> RetryFailed(CancellationToken cancellationToken) {
+			return Task.FromResult(0);
+		}
 	}
 }

app/Server/Database/Repositories/IMessageRepository.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
@@ -8,6 +10,8 @@ using DHT.Server.Data.Filters;
 namespace DHT.Server.Database.Repositories;
 
 public interface IMessageRepository {
+	IObservable<long> TotalCount { get; }
+	
 	Task Add(IReadOnlyList<Message> messages);
 	
 	Task<long> Count(MessageFilter? filter = null, CancellationToken cancellationToken = default);
@@ -19,6 +23,8 @@ public interface IMessageRepository {
 	Task Remove(MessageFilter filter, FilterRemovalMode mode);
 
 	internal sealed class Dummy : IMessageRepository {
+		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
+
 		public Task Add(IReadOnlyList<Message> messages) {
 			return Task.CompletedTask;
 		}

app/Server/Database/Repositories/IServerRepository.cs

@@ -1,19 +1,32 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace DHT.Server.Database.Repositories;
 
 public interface IServerRepository {
+	IObservable<long> TotalCount { get; }
+	
 	Task Add(IReadOnlyList<Data.Server> servers);
 	
+	Task<long> Count(CancellationToken cancellationToken = default);
+	
 	IAsyncEnumerable<Data.Server> Get();
 
 	internal sealed class Dummy : IServerRepository {
+		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
+
 		public Task Add(IReadOnlyList<Data.Server> servers) {
 			return Task.CompletedTask;
 		}
 
+		public Task<long> Count(CancellationToken cancellationToken) {
+			return Task.FromResult(0L);
+		}
+
 		public IAsyncEnumerable<Data.Server> Get() {
 			return AsyncEnumerable.Empty<Data.Server>();
 		}

app/Server/Database/Repositories/IUserRepository.cs

@@ -1,20 +1,33 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 
 namespace DHT.Server.Database.Repositories;
 
 public interface IUserRepository {
+	IObservable<long> TotalCount { get; }
+	
 	Task Add(IReadOnlyList<User> users);
 	
+	Task<long> Count(CancellationToken cancellationToken = default);
+	
 	IAsyncEnumerable<User> Get();
 
 	internal sealed class Dummy : IUserRepository {
+		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
+
 		public Task Add(IReadOnlyList<User> users) {
 			return Task.CompletedTask;
 		}
 
+		public Task<long> Count(CancellationToken cancellationToken) {
+			return Task.FromResult(0L);
+		}
+
 		public IAsyncEnumerable<User> Get() {
 			return AsyncEnumerable.Empty<User>();
 		}

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

@@ -0,0 +1,30 @@
+using System;
+using System.Reactive.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using DHT.Utils.Logging;
+using DHT.Utils.Tasks;
+
+namespace DHT.Server.Database.Sqlite.Repositories;
+
+abstract class BaseSqliteRepository : IDisposable {
+	private readonly ObservableThrottledTask<long> totalCountTask;
+
+	public IObservable<long> TotalCount { get; }
+
+	protected BaseSqliteRepository(Log log) {
+		totalCountTask = new ObservableThrottledTask<long>(log, TaskScheduler.Default);
+		TotalCount = totalCountTask.DistinctUntilChanged();
+		UpdateTotalCount();
+	}
+
+	public void Dispose() {
+		totalCountTask.Dispose();
+	}
+
+	protected void UpdateTotalCount() {
+		totalCountTask.Post(Count);
+	}
+
+	public abstract Task<long> Count(CancellationToken cancellationToken);
+}

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

@@ -1,32 +1,25 @@
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Utils;
+using DHT.Utils.Logging;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteChannelRepository : IChannelRepository {
+sealed class SqliteChannelRepository : BaseSqliteRepository, IChannelRepository {
+	private static readonly Log Log = Log.ForType<SqliteChannelRepository>();
+	
 	private readonly SqliteConnectionPool pool;
-	private readonly DatabaseStatistics statistics;
 
-	public SqliteChannelRepository(SqliteConnectionPool pool, DatabaseStatistics statistics) {
+	public SqliteChannelRepository(SqliteConnectionPool pool) : base(Log) {
 		this.pool = pool;
-		this.statistics = statistics;
-	}
-
-	internal async Task Initialize() {
-		using var conn = pool.Take();
-		await UpdateChannelStatistics(conn);
-	}
-
-	private async Task UpdateChannelStatistics(ISqliteConnection conn) {
-		statistics.TotalChannels = await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM channels", static reader => reader?.GetInt64(0) ?? 0L);
 	}
 
 	public async Task Add(IReadOnlyList<Channel> channels) {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 
 		await using (var tx = await conn.BeginTransactionAsync()) {
 			await using var cmd = conn.Upsert("channels", [
@@ -53,16 +46,21 @@ sealed class SqliteChannelRepository : IChannelRepository {
 			await tx.CommitAsync();
 		}
 
-		await UpdateChannelStatistics(conn);
+		UpdateTotalCount();
+	}
+
+	public override async Task<long> Count(CancellationToken cancellationToken) {
+		await using var conn = await pool.Take();
+		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM channels", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
 	}
 
 	public async IAsyncEnumerable<Channel> Get() {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 
 		await using var cmd = conn.Command("SELECT id, server, name, parent_id, position, topic, nsfw FROM channels");
 		await using var reader = await cmd.ExecuteReaderAsync();
 
-		while (reader.Read()) {
+		while (await reader.ReadAsync()) {
 			yield return new Channel {
 				Id = reader.GetUint64(0),
 				Server = reader.GetUint64(1),

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

@@ -9,143 +9,204 @@ using DHT.Server.Data.Filters;
 using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Utils;
 using DHT.Server.Download;
-using DHT.Utils.Tasks;
+using DHT.Utils.Logging;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteDownloadRepository : IDownloadRepository {
+sealed class SqliteDownloadRepository : BaseSqliteRepository, IDownloadRepository {
+	private static readonly Log Log = Log.ForType<SqliteDownloadRepository>();
+	
 	private readonly SqliteConnectionPool pool;
-	private readonly AsyncValueComputer<long>.Single totalDownloadsComputer;
 
-	public SqliteDownloadRepository(SqliteConnectionPool pool, AsyncValueComputer<long>.Single totalDownloadsComputer) {
+	public SqliteDownloadRepository(SqliteConnectionPool pool) : base(Log) {
 		this.pool = pool;
-		this.totalDownloadsComputer = totalDownloadsComputer;
 	}
 
-	public async Task<long> CountAttachments(AttachmentFilter? filter, CancellationToken cancellationToken) {
+	internal sealed class NewDownloadCollector : IAsyncDisposable {
-		using var conn = pool.Take();
+		private readonly SqliteDownloadRepository repository;
-		return await conn.ExecuteReaderAsync("SELECT COUNT(DISTINCT normalized_url) FROM attachments a" + filter.GenerateWhereClause("a"), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
+		private bool hasAdded = false;
+
+		private readonly SqliteCommand metadataCmd;
+
+		public NewDownloadCollector(SqliteDownloadRepository repository, ISqliteConnection conn) {
+			this.repository = repository;
+
+			metadataCmd = conn.Command(
+				"""
+				INSERT INTO download_metadata (normalized_url, download_url, status, type, size)
+				VALUES (:normalized_url, :download_url, :status, :type, :size)
+				ON CONFLICT DO NOTHING
+				"""
+			);
+			metadataCmd.Add(":normalized_url", SqliteType.Text);
+			metadataCmd.Add(":download_url", SqliteType.Text);
+			metadataCmd.Add(":status", SqliteType.Integer);
+			metadataCmd.Add(":type", SqliteType.Text);
+			metadataCmd.Add(":size", SqliteType.Integer);
+		}
+
+		public async Task Add(Data.Download download) {
+			metadataCmd.Set(":normalized_url", download.NormalizedUrl);
+			metadataCmd.Set(":download_url", download.DownloadUrl);
+			metadataCmd.Set(":status", (int) download.Status);
+			metadataCmd.Set(":type", download.Type);
+			metadataCmd.Set(":size", download.Size);
+			hasAdded |= await metadataCmd.ExecuteNonQueryAsync() > 0;
+		}
+
+		public void OnCommitted() {
+			if (hasAdded) {
+				repository.UpdateTotalCount();
+			}
+		}
+
+		public async ValueTask DisposeAsync() {
+			await metadataCmd.DisposeAsync();
+		}
 	}
 
-	public async Task AddDownload(Data.Download download) {
+	public async Task AddDownload(DownloadWithData item) {
-		using (var conn = pool.Take()) {
+		var (download, data) = item;
-			await using var cmd = conn.Upsert("downloads", [
+
+		await using (var conn = await pool.Take()) {
+			var tx = await conn.BeginTransactionAsync();
+
+			await using var metadataCmd = conn.Upsert("download_metadata", [
 				("normalized_url", SqliteType.Text),
 				("download_url", SqliteType.Text),
 				("status", SqliteType.Integer),
+				("type", SqliteType.Text),
 				("size", SqliteType.Integer),
-				("blob", SqliteType.Blob)
 			]);
 
-			cmd.Set(":normalized_url", download.NormalizedUrl);
+			metadataCmd.Set(":normalized_url", download.NormalizedUrl);
-			cmd.Set(":download_url", download.DownloadUrl);
+			metadataCmd.Set(":download_url", download.DownloadUrl);
-			cmd.Set(":status", (int) download.Status);
+			metadataCmd.Set(":status", (int) download.Status);
-			cmd.Set(":size", download.Size);
+			metadataCmd.Set(":type", download.Type);
-			cmd.Set(":blob", download.Data);
+			metadataCmd.Set(":size", download.Size);
-			await cmd.ExecuteNonQueryAsync();
+			await metadataCmd.ExecuteNonQueryAsync();
+
+			if (data == null) {
+				await using var deleteBlobCmd = conn.Command("DELETE FROM download_blobs WHERE normalized_url = :normalized_url");
+				deleteBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, download.NormalizedUrl);
+				await deleteBlobCmd.ExecuteNonQueryAsync();
+			}
+			else {
+				await using var upsertBlobCmd = conn.Upsert("download_blobs", [
+					("normalized_url", SqliteType.Text),
+					("blob", SqliteType.Blob)
+				]);
+
+				upsertBlobCmd.Set(":normalized_url", download.NormalizedUrl);
+				upsertBlobCmd.Set(":blob", data);
+				await upsertBlobCmd.ExecuteNonQueryAsync();
+			}
+
+			await tx.CommitAsync();
 		}
 
-		totalDownloadsComputer.Recompute();
+		UpdateTotalCount();
 	}
 
-	public async Task<DownloadStatusStatistics> GetStatistics(CancellationToken cancellationToken) {
+	public override Task<long> Count(CancellationToken cancellationToken) {
-		static async Task LoadUndownloadedStatistics(ISqliteConnection conn, DownloadStatusStatistics result, CancellationToken cancellationToken) {
+		return Count(filter: null, cancellationToken);
-			await using var cmd = conn.Command(
-				"""
-				SELECT IFNULL(COUNT(size), 0), IFNULL(SUM(size), 0)
-				FROM (SELECT MAX(a.size) size
-				      FROM attachments a
-				      WHERE a.normalized_url NOT IN (SELECT d.normalized_url FROM downloads d)
-				      GROUP BY a.normalized_url)
-				""");
-
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-
-			if (reader.Read()) {
-				result.SkippedCount = reader.GetInt32(0);
-				result.SkippedSize = reader.GetUint64(1);
-			}
-		}
-
-		static async Task LoadSuccessStatistics(ISqliteConnection conn, DownloadStatusStatistics result, CancellationToken cancellationToken) {
-			await using var cmd = conn.Command(
-				"""
-				SELECT
-				IFNULL(SUM(CASE WHEN status IN (:enqueued, :downloading) THEN 1 ELSE 0 END), 0),
-				IFNULL(SUM(CASE WHEN status IN (:enqueued, :downloading) THEN size ELSE 0 END), 0),
-				IFNULL(SUM(CASE WHEN status = :success THEN 1 ELSE 0 END), 0),
-				IFNULL(SUM(CASE WHEN status = :success THEN size ELSE 0 END), 0),
-				IFNULL(SUM(CASE WHEN status NOT IN (:enqueued, :downloading) AND status != :success THEN 1 ELSE 0 END), 0),
-				IFNULL(SUM(CASE WHEN status NOT IN (:enqueued, :downloading) AND status != :success THEN size ELSE 0 END), 0)
-				FROM downloads
-				"""
-			);
-			
-			cmd.AddAndSet(":enqueued", SqliteType.Integer, (int) DownloadStatus.Enqueued);
-			cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
-			cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
-
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-
-			if (reader.Read()) {
-				result.EnqueuedCount = reader.GetInt32(0);
-				result.EnqueuedSize = reader.GetUint64(1);
-				result.SuccessfulCount = reader.GetInt32(2);
-				result.SuccessfulSize = reader.GetUint64(3);
-				result.FailedCount = reader.GetInt32(4);
-				result.FailedSize = reader.GetUint64(5);
-			}
-		}
-
-		var result = new DownloadStatusStatistics();
-
-		using var conn = pool.Take();
-		await LoadUndownloadedStatistics(conn, result, cancellationToken);
-		await LoadSuccessStatistics(conn, result, cancellationToken);
-		return result;
 	}
 
-	public async IAsyncEnumerable<Data.Download> GetWithoutData() {
+	public async Task<long> Count(DownloadItemFilter? filter, CancellationToken cancellationToken) {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
+		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM download_metadata" + filter.GenerateConditions().BuildWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
+	}
 
-		await using var cmd = conn.Command("SELECT normalized_url, download_url, status, size FROM downloads");
+	public async Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken) {
+		nonSkippedFilter.IncludeStatuses = null;
+		nonSkippedFilter.ExcludeStatuses = null;
+		string nonSkippedFilterConditions = nonSkippedFilter.GenerateConditions().Build();
+
+		await using var conn = await pool.Take();
+
+		await using var cmd = conn.Command(
+			$"""
+			 SELECT
+			 IFNULL(SUM(CASE WHEN (status = :downloading) OR (status = :pending AND {nonSkippedFilterConditions}) THEN 1 ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN (status = :downloading) OR (status = :pending AND {nonSkippedFilterConditions}) THEN IFNULL(size, 0) ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN ((status = :downloading) OR (status = :pending AND {nonSkippedFilterConditions})) AND size IS NULL THEN 1 ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status = :success THEN 1 ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status = :success THEN IFNULL(size, 0) ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status = :success AND size IS NULL THEN 1 ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status NOT IN (:pending, :downloading, :success) THEN 1 ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status NOT IN (:pending, :downloading, :success) THEN IFNULL(size, 0) ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status NOT IN (:pending, :downloading, :success) AND size IS NULL THEN 1 ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status = :pending AND NOT ({nonSkippedFilterConditions}) THEN 1 ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status = :pending AND NOT ({nonSkippedFilterConditions}) THEN IFNULL(size, 0) ELSE 0 END), 0),
+			 IFNULL(SUM(CASE WHEN status = :pending AND NOT ({nonSkippedFilterConditions}) AND size IS NULL THEN 1 ELSE 0 END), 0)
+			 FROM download_metadata
+			 """
+		);
+
+		cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
+		cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
+		cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
+
+		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+
+		if (!await reader.ReadAsync(cancellationToken)) {
+			return new DownloadStatusStatistics();
+		}
+
+		return new DownloadStatusStatistics {
+			PendingCount = reader.GetInt32(0),
+			PendingTotalSize = reader.GetUint64(1),
+			PendingWithUnknownSizeCount = reader.GetInt32(2),
+			SuccessfulCount = reader.GetInt32(3),
+			SuccessfulTotalSize = reader.GetUint64(4),
+			SuccessfulWithUnknownSizeCount = reader.GetInt32(5),
+			FailedCount = reader.GetInt32(6),
+			FailedTotalSize = reader.GetUint64(7),
+			FailedWithUnknownSizeCount = reader.GetInt32(8),
+			SkippedCount = reader.GetInt32(9),
+			SkippedTotalSize = reader.GetUint64(10),
+			SkippedWithUnknownSizeCount = reader.GetInt32(11)
+		};
+	}
+
+	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");
 		await using var reader = await cmd.ExecuteReaderAsync();
 
-		while (reader.Read()) {
+		while (await reader.ReadAsync()) {
 			string normalizedUrl = reader.GetString(0);
 			string downloadUrl = reader.GetString(1);
 			var status = (DownloadStatus) reader.GetInt32(2);
-			ulong size = reader.GetUint64(3);
+			string? type = reader.IsDBNull(3) ? null : reader.GetString(3);
+			ulong? size = reader.IsDBNull(4) ? null : reader.GetUint64(4);
 
-			yield return new Data.Download(normalizedUrl, downloadUrl, status, size);
+			yield return new Data.Download(normalizedUrl, downloadUrl, status, type, size);
 		}
 	}
 
-	public async Task<Data.Download> HydrateWithData(Data.Download download) {
+	public async Task<DownloadWithData> HydrateWithData(Data.Download download) {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 
-		await using var cmd = conn.Command("SELECT blob FROM downloads WHERE normalized_url = :url");
+		await using var cmd = conn.Command("SELECT blob FROM download_blobs WHERE normalized_url = :url");
 		cmd.AddAndSet(":url", SqliteType.Text, download.NormalizedUrl);
 
 		await using var reader = await cmd.ExecuteReaderAsync();
-
+		var data = await reader.ReadAsync() && !reader.IsDBNull(0) ? (byte[]) reader["blob"] : null;
-		if (reader.Read() && !reader.IsDBNull(0)) {
+		
-			return download.WithData((byte[]) reader["blob"]);
+		return new DownloadWithData(download, data);
-		}
-		else {
-			return download;
-		}
 	}
 
-	public async Task<DownloadedAttachment?> GetDownloadedAttachment(string normalizedUrl) {
+	public async Task<DownloadWithData?> GetSuccessfulDownloadWithData(string normalizedUrl) {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 
 		await using var cmd = conn.Command(
 			"""
-			SELECT a.type, d.blob FROM downloads d
+			SELECT dm.download_url, dm.type, db.blob FROM download_metadata dm
-			LEFT JOIN attachments a ON d.normalized_url = a.normalized_url
+			JOIN download_blobs db ON dm.normalized_url = db.normalized_url
-			WHERE d.normalized_url = :normalized_url AND d.status = :success AND d.blob IS NOT NULL
+			WHERE dm.normalized_url = :normalized_url AND dm.status = :success IS NOT NULL
 			"""
 		);
 
@@ -154,56 +215,52 @@ sealed class SqliteDownloadRepository : IDownloadRepository {
 
 		await using var reader = await cmd.ExecuteReaderAsync();
 
-		if (!reader.Read()) {
+		if (!await reader.ReadAsync()) {
 			return null;
 		}
 
-		return new DownloadedAttachment {
+		var downloadUrl = reader.GetString(0);
-			Type = reader.IsDBNull(0) ? null : reader.GetString(0),
+		var type = reader.IsDBNull(1) ? null : reader.GetString(1);
-			Data = (byte[]) reader["blob"],
+		var data = (byte[]) reader[2];
-		};
+		var size = (ulong) data.LongLength;
+		var download = new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, size);
+		
+		return new DownloadWithData(download, data);
 	}
 
-	public async Task<int> EnqueueDownloadItems(AttachmentFilter? filter, CancellationToken cancellationToken) {
+	public async IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
-		using var conn = pool.Take();
+		filter.IncludeStatuses = [DownloadStatus.Pending];
+		filter.ExcludeStatuses = null;
 
-		await using var cmd = conn.Command(
-			$"""
-			 INSERT INTO downloads (normalized_url, download_url, status, size)
-			 SELECT a.normalized_url, a.download_url, :enqueued, MAX(a.size)
-			 FROM attachments a
-			 {filter.GenerateWhereClause("a")}
-			 GROUP BY a.normalized_url
-			 """
-		);
-
-		cmd.AddAndSet(":enqueued", SqliteType.Integer, (int) DownloadStatus.Enqueued);
-		return await cmd.ExecuteNonQueryAsync(cancellationToken);
-	}
-
-	public async IAsyncEnumerable<DownloadItem> PullEnqueuedDownloadItems(int count, [EnumeratorCancellation] CancellationToken cancellationToken) {
 		var found = new List<DownloadItem>();
 
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 
-		await using (var cmd = conn.Command("SELECT normalized_url, download_url, size FROM downloads WHERE status = :enqueued LIMIT :limit")) {
+		var sql = $"""
-			cmd.AddAndSet(":enqueued", SqliteType.Integer, (int) DownloadStatus.Enqueued);
+		           SELECT normalized_url, download_url, type, size
+		           FROM download_metadata
+		           {filter.GenerateConditions().BuildWhereClause()}
+		           LIMIT :limit
+		           """;
+
+		await using (var cmd = conn.Command(sql)) {
 			cmd.AddAndSet(":limit", SqliteType.Integer, Math.Max(0, count));
 
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 
-			while (reader.Read()) {
+			while (await reader.ReadAsync(cancellationToken)) {
 				found.Add(new DownloadItem {
 					NormalizedUrl = reader.GetString(0),
 					DownloadUrl = reader.GetString(1),
-					Size = reader.GetUint64(2),
+					Type = reader.IsDBNull(2) ? null : reader.GetString(2),
+					Size = reader.IsDBNull(3) ? null : reader.GetUint64(3)
 				});
 			}
 		}
 
 		if (found.Count != 0) {
-			await using var cmd = conn.Command("UPDATE downloads SET status = :downloading WHERE normalized_url = :normalized_url AND status = :enqueued");
+			await using var cmd = conn.Command("UPDATE download_metadata SET status = :downloading WHERE normalized_url = :normalized_url AND status = :pending");
-			cmd.AddAndSet(":enqueued", SqliteType.Integer, (int) DownloadStatus.Enqueued);
+			cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
 			cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
 			cmd.Add(":normalized_url", SqliteType.Text);
 
@@ -217,17 +274,23 @@ sealed class SqliteDownloadRepository : IDownloadRepository {
 		}
 	}
 
-	public async Task RemoveDownloadItems(DownloadItemFilter? filter, FilterRemovalMode mode) {
+	public async Task MoveDownloadingItemsBackToQueue(CancellationToken cancellationToken) {
-		using (var conn = pool.Take()) {
+		await using var conn = await pool.Take();
-			await conn.ExecuteAsync(
-				$"""
-				 -- noinspection SqlWithoutWhere
-				 DELETE FROM downloads
-				 {filter.GenerateWhereClause(invert: mode == FilterRemovalMode.KeepMatching)}
-				 """
-			);
-		}
 
-		totalDownloadsComputer.Recompute();
+		await using var cmd = conn.Command("UPDATE download_metadata SET status = :pending WHERE status = :downloading");
+		cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
+		cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
+		await cmd.ExecuteNonQueryAsync(cancellationToken);
+	}
+
+	public async Task<int> RetryFailed(CancellationToken cancellationToken) {
+		await using var conn = await pool.Take();
+
+		await using var cmd = conn.Command("UPDATE download_metadata SET status = :pending WHERE status = :generic_error OR (status > :last_custom_code AND status != :success)");
+		cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
+		cmd.AddAndSet(":generic_error", SqliteType.Integer, (int) DownloadStatus.GenericError);
+		cmd.AddAndSet(":last_custom_code", SqliteType.Integer, (int) DownloadStatus.LastCustomCode);
+		cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
+		return await cmd.ExecuteNonQueryAsync(cancellationToken);
 	}
 }

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

@@ -7,20 +7,21 @@ using DHT.Server.Data;
 using DHT.Server.Data.Filters;
 using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Utils;
-using DHT.Utils.Tasks;
+using DHT.Server.Download;
+using DHT.Utils.Logging;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteMessageRepository : IMessageRepository {
+sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository {
+	private static readonly Log Log = Log.ForType<SqliteMessageRepository>();
+	
 	private readonly SqliteConnectionPool pool;
-	private readonly AsyncValueComputer<long>.Single totalMessagesComputer;
+	private readonly SqliteDownloadRepository downloads;
-	private readonly AsyncValueComputer<long>.Single totalAttachmentsComputer;
 
-	public SqliteMessageRepository(SqliteConnectionPool pool, AsyncValueComputer<long>.Single totalMessagesComputer, AsyncValueComputer<long>.Single totalAttachmentsComputer) {
+	public SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : base(Log) {
 		this.pool = pool;
-		this.totalMessagesComputer = totalMessagesComputer;
+		this.downloads = downloads;
-		this.totalAttachmentsComputer = totalAttachmentsComputer;
 	}
 
 	public async Task Add(IReadOnlyList<Message> messages) {
@@ -37,9 +38,7 @@ sealed class SqliteMessageRepository : IMessageRepository {
 			await cmd.ExecuteNonQueryAsync();
 		}
 
-		bool addedAttachments = false;
+		await using (var conn = await pool.Take()) {
-
-		using (var conn = pool.Take()) {
 			await using var tx = await conn.BeginTransactionAsync();
 
 			await using var messageCmd = conn.Upsert("messages", [
@@ -91,6 +90,8 @@ sealed class SqliteMessageRepository : IMessageRepository {
 				("emoji_flags", SqliteType.Integer),
 				("count", SqliteType.Integer)
 			]);
+			
+			await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
 
 			foreach (var message in messages) {
 				object messageId = message.Id;
@@ -122,8 +123,6 @@ sealed class SqliteMessageRepository : IMessageRepository {
 				}
 
 				if (!message.Attachments.IsEmpty) {
-					addedAttachments = true;
-
 					foreach (var attachment in message.Attachments) {
 						attachmentCmd.Set(":message_id", messageId);
 						attachmentCmd.Set(":attachment_id", attachment.Id);
@@ -135,6 +134,8 @@ sealed class SqliteMessageRepository : IMessageRepository {
 						attachmentCmd.Set(":width", attachment.Width);
 						attachmentCmd.Set(":height", attachment.Height);
 						await attachmentCmd.ExecuteNonQueryAsync();
+						
+						await downloadCollector.Add(DownloadLinkExtractor.FromAttachment(attachment));
 					}
 				}
 
@@ -143,6 +144,10 @@ sealed class SqliteMessageRepository : IMessageRepository {
 						embedCmd.Set(":message_id", messageId);
 						embedCmd.Set(":json", embed.Json);
 						await embedCmd.ExecuteNonQueryAsync();
+
+						if (DownloadLinkExtractor.TryFromEmbedJson(embed.Json) is {} download) {
+							await downloadCollector.Add(download);
+						}
 					}
 				}
 
@@ -154,23 +159,28 @@ sealed class SqliteMessageRepository : IMessageRepository {
 						reactionCmd.Set(":emoji_flags", (int) reaction.EmojiFlags);
 						reactionCmd.Set(":count", reaction.Count);
 						await reactionCmd.ExecuteNonQueryAsync();
+
+						if (reaction.EmojiId is {} emojiId) {
+							await downloadCollector.Add(DownloadLinkExtractor.FromEmoji(emojiId, reaction.EmojiFlags));
+						}
 					}
 				}
 			}
 
 			await tx.CommitAsync();
+			downloadCollector.OnCommitted();
 		}
 
-		totalMessagesComputer.Recompute();
+		UpdateTotalCount();
-
-		if (addedAttachments) {
-			totalAttachmentsComputer.Recompute();
-		}
 	}
 
+	public override Task<long> Count(CancellationToken cancellationToken) {
+		return Count(filter: null, cancellationToken);
+	}
+	
 	public async Task<long> Count(MessageFilter? filter, CancellationToken cancellationToken) {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM messages" + filter.GenerateWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
+		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM messages" + filter.GenerateConditions().BuildWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
 	}
 
 	private sealed class MesageToManyCommand<T> : IAsyncDisposable {
@@ -204,7 +214,7 @@ sealed class SqliteMessageRepository : IMessageRepository {
 	}
 
 	public async IAsyncEnumerable<Message> Get(MessageFilter? filter) {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 
 		const string AttachmentSql =
 			"""
@@ -255,7 +265,7 @@ sealed class SqliteMessageRepository : IMessageRepository {
 			 FROM messages m
 			 LEFT JOIN edit_timestamps et ON m.message_id = et.message_id
 			 LEFT JOIN replied_to rt ON m.message_id = rt.message_id
-			 {filter.GenerateWhereClause("m")}
+			 {filter.GenerateConditions("m").BuildWhereClause()}
 			 """
 		);
 
@@ -280,9 +290,9 @@ sealed class SqliteMessageRepository : IMessageRepository {
 	}
 
 	public async IAsyncEnumerable<ulong> GetIds(MessageFilter? filter) {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 		
-		await using var cmd = conn.Command("SELECT message_id FROM messages" + filter.GenerateWhereClause());
+		await using var cmd = conn.Command("SELECT message_id FROM messages" + filter.GenerateConditions().BuildWhereClause());
 		await using var reader = await cmd.ExecuteReaderAsync();
 
 		while (await reader.ReadAsync()) {
@@ -291,16 +301,16 @@ sealed class SqliteMessageRepository : IMessageRepository {
 	}
 
 	public async Task Remove(MessageFilter filter, FilterRemovalMode mode) {
-		using (var conn = pool.Take()) {
+		await using (var conn = await pool.Take()) {
 			await conn.ExecuteAsync(
 				$"""
 				 -- noinspection SqlWithoutWhere
 				 DELETE FROM messages
-				 {filter.GenerateWhereClause(invert: mode == FilterRemovalMode.KeepMatching)}
+				 {filter.GenerateConditions(invert: mode == FilterRemovalMode.KeepMatching).BuildWhereClause()}
 				 """
 			);
 		}
 
-		totalMessagesComputer.Recompute();
+		UpdateTotalCount();
 	}
 }

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

@@ -1,32 +1,25 @@
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Utils;
+using DHT.Utils.Logging;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteServerRepository : IServerRepository {
+sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
+	private static readonly Log Log = Log.ForType<SqliteServerRepository>();
+	
 	private readonly SqliteConnectionPool pool;
-	private readonly DatabaseStatistics statistics;
 
-	public SqliteServerRepository(SqliteConnectionPool pool, DatabaseStatistics statistics) {
+	public SqliteServerRepository(SqliteConnectionPool pool) : base(Log) {
 		this.pool = pool;
-		this.statistics = statistics;
-	}
-
-	internal async Task Initialize() {
-		using var conn = pool.Take();
-		await UpdateServerStatistics(conn);
-	}
-
-	private async Task UpdateServerStatistics(ISqliteConnection conn) {
-		statistics.TotalServers = await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM servers", static reader => reader?.GetInt64(0) ?? 0L);
 	}
 
 	public async Task Add(IReadOnlyList<Data.Server> servers) {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 
 		await using (var tx = await conn.BeginTransactionAsync()) {
 			await using var cmd = conn.Upsert("servers", [
@@ -45,16 +38,21 @@ sealed class SqliteServerRepository : IServerRepository {
 			await tx.CommitAsync();
 		}
 
-		await UpdateServerStatistics(conn);
+		UpdateTotalCount();
+	}
+
+	public override async Task<long> Count(CancellationToken cancellationToken) {
+		await using var conn = await pool.Take();
+		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM servers", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
 	}
 
 	public async IAsyncEnumerable<Data.Server> Get() {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 
 		await using var cmd = conn.Command("SELECT id, name, type FROM servers");
 		await using var reader = await cmd.ExecuteReaderAsync();
 
-		while (reader.Read()) {
+		while (await reader.ReadAsync()) {
 			yield return new Data.Server {
 				Id = reader.GetUint64(0),
 				Name = reader.GetString(1),

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

@@ -1,34 +1,30 @@
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Utils;
+using DHT.Server.Download;
+using DHT.Utils.Logging;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteUserRepository : IUserRepository {
+sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
+	private static readonly Log Log = Log.ForType<SqliteUserRepository>();
+	
 	private readonly SqliteConnectionPool pool;
-	private readonly DatabaseStatistics statistics;
+	private readonly SqliteDownloadRepository downloads;
-	
-	public SqliteUserRepository(SqliteConnectionPool pool, DatabaseStatistics statistics) {
-		this.pool = pool;
-		this.statistics = statistics;
-	}
 
-	internal async Task Initialize() {
+	public SqliteUserRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : base(Log) {
-		using var conn = pool.Take();
+		this.pool = pool;
-		await UpdateUserStatistics(conn);
+		this.downloads = downloads;
-	}
-	
-	private async Task UpdateUserStatistics(ISqliteConnection conn) {
-		statistics.TotalUsers = await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM users", static reader => reader?.GetInt64(0) ?? 0L);
 	}
 
 	public async Task Add(IReadOnlyList<User> users) {
-		using var conn = pool.Take();
+		await using (var conn = await pool.Take()) {
+			await using var tx = await conn.BeginTransactionAsync();
 
-		await using (var tx = await conn.BeginTransactionAsync()) {
 			await using var cmd = conn.Upsert("users", [
 				("id", SqliteType.Integer),
 				("name", SqliteType.Text),
@@ -36,27 +32,39 @@ sealed class SqliteUserRepository : IUserRepository {
 				("discriminator", SqliteType.Text)
 			]);
 
+			await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
+			
 			foreach (var user in users) {
 				cmd.Set(":id", user.Id);
 				cmd.Set(":name", user.Name);
 				cmd.Set(":avatar_url", user.AvatarUrl);
 				cmd.Set(":discriminator", user.Discriminator);
 				await cmd.ExecuteNonQueryAsync();
+
+				if (user.AvatarUrl is {} avatarUrl) {
+					await downloadCollector.Add(DownloadLinkExtractor.FromUserAvatar(user.Id, avatarUrl));
+				}
 			}
 
 			await tx.CommitAsync();
+			downloadCollector.OnCommitted();
 		}
-		
+
-		await UpdateUserStatistics(conn);
+		UpdateTotalCount();
+	}
+
+	public override async Task<long> Count(CancellationToken cancellationToken) {
+		await using var conn = await pool.Take();
+		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM users", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
 	}
 
 	public async IAsyncEnumerable<User> Get() {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
-		
+
 		await using var cmd = conn.Command("SELECT id, name, avatar_url, discriminator FROM users");
 		await using var reader = await cmd.ExecuteReaderAsync();
 
-		while (reader.Read()) {
+		while (await reader.ReadAsync()) {
 			yield return new User {
 				Id = reader.GetUint64(0),
 				Name = reader.GetString(1),

app/Server/Database/Sqlite/Schema.cs

@@ -1,358 +0,0 @@
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Threading.Tasks;
-using DHT.Server.Database.Exceptions;
-using DHT.Server.Database.Sqlite.Utils;
-using DHT.Server.Download;
-using DHT.Utils.Logging;
-using Microsoft.Data.Sqlite;
-
-namespace DHT.Server.Database.Sqlite;
-
-sealed class Schema {
-	internal const int Version = 6;
-
-	private static readonly Log Log = Log.ForType<Schema>();
-
-	private readonly ISqliteConnection conn;
-
-	public Schema(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)");
-
-		var dbVersionStr = await conn.ExecuteReaderAsync("SELECT value FROM metadata WHERE key = 'version'", static reader => reader?.GetString(0));
-		if (dbVersionStr == null) {
-			await InitializeSchemas();
-		}
-		else if (!int.TryParse(dbVersionStr, out int dbVersion) || dbVersion < 1) {
-			throw new InvalidDatabaseVersionException(dbVersionStr);
-		}
-		else if (dbVersion > Version) {
-			throw new DatabaseTooNewException(dbVersion);
-		}
-		else if (dbVersion < Version) {
-			var proceed = await callbacks.CanUpgrade();
-			if (!proceed) {
-				return false;
-			}
-
-			await callbacks.Start(Version - dbVersion, async reporter => await UpgradeSchemas(dbVersion, reporter));
-		}
-
-		return true;
-	}
-
-	private async Task InitializeSchemas() {
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE users (
-		                        	id            INTEGER PRIMARY KEY NOT NULL,
-		                        	name          TEXT NOT NULL,
-		                        	avatar_url    TEXT,
-		                        	discriminator TEXT
-		                        )
-		                        """);
-
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE servers (
-		                        	id   INTEGER PRIMARY KEY NOT NULL,
-		                        	name TEXT NOT NULL,
-		                        	type TEXT NOT NULL
-		                        )
-		                        """);
-
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE channels (
-		                        	id        INTEGER PRIMARY KEY NOT NULL,
-		                        	server    INTEGER NOT NULL,
-		                        	name      TEXT NOT NULL,
-		                        	parent_id INTEGER,
-		                        	position  INTEGER,
-		                        	topic     TEXT,
-		                        	nsfw      INTEGER
-		                        )
-		                        """);
-
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE messages (
-		                        	message_id INTEGER PRIMARY KEY NOT NULL,
-		                        	sender_id  INTEGER NOT NULL,
-		                        	channel_id INTEGER NOT NULL,
-		                        	text       TEXT NOT NULL,
-		                        	timestamp  INTEGER NOT NULL
-		                        )
-		                        """);
-
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE attachments (
-		                        	message_id     INTEGER NOT NULL,
-		                        	attachment_id  INTEGER NOT NULL PRIMARY KEY NOT NULL,
-		                        	name           TEXT NOT NULL,
-		                        	type           TEXT,
-		                        	normalized_url TEXT NOT NULL,
-		                        	download_url   TEXT,
-		                        	size           INTEGER NOT NULL,
-		                        	width          INTEGER,
-		                        	height         INTEGER
-		                        )
-		                        """);
-
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE embeds (
-		                        	message_id INTEGER NOT NULL,
-		                        	json       TEXT NOT NULL
-		                        )
-		                        """);
-
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE downloads (
-		                        	normalized_url TEXT NOT NULL PRIMARY KEY,
-		                        	download_url   TEXT,
-		                        	status         INTEGER NOT NULL,
-		                        	size           INTEGER NOT NULL,
-		                        	blob           BLOB
-		                        )
-		                        """);
-
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE reactions (
-		                        	message_id  INTEGER NOT NULL,
-		                        	emoji_id    INTEGER,
-		                        	emoji_name  TEXT,
-		                        	emoji_flags INTEGER NOT NULL,
-		                        	count       INTEGER NOT NULL
-		                        )
-		                        """);
-
-		await CreateMessageEditTimestampTable();
-		await CreateMessageRepliedToTable();
-
-		await conn.ExecuteAsync("CREATE INDEX attachments_message_ix ON attachments(message_id)");
-		await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON embeds(message_id)");
-		await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON reactions(message_id)");
-
-		await conn.ExecuteAsync("INSERT INTO metadata (key, value) VALUES ('version', " + Version + ")");
-	}
-
-	private async Task CreateMessageEditTimestampTable() {
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE edit_timestamps (
-		                        	message_id     INTEGER PRIMARY KEY NOT NULL,
-		                        	edit_timestamp INTEGER NOT NULL
-		                        )
-		                        """);
-	}
-
-	private async Task CreateMessageRepliedToTable() {
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE replied_to (
-		                        	message_id    INTEGER PRIMARY KEY NOT NULL,
-		                        	replied_to_id INTEGER NOT NULL
-		                        )
-		                        """);
-	}
-
-	private async Task NormalizeAttachmentUrls(ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		await reporter.SubWork("Preparing attachments...", 0, 0);
-
-		var normalizedUrls = new Dictionary<long, string>();
-
-		await using (var selectCmd = conn.Command("SELECT attachment_id, url FROM attachments")) {
-			await using var reader = await selectCmd.ExecuteReaderAsync();
-
-			while (reader.Read()) {
-				var attachmentId = reader.GetInt64(0);
-				var originalUrl = reader.GetString(1);
-				normalizedUrls[attachmentId] = DiscordCdn.NormalizeUrl(originalUrl);
-			}
-		}
-
-		await using var tx = await conn.BeginTransactionAsync();
-
-		int totalUrls = normalizedUrls.Count;
-		int processedUrls = -1;
-
-		await using (var updateCmd = conn.Command("UPDATE attachments SET download_url = url, url = :normalized_url WHERE attachment_id = :attachment_id")) {
-			updateCmd.Add(":attachment_id", SqliteType.Integer);
-			updateCmd.Add(":normalized_url", SqliteType.Text);
-
-			foreach (var (attachmentId, normalizedUrl) in normalizedUrls) {
-				if (++processedUrls % 1000 == 0) {
-					await reporter.SubWork("Updating URLs...", processedUrls, totalUrls);
-				}
-
-				updateCmd.Set(":attachment_id", attachmentId);
-				updateCmd.Set(":normalized_url", normalizedUrl);
-				updateCmd.ExecuteNonQuery();
-			}
-		}
-
-		await reporter.SubWork("Updating URLs...", totalUrls, totalUrls);
-
-		await tx.CommitAsync();
-	}
-
-	private async Task NormalizeDownloadUrls(ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		await reporter.SubWork("Preparing downloads...", 0, 0);
-
-		var normalizedUrlsToOriginalUrls = new Dictionary<string, string>();
-		var duplicateUrlsToDelete = new HashSet<string>();
-
-		await using (var selectCmd = conn.Command("SELECT url FROM downloads ORDER BY CASE WHEN status = 200 THEN 0 ELSE 1 END")) {
-			await using var reader = await selectCmd.ExecuteReaderAsync();
-
-			while (reader.Read()) {
-				var originalUrl = reader.GetString(0);
-				var normalizedUrl = DiscordCdn.NormalizeUrl(originalUrl);
-
-				if (!normalizedUrlsToOriginalUrls.TryAdd(normalizedUrl, originalUrl)) {
-					duplicateUrlsToDelete.Add(originalUrl);
-				}
-			}
-		}
-
-		await conn.ExecuteAsync("PRAGMA cache_size = -20000");
-
-		DbTransaction tx;
-
-		await using (tx = await conn.BeginTransactionAsync()) {
-			await reporter.SubWork("Deleting duplicates...", 0, 0);
-
-			await using (var deleteCmd = conn.Delete("downloads", ("url", SqliteType.Text))) {
-				foreach (var duplicateUrl in duplicateUrlsToDelete) {
-					deleteCmd.Set(":url", duplicateUrl);
-					deleteCmd.ExecuteNonQuery();
-				}
-			}
-
-			await tx.CommitAsync();
-		}
-
-		int totalUrls = normalizedUrlsToOriginalUrls.Count;
-		int processedUrls = -1;
-
-		tx = await conn.BeginTransactionAsync();
-
-		await using (var updateCmd = conn.Command("UPDATE downloads SET download_url = :download_url, url = :normalized_url WHERE url = :download_url")) {
-			updateCmd.Add(":normalized_url", SqliteType.Text);
-			updateCmd.Add(":download_url", SqliteType.Text);
-
-			foreach (var (normalizedUrl, downloadUrl) in normalizedUrlsToOriginalUrls) {
-				if (++processedUrls % 100 == 0) {
-					await reporter.SubWork("Updating URLs...", processedUrls, totalUrls);
-
-					// Not proper way of dealing with transactions, but it avoids a long commit at the end.
-					// Schema upgrades are already non-atomic anyways, so this doesn't make it worse.
-					await tx.CommitAsync();
-					await tx.DisposeAsync();
-
-					tx = await conn.BeginTransactionAsync();
-					updateCmd.Transaction = (SqliteTransaction) tx;
-				}
-
-				updateCmd.Set(":normalized_url", normalizedUrl);
-				updateCmd.Set(":download_url", downloadUrl);
-				updateCmd.ExecuteNonQuery();
-			}
-		}
-
-		await reporter.SubWork("Updating URLs...", totalUrls, totalUrls);
-
-		await tx.CommitAsync();
-		await tx.DisposeAsync();
-
-		await conn.ExecuteAsync("PRAGMA cache_size = -2000");
-	}
-
-	private async Task UpgradeSchemas(int dbVersion, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		var perf = Log.Start("from version " + dbVersion);
-
-		await conn.ExecuteAsync("UPDATE metadata SET value = " + Version + " WHERE key = 'version'");
-
-		if (dbVersion <= 1) {
-			await reporter.MainWork("Applying schema changes...", 0, 1);
-			await conn.ExecuteAsync("ALTER TABLE channels ADD parent_id INTEGER");
-
-			perf.Step("Upgrade to version 2");
-			await reporter.NextVersion();
-		}
-
-		if (dbVersion <= 2) {
-			await reporter.MainWork("Applying schema changes...", 0, 1);
-
-			await CreateMessageEditTimestampTable();
-			await CreateMessageRepliedToTable();
-
-			await conn.ExecuteAsync("""
-			                        INSERT INTO edit_timestamps (message_id, edit_timestamp)
-			                        SELECT message_id, edit_timestamp
-			                        FROM messages
-			                        WHERE edit_timestamp IS NOT NULL
-			                        """);
-
-			await conn.ExecuteAsync("""
-			                        INSERT INTO replied_to (message_id, replied_to_id)
-			                        SELECT message_id, replied_to_id
-			                        FROM messages
-			                        WHERE replied_to_id IS NOT NULL
-			                        """);
-
-			await conn.ExecuteAsync("ALTER TABLE messages DROP COLUMN replied_to_id");
-			await conn.ExecuteAsync("ALTER TABLE messages DROP COLUMN edit_timestamp");
-
-			perf.Step("Upgrade to version 3");
-
-			await reporter.MainWork("Vacuuming the database...", 1, 1);
-			await conn.ExecuteAsync("VACUUM");
-			perf.Step("Vacuum");
-
-			await reporter.NextVersion();
-		}
-
-		if (dbVersion <= 3) {
-			await conn.ExecuteAsync("""
-			                        CREATE TABLE downloads (
-			                        	url    TEXT NOT NULL PRIMARY KEY,
-			                        	status INTEGER NOT NULL,
-			                        	size   INTEGER NOT NULL,
-			                        	blob   BLOB
-			                        )
-			                        """);
-
-			perf.Step("Upgrade to version 4");
-			await reporter.NextVersion();
-		}
-
-		if (dbVersion <= 4) {
-			await reporter.MainWork("Applying schema changes...", 0, 1);
-			await conn.ExecuteAsync("ALTER TABLE attachments ADD width INTEGER");
-			await conn.ExecuteAsync("ALTER TABLE attachments ADD height INTEGER");
-
-			perf.Step("Upgrade to version 5");
-			await reporter.NextVersion();
-		}
-
-		if (dbVersion <= 5) {
-			await reporter.MainWork("Applying schema changes...", 0, 3);
-			await conn.ExecuteAsync("ALTER TABLE attachments ADD download_url TEXT");
-			await conn.ExecuteAsync("ALTER TABLE downloads ADD download_url TEXT");
-
-			await reporter.MainWork("Updating attachments...", 1, 3);
-			await NormalizeAttachmentUrls(reporter);
-
-			await reporter.MainWork("Updating downloads...", 2, 3);
-			await NormalizeDownloadUrls(reporter);
-
-			await reporter.MainWork("Applying schema changes...", 3, 3);
-			await conn.ExecuteAsync("ALTER TABLE attachments RENAME COLUMN url TO normalized_url");
-			await conn.ExecuteAsync("ALTER TABLE downloads RENAME COLUMN url TO normalized_url");
-
-			perf.Step("Upgrade to version 6");
-			await reporter.NextVersion();
-		}
-
-		perf.End();
-	}
-}

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

@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+
+namespace DHT.Server.Database.Sqlite.Schema;
+
+interface ISchemaUpgrade {
+	Task Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter);
+}

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

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace DHT.Server.Database.Sqlite.Utils;
+namespace DHT.Server.Database.Sqlite.Schema;
 
 public interface ISchemaUpgradeCallbacks {
 	Task<bool> CanUpgrade();

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

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+
+namespace DHT.Server.Database.Sqlite.Schema;
+
+sealed class SqliteSchemaUpgradeTo2 : ISchemaUpgrade {
+	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.MainWork("Applying schema changes...", 0, 1);
+		await conn.ExecuteAsync("ALTER TABLE channels ADD parent_id INTEGER");
+	}
+}

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

@@ -0,0 +1,33 @@
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+
+namespace DHT.Server.Database.Sqlite.Schema;
+
+sealed class SqliteSchemaUpgradeTo3 : ISchemaUpgrade {
+	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.MainWork("Applying schema changes...", 0, 1);
+
+		await SqliteSchema.CreateMessageEditTimestampTable(conn);
+		await SqliteSchema.CreateMessageRepliedToTable(conn);
+
+		await conn.ExecuteAsync("""
+		                        INSERT INTO edit_timestamps (message_id, edit_timestamp)
+		                        SELECT message_id, edit_timestamp
+		                        FROM messages
+		                        WHERE edit_timestamp IS NOT NULL
+		                        """);
+
+		await conn.ExecuteAsync("""
+		                        INSERT INTO replied_to (message_id, replied_to_id)
+		                        SELECT message_id, replied_to_id
+		                        FROM messages
+		                        WHERE replied_to_id IS NOT NULL
+		                        """);
+
+		await conn.ExecuteAsync("ALTER TABLE messages DROP COLUMN replied_to_id");
+		await conn.ExecuteAsync("ALTER TABLE messages DROP COLUMN edit_timestamp");
+
+		await reporter.MainWork("Vacuuming the database...", 1, 1);
+		await conn.ExecuteAsync("VACUUM");
+	}
+}

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

@@ -0,0 +1,19 @@
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+
+namespace DHT.Server.Database.Sqlite.Schema;
+
+sealed class SqliteSchemaUpgradeTo4 : ISchemaUpgrade {
+	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.MainWork("Applying schema changes...", 0, 1);
+
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE downloads (
+		                        	url    TEXT NOT NULL PRIMARY KEY,
+		                        	status INTEGER NOT NULL,
+		                        	size   INTEGER NOT NULL,
+		                        	blob   BLOB
+		                        )
+		                        """);
+	}
+}

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

@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+
+namespace DHT.Server.Database.Sqlite.Schema;
+
+sealed class SqliteSchemaUpgradeTo5 : ISchemaUpgrade {
+	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.MainWork("Applying schema changes...", 0, 1);
+		await conn.ExecuteAsync("ALTER TABLE attachments ADD width INTEGER");
+		await conn.ExecuteAsync("ALTER TABLE attachments ADD height INTEGER");
+	}
+}

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

@@ -0,0 +1,138 @@
+using System.Collections.Generic;
+using System.Data.Common;
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+using DHT.Server.Download;
+using Microsoft.Data.Sqlite;
+
+namespace DHT.Server.Database.Sqlite.Schema;
+
+sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
+	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.MainWork("Applying schema changes...", 0, 3);
+		await conn.ExecuteAsync("ALTER TABLE attachments ADD download_url TEXT");
+		await conn.ExecuteAsync("ALTER TABLE downloads ADD download_url TEXT");
+
+		await reporter.MainWork("Updating attachments...", 1, 3);
+		await NormalizeAttachmentUrls(conn, reporter);
+
+		await reporter.MainWork("Updating downloads...", 2, 3);
+		await NormalizeDownloadUrls(conn, reporter);
+
+		await reporter.MainWork("Applying schema changes...", 3, 3);
+		await conn.ExecuteAsync("ALTER TABLE attachments RENAME COLUMN url TO normalized_url");
+		await conn.ExecuteAsync("ALTER TABLE downloads RENAME COLUMN url TO normalized_url");
+	}
+	
+	private async Task NormalizeAttachmentUrls(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.SubWork("Preparing attachments...", 0, 0);
+
+		var normalizedUrls = new Dictionary<long, string>();
+
+		await using (var selectCmd = conn.Command("SELECT attachment_id, url FROM attachments")) {
+			await using var reader = await selectCmd.ExecuteReaderAsync();
+
+			while (await reader.ReadAsync()) {
+				var attachmentId = reader.GetInt64(0);
+				var originalUrl = reader.GetString(1);
+				normalizedUrls[attachmentId] = DiscordCdn.NormalizeUrl(originalUrl);
+			}
+		}
+
+		await using var tx = await conn.BeginTransactionAsync();
+
+		int totalUrls = normalizedUrls.Count;
+		int processedUrls = -1;
+
+		await using (var updateCmd = conn.Command("UPDATE attachments SET download_url = url, url = :normalized_url WHERE attachment_id = :attachment_id")) {
+			updateCmd.Add(":attachment_id", SqliteType.Integer);
+			updateCmd.Add(":normalized_url", SqliteType.Text);
+
+			foreach (var (attachmentId, normalizedUrl) in normalizedUrls) {
+				if (++processedUrls % 1000 == 0) {
+					await reporter.SubWork("Updating URLs...", processedUrls, totalUrls);
+				}
+
+				updateCmd.Set(":attachment_id", attachmentId);
+				updateCmd.Set(":normalized_url", normalizedUrl);
+				await updateCmd.ExecuteNonQueryAsync();
+			}
+		}
+
+		await reporter.SubWork("Updating URLs...", totalUrls, totalUrls);
+
+		await tx.CommitAsync();
+	}
+
+	private async Task NormalizeDownloadUrls(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.SubWork("Preparing downloads...", 0, 0);
+
+		var normalizedUrlsToOriginalUrls = new Dictionary<string, string>();
+		var duplicateUrlsToDelete = new HashSet<string>();
+
+		await using (var selectCmd = conn.Command("SELECT url FROM downloads ORDER BY CASE WHEN status = 200 THEN 0 ELSE 1 END")) {
+			await using var reader = await selectCmd.ExecuteReaderAsync();
+
+			while (await reader.ReadAsync()) {
+				var originalUrl = reader.GetString(0);
+				var normalizedUrl = DiscordCdn.NormalizeUrl(originalUrl);
+
+				if (!normalizedUrlsToOriginalUrls.TryAdd(normalizedUrl, originalUrl)) {
+					duplicateUrlsToDelete.Add(originalUrl);
+				}
+			}
+		}
+
+		await conn.ExecuteAsync("PRAGMA cache_size = -20000");
+
+		DbTransaction tx;
+
+		await using (tx = await conn.BeginTransactionAsync()) {
+			await reporter.SubWork("Deleting duplicates...", 0, 0);
+
+			await using (var deleteCmd = conn.Delete("downloads", ("url", SqliteType.Text))) {
+				foreach (var duplicateUrl in duplicateUrlsToDelete) {
+					deleteCmd.Set(":url", duplicateUrl);
+					await deleteCmd.ExecuteNonQueryAsync();
+				}
+			}
+
+			await tx.CommitAsync();
+		}
+
+		int totalUrls = normalizedUrlsToOriginalUrls.Count;
+		int processedUrls = -1;
+
+		tx = await conn.BeginTransactionAsync();
+
+		await using (var updateCmd = conn.Command("UPDATE downloads SET download_url = :download_url, url = :normalized_url WHERE url = :download_url")) {
+			updateCmd.Add(":normalized_url", SqliteType.Text);
+			updateCmd.Add(":download_url", SqliteType.Text);
+
+			foreach (var (normalizedUrl, downloadUrl) in normalizedUrlsToOriginalUrls) {
+				if (++processedUrls % 100 == 0) {
+					await reporter.SubWork("Updating URLs...", processedUrls, totalUrls);
+
+					// Not proper way of dealing with transactions, but it avoids a long commit at the end.
+					// Schema upgrades are already non-atomic anyways, so this doesn't make it worse.
+					await tx.CommitAsync();
+					await tx.DisposeAsync();
+
+					tx = await conn.BeginTransactionAsync();
+					updateCmd.Transaction = (SqliteTransaction) tx;
+				}
+
+				updateCmd.Set(":normalized_url", normalizedUrl);
+				updateCmd.Set(":download_url", downloadUrl);
+				await updateCmd.ExecuteNonQueryAsync();
+			}
+		}
+
+		await reporter.SubWork("Updating URLs...", totalUrls, totalUrls);
+
+		await tx.CommitAsync();
+		await tx.DisposeAsync();
+
+		await conn.ExecuteAsync("PRAGMA cache_size = -2000");
+	}
+}

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

@@ -0,0 +1,155 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using DHT.Server.Data;
+using DHT.Server.Database.Sqlite.Utils;
+using DHT.Server.Download;
+using Microsoft.Data.Sqlite;
+
+namespace DHT.Server.Database.Sqlite.Schema;
+
+sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
+	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.MainWork("Applying schema changes...", 0, 6);
+		await SqliteSchema.CreateDownloadTables(conn);
+		
+		await reporter.MainWork("Migrating download metadata...", 1, 6);
+		await conn.ExecuteAsync("INSERT INTO download_metadata (normalized_url, download_url, status, size) SELECT normalized_url, download_url, status, size FROM downloads");
+		
+		await reporter.MainWork("Merging attachment metadata...", 2, 6);
+		await conn.ExecuteAsync("UPDATE download_metadata SET type = (SELECT type FROM attachments WHERE download_metadata.normalized_url = attachments.normalized_url)");
+		
+		await reporter.MainWork("Migrating downloaded files...", 3, 6);
+		await MigrateDownloadBlobsToNewTable(conn, reporter);
+		
+		await reporter.MainWork("Applying schema changes...", 4, 6);
+		await conn.ExecuteAsync("DROP TABLE downloads");
+		
+		await reporter.MainWork("Discovering downloadable links...", 5, 6);
+		await DiscoverDownloadableLinks(conn, reporter);
+	}
+
+	private async Task MigrateDownloadBlobsToNewTable(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.SubWork("Listing downloaded files...", 0, 0);
+		
+		var urlsToMigrate = await GetDownloadedFileUrls(conn);
+		int totalFiles = urlsToMigrate.Count;
+		int processedFiles = -1;
+
+		await reporter.SubWork("Processing downloaded files...", 0, totalFiles);
+		
+		var tx = await conn.BeginTransactionAsync();
+
+		await using (var insertCmd = conn.Command("INSERT INTO download_blobs (normalized_url, blob) SELECT normalized_url, blob FROM downloads WHERE normalized_url = :normalized_url"))
+		await using (var deleteCmd = conn.Command("DELETE FROM downloads WHERE normalized_url = :normalized_url")) {
+			insertCmd.Add(":normalized_url", SqliteType.Text);
+			deleteCmd.Add(":normalized_url", SqliteType.Text);
+			
+			foreach (var url in urlsToMigrate) {
+				if (++processedFiles % 10 == 0) {
+					await reporter.SubWork("Processing downloaded files...", processedFiles, totalFiles);
+			
+					// Not proper way of dealing with transactions, but it avoids a long commit at the end.
+					// Schema upgrades are already non-atomic anyways, so this doesn't make it worse.
+					await tx.CommitAsync();
+					await tx.DisposeAsync();
+			
+					tx = await conn.BeginTransactionAsync();
+					insertCmd.Transaction = (SqliteTransaction) tx;
+					deleteCmd.Transaction = (SqliteTransaction) tx;
+				}
+				
+				insertCmd.Set(":normalized_url", url);
+				await insertCmd.ExecuteNonQueryAsync();
+				
+				deleteCmd.Set(":normalized_url", url);
+				await deleteCmd.ExecuteNonQueryAsync();
+			}
+		}
+
+		await reporter.SubWork("Processing downloaded files...", totalFiles, totalFiles);
+
+		await tx.CommitAsync();
+		await tx.DisposeAsync();
+	}
+
+	private async Task<List<string>> GetDownloadedFileUrls(ISqliteConnection conn) {
+		var urls = new List<string>();
+
+		await using var selectCmd = conn.Command("SELECT normalized_url FROM downloads WHERE blob IS NOT NULL");
+		await using var reader = await selectCmd.ExecuteReaderAsync();
+
+		while (await reader.ReadAsync()) {
+			urls.Add(reader.GetString(0));
+		}
+
+		return urls;
+	}
+
+	private async Task DiscoverDownloadableLinks(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.SubWork("Processing attachments...", 0, 4);
+
+		await using (var cmd = conn.Command("""
+		                                    INSERT OR IGNORE INTO download_metadata (normalized_url, download_url, status, type, size)
+		                                    SELECT a.normalized_url, a.download_url, :pending, a.type, MAX(a.size)
+		                                    FROM attachments a
+		                                    GROUP BY a.normalized_url
+		                                    """)) {
+			cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
+			await cmd.ExecuteNonQueryAsync();
+		}
+
+		static async Task InsertDownload(SqliteCommand insertCmd, Data.Download? download) {
+			if (download == null) {
+				return;
+			}
+
+			insertCmd.Set(":normalized_url", download.NormalizedUrl);
+			insertCmd.Set(":download_url", download.DownloadUrl);
+			insertCmd.Set(":status", (int) download.Status);
+			insertCmd.Set(":type", download.Type);
+			insertCmd.Set(":size", download.Size);
+			await insertCmd.ExecuteNonQueryAsync();
+		}
+		
+		await using (var tx = await conn.BeginTransactionAsync()) {
+			await using var insertCmd = conn.Command("INSERT OR IGNORE INTO download_metadata (normalized_url, download_url, status, type, size) VALUES (:normalized_url, :download_url, :status, :type, :size)");
+			insertCmd.Add(":normalized_url", SqliteType.Text);
+			insertCmd.Add(":download_url", SqliteType.Text);
+			insertCmd.Add(":status", SqliteType.Integer);
+			insertCmd.Add(":type", SqliteType.Text);
+			insertCmd.Add(":size", SqliteType.Integer);
+
+			await reporter.SubWork("Processing embeds...", 1, 4);
+			
+			await using (var embedCmd = conn.Command("SELECT json FROM embeds")) {
+				await using var reader = await embedCmd.ExecuteReaderAsync();
+
+				while (await reader.ReadAsync()) {
+					await InsertDownload(insertCmd, await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0)));
+				}
+			}
+
+			await reporter.SubWork("Processing users...", 2, 4);
+			
+			await using (var avatarCmd = conn.Command("SELECT id, avatar_url FROM users WHERE avatar_url IS NOT NULL")) {
+				await using var reader = await avatarCmd.ExecuteReaderAsync();
+
+				while (await reader.ReadAsync()) {
+					await InsertDownload(insertCmd, DownloadLinkExtractor.FromUserAvatar(reader.GetUint64(0), reader.GetString(1)));
+				}
+			}
+			
+			await reporter.SubWork("Processing reactions...", 3, 4);
+			
+			await using (var avatarCmd = conn.Command("SELECT DISTINCT emoji_id, emoji_flags FROM reactions WHERE emoji_id IS NOT NULL")) {
+				await using var reader = await avatarCmd.ExecuteReaderAsync();
+
+				while (await reader.ReadAsync()) {
+					await InsertDownload(insertCmd, DownloadLinkExtractor.FromEmoji(reader.GetUint64(0), (EmojiFlags) reader.GetInt16(1)));
+				}
+			}
+			
+			await tx.CommitAsync();
+		}
+	}
+}

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -2,8 +2,8 @@ using System;
 using System.Threading.Tasks;
 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.Tasks;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite;
@@ -11,36 +11,33 @@ namespace DHT.Server.Database.Sqlite;
 public sealed class SqliteDatabaseFile : IDatabaseFile {
 	private const int DefaultPoolSize = 5;
 
-	public static async Task<SqliteDatabaseFile?> OpenOrCreate(string path, ISchemaUpgradeCallbacks schemaUpgradeCallbacks, TaskScheduler computeTaskResultScheduler) {
+	public static async Task<SqliteDatabaseFile?> OpenOrCreate(string path, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
 		var connectionString = new SqliteConnectionStringBuilder {
 			DataSource = path,
 			Mode = SqliteOpenMode.ReadWriteCreate,
 		};
 
-		var pool = new SqliteConnectionPool(connectionString, DefaultPoolSize);
+		var pool = await SqliteConnectionPool.Create(connectionString, DefaultPoolSize);
 		bool wasOpened;
 
 		try {
-			using var conn = pool.Take();
+			await using var conn = await pool.Take();
-			wasOpened = await new Schema(conn).Setup(schemaUpgradeCallbacks);
+			wasOpened = await new SqliteSchema(conn).Setup(schemaUpgradeCallbacks);
 		} catch (Exception) {
-			pool.Dispose();
+			await pool.DisposeAsync();
 			throw;
 		}
 
 		if (wasOpened) {
-			var db = new SqliteDatabaseFile(path, pool, computeTaskResultScheduler);
+			return new SqliteDatabaseFile(path, pool);
-			await db.Initialize();
-			return db;
 		}
 		else {
-			pool.Dispose();
+			await pool.DisposeAsync();
 			return null;
 		}
 	}
 
 	public string Path { get; }
-	public DatabaseStatistics Statistics { get; }
 	
 	public IUserRepository Users => users;
 	public IServerRepository Servers => servers;
@@ -56,82 +53,28 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 	private readonly SqliteMessageRepository messages;
 	private readonly SqliteDownloadRepository downloads;
 	
-	private readonly AsyncValueComputer<long>.Single totalMessagesComputer;
+	private SqliteDatabaseFile(string path, SqliteConnectionPool pool) {
-	private readonly AsyncValueComputer<long>.Single totalAttachmentsComputer;
+		this.Path = path;
-	private readonly AsyncValueComputer<long>.Single totalDownloadsComputer;
-
-	private SqliteDatabaseFile(string path, SqliteConnectionPool pool, TaskScheduler computeTaskResultScheduler) {
 		this.pool = pool;
 
-		this.totalMessagesComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateMessageStatistics, computeTaskResultScheduler).WithOutdatedResults().BuildWithComputer(ComputeMessageStatistics);
+		downloads = new SqliteDownloadRepository(pool);
-		this.totalAttachmentsComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateAttachmentStatistics, computeTaskResultScheduler).WithOutdatedResults().BuildWithComputer(ComputeAttachmentStatistics);
+		users = new SqliteUserRepository(pool, downloads);
-		this.totalDownloadsComputer = AsyncValueComputer<long>.WithResultProcessor(UpdateDownloadStatistics, computeTaskResultScheduler).WithOutdatedResults().BuildWithComputer(ComputeDownloadStatistics);
+		servers = new SqliteServerRepository(pool);
-
+		channels = new SqliteChannelRepository(pool);
-		this.Path = path;
+		messages = new SqliteMessageRepository(pool, downloads);
-		this.Statistics = new DatabaseStatistics();
-
-		this.users = new SqliteUserRepository(pool, Statistics);
-		this.servers = new SqliteServerRepository(pool, Statistics);
-		this.channels = new SqliteChannelRepository(pool, Statistics);
-		this.messages = new SqliteMessageRepository(pool, totalMessagesComputer, totalAttachmentsComputer);
-		this.downloads = new SqliteDownloadRepository(pool, totalDownloadsComputer);
-
-		totalMessagesComputer.Recompute();
-		totalAttachmentsComputer.Recompute();
-		totalDownloadsComputer.Recompute();
 	}
 
-	private async Task Initialize() {
+	public async ValueTask DisposeAsync() {
-		await users.Initialize();
+		users.Dispose();
-		await servers.Initialize();
+		servers.Dispose();
-		await channels.Initialize();
+		channels.Dispose();
-	}
+		messages.Dispose();
-
+		downloads.Dispose();
-	public void Dispose() {
+		await pool.DisposeAsync();
-		totalMessagesComputer.Cancel();
-		totalAttachmentsComputer.Cancel();
-		totalDownloadsComputer.Cancel();
-		pool.Dispose();
-	}
-
-	public async Task<DatabaseStatisticsSnapshot> SnapshotStatistics() {
-		return new DatabaseStatisticsSnapshot {
-			TotalServers = Statistics.TotalServers,
-			TotalChannels = Statistics.TotalChannels,
-			TotalUsers = Statistics.TotalUsers,
-			TotalMessages = await ComputeMessageStatistics(),
-		};
 	}
 
 	public async Task Vacuum() {
-		using var conn = pool.Take();
+		await using var conn = await pool.Take();
 		await conn.ExecuteAsync("VACUUM");
 	}
-
-	private async Task<long> ComputeMessageStatistics() {
-		using var conn = pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM messages", static reader => reader?.GetInt64(0) ?? 0L);
-	}
-
-	private void UpdateMessageStatistics(long totalMessages) {
-		Statistics.TotalMessages = totalMessages;
-	}
-
-	private async Task<long> ComputeAttachmentStatistics() {
-		using var conn = pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT COUNT(DISTINCT normalized_url) FROM attachments", static reader => reader?.GetInt64(0) ?? 0L);
-	}
-
-	private void UpdateAttachmentStatistics(long totalAttachments) {
-		Statistics.TotalAttachments = totalAttachments;
-	}
-
-	private async Task<long> ComputeDownloadStatistics() {
-		using var conn = pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM downloads", static reader => reader?.GetInt64(0) ?? 0L);
-	}
-
-	private void UpdateDownloadStatistics(long totalDownloads) {
-		Statistics.TotalDownloads = totalDownloads;
-	}
 }

app/Server/Database/Sqlite/SqliteFilters.cs

@@ -8,77 +8,53 @@ using DHT.Server.Database.Sqlite.Utils;
 namespace DHT.Server.Database.Sqlite;
 
 static class SqliteFilters {
-	private static string WhereAll(bool invert) {
+	public static SqliteConditionBuilder GenerateConditions(this MessageFilter? filter, string? tableAlias = null, bool invert = false) {
-		return invert ? "WHERE FALSE" : "";
+		var builder = new SqliteConditionBuilder(tableAlias, invert);
+
+		if (filter != null) {
+			if (filter.StartDate != null) {
+				builder.AddCondition("timestamp >= " + new DateTimeOffset(filter.StartDate.Value).ToUnixTimeMilliseconds());
+			}
+
+			if (filter.EndDate != null) {
+				builder.AddCondition("timestamp <= " + new DateTimeOffset(filter.EndDate.Value).ToUnixTimeMilliseconds());
+			}
+
+			if (filter.ChannelIds != null) {
+				builder.AddCondition("channel_id IN (" + string.Join(",", filter.ChannelIds) + ")");
+			}
+
+			if (filter.UserIds != null) {
+				builder.AddCondition("sender_id IN (" + string.Join(",", filter.UserIds) + ")");
+			}
+
+			if (filter.MessageIds != null) {
+				builder.AddCondition("message_id IN (" + string.Join(",", filter.MessageIds) + ")");
+			}
+		}
+
+		return builder;
 	}
 
-	public static string GenerateWhereClause(this MessageFilter? filter, string? tableAlias = null, bool invert = false) {
+	public static SqliteConditionBuilder GenerateConditions(this DownloadItemFilter? filter, string? tableAlias = null, bool invert = false) {
-		if (filter == null || filter.IsEmpty) {
+		var builder = new SqliteConditionBuilder(tableAlias, invert);
-			return WhereAll(invert);
+
+		if (filter != null) {
+			if (filter.IncludeStatuses != null) {
+				builder.AddCondition("status IN (" + filter.IncludeStatuses.In() + ")");
+			}
+
+			if (filter.ExcludeStatuses != null) {
+				builder.AddCondition("status NOT IN (" + filter.ExcludeStatuses.In() + ")");
+			}
+
+			if (filter.MaxBytes != null) {
+				builder.AddCondition("size IS NOT NULL");
+				builder.AddCondition("size <= " + filter.MaxBytes);
+			}
 		}
 
-		var where = new SqliteWhereGenerator(tableAlias, invert);
+		return builder;
-
-		if (filter.StartDate != null) {
-			where.AddCondition("timestamp >= " + new DateTimeOffset(filter.StartDate.Value).ToUnixTimeMilliseconds());
-		}
-
-		if (filter.EndDate != null) {
-			where.AddCondition("timestamp <= " + new DateTimeOffset(filter.EndDate.Value).ToUnixTimeMilliseconds());
-		}
-
-		if (filter.ChannelIds != null) {
-			where.AddCondition("channel_id IN (" + string.Join(",", filter.ChannelIds) + ")");
-		}
-
-		if (filter.UserIds != null) {
-			where.AddCondition("sender_id IN (" + string.Join(",", filter.UserIds) + ")");
-		}
-
-		if (filter.MessageIds != null) {
-			where.AddCondition("message_id IN (" + string.Join(",", filter.MessageIds) + ")");
-		}
-
-		return where.Generate();
-	}
-
-	public static string GenerateWhereClause(this AttachmentFilter? filter, string? tableAlias = null, bool invert = false) {
-		if (filter == null || filter.IsEmpty) {
-			return WhereAll(invert);
-		}
-
-		var where = new SqliteWhereGenerator(tableAlias, invert);
-
-		if (filter.MaxBytes != null) {
-			where.AddCondition("size <= " + filter.MaxBytes);
-		}
-
-		if (filter.DownloadItemRule == AttachmentFilter.DownloadItemRules.OnlyNotPresent) {
-			where.AddCondition("normalized_url NOT IN (SELECT normalized_url FROM downloads)");
-		}
-		else if (filter.DownloadItemRule == AttachmentFilter.DownloadItemRules.OnlyPresent) {
-			where.AddCondition("normalized_url IN (SELECT normalized_url FROM downloads)");
-		}
-
-		return where.Generate();
-	}
-
-	public static string GenerateWhereClause(this DownloadItemFilter? filter, string? tableAlias = null, bool invert = false) {
-		if (filter == null || filter.IsEmpty) {
-			return WhereAll(invert);
-		}
-
-		var where = new SqliteWhereGenerator(tableAlias, invert);
-
-		if (filter.IncludeStatuses != null) {
-			where.AddCondition("status IN (" + filter.IncludeStatuses.In() + ")");
-		}
-
-		if (filter.ExcludeStatuses != null) {
-			where.AddCondition("status NOT IN (" + filter.ExcludeStatuses.In() + ")");
-		}
-
-		return where.Generate();
 	}
 
 	private static string In(this ISet<DownloadStatus> statuses) {

app/Server/Database/Sqlite/SqliteSchema.cs

@@ -0,0 +1,193 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using DHT.Server.Database.Exceptions;
+using DHT.Server.Database.Sqlite.Schema;
+using DHT.Server.Database.Sqlite.Utils;
+using DHT.Utils.Logging;
+
+namespace DHT.Server.Database.Sqlite;
+
+sealed class SqliteSchema {
+	internal const int Version = 7;
+
+	private static readonly Log Log = Log.ForType<SqliteSchema>();
+
+	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)");
+
+		var dbVersionStr = await conn.ExecuteReaderAsync("SELECT value FROM metadata WHERE key = 'version'", static reader => reader?.GetString(0));
+		if (dbVersionStr == null) {
+			await InitializeSchemas();
+		}
+		else if (!int.TryParse(dbVersionStr, out int dbVersion) || dbVersion < 1) {
+			throw new InvalidDatabaseVersionException(dbVersionStr);
+		}
+		else if (dbVersion > Version) {
+			throw new DatabaseTooNewException(dbVersion);
+		}
+		else if (dbVersion < Version) {
+			var proceed = await callbacks.CanUpgrade();
+			if (!proceed) {
+				return false;
+			}
+
+			await callbacks.Start(Version - dbVersion, async reporter => await UpgradeSchemas(dbVersion, reporter));
+		}
+
+		return true;
+	}
+
+	private async Task InitializeSchemas() {
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE users (
+		                        	id            INTEGER PRIMARY KEY NOT NULL,
+		                        	name          TEXT NOT NULL,
+		                        	avatar_url    TEXT,
+		                        	discriminator TEXT
+		                        )
+		                        """);
+
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE servers (
+		                        	id   INTEGER PRIMARY KEY NOT NULL,
+		                        	name TEXT NOT NULL,
+		                        	type TEXT NOT NULL
+		                        )
+		                        """);
+
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE channels (
+		                        	id        INTEGER PRIMARY KEY NOT NULL,
+		                        	server    INTEGER NOT NULL,
+		                        	name      TEXT NOT NULL,
+		                        	parent_id INTEGER,
+		                        	position  INTEGER,
+		                        	topic     TEXT,
+		                        	nsfw      INTEGER
+		                        )
+		                        """);
+
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE messages (
+		                        	message_id INTEGER PRIMARY KEY NOT NULL,
+		                        	sender_id  INTEGER NOT NULL,
+		                        	channel_id INTEGER NOT NULL,
+		                        	text       TEXT NOT NULL,
+		                        	timestamp  INTEGER NOT NULL
+		                        )
+		                        """);
+
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE attachments (
+		                        	message_id     INTEGER NOT NULL,
+		                        	attachment_id  INTEGER NOT NULL PRIMARY KEY NOT NULL,
+		                        	name           TEXT NOT NULL,
+		                        	type           TEXT,
+		                        	normalized_url TEXT NOT NULL,
+		                        	download_url   TEXT,
+		                        	size           INTEGER NOT NULL,
+		                        	width          INTEGER,
+		                        	height         INTEGER
+		                        )
+		                        """);
+
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE embeds (
+		                        	message_id INTEGER NOT NULL,
+		                        	json       TEXT NOT NULL
+		                        )
+		                        """);
+
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE reactions (
+		                        	message_id  INTEGER NOT NULL,
+		                        	emoji_id    INTEGER,
+		                        	emoji_name  TEXT,
+		                        	emoji_flags INTEGER NOT NULL,
+		                        	count       INTEGER NOT NULL
+		                        )
+		                        """);
+
+		await CreateMessageEditTimestampTable(conn);
+		await CreateMessageRepliedToTable(conn);
+		await CreateDownloadTables(conn);
+
+		await conn.ExecuteAsync("CREATE INDEX attachments_message_ix ON attachments(message_id)");
+		await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON embeds(message_id)");
+		await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON reactions(message_id)");
+
+		await conn.ExecuteAsync("INSERT INTO metadata (key, value) VALUES ('version', " + Version + ")");
+	}
+
+	internal static async Task CreateMessageEditTimestampTable(ISqliteConnection conn) {
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE edit_timestamps (
+		                        	message_id     INTEGER PRIMARY KEY NOT NULL,
+		                        	edit_timestamp INTEGER NOT NULL
+		                        )
+		                        """);
+	}
+
+	internal static async Task CreateMessageRepliedToTable(ISqliteConnection conn) {
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE replied_to (
+		                        	message_id    INTEGER PRIMARY KEY NOT NULL,
+		                        	replied_to_id INTEGER NOT NULL
+		                        )
+		                        """);
+	}
+
+	internal static async Task CreateDownloadTables(ISqliteConnection conn) {
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE download_metadata (
+		                        	normalized_url TEXT NOT NULL PRIMARY KEY,
+		                        	download_url   TEXT NOT NULL,
+		                        	status         INTEGER NOT NULL,
+		                        	type           TEXT,
+		                        	size           INTEGER
+		                        )
+		                        """);
+
+		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
+		                        )
+		                        """);
+	}
+
+	private async Task UpgradeSchemas(int dbVersion, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		var upgrades = new Dictionary<int, ISchemaUpgrade> {
+			{ 1, new SqliteSchemaUpgradeTo2() },
+			{ 2, new SqliteSchemaUpgradeTo3() },
+			{ 3, new SqliteSchemaUpgradeTo4() },
+			{ 4, new SqliteSchemaUpgradeTo5() },
+			{ 5, new SqliteSchemaUpgradeTo6() },
+			{ 6, new SqliteSchemaUpgradeTo7() },
+		};
+
+		var perf = Log.Start("from version " + dbVersion);
+
+		for (int fromVersion = dbVersion; fromVersion < Version; fromVersion++) {
+			var toVersion = fromVersion + 1;
+			
+			if (upgrades.TryGetValue(fromVersion, out var upgrade)) {
+				await upgrade.Run(conn, reporter);
+			}
+
+			await conn.ExecuteAsync("UPDATE metadata SET value = " + toVersion + " WHERE key = 'version'");
+
+			perf.Step("Upgrade to version " + toVersion);
+			await reporter.NextVersion();
+		}
+
+		perf.End();
+	}
+}

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

@@ -3,6 +3,6 @@ using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Utils;
 
-interface ISqliteConnection : IDisposable {
+interface ISqliteConnection : IAsyncDisposable {
 	SqliteConnection InnerConnection { get; }
 }

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

@@ -2,12 +2,12 @@ using System.Collections.Generic;
 
 namespace DHT.Server.Database.Sqlite.Utils;
 
-sealed class SqliteWhereGenerator {
+sealed class SqliteConditionBuilder {
 	private readonly string? tableAlias;
 	private readonly bool invert;
-	private readonly List<string> conditions = new ();
+	private readonly List<string> conditions = [];
 
-	public SqliteWhereGenerator(string? tableAlias, bool invert) {
+	public SqliteConditionBuilder(string? tableAlias, bool invert) {
 		this.tableAlias = tableAlias;
 		this.invert = invert;
 	}
@@ -16,16 +16,20 @@ sealed class SqliteWhereGenerator {
 		conditions.Add(tableAlias == null ? condition : tableAlias + '.' + condition);
 	}
 
-	public string Generate() {
+	public string Build() {
 		if (conditions.Count == 0) {
-			return "";
+			return invert ? "FALSE" : "TRUE";
 		}
 
 		if (invert) {
-			return " WHERE NOT (" + string.Join(" AND ", conditions) + ")";
+			return "NOT (" + string.Join(" AND ", conditions) + ")";
 		}
 		else {
-			return " WHERE " + string.Join(" AND ", conditions);
+			return string.Join(" AND ", conditions);
 		}
 	}
+	
+	public string BuildWhereClause() {
+		return " WHERE " + Build();
+	}
 }

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

@@ -1,100 +1,76 @@
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
-using DHT.Utils.Logging;
+using System.Threading.Tasks;
+using DHT.Utils.Collections;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Utils;
 
-sealed class SqliteConnectionPool : IDisposable {
+sealed class SqliteConnectionPool : IAsyncDisposable {
+	public static async Task<SqliteConnectionPool> Create(SqliteConnectionStringBuilder connectionStringBuilder, int poolSize) {
+		var pool = new SqliteConnectionPool(poolSize);
+		await pool.InitializePooledConnections(connectionStringBuilder);
+		return pool;
+	}
+
 	private static string GetConnectionString(SqliteConnectionStringBuilder connectionStringBuilder) {
 		connectionStringBuilder.Pooling = false;
 		return connectionStringBuilder.ToString();
 	}
 
-	private readonly object monitor = new ();
+	private readonly int poolSize;
-	private readonly Random rand = new ();
+	private readonly List<PooledConnection> all;
-	private volatile bool isDisposed;
+	private readonly ConcurrentPool<PooledConnection> free;
 
-	private readonly BlockingCollection<PooledConnection> free = new (new ConcurrentStack<PooledConnection>());
+	private readonly CancellationTokenSource disposalTokenSource = new ();
-	private readonly List<PooledConnection> used;
+	private readonly CancellationToken disposalToken;
 
-	public SqliteConnectionPool(SqliteConnectionStringBuilder connectionStringBuilder, int poolSize) {
+	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(SqliteConnectionStringBuilder connectionStringBuilder) {
 		var connectionString = GetConnectionString(connectionStringBuilder);
 
 		for (int i = 0; i < poolSize; i++) {
 			var conn = new SqliteConnection(connectionString);
 			conn.Open();
 
-			var pooledConn = new PooledConnection(this, conn);
+			var pooledConnection = new PooledConnection(this, conn);
 
-			using (var cmd = pooledConn.Command("PRAGMA journal_mode=WAL")) {
+			await pooledConnection.ExecuteAsync("PRAGMA journal_mode=WAL", disposalToken);
-				cmd.ExecuteNonQuery();
+			await pooledConnection.ExecuteAsync("PRAGMA foreign_keys=ON", disposalToken);
-			}
 
-			free.Add(pooledConn);
+			all.Add(pooledConnection);
-		}
+			await free.Push(pooledConnection, disposalToken);
-
-		used = new List<PooledConnection>(poolSize);
-	}
-
-	private void ThrowIfDisposed() {
-		ObjectDisposedException.ThrowIf(isDisposed, nameof(SqliteConnectionPool));
-	}
-
-	public ISqliteConnection Take() {
-		while (true) {
-			ThrowIfDisposed();
-
-			lock (monitor) {
-				if (free.TryTake(out var conn)) {
-					used.Add(conn);
-					return conn;
-				}
-				else {
-					Log.ForType<SqliteConnectionPool>().Warn("Thread " + Environment.CurrentManagedThreadId + " is starving for connections.");
-				}
-			}
-
-			Thread.Sleep(TimeSpan.FromMilliseconds(rand.Next(100, 200)));
 		}
 	}
 
-	private void Return(PooledConnection conn) {
+	public async Task<ISqliteConnection> Take() {
-		ThrowIfDisposed();
+		return await free.Pop(disposalToken);
-
-		lock (monitor) {
-			if (used.Remove(conn)) {
-				free.Add(conn);
-			}
-		}
 	}
 
-	public void Dispose() {
+	private async Task Return(PooledConnection conn) {
-		if (isDisposed) {
+		await free.Push(conn, disposalToken);
+	}
+
+	public async ValueTask DisposeAsync() {
+		if (disposalToken.IsCancellationRequested) {
 			return;
 		}
 
-		isDisposed = true;
+		await disposalTokenSource.CancelAsync();
-
+		
-		lock (monitor) {
+		foreach (var conn in all) {
-			while (free.TryTake(out var conn)) {
+			await conn.InnerConnection.CloseAsync();
-				Close(conn.InnerConnection);
+			await conn.InnerConnection.DisposeAsync();
-			}
-
-			foreach (var conn in used) {
-				Close(conn.InnerConnection);
-			}
-
-			free.Dispose();
-			used.Clear();
 		}
-	}
+		
-
+		disposalTokenSource.Dispose();
-	private static void Close(SqliteConnection conn) {
-		conn.Close();
-		conn.Dispose();
 	}
 
 	private sealed class PooledConnection : ISqliteConnection {
@@ -107,8 +83,8 @@ sealed class SqliteConnectionPool : IDisposable {
 			this.InnerConnection = conn;
 		}
 
-		void IDisposable.Dispose() {
+		public async ValueTask DisposeAsync() {
-			pool.Return(this);
+			await pool.Return(this);
 		}
 	}
 }

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

@@ -13,7 +13,7 @@ static class SqliteExtensions {
 		return conn.InnerConnection.BeginTransactionAsync();
 	}
 
-	public static SqliteCommand Command(this ISqliteConnection conn, string sql) {
+	public static SqliteCommand Command(this ISqliteConnection conn, [LanguageInjection("sql")] string sql) {
 		var cmd = conn.InnerConnection.CreateCommand();
 		cmd.CommandText = sql;
 		return cmd;
@@ -28,7 +28,7 @@ static class SqliteExtensions {
 		await using var cmd = conn.Command(sql);
 		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 
-		return reader.Read() ? readFunction(reader) : readFunction(null);
+		return await reader.ReadAsync(cancellationToken) ? readFunction(reader) : readFunction(null);
 	}
 
 	public static SqliteCommand Insert(this ISqliteConnection conn, string tableName, (string Name, SqliteType Type)[] columns) {
@@ -58,7 +58,7 @@ static class SqliteExtensions {
 
 	public static SqliteCommand Delete(this ISqliteConnection conn, string tableName, (string Name, SqliteType Type) column) {
 		var cmd = conn.Command("DELETE FROM " + tableName + " WHERE " + column.Name + " = :" + column.Name);
-		CreateParameters(cmd, new[] { column });
+		CreateParameters(cmd, [column]);
 		return cmd;
 	}
 

app/Server/Download/DiscordCdn.cs

@@ -1,15 +1,43 @@
 using System;
 using System.Collections.Frozen;
+using System.Diagnostics.CodeAnalysis;
+using System.Web;
 
 namespace DHT.Server.Download;
 
 static class DiscordCdn {
-	private static FrozenSet<string> CdnHosts { get; } = new [] {
+	private static FrozenSet<string> CdnHosts { get; } = new[] {
 		"cdn.discordapp.com",
 		"cdn.discord.com",
+		"media.discordapp.net"
 	}.ToFrozenSet();
 
+	private static bool IsCdnUrl(string originalUrl, [NotNullWhen(true)] out Uri? uri) {
+		return Uri.TryCreate(originalUrl, UriKind.Absolute, out uri) && CdnHosts.Contains(uri.Host);
+	}
+
 	public static string NormalizeUrl(string originalUrl) {
-		return Uri.TryCreate(originalUrl, UriKind.Absolute, out var uri) && CdnHosts.Contains(uri.Host) ? uri.GetLeftPart(UriPartial.Path) : originalUrl;
+		return IsCdnUrl(originalUrl, out var uri) ? DoNormalize(uri) : originalUrl;
+	}
+
+	public static bool NormalizeUrlAndReturnIfCdn(string originalUrl, out string normalizedUrl) {
+		if (IsCdnUrl(originalUrl, out var uri)) {
+			normalizedUrl = DoNormalize(uri);
+			return true;
+		}
+		else {
+			normalizedUrl = originalUrl;
+			return false;
+		}
+	}
+
+	private static string DoNormalize(Uri uri) {
+		var query = HttpUtility.ParseQueryString(uri.Query);
+		
+		query.Remove("ex");
+		query.Remove("is");
+		query.Remove("hm");
+
+		return new UriBuilder(uri) { Query = query.ToString() }.Uri.ToString();
 	}
 }

app/Server/Download/DownloadItem.cs

@@ -1,7 +1,22 @@
+using System;
+using System.Net;
+using DHT.Server.Data;
+
 namespace DHT.Server.Download;
 
 public readonly struct DownloadItem {
 	public string NormalizedUrl { get; init; }
 	public string DownloadUrl { get; init; }
-	public ulong Size { get; init; }
+	public string? Type { get; init; }
+	public ulong? Size { get; init; }
+	
+	internal DownloadWithData ToSuccess(byte[] data) {
+		var size = (ulong) Math.Max(data.LongLength, 0);
+		return new DownloadWithData(new Data.Download(NormalizedUrl, DownloadUrl, DownloadStatus.Success, Type, size), data);
+	}
+	
+	internal DownloadWithData ToFailure(HttpStatusCode? statusCode = null) {
+		var status = statusCode.HasValue ? (DownloadStatus) (int) statusCode : DownloadStatus.GenericError;
+		return new DownloadWithData(new Data.Download(NormalizedUrl, DownloadUrl, status, Type, Size), Data: null);
+	}
 }

app/Server/Download/DownloadLinkExtractor.cs

@@ -0,0 +1,122 @@
+using System;
+using System.IO;
+using System.Net.Mime;
+using System.Text.Json;
+using System.Threading.Tasks;
+using DHT.Server.Data;
+using DHT.Server.Data.Embeds;
+using DHT.Utils.Logging;
+
+namespace DHT.Server.Download;
+
+static class DownloadLinkExtractor {
+	private static readonly Log Log = Log.ForType(typeof(DownloadLinkExtractor));
+
+	public static Data.Download FromUserAvatar(ulong userId, string avatarPath) {
+		string url = $"https://cdn.discordapp.com/avatars/{userId}/{avatarPath}.webp";
+		return new Data.Download(url, url, DownloadStatus.Pending, MediaTypeNames.Image.Webp, size: null);
+	}
+
+	public static Data.Download FromEmoji(ulong emojiId, EmojiFlags flags) {
+		var isAnimated = flags.HasFlag(EmojiFlags.Animated);
+		
+		string ext = isAnimated ? "gif" : "webp";
+		string type = isAnimated ? MediaTypeNames.Image.Gif : MediaTypeNames.Image.Webp;
+		
+		string url = $"https://cdn.discordapp.com/emojis/{emojiId}.{ext}";
+		return new Data.Download(url, url, DownloadStatus.Pending, type, size: null);
+	}
+
+	public static Data.Download FromAttachment(Attachment attachment) {
+		return new Data.Download(attachment.NormalizedUrl, attachment.DownloadUrl, DownloadStatus.Pending, attachment.Type, attachment.Size);
+	}
+
+	public static async Task<Data.Download?> TryFromEmbedJson(Stream jsonStream) {
+		try {
+			return FromEmbed(await JsonSerializer.DeserializeAsync(jsonStream, DiscordEmbedJsonContext.Default.DiscordEmbedJson));
+		} catch (Exception e) {
+			Log.Error("Could not parse embed json: " + e);
+			return null;
+		}
+	}
+
+	public static Data.Download? TryFromEmbedJson(string json) {
+		try {
+			return FromEmbed(JsonSerializer.Deserialize(json, DiscordEmbedJsonContext.Default.DiscordEmbedJson));
+		} catch (Exception e) {
+			Log.Error("Could not parse embed json: " + e);
+			return null;
+		}
+	}
+	
+	private static Data.Download? FromEmbed(DiscordEmbedJson? embed) {
+		if (embed is { Type: "image", Image.Url: {} imageUrl }) {
+			return FromEmbedImage(imageUrl);
+		}
+		else if (embed is { Type: "video", Video.Url: {} videoUrl }) {
+			return FromEmbedVideo(videoUrl);
+		}
+		else {
+			return null;
+		}
+	}
+
+	private static Data.Download? FromEmbedImage(string url) {
+		if (DiscordCdn.NormalizeUrlAndReturnIfCdn(url, out var normalizedUrl)) {
+			return new Data.Download(normalizedUrl, url, DownloadStatus.Pending, GuessImageType(normalizedUrl), size: null);
+		}
+		else {
+			Log.Debug("Skipping non-CDN image url: " + url);
+			return null;
+		}
+	}
+
+	private static Data.Download? FromEmbedVideo(string url) {
+		if (DiscordCdn.NormalizeUrlAndReturnIfCdn(url, out var normalizedUrl)) {
+			return new Data.Download(normalizedUrl, url, DownloadStatus.Pending, GuessVideoType(normalizedUrl), size: null);
+		}
+		else {
+			Log.Debug("Skipping non-CDN video url: " + url);
+			return null;
+		}
+	}
+
+	private static string? GuessImageType(string url) {
+		if (!Uri.TryCreate(url, UriKind.Absolute, out var uri)) {
+			return null;
+		}
+
+		ReadOnlySpan<char> extension = Path.GetExtension(uri.AbsolutePath).ToLowerInvariant();
+		
+		// Remove Twitter quality suffix.
+		int colonIndex = extension.IndexOf(':');
+		if (colonIndex != -1) {
+			extension = extension[..colonIndex];
+		}
+
+		return extension switch {
+			".jpg"  => MediaTypeNames.Image.Jpeg,
+			".jpeg" => MediaTypeNames.Image.Jpeg,
+			".png"  => MediaTypeNames.Image.Png,
+			".gif"  => MediaTypeNames.Image.Gif,
+			".webp" => MediaTypeNames.Image.Webp,
+			".bmp"  => MediaTypeNames.Image.Bmp,
+			_       => null
+		};
+	}
+
+	private static string? GuessVideoType(string url) {
+		if (!Uri.TryCreate(url, UriKind.Absolute, out var uri)) {
+			return null;
+		}
+
+		string extension = Path.GetExtension(uri.AbsolutePath).ToLowerInvariant();
+		return extension switch {
+			".mp4"  => "video/mp4",
+			".mpeg" => "video/mpeg",
+			".webm" => "video/webm",
+			".mov"  => "video/quicktime",
+			_       => null
+		};
+	}
+}

app/Server/Download/Downloader.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using DHT.Server.Data.Filters;
 using DHT.Server.Database;
 
 namespace DHT.Server.Download;
@@ -16,10 +17,10 @@ public sealed class Downloader {
 		this.db = db;
 	}
 
-	public async Task<IObservable<DownloadItem>> Start() {
+	public async Task<IObservable<DownloadItem>> Start(DownloadItemFilter filter) {
 		await semaphore.WaitAsync();
 		try {
-			current ??= new DownloaderTask(db);
+			current ??= new DownloaderTask(db, filter);
 			return current.FinishedItems;
 		} finally {
 			semaphore.Release();

app/Server/Download/DownloaderTask.cs

@@ -5,6 +5,7 @@ using System.Reactive.Subjects;
 using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;
+using DHT.Server.Data.Filters;
 using DHT.Server.Database;
 using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
@@ -29,15 +30,17 @@ sealed class DownloaderTask : IAsyncDisposable {
 	private readonly CancellationToken cancellationToken;
 
 	private readonly IDatabaseFile db;
-	private readonly Subject<DownloadItem> finishedItemPublisher = new ();
+	private readonly DownloadItemFilter filter;
+	private readonly ISubject<DownloadItem> finishedItemPublisher = Subject.Synchronize(new Subject<DownloadItem>());
 
 	private readonly Task queueWriterTask;
 	private readonly Task[] downloadTasks;
 
 	public IObservable<DownloadItem> FinishedItems => finishedItemPublisher;
 
-	internal DownloaderTask(IDatabaseFile db) {
+	internal DownloaderTask(IDatabaseFile db, DownloadItemFilter filter) {
 		this.db = db;
+		this.filter = filter;
 		this.cancellationToken = cancellationTokenSource.Token;
 		this.queueWriterTask = Task.Run(RunQueueWriterTask);
 		this.downloadTasks = Enumerable.Range(1, DownloadTasks).Select(taskIndex => Task.Run(() => RunDownloadTask(taskIndex))).ToArray();
@@ -45,7 +48,7 @@ sealed class DownloaderTask : IAsyncDisposable {
 
 	private async Task RunQueueWriterTask() {
 		while (await downloadQueue.Writer.WaitToWriteAsync(cancellationToken)) {
-			var newItems = await db.Downloads.PullEnqueuedDownloadItems(QueueSize, cancellationToken).ToListAsync(cancellationToken);
+			var newItems = await db.Downloads.PullPendingDownloadItems(QueueSize, filter, cancellationToken).ToListAsync(cancellationToken);
 			if (newItems.Count == 0) {
 				await Task.Delay(TimeSpan.FromMilliseconds(50), cancellationToken);
 				continue;
@@ -70,14 +73,14 @@ sealed class DownloaderTask : IAsyncDisposable {
 
 			try {
 				var downloadedBytes = await client.GetByteArrayAsync(item.DownloadUrl, cancellationToken);
-				await db.Downloads.AddDownload(Data.Download.NewSuccess(item, downloadedBytes));
+				await db.Downloads.AddDownload(item.ToSuccess(downloadedBytes));
 			} catch (OperationCanceledException) {
 				// Ignore.
 			} catch (HttpRequestException e) {
-				await db.Downloads.AddDownload(Data.Download.NewFailure(item, e.StatusCode, item.Size));
+				await db.Downloads.AddDownload(item.ToFailure(e.StatusCode));
 				log.Error(e);
 			} catch (Exception e) {
-				await db.Downloads.AddDownload(Data.Download.NewFailure(item, null, item.Size));
+				await db.Downloads.AddDownload(item.ToFailure());
 				log.Error(e);
 			} finally {
 				try {

app/Server/Endpoints/GetAttachmentEndpoint.cs

@@ -1,24 +0,0 @@
-using System.Net;
-using System.Threading.Tasks;
-using DHT.Server.Data;
-using DHT.Server.Database;
-using DHT.Utils.Http;
-using Microsoft.AspNetCore.Http;
-
-namespace DHT.Server.Endpoints;
-
-sealed class GetAttachmentEndpoint : BaseEndpoint {
-	public GetAttachmentEndpoint(IDatabaseFile db) : base(db) {}
-
-	protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
-		string attachmentUrl = WebUtility.UrlDecode((string) ctx.Request.RouteValues["url"]!);
-		DownloadedAttachment? maybeDownloadedAttachment = await Db.Downloads.GetDownloadedAttachment(attachmentUrl);
-
-		if (maybeDownloadedAttachment is {} downloadedAttachment) {
-			return new HttpOutput.File(downloadedAttachment.Type, downloadedAttachment.Data);
-		}
-		else {
-			return new HttpOutput.Redirect(attachmentUrl, permanent: false);
-		}
-	}
-}

app/Server/Endpoints/GetDownloadedFileEndpoint.cs

@@ -0,0 +1,24 @@
+using System.Net;
+using System.Threading.Tasks;
+using DHT.Server.Database;
+using DHT.Server.Download;
+using DHT.Utils.Http;
+using Microsoft.AspNetCore.Http;
+
+namespace DHT.Server.Endpoints;
+
+sealed class GetDownloadedFileEndpoint : BaseEndpoint {
+	public GetDownloadedFileEndpoint(IDatabaseFile db) : base(db) {}
+
+	protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
+		string url = WebUtility.UrlDecode((string) ctx.Request.RouteValues["url"]!);
+		string normalizedUrl = DiscordCdn.NormalizeUrl(url);
+		
+		if (await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl) is { Download: {} download, Data: {} data }) {
+			return new HttpOutput.File(download.Type, data);
+		}
+		else {
+			return new HttpOutput.Redirect(url, permanent: false);
+		}
+	}
+}

app/Server/Server.csproj

@@ -13,7 +13,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
   
   <ItemGroup>

app/Server/Service/ServerStartup.cs

@@ -11,12 +11,12 @@ using Microsoft.Extensions.Hosting;
 namespace DHT.Server.Service;
 
 sealed class Startup {
-	private static readonly string[] AllowedOrigins = {
+	private static readonly string[] AllowedOrigins = [
 		"https://discord.com",
 		"https://ptb.discord.com",
 		"https://canary.discord.com",
-		"https://discordapp.com",
+		"https://discordapp.com"
-	};
+	];
 
 	public void ConfigureServices(IServiceCollection services) {
 		services.Configure<JsonOptions>(static options => {
@@ -41,7 +41,7 @@ sealed class Startup {
 		
 		app.UseEndpoints(endpoints => {
 			endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(db, parameters).Handle);
-			endpoints.MapGet("/get-attachment/{url}", new GetAttachmentEndpoint(db).Handle);
+			endpoints.MapGet("/get-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
 			endpoints.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
 			endpoints.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
 			endpoints.MapPost("/track-messages", new TrackMessagesEndpoint(db).Handle);

app/Server/State.cs

@@ -22,6 +22,6 @@ public sealed class State : IAsyncDisposable {
 	public async ValueTask DisposeAsync() {
 		await Downloader.Stop();
 		await Server.Stop();
-		Db.Dispose();
+		await Db.DisposeAsync();
 	}
 }

app/Utils/Collections/ConcurrentPool.cs

@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace DHT.Utils.Collections;
+
+public sealed class ConcurrentPool<T> {
+	private readonly SemaphoreSlim mutexSemaphore;
+	private readonly SemaphoreSlim availableItemSemaphore;
+	private readonly Stack<T> items;
+
+	public ConcurrentPool(int size) {
+		mutexSemaphore = new SemaphoreSlim(1);
+		availableItemSemaphore = new SemaphoreSlim(0, size);
+		items = new Stack<T>();
+	}
+
+	public async Task Push(T item, CancellationToken cancellationToken) {
+		await PushItem(item, cancellationToken);
+		availableItemSemaphore.Release();
+	}
+
+	public async Task<T> Pop(CancellationToken cancellationToken) {
+		await availableItemSemaphore.WaitAsync(cancellationToken);
+		return await PopItem(cancellationToken);
+	}
+
+	private async Task PushItem(T item, CancellationToken cancellationToken) {
+		await mutexSemaphore.WaitAsync(cancellationToken);
+		try {
+			items.Push(item);
+		} finally {
+			mutexSemaphore.Release();
+		}
+	}
+
+	private async Task<T> PopItem(CancellationToken cancellationToken) {
+		await mutexSemaphore.WaitAsync(cancellationToken);
+		try {
+			return items.Pop();
+		} finally {
+			mutexSemaphore.Release();
+		}
+	}
+}

app/Utils/Collections/MultiDictionary.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-
-namespace DHT.Utils.Collections;
-
-public sealed class MultiDictionary<TKey, TValue> where TKey : notnull {
-	private readonly Dictionary<TKey, List<TValue>> dict = new();
-
-	public void Add(TKey key, TValue value) {
-		if (!dict.TryGetValue(key, out var list)) {
-			dict[key] = list = new List<TValue>();
-		}
-
-		list.Add(value);
-	}
-
-	public List<TValue>? GetListOrNull(TKey key) {
-		return dict.TryGetValue(key, out var list) ? list : null;
-	}
-}