Remove some runtimes from the portable build

Closes #273

.github/FUNDING.yml

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

README.md

@@ -18,7 +18,7 @@ Folder organization:
 * `app/` contains a Visual Studio solution for the desktop app
 * `web/` contains source code of the [official website](https://dht.chylex.com), which can be used as a template when making your own website
 
-To start editing source code for the desktop app, install the [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
+To start editing source code for the desktop app, install the [.NET 9 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/9.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
 
 ### Building
 
@@ -28,18 +28,18 @@ To build a `Release` version of the desktop app, follow the instructions for you
 
 #### Release – Windows (64-bit)
 
-1. Install [Powershell 5](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) or newer (on Windows 10, the included version of Powershell should be enough)
+1. Install Debian in WSL and open a terminal in the project folder.
+2. Run the `app/build.wsl.sh` script.
+3. Read the [Distribution](#distribution) section below.
 
-Run the `app/build.bat` script, and read the [Distribution](#distribution) section below.
+Note: The build script expects `dotnet.exe` to be installed in `C:\Program Files\dotnet`.
 
 #### Release – Other Operating Systems
 
-1. Install the `zip` package from your repository
+1. Install the `zip` package from your repository.
-
+2. Run the `app/build.sh` script.
-Run the `app/build.sh` script, and read the [Distribution](#distribution) section below.
+3. Read the [Distribution](#distribution) section below.
 
 #### Distribution
 
-The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires .NET 8 to be installed.
+The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires the ASP.NET Core Runtime to be installed.
-
-Note that when building on Windows, the generated `.zip` files for Linux and Mac will not have correct file permissions, so it will not be possible to run them by double-clicking the executable. Since .NET 8 fixed several issues with publishing Windows executables on Linux, I recommend using Linux to build the app for all operating systems.

app/Desktop/Arguments.cs

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

app/Desktop/Common/DatabaseGui.cs

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

app/Desktop/Desktop.csproj

@@ -15,14 +15,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.11" />
+    <PackageReference Include="Avalonia" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.11" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.11" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
   </ItemGroup>
   

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -9,19 +8,19 @@ namespace DHT.Desktop.Dialogs.CheckBox;
 class CheckBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 	
-	private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
+	private IReadOnlyList<CheckBoxItem> items = [];
 	
 	public IReadOnlyList<CheckBoxItem> Items {
 		get => items;
 		
 		protected set {
-			foreach (var item in items) {
+			foreach (CheckBoxItem item in items) {
 				item.PropertyChanged -= OnItemPropertyChanged;
 			}
 			
 			items = value;
 			
-			foreach (var item in items) {
+			foreach (CheckBoxItem item in items) {
 				item.PropertyChanged += OnItemPropertyChanged;
 			}
 		}
@@ -38,7 +37,7 @@ class CheckBoxDialogModel : ObservableObject {
 	private void SetAllChecked(bool isChecked) {
 		pauseCheckEvents = true;
 		
-		foreach (var item in Items) {
+		foreach (CheckBoxItem item in Items) {
 			item.IsChecked = isChecked;
 		}
 		
@@ -65,6 +64,6 @@ sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
 	
 	public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
 		this.Items = new List<CheckBoxItem<T>>(items);
-		base.Items = this.Items;
+		base.Items = Items;
 	}
 }

app/Desktop/Dialogs/File/FileDialogs.cs

@@ -18,7 +18,7 @@ static class FileDialogs {
 	
 	public static FilePickerFileType CreateFilter(string name, string[] extensions) {
 		return new FilePickerFileType(name) {
-			Patterns = extensions.Select(static ext => "*." + ext).ToArray()
+			Patterns = extensions.Select(static ext => "*." + ext).ToArray(),
 		};
 	}
 	

app/Desktop/Dialogs/Message/Dialog.cs

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

app/Desktop/Dialogs/Message/DialogResult.cs

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

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

@@ -2,11 +2,15 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class ProgressDialog : Window {
+	private static readonly Log Log = Log.ForType<ProgressDialog>();
+	
 	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
 		var taskCompletionSource = new TaskCompletionSource();
 		var dialog = new ProgressDialog();
@@ -84,6 +88,11 @@ public sealed partial class ProgressDialog : Window {
 	
 	public async Task ShowProgressDialog(Window owner) {
 		await ShowDialog(owner);
-		await progressTask;
+		try {
+			await progressTask;
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(owner, "Unexpected Error", e.Message);
+		}
 	}
 }

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

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

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -10,19 +9,19 @@ class TextBoxDialogModel : ObservableObject {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
 	
-	private IReadOnlyList<TextBoxItem> items = Array.Empty<TextBoxItem>();
+	private IReadOnlyList<TextBoxItem> items = [];
 	
 	public IReadOnlyList<TextBoxItem> Items {
 		get => items;
 		
 		protected set {
-			foreach (var item in items) {
+			foreach (TextBoxItem item in items) {
 				item.ErrorsChanged -= OnItemErrorsChanged;
 			}
 			
 			items = value;
 			
-			foreach (var item in items) {
+			foreach (TextBoxItem item in items) {
 				item.ErrorsChanged += OnItemErrorsChanged;
 			}
 		}

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

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

app/Desktop/Discord/SettingsJsonResult.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -21,15 +21,15 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 	public sealed record Unit(string Name, uint Scale);
 	
 	private static readonly Unit[] AllUnits = [
-		new Unit("B", 1),
+		new Unit("B", Scale: 1),
-		new Unit("kB", 1024),
+		new Unit("kB", Scale: 1024),
-		new Unit("MB", 1024 * 1024)
+		new Unit("MB", Scale: 1024 * 1024)
 	];
 	
 	private static readonly HashSet<string> FilterProperties = [
 		nameof(LimitSize),
 		nameof(MaximumSize),
-		nameof(MaximumSizeUnit)
+		nameof(MaximumSizeUnit),
 	];
 	
 	public string FilterStatisticsText { get; private set; } = "";
@@ -80,7 +80,7 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 		LimitSize = await state.Db.Settings.Get(SettingsKey.DownloadsLimitSize, LimitSize);
 		MaximumSize = await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSize, MaximumSize);
 		
-		if (await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSizeUnit, null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
+		if (await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSizeUnit, defaultValue: null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
 			MaximumSizeUnit = unitValue;
 		}
 		
@@ -130,7 +130,7 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 	
 	
 	private void UpdateFilterStatistics() {
-		var filter = CreateFilter();
+		DownloadItemFilter filter = CreateFilter();
 		if (filter.IsEmpty) {
 			downloadItemCountTask.Cancel();
 			matchingItemCount = totalItemCount;
@@ -149,8 +149,8 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 	}
 	
 	private void UpdateFilterStatisticsText() {
-		var matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
+		string matchingItemCountStr = matchingItemCount?.Format() ?? "(...)";
-		var totalItemCountStr = totalItemCount?.Format() ?? "(...)";
+		string totalItemCountStr = totalItemCount?.Format() ?? "(...)";
 		
 		FilterStatisticsText = verb + " " + matchingItemCountStr + " out of " + totalItemCountStr + " file" + (totalItemCount is null or 1 ? "." : "s.");
 		OnPropertyChanged(nameof(FilterStatisticsText));

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

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

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -27,7 +27,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		nameof(FilterByChannel),
 		nameof(IncludedChannels),
 		nameof(FilterByUser),
-		nameof(IncludedUsers)
+		nameof(IncludedUsers),
 	];
 	
 	public string FilterStatisticsText { get; private set; } = "";
@@ -160,7 +160,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 	}
 	
 	private void UpdateFilterStatistics() {
-		var filter = CreateFilter();
+		MessageFilter filter = CreateFilter();
 		if (filter.IsEmpty) {
 			exportedMessageCountTask.Cancel();
 			exportedMessageCount = totalMessageCount;
@@ -179,8 +179,8 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 	}
 	
 	private void UpdateFilterStatisticsText() {
-		var exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
+		string exportedMessageCountStr = exportedMessageCount?.Format() ?? "(...)";
-		var totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
+		string totalMessageCountStr = totalMessageCount?.Format() ?? "(...)";
 		
 		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
 		OnPropertyChanged(nameof(FilterStatisticsText));
@@ -189,16 +189,16 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 	public async Task OpenChannelFilterDialog() {
 		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
 			var items = new List<CheckBoxItem<ulong>>();
-			var servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
+			Dictionary<ulong, DHT.Server.Data.Server> servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
 			
-			await foreach (var channel in state.Db.Channels.Get()) {
+			await foreach (Channel channel in state.Db.Channels.Get()) {
-				var channelId = channel.Id;
+				ulong channelId = channel.Id;
-				var channelName = channel.Name;
+				string channelName = channel.Name;
 				
 				string title;
 				if (servers.TryGetValue(channel.Server, out var server)) {
 					var titleBuilder = new StringBuilder();
-					var serverType = server.Type;
+					ServerType? serverType = server.Type;
 					
 					titleBuilder.Append('[')
 					            .Append(ServerTypes.ToString(serverType))
@@ -221,7 +221,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 				
 				items.Add(new CheckBoxItem<ulong>(channelId) {
 					Title = title,
-					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId)
+					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId),
 				});
 			}
 			
@@ -238,7 +238,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 			return;
 		}
 		
-		var result = await OpenIdFilterDialog(Title, items);
+		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
 		if (result != null) {
 			IncludedChannels = result;
 		}
@@ -248,10 +248,10 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
 			var checkBoxItems = new List<CheckBoxItem<ulong>>();
 			
-			await foreach (var user in state.Db.Users.Get()) {
+			await foreach (User user in state.Db.Users.Get()) {
 				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
 					Title = user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})",
-					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
+					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id),
 				});
 			}
 			
@@ -268,7 +268,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 			return;
 		}
 		
-		var result = await OpenIdFilterDialog(Title, items);
+		HashSet<ulong>? result = await OpenIdFilterDialog(Title, items);
 		if (result != null) {
 			IncludedUsers = result;
 		}
@@ -278,7 +278,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
 		
 		var model = new CheckBoxDialogModel<ulong>(items) {
-			Title = title
+			Title = title,
 		};
 		
 		var dialog = new CheckBoxDialog { DataContext = model };

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

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

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -27,7 +27,7 @@ sealed partial class StatusBarModel : ObservableObject, IDisposable {
 		ServerManager.Status.Started  => "READY",
 		ServerManager.Status.Stopping => "STOPPING",
 		ServerManager.Status.Stopped  => "STOPPED",
-		_                             => ""
+		_                             => "",
 	};
 	
 	private readonly State state;

app/Desktop/Main/MainWindowModel.cs

@@ -46,7 +46,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
 		currentScreen = welcomeScreen;
 		
-		var dbFile = args.DatabaseFile;
+		string? dbFile = args.DatabaseFile;
 		if (!string.IsNullOrWhiteSpace(dbFile)) {
 			async void OnWindowOpened(object? o, EventArgs eventArgs) {
 				window.Opened -= OnWindowOpened;

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -72,7 +72,7 @@ sealed class DatabasePageModel {
 	}
 	
 	public async Task MergeWithDatabase() {
-		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		string[] paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
 		if (paths.Length > 0) {
 			await ProgressDialog.Show(window, "Database Merge", async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
 		}
@@ -133,10 +133,10 @@ sealed class DatabasePageModel {
 	}
 	
 	public async Task ImportLegacyArchive() {
-		var paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
+		string[] paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Legacy DHT Archive",
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
-			AllowMultiple = true
+			AllowMultiple = true,
 		});
 		
 		if (paths.Length > 0) {
@@ -167,16 +167,16 @@ sealed class DatabasePageModel {
 		
 		var items = new List<TextBoxItem<DHT.Server.Data.Server>>();
 		
-		foreach (var server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
+		foreach (DHT.Server.Data.Server server in servers.OrderBy(static server => server.Type).ThenBy(static server => server.Name)) {
 			items.Add(new TextBoxItem<DHT.Server.Data.Server>(server) {
 				Title = server.Name + " (" + ServerTypes.ToNiceString(server.Type) + ")",
-				ValidityCheck = IsValidSnowflake
+				ValidityCheck = IsValidSnowflake,
 			});
 		}
 		
 		var model = new TextBoxDialogModel<DHT.Server.Data.Server>(items) {
 			Title = "Imported Server IDs",
-			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID."
+			Description = "Please fill in the IDs of servers and direct messages. First enable Developer Mode in Discord, then right-click each server or direct message, click 'Copy ID', and paste it into the input field. If a server no longer exists, leave its input field empty to use a random ID.",
 		};
 		
 		var dialog = new TextBoxDialog { DataContext = model };
@@ -193,7 +193,7 @@ sealed class DatabasePageModel {
 	
 	private static async Task PerformImport(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback, string neutralDialogTitle, string errorDialogTitle, string itemName, Func<string, Task<bool>> performImport) {
 		int total = paths.Length;
-		var oldStatistics = await DatabaseStatistics.Take(target);
+		DatabaseStatistics oldStatistics = await DatabaseStatistics.Take(target);
 		
 		int successful = 0;
 		int finished = 0;
@@ -224,7 +224,7 @@ sealed class DatabasePageModel {
 			return;
 		}
 		
-		var newStatistics = await DatabaseStatistics.Take(target);
+		DatabaseStatistics newStatistics = await DatabaseStatistics.Take(target);
 		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
 	}
 	
@@ -245,7 +245,7 @@ sealed class DatabasePageModel {
 		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
 		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
 		
-		StringBuilder message = new StringBuilder();
+		var message = new StringBuilder();
 		message.Append("Processed ");
 		
 		if (successfulItems == totalItems) {

app/Desktop/Main/Pages/DebugPage.axaml

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

app/Desktop/Main/Pages/DebugPageModel.cs

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

app/Desktop/Main/Pages/DownloadsPage.axaml

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

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -1,12 +1,17 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Avalonia.Controls;
 using Avalonia.ReactiveUI;
 using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Server;
+using DHT.Server.Data;
 using DHT.Server.Data.Aggregations;
 using DHT.Server.Data.Filters;
 using DHT.Server.Data.Settings;
@@ -48,6 +53,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 	
 	public bool IsDownloading => state.Downloader.IsDownloading;
 	
+	private readonly Window window;
 	private readonly State state;
 	private readonly ThrottledTask<DownloadStatusStatistics> downloadStatisticsTask;
 	private readonly IDisposable downloadItemCountSubscription;
@@ -55,9 +61,10 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 	private IDisposable? finishedItemsSubscription;
 	private DownloadItemFilter? currentDownloadFilter;
 	
-	public DownloadsPageModel() : this(State.Dummy) {}
+	public DownloadsPageModel() : this(null!, State.Dummy) {}
 	
-	public DownloadsPageModel(State state) {
+	public DownloadsPageModel(Window window, State state) {
+		this.window = window;
 		this.state = state;
 		
 		FilterModel = new DownloadItemFilterPanelModel(state);
@@ -66,7 +73,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 			statisticsPending,
 			statisticsDownloaded,
 			statisticsFailed,
-			statisticsSkipped
+			statisticsSkipped,
 		];
 		
 		downloadStatisticsTask = new ThrottledTask<DownloadStatusStatistics>(Log, UpdateStatistics, TaskScheduler.FromCurrentSynchronizationContext());
@@ -78,7 +85,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 	public async Task Initialize() {
 		await FilterModel.Initialize();
 		
-		if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, false)) {
+		if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, defaultValue: false)) {
 			await StartDownload();
 		}
 	}
@@ -113,7 +120,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 	private async Task StartDownload() {
 		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
 		
-		var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
+		IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
 		finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
 		
 		OnDownloadStateChanged();
@@ -158,6 +165,50 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 		downloadStatisticsTask.Post(cancellationToken => state.Db.Downloads.GetStatistics(currentDownloadFilter ?? new DownloadItemFilter(), cancellationToken));
 	}
 	
+	private const string DeleteOrphanedDownloadsTitle = "Delete Orphaned Downloads";
+	
+	public async Task OnClickDeleteOrphanedDownloads() {
+		await ProgressDialog.Show(window, DeleteOrphanedDownloadsTitle, DeleteOrphanedDownloads);
+	}
+	
+	private async Task DeleteOrphanedDownloads(ProgressDialog dialog, IProgressCallback callback) {
+		await callback.UpdateIndeterminate("Searching for orphaned downloads...");
+		
+		HashSet<string> reachableNormalizedUrls = [];
+		HashSet<string> orphanedNormalizedUrls = [];
+		
+		await foreach (Download download in state.Db.Downloads.FindAllDownloadableUrls()) {
+			reachableNormalizedUrls.Add(download.NormalizedUrl);
+		}
+		
+		await foreach (Download download in state.Db.Downloads.Get()) {
+			string normalizedUrl = download.NormalizedUrl;
+			if (!reachableNormalizedUrls.Contains(normalizedUrl)) {
+				orphanedNormalizedUrls.Add(normalizedUrl);
+			}
+		}
+		
+		if (orphanedNormalizedUrls.Count == 0) {
+			await Dialog.ShowOk(window, DeleteOrphanedDownloadsTitle, "No orphaned downloads found.");
+			return;
+		}
+		
+		if (await Dialog.ShowYesNo(window, DeleteOrphanedDownloadsTitle, orphanedNormalizedUrls.Count + " orphaned download(s) will be removed from this database. This action cannot be undone. Proceed?") != DialogResult.YesNo.Yes) {
+			return;
+		}
+		
+		await callback.UpdateIndeterminate("Deleting orphaned downloads...");
+		await state.Db.Downloads.Remove(orphanedNormalizedUrls);
+		RecomputeDownloadStatistics();
+		
+		if (await Dialog.ShowYesNo(window, DeleteOrphanedDownloadsTitle, "Orphaned downloads deleted. Vacuum database now to reclaim space?") != DialogResult.YesNo.Yes) {
+			return;
+		}
+		
+		await callback.UpdateIndeterminate("Vacuuming database...");
+		await state.Db.Vacuum();
+	}
+	
 	private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
 		statisticsPending.Items = statusStatistics.PendingCount;
 		statisticsPending.Size = statusStatistics.PendingTotalSize;

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -13,13 +13,21 @@
 
     <StackPanel Spacing="10">
         <TextBlock TextWrapping="Wrap">
-            To start tracking messages, copy the tracking script and paste it into the console of either the Discord app, or your browser. The console is usually opened by pressing Ctrl+Shift+I.
+            <TextBlock.Text>
+                <MultiBinding StringFormat="To start tracking messages, copy the tracking script and paste it into the console of either the Discord app, or your browser. The console is usually opened by pressing {0}.">
+                    <Binding Path="OpenDevToolsShortcutText" />
+                </MultiBinding>
+            </TextBlock.Text>
         </TextBlock>
         <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="10">
             <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick" IsEnabled="{Binding IsCopyTrackingScriptButtonEnabled}">Copy Tracking Script</Button>
         </StackPanel>
         <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
-            By default, the Discord app does not allow opening the console. The button below will change a hidden setting in the Discord app that controls whether the Ctrl+Shift+I shortcut is enabled.
+            <TextBlock.Text>
+                <MultiBinding StringFormat="By default, the Discord app does not allow opening the console. The button below will change a hidden setting in the Discord app that controls whether the {0} shortcut is enabled.">
+                    <Binding Path="OpenDevToolsShortcutText" />
+                </MultiBinding>
+            </TextBlock.Text>
         </TextBlock>
         <Button DockPanel.Dock="Right" Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
     </StackPanel>

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

@@ -16,7 +16,7 @@ public sealed partial class TrackingPage : UserControl {
 	
 	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
 		if (DataContext is TrackingPageModel model) {
-			var originalText = CopyTrackingScript.Content;
+			object? originalText = CopyTrackingScript.Content;
 			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;
 			
 			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -3,6 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
+using Avalonia.Input.Platform;
 using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
@@ -23,6 +24,8 @@ sealed partial class TrackingPageModel : ObservableObject {
 	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
 	private bool isToggleAppDevToolsButtonEnabled = false;
 	
+	public string OpenDevToolsShortcutText { get; } = OperatingSystem.IsMacOS() ? "Cmd+Shift+I" : "Ctrl+Shift+I";
+	
 	public string ToggleAppDevToolsButtonText {
 		get {
 			if (!AreDevToolsEnabled.HasValue) {
@@ -33,7 +36,7 @@ sealed partial class TrackingPageModel : ObservableObject {
 				return "Unavailable";
 			}
 			
-			return AreDevToolsEnabled.Value ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+			return (AreDevToolsEnabled.Value ? "Disable" : "Enable") + " " + OpenDevToolsShortcutText;
 		}
 	}
 	
@@ -62,7 +65,7 @@ sealed partial class TrackingPageModel : ObservableObject {
 		string url = $"http://127.0.0.1:{ServerConfiguration.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
 		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
 		
-		var clipboard = window.Clipboard;
+		IClipboard? clipboard = window.Clipboard;
 		if (clipboard == null) {
 			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
 			return false;
@@ -102,11 +105,11 @@ sealed partial class TrackingPageModel : ObservableObject {
 		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
 			case SettingsJsonResult.Success:
 				AreDevToolsEnabled = newState;
-				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
+				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
 				break;
 			
 			case SettingsJsonResult.AlreadySet:
-				await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
+				await Dialog.ShowOk(window, DialogTitle, OpenDevToolsShortcutText + " is already " + (newState ? "enabled." : "disabled."));
 				AreDevToolsEnabled = newState;
 				break;
 			

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -12,10 +12,13 @@ using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Data.Filters;
 using DHT.Server.Service.Viewer;
+using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Main.Pages;
 
 sealed partial class ViewerPageModel : ObservableObject, IDisposable {
+	private static readonly Log Log = Log.ForType<ViewerPageModel>();
+	
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 	
@@ -58,8 +61,8 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 	}
 	
 	public async Task OnClickApplyFiltersToDatabase() {
-		var filter = FilterModel.CreateFilter();
+		MessageFilter filter = FilterModel.CreateFilter();
-		var messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
+		long messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
 		
 		if (DatabaseToolFilterModeKeep) {
 			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", messageCount.Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
@@ -74,6 +77,21 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 	}
 	
 	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {
-		await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Removing messages...", _ => state.Db.Messages.Remove(filter, removalMode));
+		await ProgressDialog.Show(window, "Apply Filters", async (_, callback) => {
+			await callback.UpdateIndeterminate("Removing messages...");
+			Log.Info("Removed messages: " + await state.Db.Messages.Remove(filter, removalMode));
+			
+			await callback.UpdateIndeterminate("Cleaning up attachments...");
+			Log.Info("Removed orphaned attachments: " + await state.Db.Messages.RemoveUnreachableAttachments());
+			
+			await callback.UpdateIndeterminate("Cleaning up users...");
+			Log.Info("Removed orphaned users: " + await state.Db.Users.RemoveUnreachable());
+			
+			await callback.UpdateIndeterminate("Cleaning up channels...");
+			Log.Info("Removed orphaned channels: " + await state.Db.Channels.RemoveUnreachable());
+			
+			await callback.UpdateIndeterminate("Cleaning up servers...");
+			Log.Info("Removed orphaned servers: " + await state.Db.Servers.RemoveUnreachable());
+		});
 	}
 }

app/Desktop/Main/Screens/MainContentScreen.axaml

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

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -35,12 +35,8 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 	public StatusBarModel StatusBarModel { get; }
 	
 	public event EventHandler? DatabaseClosed {
-		add {
+		add => DatabasePageModel.DatabaseClosed += value;
-			DatabasePageModel.DatabaseClosed += value;
+		remove => DatabasePageModel.DatabaseClosed -= value;
-		}
-		remove {
-			DatabasePageModel.DatabaseClosed -= value;
-		}
 	}
 	
 	[Obsolete("Designer")]
@@ -53,7 +49,7 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 		TrackingPageModel = new TrackingPageModel(window);
 		TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
 		
-		DownloadsPageModel = new DownloadsPageModel(state);
+		DownloadsPageModel = new DownloadsPageModel(window, state);
 		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
 		
 		ViewerPageModel = new ViewerPageModel(window, state);

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -40,7 +40,7 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 	public async Task OpenOrCreateDatabase() {
 		IsOpenOrCreateDatabaseButtonEnabled = false;
 		try {
-			var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
+			string? path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
 			if (path != null) {
 				await OpenOrCreateDatabaseFromPath(path);
 			}
@@ -54,13 +54,13 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 		
 		bool isNew = !File.Exists(path);
 		
-		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
+		IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
 		if (db == null) {
 			return;
 		}
 		
 		if (isNew && await Dialog.ShowYesNo(window, "Automatic Downloads", "Do you want to automatically download files hosted on Discord? You can change this later in the Downloads tab.") == DialogResult.YesNo.Yes) {
-			await db.Settings.Set(SettingsKey.DownloadsAutoStart, true);
+			await db.Settings.Set(SettingsKey.DownloadsAutoStart, value: true);
 		}
 		
 		DatabaseSelected?.Invoke(this, db);
@@ -110,11 +110,11 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 	}
 	
 	public async Task CheckUpdates() {
-		Version? latestVersion = await ProgressDialog.ShowIndeterminate<Version?>(window, "Check Updates", "Checking for updates...", async _ => {
+		var latestVersion = await ProgressDialog.ShowIndeterminate<Version?>(window, "Check Updates", "Checking for updates...", async _ => {
 			var client = new HttpClient(new SocketsHttpHandler {
 				AutomaticDecompression = DecompressionMethods.None,
 				AllowAutoRedirect = false,
-				UseCookies = false
+				UseCookies = false,
 			});
 			
 			client.Timeout = TimeSpan.FromSeconds(30);
@@ -133,7 +133,7 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 				return null;
 			}
 			
-			if (!System.Version.TryParse(response, out var latestVersion)) {
+			if (!System.Version.TryParse(response, out Version? latestVersion)) {
 				await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
 				return null;
 			}

app/Desktop/Program.cs

@@ -19,7 +19,7 @@ static class Program {
 	static Program() {
 		var assembly = Assembly.GetExecutingAssembly();
 		
-		AssemblyVersion = assembly.GetName().Version ?? new Version(0, 0, 0, 0);
+		AssemblyVersion = assembly.GetName().Version ?? new Version(major: 0, minor: 0, build: 0, revision: 0);
 		Version = VersionToString(AssemblyVersion);
 		
 		Culture = CultureInfo.CurrentCulture;

app/Desktop/Server/ServerConfiguration.cs

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

app/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
   
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
-    <LangVersion>12</LangVersion>
+    <LangVersion>13</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   
@@ -39,6 +39,7 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugSymbols>false</DebugSymbols>
     <DebugType>none</DebugType>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
   
   <PropertyGroup>

app/Resources/Tracker/scripts/webpack.js

@@ -91,8 +91,8 @@ class WEBPACK {
 	}
 	
 	static findFunction(name, additionalRequiredProps) {
-		const searchedProps = additionalRequiredProps ? [name, ...additionalRequiredProps] : [name];
+		const searchedProps = additionalRequiredProps ? [ name, ...additionalRequiredProps ] : [ name ];
-		const matchingModule = this.findModule("containing function " + name, this.filterByPropsWithPredicate(prop => typeof(prop) === "function", ...searchedProps));
+		const matchingModule = this.findModule("containing function " + name, this.filterByPropsWithPredicate(prop => typeof (prop) === "function", ...searchedProps));
 		return matchingModule == null ? null : matchingModule[name].bind(matchingModule);
 	}
 }

app/Resources/Viewer/scripts/discord.mjs

@@ -298,13 +298,13 @@ export default (function() {
 					
 					return "<span class='jump' data-jump='" + value.id + "'>Jump to reply</span><span class='user'>" + avatar + user + "</span>" + contents;
 				}
-				else if (property === "reactions"){
+				else if (property === "reactions") {
-					if (!value){
+					if (!value) {
 						return "";
 					}
 					
 					return "<div class='reactions'>" + value.map(reaction => {
-						if ("id" in reaction){
+						if ("id" in reaction) {
 							const ext = reaction.a && settings.enableAnimatedEmoji ? "gif" : "webp";
 							const url = fileUrlProcessor("https://cdn.discordapp.com/emojis/" + reaction.id + "." + ext);
 							// noinspection JSUnusedGlobalSymbols

app/Resources/Viewer/styles/messages.css

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

app/Server/Data/DownloadStatus.cs

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

app/Server/Data/EmojiFlags.cs

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

app/Server/Data/Filters/FilterRemovalMode.cs

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

app/Server/Data/ServerType.cs

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

app/Server/Database/DatabaseExtensions.cs

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

app/Server/Database/Export/ViewerJsonExport.cs

@@ -16,28 +16,28 @@ static class ViewerJsonExport {
 	private static readonly Log Log = Log.ForType(typeof(ViewerJsonExport));
 	
 	public static async Task GetMetadata(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
-		var perf = Log.Start();
+		Perf perf = Log.Start();
 		
 		var includedChannels = new List<Channel>();
 		var includedServerIds = new HashSet<ulong>();
 		
-		var channelIdFilter = filter?.ChannelIds;
+		HashSet<ulong>? channelIdFilter = filter?.ChannelIds;
 		
-		await foreach (var channel in db.Channels.Get(cancellationToken)) {
+		await foreach (Channel channel in db.Channels.Get(cancellationToken)) {
 			if (channelIdFilter == null || channelIdFilter.Contains(channel.Id)) {
 				includedChannels.Add(channel);
 				includedServerIds.Add(channel.Server);
 			}
 		}
 		
-		var users = await GenerateUserList(db, cancellationToken);
+		Dictionary<Snowflake, ViewerJson.JsonUser> users = await GenerateUserList(db, cancellationToken);
-		var servers = await GenerateServerList(db, includedServerIds, cancellationToken);
+		Dictionary<Snowflake, ViewerJson.JsonServer> servers = await GenerateServerList(db, includedServerIds, cancellationToken);
-		var channels = GenerateChannelList(includedChannels);
+		Dictionary<Snowflake, ViewerJson.JsonChannel> channels = GenerateChannelList(includedChannels);
 		
 		var meta = new ViewerJson.JsonMeta {
 			Users = users,
 			Servers = servers,
-			Channels = channels
+			Channels = channels,
 		};
 		
 		perf.Step("Collect database data");
@@ -49,11 +49,11 @@ static class ViewerJsonExport {
 	}
 	
 	public static async Task GetMessages(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
-		var perf = Log.Start();
+		Perf perf = Log.Start();
 		
 		ReadOnlyMemory<byte> newLine = "\n"u8.ToArray();
 		
-		await foreach(var message in GenerateMessageList(db, filter, cancellationToken)) {
+		await foreach (ViewerJson.JsonMessage message in GenerateMessageList(db, filter, cancellationToken)) {
 			await JsonSerializer.SerializeAsync(stream, message, ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
 			await stream.WriteAsync(newLine, cancellationToken);
 		}
@@ -65,7 +65,7 @@ static class ViewerJsonExport {
 	private static async Task<Dictionary<Snowflake, ViewerJson.JsonUser>> GenerateUserList(IDatabaseFile db, CancellationToken cancellationToken) {
 		var users = new Dictionary<Snowflake, ViewerJson.JsonUser>();
 		
-		await foreach (var user in db.Users.Get(cancellationToken)) {
+		await foreach (User user in db.Users.Get(cancellationToken)) {
 			users[user.Id] = new ViewerJson.JsonUser {
 				Name = user.Name,
 				DisplayName = user.DisplayName,
@@ -79,14 +79,14 @@ static class ViewerJsonExport {
 	private static async Task<Dictionary<Snowflake, ViewerJson.JsonServer>> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, CancellationToken cancellationToken) {
 		var servers = new Dictionary<Snowflake, ViewerJson.JsonServer>();
 		
-		await foreach (var server in db.Servers.Get(cancellationToken)) {
+		await foreach (Data.Server server in db.Servers.Get(cancellationToken)) {
 			if (!serverIds.Contains(server.Id)) {
 				continue;
 			}
 			
 			servers[server.Id] = new ViewerJson.JsonServer {
 				Name = server.Name,
-				Type = ServerTypes.ToJsonViewerString(server.Type)
+				Type = ServerTypes.ToJsonViewerString(server.Type),
 			};
 		}
 		
@@ -96,14 +96,14 @@ static class ViewerJsonExport {
 	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels) {
 		var channels = new Dictionary<Snowflake, ViewerJson.JsonChannel>();
 		
-		foreach (var channel in includedChannels) {
+		foreach (Channel channel in includedChannels) {
 			channels[channel.Id] = new ViewerJson.JsonChannel {
 				Server = channel.Server,
 				Name = channel.Name,
 				Parent = channel.ParentId?.ToString(),
 				Position = channel.Position,
 				Topic = channel.Topic,
-				Nsfw = channel.Nsfw
+				Nsfw = channel.Nsfw,
 			};
 		}
 		
@@ -111,7 +111,7 @@ static class ViewerJsonExport {
 	}
 	
 	private static async IAsyncEnumerable<ViewerJson.JsonMessage> GenerateMessageList(IDatabaseFile db, MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
-		await foreach (var message in db.Messages.Get(filter, cancellationToken)) {
+		await foreach (Message message in db.Messages.Get(filter, cancellationToken)) {
 			yield return new ViewerJson.JsonMessage {
 				Id = message.Id,
 				C = message.Channel,
@@ -124,7 +124,7 @@ static class ViewerJsonExport {
 				A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
 					var a = new ViewerJson.JsonMessageAttachment {
 						Url = attachment.DownloadUrl,
-						Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl
+						Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out Uri? uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl,
 					};
 					
 					if (attachment is { Width: not null, Height: not null }) {
@@ -141,8 +141,8 @@ static class ViewerJsonExport {
 					Id = reaction.EmojiId?.ToString(),
 					N = reaction.EmojiName,
 					A = reaction.EmojiFlags.HasFlag(EmojiFlags.Animated),
-					C = reaction.Count
+					C = reaction.Count,
-				}).ToArray()
+				}).ToArray(),
 			};
 		}
 	}

app/Server/Database/Import/FakeSnowflake.cs

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

app/Server/Database/Import/LegacyArchiveImport.cs

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

app/Server/Database/Repositories/IChannelRepository.cs

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

app/Server/Database/Repositories/IDownloadRepository.cs

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

app/Server/Database/Repositories/IMessageRepository.cs

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

app/Server/Database/Repositories/IServerRepository.cs

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

app/Server/Database/Repositories/IUserRepository.cs

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

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

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

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

@@ -177,7 +177,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			FailedWithUnknownSizeCount = reader.GetInt32(8),
 			SkippedCount = reader.GetInt32(9),
 			SkippedTotalSize = reader.GetUint64(10),
-			SkippedWithUnknownSizeCount = reader.GetInt32(11)
+			SkippedWithUnknownSizeCount = reader.GetInt32(11),
 		};
 	}
 	
@@ -206,7 +206,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		
 		long rowid;
 		
-		await using (var reader = await cmd.ExecuteReaderAsync()) {
+		await using (SqliteDataReader reader = await cmd.ExecuteReaderAsync()) {
 			if (!await reader.ReadAsync()) {
 				return false;
 			}
@@ -264,15 +264,15 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		
 		await using var conn = await pool.Take();
 		
-		var sql = $"""
+		string sql = $"""
-		           SELECT normalized_url, download_url, type, size
+		              SELECT normalized_url, download_url, type, size
-		           FROM download_metadata
+		              FROM download_metadata
-		           {filter.GenerateConditions().BuildWhereClause()}
+		              {filter.GenerateConditions().BuildWhereClause()}
-		           LIMIT :limit
+		              LIMIT :limit
-		           """;
+		              """;
 		
 		await using (var cmd = conn.Command(sql)) {
-			cmd.AddAndSet(":limit", SqliteType.Integer, Math.Max(0, count));
+			cmd.AddAndSet(":limit", SqliteType.Integer, Math.Max(val1: 0, count));
 			
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 			
@@ -281,7 +281,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 					NormalizedUrl = reader.GetString(0),
 					DownloadUrl = reader.GetString(1),
 					Type = reader.IsDBNull(2) ? null : reader.GetString(2),
-					Size = reader.IsDBNull(3) ? null : reader.GetUint64(3)
+					Size = reader.IsDBNull(3) ? null : reader.GetUint64(3),
 				});
 			}
 		}
@@ -292,7 +292,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
 			cmd.Add(":normalized_url", SqliteType.Text);
 			
-			foreach (var item in found) {
+			foreach (DownloadItem item in found) {
 				cmd.Set(":normalized_url", item.NormalizedUrl);
 				
 				if (await cmd.ExecuteNonQueryAsync(cancellationToken) == 1) {
@@ -321,4 +321,62 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
 		return await cmd.ExecuteNonQueryAsync(cancellationToken);
 	}
+	
+	public async Task Remove(ICollection<string> normalizedUrls) {
+		await using (var conn = await pool.Take()) {
+			await conn.BeginTransactionAsync();
+			
+			await using (var cmd = conn.Command("DELETE FROM download_metadata WHERE normalized_url = :normalized_url")) {
+				cmd.Add(":normalized_url", SqliteType.Text);
+				
+				foreach (string normalizedUrl in normalizedUrls) {
+					cmd.Set(":normalized_url", normalizedUrl);
+					await cmd.ExecuteNonQueryAsync();
+				}
+			}
+			
+			await conn.CommitTransactionAsync();
+		}
+		
+		UpdateTotalCount();
+	}
+	
+	public async IAsyncEnumerable<Data.Download> FindAllDownloadableUrls([EnumeratorCancellation] CancellationToken cancellationToken = default) {
+		await using var conn = await pool.Take();
+		
+		await using (var cmd = conn.Command("SELECT normalized_url, download_url, type, size FROM attachments")) {
+			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+			
+			while (await reader.ReadAsync(cancellationToken)) {
+				yield return DownloadLinkExtractor.FromAttachment(reader.GetString(0), reader.GetString(1), reader.IsDBNull(2) ? null : reader.GetString(2), reader.GetUint64(3));
+			}
+		}
+		
+		await using (var cmd = conn.Command("SELECT json FROM message_embeds")) {
+			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+			
+			while (await reader.ReadAsync(cancellationToken)) {
+				var result = await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0));
+				if (result is not null) {
+					yield return result;
+				}
+			}
+		}
+		
+		await using (var cmd = conn.Command("SELECT id, avatar_url FROM users WHERE avatar_url IS NOT NULL")) {
+			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+			
+			while (await reader.ReadAsync(cancellationToken)) {
+				yield return DownloadLinkExtractor.FromUserAvatar(reader.GetUint64(0), reader.GetString(1));
+			}
+		}
+		
+		await using (var cmd = conn.Command("SELECT DISTINCT emoji_id, emoji_flags FROM message_reactions WHERE emoji_id IS NOT NULL")) {
+			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+			
+			while (await reader.ReadAsync(cancellationToken)) {
+				yield return DownloadLinkExtractor.FromEmoji(reader.GetUint64(0), (EmojiFlags) reader.GetInt16(1));
+			}
+		}
+	}
 }

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

@@ -39,7 +39,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				("sender_id", SqliteType.Integer),
 				("channel_id", SqliteType.Integer),
 				("text", SqliteType.Text),
-				("timestamp", SqliteType.Integer)
+				("timestamp", SqliteType.Integer),
 			]);
 			
 			await using var attachmentCmd = conn.Upsert("attachments", [
@@ -50,7 +50,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				("download_url", SqliteType.Text),
 				("size", SqliteType.Integer),
 				("width", SqliteType.Integer),
-				("height", SqliteType.Integer)
+				("height", SqliteType.Integer),
 			]);
 			
 			await using var deleteMessageEditTimestampCmd = DeleteByMessageId(conn, "message_edit_timestamps");
@@ -62,22 +62,22 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 			
 			await using var messageEditTimestampCmd = conn.Insert("message_edit_timestamps", [
 				("message_id", SqliteType.Integer),
-				("edit_timestamp", SqliteType.Integer)
+				("edit_timestamp", SqliteType.Integer),
 			]);
 			
 			await using var messageRepliedToCmd = conn.Insert("message_replied_to", [
 				("message_id", SqliteType.Integer),
-				("replied_to_id", SqliteType.Integer)
+				("replied_to_id", SqliteType.Integer),
 			]);
 			
 			await using var messageAttachmentCmd = conn.Insert("message_attachments", [
 				("message_id", SqliteType.Integer),
-				("attachment_id", SqliteType.Integer)
+				("attachment_id", SqliteType.Integer),
 			]);
 			
 			await using var messageEmbedCmd = conn.Insert("message_embeds", [
 				("message_id", SqliteType.Integer),
-				("json", SqliteType.Text)
+				("json", SqliteType.Text),
 			]);
 			
 			await using var messageReactionCmd = conn.Insert("message_reactions", [
@@ -85,12 +85,12 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				("emoji_id", SqliteType.Integer),
 				("emoji_name", SqliteType.Text),
 				("emoji_flags", SqliteType.Integer),
-				("count", SqliteType.Integer)
+				("count", SqliteType.Integer),
 			]);
 			
 			await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
 			
-			foreach (var message in messages) {
+			foreach (Message message in messages) {
 				object messageId = message.Id;
 				
 				messageCmd.Set(":message_id", messageId);
@@ -120,7 +120,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				}
 				
 				if (!message.Attachments.IsEmpty) {
-					foreach (var attachment in message.Attachments) {
+					foreach (Attachment attachment in message.Attachments) {
 						object attachmentId = attachment.Id;
 						
 						attachmentCmd.Set(":attachment_id", attachmentId);
@@ -142,7 +142,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				}
 				
 				if (!message.Embeds.IsEmpty) {
-					foreach (var embed in message.Embeds) {
+					foreach (Embed embed in message.Embeds) {
 						messageEmbedCmd.Set(":message_id", messageId);
 						messageEmbedCmd.Set(":json", embed.Json);
 						await messageEmbedCmd.ExecuteNonQueryAsync();
@@ -154,7 +154,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				}
 				
 				if (!message.Reactions.IsEmpty) {
-					foreach (var reaction in message.Reactions) {
+					foreach (Reaction reaction in message.Reactions) {
 						messageReactionCmd.Set(":message_id", messageId);
 						messageReactionCmd.Set(":emoji_id", reaction.EmojiId);
 						messageReactionCmd.Set(":emoji_name", reaction.EmojiName);
@@ -245,7 +245,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 			""";
 		
 		await using var embedCmd = new MessageToManyCommand<Embed>(conn, EmbedSql, static reader => new Embed {
-			Json = reader.GetString(0)
+			Json = reader.GetString(0),
 		});
 		
 		const string ReactionSql =
@@ -287,7 +287,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				RepliedToId = reader.IsDBNull(6) ? null : reader.GetUint64(6),
 				Attachments = await attachmentCmd.GetItems(messageId),
 				Embeds = await embedCmd.GetItems(messageId),
-				Reactions = await reactionsCmd.GetItems(messageId)
+				Reactions = await reactionsCmd.GetItems(messageId),
 			};
 		}
 	}
@@ -303,17 +303,24 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 		}
 	}
 	
-	public async Task Remove(MessageFilter filter, FilterRemovalMode mode) {
+	public async Task<int> Remove(MessageFilter filter, FilterRemovalMode mode) {
+		int removed;
 		await using (var conn = await pool.Take()) {
-			await conn.ExecuteAsync(
+			removed = await conn.ExecuteAsync(
-				$"""
+				          $"""
-				 -- noinspection SqlWithoutWhere
+				           -- noinspection SqlWithoutWhere
-				 DELETE FROM messages
+				           DELETE FROM messages
-				 {filter.GenerateConditions(invert: mode == FilterRemovalMode.KeepMatching).BuildWhereClause()}
+				           {filter.GenerateConditions(invert: mode == FilterRemovalMode.KeepMatching).BuildWhereClause()}
-				 """
+				           """
-			);
+			          );
 		}
 		
 		UpdateTotalCount();
+		return removed;
+	}
+	
+	public async Task<int> RemoveUnreachableAttachments() {
+		await using var conn = await pool.Take();
+		return await conn.ExecuteAsync("DELETE FROM attachments WHERE attachment_id NOT IN (SELECT DISTINCT attachment_id FROM message_attachments)");
 	}
 }

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

@@ -26,10 +26,10 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 			await using var cmd = conn.Upsert("servers", [
 				("id", SqliteType.Integer),
 				("name", SqliteType.Text),
-				("type", SqliteType.Text)
+				("type", SqliteType.Text),
 			]);
 			
-			foreach (var server in servers) {
+			foreach (Data.Server server in servers) {
 				cmd.Set(":id", server.Id);
 				cmd.Set(":name", server.Name);
 				cmd.Set(":type", ServerTypes.ToString(server.Type));
@@ -61,4 +61,14 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 			};
 		}
 	}
+	
+	public async Task<int> RemoveUnreachable() {
+		int removed;
+		await using (var conn = await pool.Take()) {
+			removed = await conn.ExecuteAsync("DELETE FROM servers WHERE id NOT IN (SELECT DISTINCT server FROM channels)");
+		}
+		
+		UpdateTotalCount();
+		return removed;
+	}
 }

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

@@ -53,6 +53,6 @@ sealed class SqliteSettingsRepository(SqliteConnectionPool pool) : ISettingsRepo
 			value = await reader.ReadAsync() ? reader.GetString(0) : null;
 		}
 		
-		return value != null && key.FromString(value, out var convertedValue) ? convertedValue : defaultValue;
+		return value != null && key.FromString(value, out T convertedValue) ? convertedValue : defaultValue;
 	}
 }

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

@@ -31,12 +31,12 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 				("name", SqliteType.Text),
 				("display_name", SqliteType.Text),
 				("avatar_url", SqliteType.Text),
-				("discriminator", SqliteType.Text)
+				("discriminator", SqliteType.Text),
 			]);
 			
 			await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
 			
-			foreach (var user in users) {
+			foreach (User user in users) {
 				cmd.Set(":id", user.Id);
 				cmd.Set(":name", user.Name);
 				cmd.Set(":display_name", user.DisplayName);
@@ -77,4 +77,14 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 			};
 		}
 	}
+	
+	public async Task<int> RemoveUnreachable() {
+		int removed;
+		await using (var conn = await pool.Take()) {
+			removed = await conn.ExecuteAsync("DELETE FROM users WHERE id NOT IN (SELECT DISTINCT sender_id FROM messages)");
+		}
+		
+		UpdateTotalCount();
+		return removed;
+	}
 }

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

@@ -0,0 +1,77 @@
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+using DHT.Utils.Logging;
+
+namespace DHT.Server.Database.Sqlite.Schema;
+
+sealed class SqliteSchemaUpgradeTo10 : ISchemaUpgrade {
+	private static readonly Log Log = Log.ForType<SqliteSchemaUpgradeTo10>();
+	
+	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
+		await reporter.MainWork("Migrating message embeds...", finishedItems: 0, totalItems: 6);
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE message_embeds_new (
+		                        	message_id INTEGER NOT NULL,
+		                        	json       TEXT NOT NULL,
+		                        	FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE
+		                        )
+		                        """);
+		await conn.ExecuteAsync("INSERT INTO message_embeds_new (message_id, json) SELECT message_id, json FROM message_embeds WHERE message_id IN (SELECT DISTINCT message_id FROM messages)");
+		
+		await reporter.MainWork("Migrating message reactions...", finishedItems: 1, totalItems: 6);
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE message_reactions_new (
+		                        	message_id  INTEGER NOT NULL,
+		                        	emoji_id    INTEGER,
+		                        	emoji_name  TEXT,
+		                        	emoji_flags INTEGER NOT NULL,
+		                        	count       INTEGER NOT NULL,
+		                        	FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE
+		                        )
+		                        """);
+		await conn.ExecuteAsync("INSERT INTO message_reactions_new (message_id, emoji_id, emoji_name, emoji_flags, count) SELECT message_id, emoji_id, emoji_name, emoji_flags, count FROM message_reactions WHERE message_id IN (SELECT DISTINCT message_id FROM messages)");
+		
+		await reporter.MainWork("Migrating message edit timestamps...", finishedItems: 2, totalItems: 6);
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE message_edit_timestamps_new (
+		                        	message_id     INTEGER PRIMARY KEY NOT NULL,
+		                        	edit_timestamp INTEGER NOT NULL,
+		                        	FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE
+		                        )
+		                        """);
+		await conn.ExecuteAsync("INSERT INTO message_edit_timestamps_new (message_id, edit_timestamp) SELECT message_id, edit_timestamp FROM message_edit_timestamps WHERE message_id IN (SELECT DISTINCT message_id FROM messages)");
+		
+		await reporter.MainWork("Migrating message replies...", finishedItems: 3, totalItems: 6);
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE message_replied_to_new (
+		                        	message_id    INTEGER PRIMARY KEY NOT NULL,
+		                        	replied_to_id INTEGER NOT NULL,
+		                        	FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE
+		                        )
+		                        """);
+		await conn.ExecuteAsync("INSERT INTO message_replied_to_new (message_id, replied_to_id) SELECT message_id, replied_to_id FROM message_replied_to WHERE message_id IN (SELECT DISTINCT message_id FROM messages)");
+		
+		await reporter.MainWork("Applying schema changes...", finishedItems: 4, totalItems: 6);
+		
+		await conn.ExecuteAsync("DROP TABLE message_embeds");
+		await conn.ExecuteAsync("ALTER TABLE message_embeds_new RENAME TO message_embeds");
+		await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON message_embeds(message_id)");
+		
+		await conn.ExecuteAsync("DROP TABLE message_reactions");
+		await conn.ExecuteAsync("ALTER TABLE message_reactions_new RENAME TO message_reactions");
+		await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON message_reactions(message_id)");
+		
+		await conn.ExecuteAsync("DROP TABLE message_edit_timestamps");
+		await conn.ExecuteAsync("ALTER TABLE message_edit_timestamps_new RENAME TO message_edit_timestamps");
+		
+		await conn.ExecuteAsync("DROP TABLE message_replied_to");
+		await conn.ExecuteAsync("ALTER TABLE message_replied_to_new RENAME TO message_replied_to");
+		
+		await reporter.MainWork("Removing orphaned objects...", finishedItems: 5, totalItems: 6);
+		
+		Log.Info("Removed orphaned attachments: " + await conn.ExecuteAsync("DELETE FROM attachments WHERE attachment_id NOT IN (SELECT DISTINCT attachment_id FROM message_attachments)"));
+		Log.Info("Removed orphaned users: " + await conn.ExecuteAsync("DELETE FROM users WHERE id NOT IN (SELECT DISTINCT sender_id FROM messages)"));
+		Log.Info("Removed orphaned channels: " + await conn.ExecuteAsync("DELETE FROM channels WHERE id NOT IN (SELECT DISTINCT channel_id FROM messages)"));
+		Log.Info("Removed orphaned servers: " + await conn.ExecuteAsync("DELETE FROM servers WHERE id NOT IN (SELECT DISTINCT server FROM channels)"));
+	}
+}

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

@@ -5,7 +5,7 @@ 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 reporter.MainWork("Applying schema changes...", finishedItems: 0, totalItems: 1);
 		await conn.ExecuteAsync("ALTER TABLE channels ADD parent_id INTEGER");
 	}
 }

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

@@ -5,13 +5,21 @@ 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 reporter.MainWork("Applying schema changes...", finishedItems: 0, totalItems: 1);
 		
-		await SqliteSchema.CreateMessageEditTimestampTable(conn);
+		await conn.ExecuteAsync("""
-		await conn.ExecuteAsync("ALTER TABLE message_edit_timestamps RENAME TO edit_timestamps");
+		                        CREATE TABLE edit_timestamps (
+		                        	message_id     INTEGER PRIMARY KEY NOT NULL,
+		                        	edit_timestamp INTEGER NOT NULL
+		                        )
+		                        """);
 		
-		await SqliteSchema.CreateMessageRepliedToTable(conn);
+		await conn.ExecuteAsync("""
-		await conn.ExecuteAsync("ALTER TABLE message_replied_to RENAME TO replied_to");
+		                        CREATE TABLE replied_to (
+		                        	message_id    INTEGER PRIMARY KEY NOT NULL,
+		                        	replied_to_id INTEGER NOT NULL
+		                        )
+		                        """);
 		
 		await conn.ExecuteAsync("""
 		                        INSERT INTO edit_timestamps (message_id, edit_timestamp)
@@ -30,7 +38,7 @@ sealed class SqliteSchemaUpgradeTo3 : ISchemaUpgrade {
 		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 reporter.MainWork("Vacuuming the database...", finishedItems: 1, totalItems: 1);
 		await conn.ExecuteAsync("VACUUM");
 	}
 }

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

@@ -5,7 +5,7 @@ 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 reporter.MainWork("Applying schema changes...", finishedItems: 0, totalItems: 1);
 		
 		await conn.ExecuteAsync("""
 		                        CREATE TABLE downloads (

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

@@ -5,7 +5,7 @@ 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 reporter.MainWork("Applying schema changes...", finishedItems: 0, totalItems: 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

@@ -8,23 +8,23 @@ 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 reporter.MainWork("Applying schema changes...", finishedItems: 0, totalItems: 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 reporter.MainWork("Updating attachments...", finishedItems: 1, totalItems: 3);
 		await NormalizeAttachmentUrls(conn, reporter);
 		
-		await reporter.MainWork("Updating downloads...", 2, 3);
+		await reporter.MainWork("Updating downloads...", finishedItems: 2, totalItems: 3);
 		await NormalizeDownloadUrls(conn, reporter);
 		
-		await reporter.MainWork("Applying schema changes...", 3, 3);
+		await reporter.MainWork("Applying schema changes...", finishedItems: 3, totalItems: 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);
+		await reporter.SubWork("Preparing attachments...", finishedItems: 0, totalItems: 0);
 		
 		var normalizedUrls = new Dictionary<long, string>();
 		
@@ -32,8 +32,8 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
 			await using var reader = await selectCmd.ExecuteReaderAsync();
 			
 			while (await reader.ReadAsync()) {
-				var attachmentId = reader.GetInt64(0);
+				long attachmentId = reader.GetInt64(0);
-				var originalUrl = reader.GetString(1);
+				string originalUrl = reader.GetString(1);
 				normalizedUrls[attachmentId] = DiscordCdn.NormalizeUrl(originalUrl);
 			}
 		}
@@ -47,7 +47,7 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
 			updateCmd.Add(":attachment_id", SqliteType.Integer);
 			updateCmd.Add(":normalized_url", SqliteType.Text);
 			
-			foreach (var (attachmentId, normalizedUrl) in normalizedUrls) {
+			foreach ((long attachmentId, string normalizedUrl) in normalizedUrls) {
 				if (++processedUrls % 1000 == 0) {
 					await reporter.SubWork("Updating URLs...", processedUrls, totalUrls);
 				}
@@ -64,7 +64,7 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
 	}
 	
 	private async Task NormalizeDownloadUrls(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		await reporter.SubWork("Preparing downloads...", 0, 0);
+		await reporter.SubWork("Preparing downloads...", finishedItems: 0, totalItems: 0);
 		
 		var normalizedUrlsToOriginalUrls = new Dictionary<string, string>();
 		var duplicateUrlsToDelete = new HashSet<string>();
@@ -73,8 +73,8 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
 			await using var reader = await selectCmd.ExecuteReaderAsync();
 			
 			while (await reader.ReadAsync()) {
-				var originalUrl = reader.GetString(0);
+				string originalUrl = reader.GetString(0);
-				var normalizedUrl = DiscordCdn.NormalizeUrl(originalUrl);
+				string normalizedUrl = DiscordCdn.NormalizeUrl(originalUrl);
 				
 				if (!normalizedUrlsToOriginalUrls.TryAdd(normalizedUrl, originalUrl)) {
 					duplicateUrlsToDelete.Add(originalUrl);
@@ -85,10 +85,10 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
 		await conn.ExecuteAsync("PRAGMA cache_size = -20000");
 		await conn.BeginTransactionAsync();
 		
-		await reporter.SubWork("Deleting duplicates...", 0, 0);
+		await reporter.SubWork("Deleting duplicates...", finishedItems: 0, totalItems: 0);
 		
 		await using (var deleteCmd = conn.Delete("downloads", ("url", SqliteType.Text))) {
-			foreach (var duplicateUrl in duplicateUrlsToDelete) {
+			foreach (string duplicateUrl in duplicateUrlsToDelete) {
 				deleteCmd.Set(":url", duplicateUrl);
 				await deleteCmd.ExecuteNonQueryAsync();
 			}
@@ -105,7 +105,7 @@ sealed class SqliteSchemaUpgradeTo6 : ISchemaUpgrade {
 			updateCmd.Add(":normalized_url", SqliteType.Text);
 			updateCmd.Add(":download_url", SqliteType.Text);
 			
-			foreach (var (normalizedUrl, downloadUrl) in normalizedUrlsToOriginalUrls) {
+			foreach ((string normalizedUrl, string downloadUrl) in normalizedUrlsToOriginalUrls) {
 				if (++processedUrls % 100 == 0) {
 					await reporter.SubWork("Updating URLs...", processedUrls, totalUrls);
 					

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

@@ -9,33 +9,33 @@ 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 reporter.MainWork("Applying schema changes...", finishedItems: 0, totalItems: 6);
 		await SqliteSchema.CreateDownloadTables(conn);
 		
-		await reporter.MainWork("Migrating download metadata...", 1, 6);
+		await reporter.MainWork("Migrating download metadata...", finishedItems: 1, totalItems: 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 reporter.MainWork("Merging attachment metadata...", finishedItems: 2, totalItems: 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 reporter.MainWork("Migrating downloaded files...", finishedItems: 3, totalItems: 6);
 		await MigrateDownloadBlobsToNewTable(conn, reporter);
 		
-		await reporter.MainWork("Applying schema changes...", 4, 6);
+		await reporter.MainWork("Applying schema changes...", finishedItems: 4, totalItems: 6);
 		await conn.ExecuteAsync("DROP TABLE downloads");
 		
-		await reporter.MainWork("Discovering downloadable links...", 5, 6);
+		await reporter.MainWork("Discovering downloadable links...", finishedItems: 5, totalItems: 6);
 		await DiscoverDownloadableLinks(conn, reporter);
 	}
 	
 	private async Task MigrateDownloadBlobsToNewTable(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		await reporter.SubWork("Listing downloaded files...", 0, 0);
+		await reporter.SubWork("Listing downloaded files...", finishedItems: 0, totalItems: 0);
 		
-		var urlsToMigrate = await GetDownloadedFileUrls(conn);
+		List<string> urlsToMigrate = await GetDownloadedFileUrls(conn);
 		int totalFiles = urlsToMigrate.Count;
 		int processedFiles = -1;
 		
-		await reporter.SubWork("Processing downloaded files...", 0, totalFiles);
+		await reporter.SubWork("Processing downloaded files...", finishedItems: 0, totalFiles);
 		
 		await conn.BeginTransactionAsync();
 		
@@ -44,7 +44,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
 			insertCmd.Add(":normalized_url", SqliteType.Text);
 			deleteCmd.Add(":normalized_url", SqliteType.Text);
 			
-			foreach (var url in urlsToMigrate) {
+			foreach (string url in urlsToMigrate) {
 				if (++processedFiles % 10 == 0) {
 					await reporter.SubWork("Processing downloaded files...", processedFiles, totalFiles);
 					
@@ -84,7 +84,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
 	}
 	
 	private async Task DiscoverDownloadableLinks(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		await reporter.SubWork("Processing attachments...", 0, 4);
+		await reporter.SubWork("Processing attachments...", finishedItems: 0, totalItems: 4);
 		
 		await using (var cmd = conn.Command("""
 		                                    INSERT OR IGNORE INTO download_metadata (normalized_url, download_url, status, type, size)
@@ -118,7 +118,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
 		insertCmd.Add(":type", SqliteType.Text);
 		insertCmd.Add(":size", SqliteType.Integer);
 		
-		await reporter.SubWork("Processing embeds...", 1, 4);
+		await reporter.SubWork("Processing embeds...", finishedItems: 1, totalItems: 4);
 		
 		await using (var embedCmd = conn.Command("SELECT json FROM embeds")) {
 			await using var reader = await embedCmd.ExecuteReaderAsync();
@@ -128,7 +128,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
 			}
 		}
 		
-		await reporter.SubWork("Processing users...", 2, 4);
+		await reporter.SubWork("Processing users...", finishedItems: 2, totalItems: 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();
@@ -138,7 +138,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
 			}
 		}
 		
-		await reporter.SubWork("Processing reactions...", 3, 4);
+		await reporter.SubWork("Processing reactions...", finishedItems: 3, totalItems: 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();

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

@@ -5,7 +5,7 @@ namespace DHT.Server.Database.Sqlite.Schema;
 
 sealed class SqliteSchemaUpgradeTo8 : ISchemaUpgrade {
 	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		await reporter.MainWork("Applying schema changes...", 0, 1);
+		await reporter.MainWork("Applying schema changes...", finishedItems: 0, totalItems: 1);
 		await conn.ExecuteAsync("ALTER TABLE users ADD display_name TEXT");
 	}
 }

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

@@ -5,13 +5,13 @@ namespace DHT.Server.Database.Sqlite.Schema;
 
 sealed class SqliteSchemaUpgradeTo9 : ISchemaUpgrade {
 	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		await reporter.MainWork("Applying schema changes...", 0, 3);
+		await reporter.MainWork("Applying schema changes...", finishedItems: 0, totalItems: 3);
 		await SqliteSchema.CreateMessageAttachmentsTable(conn);
 		
-		await reporter.MainWork("Migrating message attachments...", 1, 3);
+		await reporter.MainWork("Migrating message attachments...", finishedItems: 1, totalItems: 3);
 		await conn.ExecuteAsync("INSERT INTO message_attachments (message_id, attachment_id) SELECT message_id, attachment_id FROM attachments a JOIN messages m USING (message_id)");
 		
-		await reporter.MainWork("Applying schema changes...", 2, 3);
+		await reporter.MainWork("Applying schema changes...", finishedItems: 2, totalItems: 3);
 		await conn.ExecuteAsync("DROP INDEX attachments_message_ix");
 		await conn.ExecuteAsync("ALTER TABLE attachments DROP COLUMN message_id");
 		

app/Server/Database/Sqlite/SqliteSchema.cs

@@ -8,7 +8,7 @@ using DHT.Utils.Logging;
 namespace DHT.Server.Database.Sqlite;
 
 sealed class SqliteSchema {
-	internal const int Version = 9;
+	internal const int Version = 10;
 	
 	private static readonly Log Log = Log.ForType<SqliteSchema>();
 	
@@ -21,7 +21,7 @@ sealed class SqliteSchema {
 	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));
+		string? dbVersionStr = await conn.ExecuteReaderAsync("SELECT value FROM metadata WHERE key = 'version'", static reader => reader?.GetString(0));
 		if (dbVersionStr == null) {
 			await InitializeSchemas();
 		}
@@ -32,7 +32,7 @@ sealed class SqliteSchema {
 			throw new DatabaseTooNewException(dbVersion);
 		}
 		else if (dbVersion < Version) {
-			var proceed = await callbacks.CanUpgrade();
+			bool proceed = await callbacks.CanUpgrade();
 			if (!proceed) {
 				return false;
 			}
@@ -100,7 +100,8 @@ sealed class SqliteSchema {
 		await conn.ExecuteAsync("""
 		                        CREATE TABLE message_embeds (
 		                        	message_id INTEGER NOT NULL,
-		                        	json       TEXT NOT NULL
+		                        	json       TEXT NOT NULL,
+		                        	FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE
 		                        )
 		                        """);
 		
@@ -110,12 +111,27 @@ sealed class SqliteSchema {
 		                        	emoji_id    INTEGER,
 		                        	emoji_name  TEXT,
 		                        	emoji_flags INTEGER NOT NULL,
-		                        	count       INTEGER NOT NULL
+		                        	count       INTEGER NOT NULL,
+		                        	FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE
+		                        )
+		                        """);
+		
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE message_edit_timestamps (
+		                        	message_id     INTEGER PRIMARY KEY NOT NULL,
+		                        	edit_timestamp INTEGER NOT NULL,
+		                        	FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE
+		                        )
+		                        """);
+		
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE message_replied_to (
+		                        	message_id    INTEGER PRIMARY KEY NOT NULL,
+		                        	replied_to_id INTEGER NOT NULL,
+		                        	FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE
 		                        )
 		                        """);
 		
-		await CreateMessageEditTimestampTable(conn);
-		await CreateMessageRepliedToTable(conn);
 		await CreateDownloadTables(conn);
 		await CreateMessageAttachmentsTable(conn);
 		
@@ -125,24 +141,6 @@ sealed class SqliteSchema {
 		await conn.ExecuteAsync("INSERT INTO metadata (key, value) VALUES ('version', " + Version + ")");
 	}
 	
-	internal static async Task CreateMessageEditTimestampTable(ISqliteConnection conn) {
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE message_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 message_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 (
@@ -185,14 +183,15 @@ sealed class SqliteSchema {
 			{ 6, new SqliteSchemaUpgradeTo7() },
 			{ 7, new SqliteSchemaUpgradeTo8() },
 			{ 8, new SqliteSchemaUpgradeTo9() },
+			{ 9, new SqliteSchemaUpgradeTo10() },
 		};
 		
-		var perf = Log.Start("from version " + dbVersion);
+		Perf perf = Log.Start("from version " + dbVersion);
 		
 		for (int fromVersion = dbVersion; fromVersion < Version; fromVersion++) {
-			var toVersion = fromVersion + 1;
+			int toVersion = fromVersion + 1;
 			
-			if (upgrades.TryGetValue(fromVersion, out var upgrade)) {
+			if (upgrades.TryGetValue(fromVersion, out ISchemaUpgrade? upgrade)) {
 				await upgrade.Run(conn, reporter);
 			}
 			

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

@@ -35,7 +35,7 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
 	}
 	
 	private async Task InitializePooledConnections(SqliteConnectionStringBuilder connectionStringBuilder) {
-		var connectionString = GetConnectionString(connectionStringBuilder);
+		string connectionString = GetConnectionString(connectionStringBuilder);
 		
 		for (int i = 0; i < poolSize; i++) {
 			var conn = new SqliteConnection(connectionString);
@@ -66,7 +66,7 @@ sealed class SqliteConnectionPool : IAsyncDisposable {
 		
 		await disposalTokenSource.CancelAsync();
 		
-		foreach (var conn in all) {
+		foreach (PooledConnection conn in all) {
 			await conn.InnerConnection.CloseAsync();
 			await conn.InnerConnection.DisposeAsync();
 		}

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

@@ -31,8 +31,8 @@ static class SqliteExtensions {
 	}
 	
 	public static SqliteCommand Insert(this ISqliteConnection conn, string tableName, (string Name, SqliteType Type)[] columns) {
-		string columnNames = string.Join(',', columns.Select(static c => c.Name));
+		string columnNames = string.Join(separator: ',', columns.Select(static c => c.Name));
-		string columnParams = string.Join(',', columns.Select(static c => ':' + c.Name));
+		string columnParams = string.Join(separator: ',', columns.Select(static c => ':' + c.Name));
 		
 		var cmd = conn.Command("INSERT INTO " + tableName + " (" + columnNames + ")" +
 		                       "VALUES (" + columnParams + ")");
@@ -42,9 +42,9 @@ static class SqliteExtensions {
 	}
 	
 	public static SqliteCommand Upsert(this ISqliteConnection conn, string tableName, (string Name, SqliteType Type)[] columns) {
-		string columnNames = string.Join(',', columns.Select(static c => c.Name));
+		string columnNames = string.Join(separator: ',', columns.Select(static c => c.Name));
-		string columnParams = string.Join(',', columns.Select(static c => ':' + c.Name));
+		string columnParams = string.Join(separator: ',', columns.Select(static c => ':' + c.Name));
-		string columnUpdates = string.Join(',', columns.Skip(1).Select(static c => c.Name + " = excluded." + c.Name));
+		string columnUpdates = string.Join(separator: ',', columns.Skip(1).Select(static c => c.Name + " = excluded." + c.Name));
 		
 		var cmd = conn.Command("INSERT INTO " + tableName + " (" + columnNames + ")" +
 		                       "VALUES (" + columnParams + ")" +
@@ -62,7 +62,7 @@ static class SqliteExtensions {
 	}
 	
 	private static void CreateParameters(SqliteCommand cmd, (string Name, SqliteType Type)[] columns) {
-		foreach (var (name, type) in columns) {
+		foreach ((string name, SqliteType type) in columns) {
 			cmd.Parameters.Add(":" + name, type);
 		}
 	}

app/Server/Download/DiscordCdn.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Frozen;
+using System.Collections.Specialized;
 using System.Diagnostics.CodeAnalysis;
 using System.Web;
 
@@ -9,7 +10,7 @@ static class DiscordCdn {
 	private static FrozenSet<string> CdnHosts { get; } = new[] {
 		"cdn.discordapp.com",
 		"cdn.discord.com",
-		"media.discordapp.net"
+		"media.discordapp.net",
 	}.ToFrozenSet();
 	
 	private static bool IsCdnUrl(string originalUrl, [NotNullWhen(true)] out Uri? uri) {
@@ -17,11 +18,11 @@ static class DiscordCdn {
 	}
 	
 	public static string NormalizeUrl(string originalUrl) {
-		return IsCdnUrl(originalUrl, out var uri) ? DoNormalize(uri) : originalUrl;
+		return IsCdnUrl(originalUrl, out Uri? uri) ? DoNormalize(uri) : originalUrl;
 	}
 	
 	public static bool NormalizeUrlAndReturnIfCdn(string originalUrl, out string normalizedUrl) {
-		if (IsCdnUrl(originalUrl, out var uri)) {
+		if (IsCdnUrl(originalUrl, out Uri? uri)) {
 			normalizedUrl = DoNormalize(uri);
 			return true;
 		}
@@ -32,7 +33,7 @@ static class DiscordCdn {
 	}
 	
 	private static string DoNormalize(Uri uri) {
-		var query = HttpUtility.ParseQueryString(uri.Query);
+		NameValueCollection query = HttpUtility.ParseQueryString(uri.Query);
 		
 		query.Remove("ex");
 		query.Remove("is");

app/Server/Download/DownloadItem.cs

@@ -11,11 +11,11 @@ public readonly struct DownloadItem {
 	public ulong? Size { get; init; }
 	
 	internal Data.Download ToSuccess(long size) {
-		return new Data.Download(NormalizedUrl, DownloadUrl, DownloadStatus.Success, Type, (ulong) Math.Max(size, 0));
+		return new Data.Download(NormalizedUrl, DownloadUrl, DownloadStatus.Success, Type, (ulong) Math.Max(size, val2: 0));
 	}
 	
 	internal Data.Download ToFailure(HttpStatusCode? statusCode = null) {
-		var status = statusCode.HasValue ? (DownloadStatus) (int) statusCode : DownloadStatus.GenericError;
+		DownloadStatus status = statusCode.HasValue ? (DownloadStatus) (int) statusCode : DownloadStatus.GenericError;
 		return new Data.Download(NormalizedUrl, DownloadUrl, status, Type, Size);
 	}
 }

app/Server/Download/DownloadLinkExtractor.cs

@@ -18,7 +18,7 @@ static class DownloadLinkExtractor {
 	}
 	
 	public static Data.Download FromEmoji(ulong emojiId, EmojiFlags flags) {
-		var isAnimated = flags.HasFlag(EmojiFlags.Animated);
+		bool isAnimated = flags.HasFlag(EmojiFlags.Animated);
 		
 		string ext = isAnimated ? "gif" : "webp";
 		string type = isAnimated ? MediaTypeNames.Image.Gif : MediaTypeNames.Image.Webp;
@@ -28,7 +28,11 @@ static class DownloadLinkExtractor {
 	}
 	
 	public static Data.Download FromAttachment(Attachment attachment) {
-		return new Data.Download(attachment.NormalizedUrl, attachment.DownloadUrl, DownloadStatus.Pending, attachment.Type, attachment.Size);
+		return FromAttachment(attachment.NormalizedUrl, attachment.DownloadUrl, attachment.Type, attachment.Size);
+	}
+	
+	public static Data.Download FromAttachment(string normalizedUrl, string downloadUrl, string? type, ulong size) {
+		return new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Pending, type, size);
 	}
 	
 	public static async Task<Data.Download?> TryFromEmbedJson(Stream jsonStream) {
@@ -62,7 +66,7 @@ static class DownloadLinkExtractor {
 	}
 	
 	private static Data.Download? FromEmbedImage(string url) {
-		if (DiscordCdn.NormalizeUrlAndReturnIfCdn(url, out var normalizedUrl)) {
+		if (DiscordCdn.NormalizeUrlAndReturnIfCdn(url, out string normalizedUrl)) {
 			return new Data.Download(normalizedUrl, url, DownloadStatus.Pending, GuessImageType(normalizedUrl), size: null);
 		}
 		else {
@@ -72,7 +76,7 @@ static class DownloadLinkExtractor {
 	}
 	
 	private static Data.Download? FromEmbedVideo(string url) {
-		if (DiscordCdn.NormalizeUrlAndReturnIfCdn(url, out var normalizedUrl)) {
+		if (DiscordCdn.NormalizeUrlAndReturnIfCdn(url, out string normalizedUrl)) {
 			return new Data.Download(normalizedUrl, url, DownloadStatus.Pending, GuessVideoType(normalizedUrl), size: null);
 		}
 		else {
@@ -82,7 +86,7 @@ static class DownloadLinkExtractor {
 	}
 	
 	private static string? GuessImageType(string url) {
-		if (!Uri.TryCreate(url, UriKind.Absolute, out var uri)) {
+		if (!Uri.TryCreate(url, UriKind.Absolute, out Uri? uri)) {
 			return null;
 		}
 		
@@ -101,12 +105,12 @@ static class DownloadLinkExtractor {
 			".gif"  => MediaTypeNames.Image.Gif,
 			".webp" => MediaTypeNames.Image.Webp,
 			".bmp"  => MediaTypeNames.Image.Bmp,
-			_       => null
+			_       => null,
 		};
 	}
 	
 	private static string? GuessVideoType(string url) {
-		if (!Uri.TryCreate(url, UriKind.Absolute, out var uri)) {
+		if (!Uri.TryCreate(url, UriKind.Absolute, out Uri? uri)) {
 			return null;
 		}
 		
@@ -116,7 +120,7 @@ static class DownloadLinkExtractor {
 			".mpeg" => "video/mpeg",
 			".webm" => "video/webm",
 			".mov"  => "video/quicktime",
-			_       => null
+			_       => null,
 		};
 	}
 }

app/Server/Download/Downloader.cs

@@ -12,7 +12,7 @@ public sealed class Downloader {
 	
 	private readonly IDatabaseFile db;
 	private readonly int? concurrentDownloads;
-	private readonly SemaphoreSlim semaphore = new (1, 1);
+	private readonly SemaphoreSlim semaphore = new (initialCount: 1, maxCount: 1);
 	
 	internal Downloader(IDatabaseFile db, int? concurrentDownloads) {
 		this.db = db;

app/Server/Download/DownloaderTask.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -21,14 +22,14 @@ sealed class DownloaderTask : IAsyncDisposable {
 	private const string UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
 	
 	private static int GetDownloadTaskCount(int? concurrentDownloads) {
-		return Math.Max(1, concurrentDownloads ?? DefaultConcurrentDownloads);
+		return Math.Max(val1: 1, concurrentDownloads ?? DefaultConcurrentDownloads);
 	}
 	
 	private readonly Channel<DownloadItem> downloadQueue = Channel.CreateBounded<DownloadItem>(new BoundedChannelOptions(QueueSize) {
 		SingleReader = false,
 		SingleWriter = true,
 		AllowSynchronousContinuations = false,
-		FullMode = BoundedChannelFullMode.Wait
+		FullMode = BoundedChannelFullMode.Wait,
 	});
 	
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
@@ -48,28 +49,28 @@ sealed class DownloaderTask : IAsyncDisposable {
 		this.filter = filter;
 		this.cancellationToken = cancellationTokenSource.Token;
 		this.queueWriterTask = Task.Run(RunQueueWriterTask);
-		this.downloadTasks = Enumerable.Range(1, GetDownloadTaskCount(concurrentDownloads)).Select(taskIndex => Task.Run(() => RunDownloadTask(taskIndex))).ToArray();
+		this.downloadTasks = Enumerable.Range(start: 1, GetDownloadTaskCount(concurrentDownloads)).Select(taskIndex => Task.Run(() => RunDownloadTask(taskIndex))).ToArray();
 	}
 	
 	private async Task RunQueueWriterTask() {
 		while (await downloadQueue.Writer.WaitToWriteAsync(cancellationToken)) {
-			var newItems = await db.Downloads.PullPendingDownloadItems(QueueSize, filter, cancellationToken).ToListAsync(cancellationToken);
+			List<DownloadItem> newItems = await db.Downloads.PullPendingDownloadItems(QueueSize, filter, cancellationToken).ToListAsync(cancellationToken);
 			if (newItems.Count == 0) {
 				await Task.Delay(TimeSpan.FromMilliseconds(50), cancellationToken);
 				continue;
 			}
 			
-			foreach (var newItem in newItems) {
+			foreach (DownloadItem newItem in newItems) {
 				await downloadQueue.Writer.WriteAsync(newItem, cancellationToken);
 			}
 		}
 	}
 	
 	private async Task RunDownloadTask(int taskIndex) {
-		var log = Log.ForType<DownloaderTask>("Task " + taskIndex);
+		Log log = Log.ForType<DownloaderTask>("Task " + taskIndex);
 		
 		var client = new HttpClient(new SocketsHttpHandler {
-			ConnectTimeout = TimeSpan.FromSeconds(30)
+			ConnectTimeout = TimeSpan.FromSeconds(30),
 		});
 		
 		client.Timeout = Timeout.InfiniteTimeSpan;
@@ -78,14 +79,14 @@ sealed class DownloaderTask : IAsyncDisposable {
 		string tempFileName = Path.GetTempFileName();
 		log.Debug("Using temporary file: " + tempFileName);
 		
-		await using var tempFileStream = new FileStream(tempFileName, FileMode.Create, FileAccess.ReadWrite, FileShare.Read, 4096, FileOptions.DeleteOnClose);
+		await using var tempFileStream = new FileStream(tempFileName, FileMode.Create, FileAccess.ReadWrite, FileShare.Read, bufferSize: 4096, FileOptions.DeleteOnClose);
 		
 		while (!cancellationToken.IsCancellationRequested) {
-			var item = await downloadQueue.Reader.ReadAsync(cancellationToken);
+			DownloadItem item = await downloadQueue.Reader.ReadAsync(cancellationToken);
 			log.Debug("Downloading " + item.DownloadUrl + "...");
 			
 			try {
-				var response = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, item.DownloadUrl), HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+				HttpResponseMessage response = await client.SendAsync(new HttpRequestMessage(HttpMethod.Get, item.DownloadUrl), HttpCompletionOption.ResponseHeadersRead, cancellationToken);
 				response.EnsureSuccessStatusCode();
 				await HandleResponse(response, tempFileStream, item);
 			} catch (OperationCanceledException e) when (e.CancellationToken == cancellationToken) {
@@ -119,11 +120,11 @@ sealed class DownloaderTask : IAsyncDisposable {
 				throw new InvalidOperationException("Temporary file is not empty: " + tempFileStream.Name);
 			}
 			
-			await using (var responseStream = await response.Content.ReadAsStreamAsync(cancellationToken)) {
+			await using (Stream responseStream = await response.Content.ReadAsStreamAsync(cancellationToken)) {
 				await responseStream.CopyToAsync(tempFileStream, cancellationToken);
 			}
 			
-			tempFileStream.Seek(0, SeekOrigin.Begin);
+			tempFileStream.Seek(offset: 0, SeekOrigin.Begin);
 			await db.Downloads.AddDownload(item.ToSuccess(contentLength), tempFileStream);
 		} finally {
 			tempFileStream.SetLength(0);

app/Server/Endpoints/BaseEndpoint.cs

@@ -7,6 +7,7 @@ using DHT.Server.Database;
 using DHT.Utils.Http;
 using DHT.Utils.Logging;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
 
 namespace DHT.Server.Endpoints;
 
@@ -16,7 +17,7 @@ abstract class BaseEndpoint(IDatabaseFile db) {
 	protected IDatabaseFile Db { get; } = db;
 	
 	public async Task Handle(HttpContext ctx) {
-		var response = ctx.Response;
+		HttpResponse response = ctx.Response;
 		
 		try {
 			response.StatusCode = (int) HttpStatusCode.OK;
@@ -49,7 +50,7 @@ abstract class BaseEndpoint(IDatabaseFile db) {
 	}
 	
 	protected static Guid GetSessionId(HttpRequest request) {
-		if (request.Query.TryGetValue("session", out var sessionIdValue) && sessionIdValue.Count == 1 && Guid.TryParse(sessionIdValue[0], out Guid sessionId)) {
+		if (request.Query.TryGetValue("session", out StringValues sessionIdValue) && sessionIdValue.Count == 1 && Guid.TryParse(sessionIdValue[0], out Guid sessionId)) {
 			return sessionId;
 		}
 		else {

app/Server/Endpoints/GetTrackingScriptEndpoint.cs

@@ -15,7 +15,7 @@ sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parame
 		string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
 		string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + parameters.Port + ";")
 		                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(parameters.Token))
-		                         .Replace("/*[IMPORTS]*/", await resources.ReadJoinedAsync("Tracker/scripts/", '\n', [ "/webpack.js" ]))
+		                         .Replace("/*[IMPORTS]*/", await resources.ReadJoinedAsync("Tracker/scripts/", separator: '\n', [ "/webpack.js" ]))
 		                         .Replace("/*[CSS-CONTROLLER]*/", await resources.ReadTextAsync("Tracker/styles/controller.css"))
 		                         .Replace("/*[CSS-SETTINGS]*/", await resources.ReadTextAsync("Tracker/styles/settings.css"))
 		                         .Replace("/*[DEBUGGER]*/", request.Query.ContainsKey("debug") ? "debugger;" : "");

app/Server/Endpoints/GetViewerMessagesEndpoint.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
@@ -9,8 +10,8 @@ namespace DHT.Server.Endpoints;
 
 sealed class GetViewerMessagesEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
 	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
-		var sessionId = GetSessionId(request);
+		Guid sessionId = GetSessionId(request);
-		var session = viewerSessions.Get(sessionId);
+		ViewerSession session = viewerSessions.Get(sessionId);
 		
 		response.ContentType = "application/x-ndjson";
 		return ViewerJsonExport.GetMessages(response.Body, Db, session.MessageFilter, cancellationToken);

app/Server/Endpoints/GetViewerMetadataEndpoint.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,8 +11,8 @@ namespace DHT.Server.Endpoints;
 
 sealed class GetViewerMetadataEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
 	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
-		var sessionId = GetSessionId(request);
+		Guid sessionId = GetSessionId(request);
-		var session = viewerSessions.Get(sessionId);
+		ViewerSession session = viewerSessions.Get(sessionId);
 		
 		response.ContentType = MediaTypeNames.Application.Json;
 		return ViewerJsonExport.GetMetadata(response.Body, Db, session.MessageFilter, cancellationToken);

app/Server/Endpoints/TrackChannelEndpoint.cs

@@ -11,27 +11,31 @@ namespace DHT.Server.Endpoints;
 
 sealed class TrackChannelEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
-		var root = await ReadJson(request);
+		JsonElement root = await ReadJson(request);
-		var server = ReadServer(root.RequireObject("server"), "server");
+		Data.Server server = ReadServer(root.RequireObject("server"), "server");
-		var channel = ReadChannel(root.RequireObject("channel"), "channel", server.Id);
+		Channel channel = ReadChannel(root.RequireObject("channel"), "channel", server.Id);
 		
 		await Db.Servers.Add([server]);
 		await Db.Channels.Add([channel]);
 	}
 	
-	private static Data.Server ReadServer(JsonElement json, string path) => new () {
+	private static Data.Server ReadServer(JsonElement json, string path) {
-		Id = json.RequireSnowflake("id", path),
+		return new Data.Server  {
-		Name = json.RequireString("name", path),
+			Id = json.RequireSnowflake("id", path),
-		Type = ServerTypes.FromString(json.RequireString("type", path)) ?? throw new HttpException(HttpStatusCode.BadRequest, "Server type must be either 'SERVER', 'GROUP', or 'DM'.")
+			Name = json.RequireString("name", path),
-	};
+			Type = ServerTypes.FromString(json.RequireString("type", path)) ?? throw new HttpException(HttpStatusCode.BadRequest, "Server type must be either 'SERVER', 'GROUP', or 'DM'."),
+		};
+	}
 	
-	private static Channel ReadChannel(JsonElement json, string path, ulong serverId) => new () {
+	private static Channel ReadChannel(JsonElement json, string path, ulong serverId) {
-		Id = json.RequireSnowflake("id", path),
+		return new Channel  {
-		Server = serverId,
+			Id = json.RequireSnowflake("id", path),
-		Name = json.RequireString("name", path),
+			Server = serverId,
-		ParentId = json.HasKey("parent") ? json.RequireSnowflake("parent", path) : null,
+			Name = json.RequireString("name", path),
-		Position = json.HasKey("position") ? json.RequireInt("position", path, min: 0) : null,
+			ParentId = json.HasKey("parent") ? json.RequireSnowflake("parent", path) : null,
-		Topic = json.HasKey("topic") ? json.RequireString("topic", path) : null,
+			Position = json.HasKey("position") ? json.RequireInt("position", path, min: 0) : null,
-		Nsfw = json.HasKey("nsfw") ? json.RequireBool("nsfw", path) : null
+			Topic = json.HasKey("topic") ? json.RequireString("topic", path) : null,
-	};
+			Nsfw = json.HasKey("nsfw") ? json.RequireBool("nsfw", path) : null,
+		};
+	}
 }

app/Server/Endpoints/TrackMessagesEndpoint.cs

@@ -21,7 +21,7 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 	private const string NoNewMessages = "0";
 	
 	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
-		var root = await ReadJson(request);
+		JsonElement root = await ReadJson(request);
 		
 		if (root.ValueKind != JsonValueKind.Array) {
 			throw new HttpException(HttpStatusCode.BadRequest, "Expected root element to be an array.");
@@ -32,7 +32,7 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 		
 		int i = 0;
 		foreach (JsonElement ele in root.EnumerateArray()) {
-			var message = ReadMessage(ele, "message");
+			Message message = ReadMessage(ele, "message");
 			messages[i++] = message;
 			addedMessageIds.Add(message.Id);
 		}
@@ -45,55 +45,63 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 		await response.WriteTextAsync(anyNewMessages ? HasNewMessages : NoNewMessages, cancellationToken);
 	}
 	
-	private static Message ReadMessage(JsonElement json, string path) => new () {
+	private static Message ReadMessage(JsonElement json, string path) {
-		Id = json.RequireSnowflake("id", path),
+		return new Message  {
-		Sender = json.RequireSnowflake("sender", path),
+			Id = json.RequireSnowflake("id", path),
-		Channel = json.RequireSnowflake("channel", path),
+			Sender = json.RequireSnowflake("sender", path),
-		Text = json.RequireString("text", path),
+			Channel = json.RequireSnowflake("channel", path),
-		Timestamp = json.RequireLong("timestamp", path),
+			Text = json.RequireString("text", path),
-		EditTimestamp = json.HasKey("editTimestamp") ? json.RequireLong("editTimestamp", path) : null,
+			Timestamp = json.RequireLong("timestamp", path),
-		RepliedToId = json.HasKey("repliedToId") ? json.RequireSnowflake("repliedToId", path) : null,
+			EditTimestamp = json.HasKey("editTimestamp") ? json.RequireLong("editTimestamp", path) : null,
-		Attachments = json.HasKey("attachments") ? ReadAttachments(json.RequireArray("attachments", path + ".attachments"), path + ".attachments[]").ToImmutableList() : ImmutableList<Attachment>.Empty,
+			RepliedToId = json.HasKey("repliedToId") ? json.RequireSnowflake("repliedToId", path) : null,
-		Embeds = json.HasKey("embeds") ? ReadEmbeds(json.RequireArray("embeds", path + ".embeds"), path + ".embeds[]").ToImmutableList() : ImmutableList<Embed>.Empty,
+			Attachments = json.HasKey("attachments") ? ReadAttachments(json.RequireArray("attachments", path + ".attachments"), path + ".attachments[]").ToImmutableList() : ImmutableList<Attachment>.Empty,
-		Reactions = json.HasKey("reactions") ? ReadReactions(json.RequireArray("reactions", path + ".reactions"), path + ".reactions[]").ToImmutableList() : ImmutableList<Reaction>.Empty,
+			Embeds = json.HasKey("embeds") ? ReadEmbeds(json.RequireArray("embeds", path + ".embeds"), path + ".embeds[]").ToImmutableList() : ImmutableList<Embed>.Empty,
-	};
+			Reactions = json.HasKey("reactions") ? ReadReactions(json.RequireArray("reactions", path + ".reactions"), path + ".reactions[]").ToImmutableList() : ImmutableList<Reaction>.Empty,
+		};
+	}
 	
 	[SuppressMessage("ReSharper", "ConvertToLambdaExpression")]
-	private static IEnumerable<Attachment> ReadAttachments(JsonElement.ArrayEnumerator array, string path) => array.Select(ele => {
+	private static IEnumerable<Attachment> ReadAttachments(JsonElement.ArrayEnumerator array, string path) {
-		var downloadUrl = ele.RequireString("url", path);
+		return array.Select(ele => {
-		return new Attachment {
+			string downloadUrl = ele.RequireString("url", path);
-			Id = ele.RequireSnowflake("id", path),
+			return new Attachment {
-			Name = ele.RequireString("name", path),
+				Id = ele.RequireSnowflake("id", path),
-			Type = ele.HasKey("type") ? ele.RequireString("type", path) : null,
+				Name = ele.RequireString("name", path),
-			NormalizedUrl = DiscordCdn.NormalizeUrl(downloadUrl),
+				Type = ele.HasKey("type") ? ele.RequireString("type", path) : null,
-			DownloadUrl = downloadUrl,
+				NormalizedUrl = DiscordCdn.NormalizeUrl(downloadUrl),
-			Size = (ulong) ele.RequireLong("size", path),
+				DownloadUrl = downloadUrl,
-			Width = ele.HasKey("width") ? ele.RequireInt("width", path) : null,
+				Size = (ulong) ele.RequireLong("size", path),
-			Height = ele.HasKey("height") ? ele.RequireInt("height", path) : null,
+				Width = ele.HasKey("width") ? ele.RequireInt("width", path) : null,
-		};
+				Height = ele.HasKey("height") ? ele.RequireInt("height", path) : null,
-	}).DistinctByKeyStable(static attachment => {
+			};
-		// Some Discord messages have duplicate attachments with the same id for unknown reasons.
+		}).DistinctByKeyStable(static attachment => {
-		return attachment.Id;
+			// Some Discord messages have duplicate attachments with the same id for unknown reasons.
-	});
+			return attachment.Id;
+		});
+	}
 	
-	private static IEnumerable<Embed> ReadEmbeds(JsonElement.ArrayEnumerator array, string path) => array.Select(ele => new Embed {
+	private static IEnumerable<Embed> ReadEmbeds(JsonElement.ArrayEnumerator array, string path) {
-		Json = ele.ValueKind == JsonValueKind.String ? ele.ToString() : throw new HttpException(HttpStatusCode.BadRequest, "Expected key '" + path + "' to be a string.")
+		return array.Select(ele => new Embed {
-	});
+			Json = ele.ValueKind == JsonValueKind.String ? ele.ToString() : throw new HttpException(HttpStatusCode.BadRequest, "Expected key '" + path + "' to be a string."),
+		});
+	}
 	
-	private static IEnumerable<Reaction> ReadReactions(JsonElement.ArrayEnumerator array, string path) => array.Select(ele => {
+	private static IEnumerable<Reaction> ReadReactions(JsonElement.ArrayEnumerator array, string path) {
-		var reaction = new Reaction {
+		return array.Select(ele => {
-			EmojiId = ele.HasKey("id") ? ele.RequireSnowflake("id", path) : null,
+			var reaction = new Reaction {
-			EmojiName = ele.HasKey("name") ? ele.RequireString("name", path) : null,
+				EmojiId = ele.HasKey("id") ? ele.RequireSnowflake("id", path) : null,
-			EmojiFlags = ReadEmojiFlag(ele, "isAnimated", path, EmojiFlags.Animated),
+				EmojiName = ele.HasKey("name") ? ele.RequireString("name", path) : null,
-			Count = ele.RequireInt("count", path),
+				EmojiFlags = ReadEmojiFlag(ele, "isAnimated", path, EmojiFlags.Animated),
-		};
+				Count = ele.RequireInt("count", path),
+			};
 			
-		if (reaction.EmojiId == null && reaction.EmojiName == null) {
+			if (reaction.EmojiId == null && reaction.EmojiName == null) {
-			throw new HttpException(HttpStatusCode.BadRequest, "Expected key '" + path + ".id' and/or '" + path + ".name' to be present.");
+				throw new HttpException(HttpStatusCode.BadRequest, "Expected key '" + path + ".id' and/or '" + path + ".name' to be present.");
-		}
+			}
 			
-		return reaction;
+			return reaction;
-	});
+		});
+	}
 	
 	private static EmojiFlags ReadEmojiFlag(JsonElement ele, string key, string path, EmojiFlags flag) {
 		return ele.HasKey(key) && ele.RequireBool(key, path) ? flag : EmojiFlags.None;

app/Server/Endpoints/TrackUsersEndpoint.cs

@@ -11,7 +11,7 @@ namespace DHT.Server.Endpoints;
 
 sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
-		var root = await ReadJson(request);
+		JsonElement root = await ReadJson(request);
 		
 		if (root.ValueKind != JsonValueKind.Array) {
 			throw new HttpException(HttpStatusCode.BadRequest, "Expected root element to be an array.");
@@ -27,11 +27,13 @@ sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 		await Db.Users.Add(users);
 	}
 	
-	private static User ReadUser(JsonElement json, string path) => new () {
+	private static User ReadUser(JsonElement json, string path) {
-		Id = json.RequireSnowflake("id", path),
+		return new User  {
-		Name = json.RequireString("name", path),
+			Id = json.RequireSnowflake("id", path),
-		DisplayName = json.HasKey("displayName") ? json.RequireString("displayName", path) : null,
+			Name = json.RequireString("name", path),
-		AvatarUrl = json.HasKey("avatar") ? json.RequireString("avatar", path) : null,
+			DisplayName = json.HasKey("displayName") ? json.RequireString("displayName", path) : null,
-		Discriminator = json.HasKey("discriminator") ? json.RequireString("discriminator", path) : null
+			AvatarUrl = json.HasKey("avatar") ? json.RequireString("avatar", path) : null,
-	};
+			Discriminator = json.HasKey("discriminator") ? json.RequireString("discriminator", path) : null,
+		};
+	}
 }

app/Server/Endpoints/ViewerEndpoint.cs

@@ -35,7 +35,7 @@ sealed class ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : BaseEn
 			throw new HttpException(HttpStatusCode.NotFound, "File not found: " + path);
 		}
 		else {
-			var contentType = ContentTypeProvider.TryGetContentType(path, out string? type) ? type : null;
+			string? contentType = ContentTypeProvider.TryGetContentType(path, out string? type) ? type : null;
 			await response.WriteFileAsync(contentType, resourceBytes, cancellationToken);
 		}
 	}

app/Server/Service/Middlewares/ServerAuthorizationMiddleware.cs

@@ -18,7 +18,7 @@ sealed class ServerAuthorizationMiddleware {
 	}
 	
 	public async Task InvokeAsync(HttpContext context) {
-		var request = context.Request;
+		HttpRequest request = context.Request;
 		
 		bool success = HttpMethods.IsGet(request.Method)
 			               ? CheckToken(request.Query["token"])

app/Server/Service/Middlewares/ServerLoggingMiddleware.cs

@@ -25,15 +25,15 @@ sealed class ServerLoggingMiddleware(RequestDelegate next) {
 	private static void OnFinished(Stopwatch stopwatch, HttpContext context) {
 		stopwatch.Stop();
 		
-		var request = context.Request;
+		HttpRequest request = context.Request;
-		var requestLength = request.ContentLength ?? 0L;
+		long requestLength = request.ContentLength ?? 0L;
-		var elapsedMs = stopwatch.ElapsedMilliseconds;
+		long elapsedMs = stopwatch.ElapsedMilliseconds;
 		
 		if (context.RequestAborted.IsCancellationRequested) {
 			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms");
 		}
 		else {
-			var responseStatus = context.Response.StatusCode;
+			int responseStatus = context.Response.StatusCode;
 			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
 		}
 	}

app/Server/Service/ServerManager.cs

@@ -24,12 +24,12 @@ public sealed class ServerManager {
 		Starting,
 		Started,
 		Stopping,
-		Stopped
+		Stopped,
 	}
 	
 	private readonly IDatabaseFile db;
 	private readonly ViewerSessions viewerSessions;
-	private readonly SemaphoreSlim semaphore = new (1, 1);
+	private readonly SemaphoreSlim semaphore = new (initialCount: 1, maxCount: 1);
 	
 	internal ServerManager(IDatabaseFile db, ViewerSessions viewerSessions) {
 		this.db = db;
@@ -72,11 +72,11 @@ public sealed class ServerManager {
 			options.ListenLocalhost(port, static listenOptions => listenOptions.Protocols = HttpProtocols.Http1);
 		}
 		
-		var newServer = new WebHostBuilder()
+		IWebHost newServer = new WebHostBuilder()
-		                .ConfigureServices(AddServices)
+		                     .ConfigureServices(AddServices)
-		                .UseKestrel(SetKestrelOptions)
+		                     .UseKestrel(SetKestrelOptions)
-		                .UseStartup<Startup>()
+		                     .UseStartup<Startup>()
-		                .Build();
+		                     .Build();
 		
 		Log.Info("Starting server on port " + port + "...");
 		

app/Server/Service/ServerStartup.cs

@@ -17,7 +17,7 @@ sealed class Startup {
 		"https://discord.com",
 		"https://ptb.discord.com",
 		"https://canary.discord.com",
-		"https://discordapp.com"
+		"https://discordapp.com",
 	];
 	
 	public void ConfigureServices(IServiceCollection services) {

app/Server/State.cs

@@ -8,7 +8,7 @@ using DHT.Server.Service.Viewer;
 namespace DHT.Server;
 
 public sealed class State : IAsyncDisposable {
-	public static State Dummy { get; } = new (DummyDatabaseFile.Instance, null);
+	public static State Dummy { get; } = new (DummyDatabaseFile.Instance, concurrentDownloads: null);
 	
 	public IDatabaseFile Db { get; }
 	public Downloader Downloader { get; }

app/Utils/Collections/ConcurrentPool.cs

@@ -11,7 +11,7 @@ public sealed class ConcurrentPool<T> {
 	
 	public ConcurrentPool(int size) {
 		mutexSemaphore = new SemaphoreSlim(1);
-		availableItemSemaphore = new SemaphoreSlim(0, size);
+		availableItemSemaphore = new SemaphoreSlim(initialCount: 0, size);
 		items = new Stack<T>();
 	}
 	

app/Utils/Collections/LinqExtensions.cs

@@ -7,7 +7,7 @@ public static class LinqExtensions {
 	public static IEnumerable<TItem> DistinctByKeyStable<TItem, TKey>(this IEnumerable<TItem> collection, Func<TItem, TKey> getKeyFromItem) where TKey : IEquatable<TKey> {
 		HashSet<TKey>? seenKeys = null;
 		
-		foreach (var item in collection) {
+		foreach (TItem item in collection) {
 			seenKeys ??= [];
 			
 			if (seenKeys.Add(getKeyFromItem(item))) {

app/Utils/Http/JsonExtensions.cs

@@ -9,7 +9,7 @@ public static class JsonExtensions {
 	}
 	
 	public static JsonElement RequireObject(this JsonElement json, string key, string? path = null) {
-		if (json.TryGetProperty(key, out var result)) {
+		if (json.TryGetProperty(key, out JsonElement result)) {
 			return result;
 		}
 		else {
@@ -18,7 +18,7 @@ public static class JsonExtensions {
 	}
 	
 	public static JsonElement.ArrayEnumerator RequireArray(this JsonElement json, string key, string? path = null) {
-		if (json.TryGetProperty(key, out var result) && result.ValueKind == JsonValueKind.Array) {
+		if (json.TryGetProperty(key, out JsonElement result) && result.ValueKind == JsonValueKind.Array) {
 			return result.EnumerateArray();
 		}
 		else {
@@ -27,7 +27,7 @@ public static class JsonExtensions {
 	}
 	
 	public static string RequireString(this JsonElement json, string key, string path) {
-		if (json.TryGetProperty(key, out var result) && result.ValueKind == JsonValueKind.String) {
+		if (json.TryGetProperty(key, out JsonElement result) && result.ValueKind == JsonValueKind.String) {
 			return result.ToString();
 		}
 		else {
@@ -36,7 +36,7 @@ public static class JsonExtensions {
 	}
 	
 	public static bool RequireBool(this JsonElement json, string key, string path) {
-		if (json.TryGetProperty(key, out var result) && result.ValueKind is JsonValueKind.True or JsonValueKind.False) {
+		if (json.TryGetProperty(key, out JsonElement result) && result.ValueKind is JsonValueKind.True or JsonValueKind.False) {
 			return result.GetBoolean();
 		}
 		else {
@@ -45,7 +45,7 @@ public static class JsonExtensions {
 	}
 	
 	public static int RequireInt(this JsonElement json, string key, string path, int min = int.MinValue, int max = int.MaxValue) {
-		if (json.TryGetProperty(key, out var result) && result.ValueKind == JsonValueKind.Number && result.TryGetInt32(out var i) && i >= min && i <= max) {
+		if (json.TryGetProperty(key, out JsonElement result) && result.ValueKind == JsonValueKind.Number && result.TryGetInt32(out int i) && i >= min && i <= max) {
 			return i;
 		}
 		else if (min == int.MinValue && max == int.MaxValue) {
@@ -63,7 +63,7 @@ public static class JsonExtensions {
 	}
 	
 	public static long RequireLong(this JsonElement json, string key, string path, long min = long.MinValue, long max = long.MaxValue) {
-		if (json.TryGetProperty(key, out var result) && result.ValueKind == JsonValueKind.Number && result.TryGetInt64(out var l) && l >= min && l <= max) {
+		if (json.TryGetProperty(key, out JsonElement result) && result.ValueKind == JsonValueKind.Number && result.TryGetInt64(out long l) && l >= min && l <= max) {
 			return l;
 		}
 		else if (min == long.MinValue && max == long.MaxValue) {
@@ -81,7 +81,7 @@ public static class JsonExtensions {
 	}
 	
 	public static ulong RequireSnowflake(this JsonElement json, string key, string path) {
-		if (ulong.TryParse(json.RequireString(key, path), out var snowflake)) {
+		if (ulong.TryParse(json.RequireString(key, path), out ulong snowflake)) {
 			return snowflake;
 		}
 		else {

app/Utils/Logging/Log.cs

@@ -50,7 +50,7 @@ public sealed class Log {
 		ConsoleColor prevColor = Console.ForegroundColor;
 		Console.ForegroundColor = color;
 		
-		StringBuilder builder = new StringBuilder();
+		var builder = new StringBuilder();
 		
 		foreach (string line in text.Replace("\r", "").Split('\n')) {
 			builder.Clear();

app/Utils/Resources/ResourceLoader.cs

@@ -12,8 +12,8 @@ public sealed class ResourceLoader(Assembly assembly) {
 	private Stream? TryGetEmbeddedStream(string filename) {
 		Stream? stream = null;
 		
-		foreach (var embeddedName in assembly.GetManifestResourceNames()) {
+		foreach (string embeddedName in assembly.GetManifestResourceNames()) {
-			if (embeddedName.Replace('\\', '/') == filename) {
+			if (embeddedName.Replace(oldChar: '\\', newChar: '/') == filename) {
 				stream = assembly.GetManifestResourceStream(embeddedName);
 				break;
 			}
@@ -48,8 +48,8 @@ public sealed class ResourceLoader(Assembly assembly) {
 	public async Task<string> ReadJoinedAsync(string path, char separator, string[] order) {
 		List<(string, Stream)> resourceNames = [];
 		
-		foreach (var embeddedName in assembly.GetManifestResourceNames()) {
+		foreach (string embeddedName in assembly.GetManifestResourceNames()) {
-			var embeddedNameNormalized = embeddedName.Replace('\\', '/');
+			string embeddedNameNormalized = embeddedName.Replace(oldChar: '\\', newChar: '/');
 			if (embeddedNameNormalized.StartsWith(path)) {
 				resourceNames.Add((embeddedNameNormalized, assembly.GetManifestResourceStream(embeddedName)!));
 			}
@@ -62,10 +62,10 @@ public sealed class ResourceLoader(Assembly assembly) {
 			return key == -1 ? order.Length : key;
 		}
 		
-		foreach(var (_, stream) in resourceNames.OrderBy(item => GetOrderKey(item.Item1))) {
+		foreach ((_, Stream stream) in resourceNames.OrderBy(item => GetOrderKey(item.Item1))) {
 			joined.Append(await ReadTextAsync(stream)).Append(separator);
 		}
 		
-		return joined.ToString(0, Math.Max(0, joined.Length - 1));
+		return joined.ToString(startIndex: 0, Math.Max(val1: 0, joined.Length - 1));
 	}
 }

app/Utils/Tasks/DelayedThrottledTask.cs

@@ -11,7 +11,7 @@ public sealed class DelayedThrottledTask<T> : IDisposable {
 		SingleReader = true,
 		SingleWriter = false,
 		AllowSynchronousContinuations = false,
-		FullMode = BoundedChannelFullMode.DropOldest
+		FullMode = BoundedChannelFullMode.DropOldest,
 	});
 	
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
@@ -28,7 +28,7 @@ public sealed class DelayedThrottledTask<T> : IDisposable {
 	}
 	
 	private async Task ReaderTask() {
-		var cancellationToken = cancellationTokenSource.Token;
+		CancellationToken cancellationToken = cancellationTokenSource.Token;
 		
 		try {
 			while (await taskChannel.Reader.WaitToReadAsync(cancellationToken)) {

app/Utils/Tasks/RestartableTask.cs

@@ -15,8 +15,8 @@ public sealed class RestartableTask<T>(Action<T> resultProcessor, TaskScheduler
 			
 			cancellationTokenSource = new CancellationTokenSource();
 			
-			var taskCancellationTokenSource = cancellationTokenSource;
+			CancellationTokenSource? taskCancellationTokenSource = cancellationTokenSource;
-			var taskCancellationToken = taskCancellationTokenSource.Token;
+			CancellationToken taskCancellationToken = taskCancellationTokenSource.Token;
 			
 			Task.Run(() => resultComputer(taskCancellationToken), taskCancellationToken)
 			    .ContinueWith(task => resultProcessor(task.Result), taskCancellationToken, TaskContinuationOptions.OnlyOnRanToCompletion, resultScheduler)

app/Utils/Tasks/ThrottledTask.cs

@@ -11,7 +11,7 @@ public abstract class ThrottledTaskBase<T> : IDisposable {
 		SingleReader = true,
 		SingleWriter = false,
 		AllowSynchronousContinuations = false,
-		FullMode = BoundedChannelFullMode.DropOldest
+		FullMode = BoundedChannelFullMode.DropOldest,
 	});
 	
 	private readonly CancellationTokenSource cancellationTokenSource = new ();
@@ -22,10 +22,10 @@ public abstract class ThrottledTaskBase<T> : IDisposable {
 	}
 	
 	protected async Task ReaderTask() {
-		var cancellationToken = cancellationTokenSource.Token;
+		CancellationToken cancellationToken = cancellationTokenSource.Token;
 		
 		try {
-			await foreach (var item in taskChannel.Reader.ReadAllAsync(cancellationToken)) {
+			await foreach (Func<CancellationToken, T> item in taskChannel.Reader.ReadAllAsync(cancellationToken)) {
 				try {
 					await Run(item, cancellationToken);
 				} catch (OperationCanceledException) {

app/build.bat

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

app/build.sh

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

app/build.wsl.sh

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