Release v45.0

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/Common/SystemUtils.cs

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

app/Desktop/Desktop.csproj

@@ -15,14 +15,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.6" />
+    <PackageReference Include="Avalonia" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
+    <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/AboutWindow.axaml

@@ -3,12 +3,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:main="clr-namespace:DHT.Desktop.Main"
-        mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
+        mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="360"
         x:Class="DHT.Desktop.Main.AboutWindow"
         x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="480" Height="295" CanResize="False"
+        Width="480" Height="360" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Design.DataContext>
@@ -39,10 +39,11 @@
 
         <StackPanel>
             <Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
+            <Button Command="{Binding ShowIssueTracker}">Issue Tracker</Button>
             <Button Command="{Binding ShowSourceCode}">Source Code</Button>
         </StackPanel>
 
-        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
             <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Third-Party Software</TextBlock>
             <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
             <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
@@ -55,13 +56,21 @@
             <TextBlock Grid.Row="3" Grid.Column="1">MIT</TextBlock>
             <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">NuGet</Button>
 
-            <TextBlock Grid.Row="4" Grid.Column="0">SQLite</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="0">MVVM Toolkit</TextBlock>
-            <TextBlock Grid.Row="4" Grid.Column="1">Public Domain</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</Button>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryCommunityToolkit}">GitHub</Button>
 
-            <TextBlock Grid.Row="5" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
+            <TextBlock Grid.Row="5" Grid.Column="0">SQLite</TextBlock>
-            <TextBlock Grid.Row="5" Grid.Column="1">Apache-2.0</TextBlock>
+            <TextBlock Grid.Row="5" Grid.Column="1">Public Domain</TextBlock>
-            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official Website</Button>
+
+            <TextBlock Grid.Row="6" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
+            <TextBlock Grid.Row="6" Grid.Column="1">Apache-2.0</TextBlock>
+            <Button Grid.Row="6" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
+
+            <TextBlock Grid.Row="7" Grid.Column="0">Rx.NET</TextBlock>
+            <TextBlock Grid.Row="7" Grid.Column="1">MIT</TextBlock>
+            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
         </Grid>
 
     </StackPanel>

app/Desktop/Main/AboutWindowModel.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.ReactiveUI;
@@ -8,23 +9,27 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Server;
 using DHT.Server.Data.Filters;
+using DHT.Server.Data.Settings;
+using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposable {
+sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisposable {
+	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
+	
 	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; } = "";
@@ -33,7 +38,7 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 	private bool limitSize = false;
 	
 	[ObservableProperty]
-	private ulong maximumSize = 0L;
+	private ulong maximumSize = 0UL;
 	
 	[ObservableProperty]
 	private Unit maximumSizeUnit = AllUnits[0];
@@ -43,6 +48,9 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 	private readonly State state;
 	private readonly string verb;
 	
+	private readonly DelayedThrottledTask<FilterSettings> saveFilterSettingsTask;
+	private bool isLoadingFilterSettings;
+	
 	private readonly RestartableTask<long> downloadItemCountTask;
 	private long? matchingItemCount;
 	
@@ -56,6 +64,8 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 		this.state = state;
 		this.verb = verb;
 		
+		this.saveFilterSettingsTask = new DelayedThrottledTask<FilterSettings>(Log, TimeSpan.FromSeconds(5), SaveFilterSettings);
+		
 		this.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
 		this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
 		
@@ -64,13 +74,51 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 		PropertyChanged += OnPropertyChanged;
 	}
 	
-	public void Dispose() {
+	public async Task Initialize() {
+		isLoadingFilterSettings = true;
+		
+		LimitSize = await state.Db.Settings.Get(SettingsKey.DownloadsLimitSize, LimitSize);
+		MaximumSize = await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSize, MaximumSize);
+		
+		if (await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSizeUnit, defaultValue: null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
+			MaximumSizeUnit = unitValue;
+		}
+		
+		isLoadingFilterSettings = false;
+	}
+	
+	public async ValueTask DisposeAsync() {
+		saveFilterSettingsTask.Dispose();
+		
 		downloadItemCountTask.Cancel();
 		downloadItemCountSubscription.Dispose();
+		
+		await SaveFilterSettings(new FilterSettings(this));
+	}
+	
+	private sealed record FilterSettings(bool LimitSize, ulong MaximumSize, Unit MaximumSizeUnit) {
+		public FilterSettings(DownloadItemFilterPanelModel model) : this(model.LimitSize, model.MaximumSize, model.MaximumSizeUnit) {}
+	}
+	
+	private async Task SaveFilterSettings(FilterSettings settings) {
+		try {
+			await state.Db.Settings.Set(async setter => {
+				await setter.Set(SettingsKey.DownloadsLimitSize, settings.LimitSize);
+				await setter.Set(SettingsKey.DownloadsMaximumSize, settings.MaximumSize);
+				await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
+			});
+		} catch (Exception e) {
+			Log.Error("Could not save download filter settings");
+			Log.Error(e);
+		}
 	}
 	
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
 		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
+			if (!isLoadingFilterSettings) {
+				saveFilterSettingsTask.Post(new FilterSettings(this));
+			}
+			
 			UpdateFilterStatistics();
 		}
 	}
@@ -82,7 +130,7 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 	
 	
 	private void UpdateFilterStatistics() {
-		var filter = CreateFilter();
+		DownloadItemFilter filter = CreateFilter();
 		if (filter.IsEmpty) {
 			downloadItemCountTask.Cancel();
 			matchingItemCount = totalItemCount;
@@ -101,8 +149,8 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposabl
 	}
 	
 	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,13 +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()) {
-				var name = user.Name;
-				var discriminator = user.Discriminator;
-
 				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
-					Title = discriminator == null ? name : name + " #" + discriminator,
+					Title = user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})",
-					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
+					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id),
 				});
 			}
 			
@@ -271,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;
 		}
@@ -281,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;
@@ -95,6 +95,8 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		mainContentScreenModel = new MainContentScreenModel(window, state);
 		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
 		
+		await mainContentScreenModel.Initialize();
+		
 		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
 		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
 		
@@ -104,7 +106,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
 		if (mainContentScreenModel != null) {
 			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
-			mainContentScreenModel.Dispose();
+			await mainContentScreenModel.DisposeAsync();
 			mainContentScreenModel = null;
 		}
 		
@@ -124,7 +126,10 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	}
 	
 	public async ValueTask DisposeAsync() {
-		mainContentScreenModel?.Dispose();
+		if (mainContentScreenModel != null) {
+			await mainContentScreenModel.DisposeAsync();
+		}
+		
 		await DisposeState();
 	}
 }

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,45 +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,
@@ -152,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,10 +30,17 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Orientation="Vertical" Spacing="20">
+    <StackPanel Orientation="Vertical">
-        <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
+        <WrapPanel Orientation="Horizontal">
-        <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
+            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-        <StackPanel Orientation="Vertical" Spacing="12">
+            <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
+            <Button Command="{Binding OnClickDeleteOrphanedDownloads}">Delete Orphaned Downloads</Button>
+        </WrapPanel>
+        <StackPanel Orientation="Vertical" Spacing="20" Margin="0 10 0 0">
+            <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
+            <TextBlock TextWrapping="Wrap">
+                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>
@@ -43,9 +50,6 @@
                     </DataGrid.Columns>
                 </DataGrid>
             </Expander>
-            <StackPanel Orientation="Horizontal" Spacing="10">
-                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
-            </StackPanel>
         </StackPanel>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -1,21 +1,27 @@
 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;
 using DHT.Server.Download;
 using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
+sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
 	
 	[ObservableProperty(Setter = Access.Private)]
@@ -47,6 +53,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 	
 	public bool IsDownloading => state.Downloader.IsDownloading;
 	
+	private readonly Window window;
 	private readonly State state;
 	private readonly ThrottledTask<DownloadStatusStatistics> downloadStatisticsTask;
 	private readonly IDisposable downloadItemCountSubscription;
@@ -54,9 +61,10 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 	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);
@@ -65,7 +73,7 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 			statisticsPending,
 			statisticsDownloaded,
 			statisticsFailed,
-			statisticsSkipped
+			statisticsSkipped,
 		];
 		
 		downloadStatisticsTask = new ThrottledTask<DownloadStatusStatistics>(Log, UpdateStatistics, TaskScheduler.FromCurrentSynchronizationContext());
@@ -74,13 +82,21 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 		RecomputeDownloadStatistics();
 	}
 	
-	public void Dispose() {
+	public async Task Initialize() {
+		await FilterModel.Initialize();
+		
+		if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, defaultValue: false)) {
+			await StartDownload();
+		}
+	}
+	
+	public async ValueTask DisposeAsync() {
 		finishedItemsSubscription?.Dispose();
 		
 		downloadItemCountSubscription.Dispose();
 		downloadStatisticsTask.Dispose();
 		
-		FilterModel.Dispose();
+		await FilterModel.DisposeAsync();
 	}
 	
 	private void OnDownloadCountChanged(long newDownloadCount) {
@@ -91,26 +107,41 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 		IsToggleDownloadButtonEnabled = false;
 		
 		if (IsDownloading) {
-			await state.Downloader.Stop();
+			await StopDownload();
-			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
-
-			finishedItemsSubscription?.Dispose();
-			finishedItemsSubscription = null;
-			
-			currentDownloadFilter = null;
 		}
 		else {
-			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+			await StartDownload();
-			
-			var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
-			finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
 		}
 		
+		await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
+		IsToggleDownloadButtonEnabled = true;
+	}
+	
+	private async Task StartDownload() {
+		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+		
+		IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
+		finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
+		
+		OnDownloadStateChanged();
+	}
+	
+	private async Task StopDownload() {
+		await state.Downloader.Stop();
+		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+		
+		finishedItemsSubscription?.Dispose();
+		finishedItemsSubscription = null;
+		
+		currentDownloadFilter = null;
+		OnDownloadStateChanged();
+	}
+	
+	private void OnDownloadStateChanged() {
 		RecomputeDownloadStatistics();
 		
 		OnPropertyChanged(nameof(ToggleDownloadButtonText));
 		OnPropertyChanged(nameof(IsDownloading));
-		IsToggleDownloadButtonEnabled = true;
 	}
 	
 	private void OnItemFinished(DownloadItem item) {
@@ -134,6 +165,50 @@ sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 		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

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
@@ -13,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;
 	
@@ -52,18 +54,15 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 			string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
 			string serverToken = ServerConfiguration.Token;
 			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
-			
+			SystemUtils.OpenUrl(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
-			Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId)) {
-				UseShellExecute = true
-			});
 		} catch (Exception e) {
 			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
 		}
 	}
 	
 	public async Task OnClickApplyFiltersToDatabase() {
-		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?")) {
@@ -78,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

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Main.Pages;
@@ -6,7 +7,7 @@ using DHT.Server;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed class MainContentScreenModel : IDisposable {
+sealed class MainContentScreenModel : IAsyncDisposable {
 	public DatabasePage DatabasePage { get; }
 	private DatabasePageModel DatabasePageModel { get; }
 	
@@ -34,12 +35,8 @@ sealed class MainContentScreenModel : IDisposable {
 	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")]
@@ -52,7 +49,7 @@ sealed class MainContentScreenModel : IDisposable {
 		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);
@@ -71,8 +68,12 @@ sealed class MainContentScreenModel : IDisposable {
 		StatusBarModel = new StatusBarModel(state);
 	}
 	
-	public void Dispose() {
+	public async Task Initialize() {
-		DownloadsPageModel.Dispose();
+		await DownloadsPageModel.Initialize();
+	}
+	
+	public async ValueTask DisposeAsync() {
+		await DownloadsPageModel.DisposeAsync();
 		ViewerPageModel.Dispose();
 		AdvancedPageModel.Dispose();
 		StatusBarModel.Dispose();

app/Desktop/Main/Screens/WelcomeScreen.axaml

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

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -1,18 +1,24 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
+using DHT.Server.Data.Settings;
 using DHT.Server.Database;
 using DHT.Server.Database.Sqlite.Schema;
+using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Main.Screens;
 
 sealed partial class WelcomeScreenModel : ObservableObject {
+	private static readonly Log Log = Log.ForType<WelcomeScreenModel>();
+	
 	public string Version => Program.Version;
 	
 	[ObservableProperty(Setter = Access.Private)]
@@ -34,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);
 			}
@@ -46,19 +52,21 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 	public async Task OpenOrCreateDatabaseFromPath(string path) {
 		dbFilePath = path;
 		
-		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
+		bool isNew = !File.Exists(path);
-		if (db != null) {
+		
-			DatabaseSelected?.Invoke(this, db);
+		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, value: true);
+		}
+		
+		DatabaseSelected?.Invoke(this, db);
 	}
 	
-	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
+	private sealed class SchemaUpgradeCallbacks(Window window) : ISchemaUpgradeCallbacks {
-		private readonly Window window;
-		
-		public SchemaUpgradeCallbacks(Window window) {
-			this.window = window;
-		}
-
 		public async Task<bool> CanUpgrade() {
 			return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
 		}
@@ -75,17 +83,9 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 			await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
 		}
 		
-		private sealed class ProgressReporter : ISchemaUpgradeCallbacks.IProgressReporter {
+		private sealed class ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) : ISchemaUpgradeCallbacks.IProgressReporter {
-			private readonly IReadOnlyList<IProgressCallback> callbacks;
-			
-			private readonly int versionSteps;
 			private int versionProgress = 0;
 			
-			public ProgressReporter(int versionSteps, IReadOnlyList<IProgressCallback> callbacks) {
-				this.callbacks = callbacks;
-				this.versionSteps = versionSteps;
-			}
-
 			public async Task NextVersion() {
 				await callbacks[0].Update("Upgrading schema version...", versionProgress++, versionSteps);
 				await HideChildren(0);
@@ -109,6 +109,53 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 		}
 	}
 	
+	public async Task CheckUpdates() {
+		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,
+			});
+			
+			client.Timeout = TimeSpan.FromSeconds(30);
+			client.MaxResponseContentBufferSize = 1024;
+			client.DefaultRequestHeaders.UserAgent.ParseAdd("DiscordHistoryTracker/" + Program.Version);
+			
+			string response;
+			try {
+				response = await client.GetStringAsync(Program.Website + "/version");
+			} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
+				await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
+				return null;
+			} catch (Exception e) {
+				Log.Error(e);
+				await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
+				return null;
+			}
+			
+			if (!System.Version.TryParse(response, out Version? latestVersion)) {
+				await Dialog.ShowOk(window, "Check Updates", "Server returned an invalid response.");
+				return null;
+			}
+			
+			return latestVersion;
+		});
+		
+		if (latestVersion == null) {
+			return;
+		}
+		
+		if (Program.AssemblyVersion >= latestVersion) {
+			await Dialog.ShowOk(window, "Check Updates", "You are using the latest version.");
+			return;
+		}
+		
+		if (await Dialog.ShowYesNo(window, "Check Updates", "A newer version is available: v" + Program.VersionToString(latestVersion) + "\nVisit the official website and close the app?") == DialogResult.YesNo.Yes) {
+			SystemUtils.OpenUrl(Program.Website);
+			Exit();
+		}
+	}
+	
 	public async Task ShowAboutDialog() {
 		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
 	}

app/Desktop/Program.cs

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

app/Desktop/Server/ServerConfiguration.cs

@@ -3,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/Schemas/track-users.yml

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

app/Resources/Tracker/bootstrap.js

@@ -10,11 +10,16 @@
 		return;
 	}
 	
+	/*[IMPORTS]*/
+	
+	if (!DISCORD.isCompatible()) {
+		alert("Discord History Tracker is not compatible with this version of Discord.");
+		return;
+	}
+	
 	window.DHT_LOADED = true;
 	window.DHT_ON_UNLOAD = [];
 	
-	/*[IMPORTS]*/
-	
 	const port = 0; /*[PORT]*/
 	const token = "/*[TOKEN]*/";
 	STATE.setup(port, token);
@@ -46,7 +51,7 @@
 		return action === null || action === CONSTANTS.AUTOSCROLL_ACTION_NOTHING;
 	};
 	
-	const onTrackingContinued = function(anyNewMessages) {
+	const onTrackingContinued = function(anyNewMessages, hasMoreBefore) {
 		if (!STATE.isTracking()) {
 			return;
 		}
@@ -63,7 +68,7 @@
 		if (SETTINGS.autoscroll) {
 			let action = null;
 			
-			if (!DISCORD.hasMoreMessages()) {
+			if (!hasMoreBefore) {
 				console.debug("[DHT] Reached first message.");
 				action = SETTINGS.afterFirstMsg;
 			}
@@ -84,7 +89,7 @@
 	
 	let waitUntilSendingFinishedTimer = null;
 	
-	const onMessagesUpdated = async messages => {
+	const onMessagesUpdated = async (server, channel, messages, hasMoreBefore) => {
 		if (!STATE.isTracking() || delayedStopRequests > 0) {
 			return;
 		}
@@ -94,24 +99,16 @@
 			
 			waitUntilSendingFinishedTimer = window.setTimeout(() => {
 				waitUntilSendingFinishedTimer = null;
-				onMessagesUpdated(messages);
+				onMessagesUpdated(server, channel, messages, hasMoreBefore);
 			}, 100);
 			
 			return;
 		}
 		
-		const info = DISCORD.getSelectedChannel();
-		
-		if (!info) {
-			GUI.setStatus("Error (Unknown Channel)");
-			stopTrackingDelayed();
-			return;
-		}
-		
 		isSending = true;
 		
 		try {
-			await STATE.addDiscordChannel(info.server, info.channel);
+			await STATE.addDiscordChannel(server, channel);
 		} catch (e) {
 			onError(e);
 			return;
@@ -120,35 +117,33 @@
 		try {
 			if (!messages.length) {
 				isSending = false;
-				onTrackingContinued(false);
+				onTrackingContinued(false, hasMoreBefore);
 			}
 			else {
 				const anyNewMessages = await STATE.addDiscordMessages(messages);
-				onTrackingContinued(anyNewMessages);
+				onTrackingContinued(anyNewMessages, hasMoreBefore);
 			}
 		} catch (e) {
 			onError(e);
 		}
 	};
 	
-	DISCORD.setupMessageCallback(onMessagesUpdated);
+	const starter = DISCORD.setupMessageCallback(onMessagesUpdated);
 	
 	STATE.onTrackingStateChanged(enabled => {
 		if (enabled) {
-			const messages = DISCORD.getMessages();
-			
-			if (messages.length === 0) {
-				stopTrackingDelayed(() => alert("Cannot see any messages."));
-				return;
-			}
-			
 			GUI.setStatus("Starting");
+			GUI.createTrackingStyles();
 			hasJustStarted = true;
-			// noinspection JSIgnoredPromiseFromCall
+			
-			onMessagesUpdated(messages);
+			if (!starter()) {
+				stopTrackingDelayed(() => alert("Cannot see any messages."));
+				hasJustStarted = false;
+			}
 		}
 		else {
 			isSending = false;
+			GUI.deleteTrackingStyles();
 		}
 	});
 	

app/Resources/Tracker/scripts/discord.js

@@ -4,11 +4,26 @@ class DISCORD {
 	
 	// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 	static CHANNEL_TYPE = {
+		GUILD_TEXT: 0,
 		DM: 1,
 		GROUP_DM: 3,
+		GUILD_ANNOUNCEMENT: 5,
 		ANNOUNCEMENT_THREAD: 10,
 		PUBLIC_THREAD: 11,
-		PRIVATE_THREAD: 12
+		PRIVATE_THREAD: 12,
+		
+		isPrivate(type) {
+			return type === this.DM
+				|| type === this.GROUP_DM;
+		},
+		
+		isNavigableGuildChannel(type) {
+			return type === this.GUILD_TEXT
+				|| type === this.GUILD_ANNOUNCEMENT
+				|| type === this.ANNOUNCEMENT_THREAD
+				|| type === this.PUBLIC_THREAD
+				|| type === this.PRIVATE_THREAD;
+		}
 	};
 	
 	// https://discord.com/developers/docs/resources/channel#message-object-message-types
@@ -18,6 +33,74 @@ class DISCORD {
 		THREAD_STARTER: 21
 	};
 	
+	// https://discord.com/developers/docs/topics/permissions#permissions-bitwise-permission-flags
+	static PERMISSION = {
+		VIEW_CHANNEL: 1n << 10n
+	};
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): ?DiscordGuild} getGuild
+	 */
+	static #guildStore = WEBPACK.findModule("guildStore", WEBPACK.filterByProps("getGuild", "getGuilds", "getGuildIds"));
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): Boolean} isOptInEnabled
+	 * @property {function(String): Set<String>} getOptedInChannels
+	 */
+	static #guildSettings = WEBPACK.findModule("guildSettings", WEBPACK.filterByProps("isOptInEnabled", "getOptedInChannels"));
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): ?DiscordChannel} getChannel
+	 * @property {function(String): Array<DiscordChannel>} getMutableGuildChannelsForGuild
+	 * @property {function(): Array<DiscordChannel>} getSortedPrivateChannels
+	 */
+	static #channelStore = WEBPACK.findModule("channelStore", WEBPACK.filterByProps("getChannel", "getMutableGuildChannelsForGuild", "getSortedPrivateChannels"));
+	
+	/**
+	 * @type {function(BigInt, Object): Boolean}
+	 */
+	static #hasPermission = WEBPACK.findFunction("can", [ "getGuildPermissions", "getChannelPermissions" ]);
+	
+	/**
+	 * @type {function(String): MessageData}
+	 */
+	static #getMessages = WEBPACK.findFunction("getMessages");
+	
+	/**
+	 * @type {function(String): void}
+	 */
+	static #jumpToMessage = WEBPACK.findFunction("jumpToMessage");
+	
+	/**
+	 * @type {function(): String}
+	 */
+	static #getCurrentlySelectedChannelId = WEBPACK.findFunction("getCurrentlySelectedChannelId");
+	
+	/**
+	 * @type {function(String): void}
+	 */
+	static #selectPrivateChannel = WEBPACK.findFunction("selectPrivateChannel", [ "selectChannel" ]);
+	
+	/**
+	 * @type {function(String, Object, String=null): void}
+	 */
+	static #transitionToGuildSync = WEBPACK.findFunction("transitionToGuildSync");
+	
+	static isCompatible() {
+		return !!this.#guildStore
+			&& !!this.#guildSettings
+			&& !!this.#channelStore
+			&& !!this.#hasPermission
+			&& !!this.#getMessages
+			&& !!this.#jumpToMessage
+			&& !!this.#getCurrentlySelectedChannelId
+			&& !!this.#selectPrivateChannel
+			&& !!this.#transitionToGuildSync;
+	}
+	
 	static getMessageOuterElement() {
 		return DOM.queryReactClass("messagesWrapper");
 	}
@@ -26,14 +109,6 @@ class DISCORD {
 		return DOM.queryReactClass("scroller", this.getMessageOuterElement());
 	}
 	
-	static getMessageElements() {
-		return this.getMessageOuterElement().querySelectorAll("[class*='message_']");
-	}
-	
-	static hasMoreMessages() {
-		return document.querySelector("#messagesNavigationDescription + [class^=container]") === null;
-	}
-	
 	static loadOlderMessages() {
 		const view = this.getMessageScrollerElement();
 		
@@ -42,26 +117,43 @@ class DISCORD {
 		}
 	}
 	
+	static getMessagesFromSelectedChannel() {
+		const channelId = this.#getCurrentlySelectedChannelId();
+		return channelId ? this.#getMessages(channelId) : null;
+	}
+	
 	/**
 	 * Calls the provided function with a list of messages whenever the currently loaded messages change.
+	 * @param callback {function(server: ?DiscordGuild, channel: DiscordChannel, messages: Array<DiscordMessage>, hasMoreBefore: boolean)}
 	 */
 	static setupMessageCallback(callback) {
 		const previousMessages = new Set();
 		
-		const onMessageElementsChanged = function() {
+		const onMessageElementsChanged = force => {
-			const messages = DISCORD.getMessages();
+			const messages = this.getMessagesFromSelectedChannel();
-			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !DISCORD.hasMoreMessages();
+			if (!messages || !messages.ready || messages.loadingMore) {
+				return false;
+			}
 			
+			const channel = this.#channelStore.getChannel(messages.channelId);
+			if (!channel) {
+				return false;
+			}
+			
+			const hasChanged = force || !messages.hasMoreBefore || messages.some(message => !previousMessages.has(message.id));
 			if (!hasChanged) {
-				return;
+				return false;
 			}
 			
 			previousMessages.clear();
-			for (const message of messages) {
+			for (const message of messages._array) {
 				previousMessages.add(message.id);
 			}
 			
-			callback(messages);
+			const server = this.#guildStore.getGuild(channel.guild_id);
+			
+			callback(server, channel, messages._array, messages.hasMoreBefore);
+			return true;
 		};
 		
 		let debounceTimer;
@@ -74,7 +166,7 @@ class DISCORD {
 			debounceTimer = window.setTimeout(onMessageElementsChanged, 100);
 		};
 		
-		const observer = new MutationObserver(function () {
+		const observer = new MutationObserver(function() {
 			onMessageElementsChangedLater();
 		});
 		
@@ -112,216 +204,54 @@ class DISCORD {
 			observedElement = null;
 			window.clearInterval(observerTimer);
 		});
-	}
 		
-	/**
+		return () => onMessageElementsChanged(true);
-	 * Returns the message from a message element.
-	 * @returns { null | DiscordMessage } }
-	 */
-	static getMessageFromElement(ele) {
-		const props = DOM.getReactProps(ele);
-		
-		if (props && Array.isArray(props.children)) {
-			for (const child of props.children) {
-				if (!(child instanceof Object)) {
-					continue;
-				}
-				
-				const childProps = child.props;
-				if (childProps instanceof Object && "message" in childProps) {
-					return childProps.message;
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Returns an array containing currently loaded messages.
-	 */
-	static getMessages() {
-		try {
-			const messages = [];
-			
-			for (const ele of this.getMessageElements()) {
-				try {
-					const message = this.getMessageFromElement(ele);
-					
-					if (message != null) {
-						messages.push(message);
-					}
-				} catch (e) {
-					console.error("[DHT] Error extracing message data, skipping it.", e, ele, DOM.tryGetReactProps(ele));
-				}
-			}
-			
-			return messages;
-		} catch (e) {
-			console.error("[DHT] Error retrieving messages.", e);
-			return [];
-		}
-	}
-	
-	/**
-	 * Returns an object containing the selected server and channel information.
-	 * For types DM and GROUP, the server and channel ids and names are identical.
-	 * @returns { {} | null }
-	 */
-	static getSelectedChannel() {
-		try {
-			let obj = null;
-			
-			try {
-				for (const child of DOM.getReactProps(DOM.queryReactClass("chatContent")).children) {
-					if (child && child.props && child.props.channel) {
-						obj = child.props.channel;
-						break;
-					}
-				}
-			} catch (e) {
-				console.error("[DHT] Error retrieving selected channel from 'chatContent' element.", e);
-			}
-			
-			if (!obj || typeof obj.id !== "string") {
-				return null;
-			}
-			
-			const dms = DOM.queryReactClass("privateChannels");
-			
-			if (dms) {
-				let name;
-				
-				for (const ele of dms.querySelectorAll("[class*='channel_'] [class*='selected_'] [class^='name_'] *")) {
-					const node = Array.prototype.find.call(ele.childNodes, node => node.nodeType === Node.TEXT_NODE);
-					
-					if (node) {
-						name = node.nodeValue;
-						break;
-					}
-				}
-				
-				if (!name) {
-					return null;
-				}
-				
-				let type;
-				
-				// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
-				switch (obj.type) {
-					case DISCORD.CHANNEL_TYPE.DM: type = "DM"; break;
-					case DISCORD.CHANNEL_TYPE.GROUP_DM: type = "GROUP"; break;
-					default: return null;
-				}
-				
-				const id = obj.id;
-				const server = { id, name, type };
-				const channel = { id, name };
-				
-				return { server, channel };
-			}
-			else if (obj.guild_id) {
-				let guild;
-				
-				for (const child of DOM.getReactProps(document.querySelector("nav header [class*='headerContent_']")).children) {
-					if (child && child.props && child.props.guild) {
-						guild = child.props.guild;
-						break;
-					}
-				}
-				
-				if (!guild || typeof guild.name !== "string" || obj.guild_id !== guild.id) {
-					return null;
-				}
-				
-				const server = {
-					"id": guild.id,
-					"name": guild.name,
-					"type": "SERVER"
-				};
-				
-				const channel = {
-					"id": obj.id,
-					"name": obj.name,
-					"extra": {
-						"nsfw": obj.nsfw
-					}
-				};
-				
-				if (obj.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
-					channel["extra"]["parent"] = obj.parent_id;
-				}
-				else {
-					channel["extra"]["position"] = obj.position;
-					channel["extra"]["topic"] = obj.topic;
-				}
-				
-				return { server, channel };
-			}
-			else {
-				return null;
-			}
-		} catch (e) {
-			console.error("[DHT] Error retrieving selected channel.", e);
-			return null;
-		}
 	}
 	
 	/**
 	 * Selects the next text channel and returns true, otherwise returns false if there are no more channels.
 	 */
 	static selectNextTextChannel() {
-		const dms = DOM.queryReactClass("privateChannels");
+		const currentChannel = this.#channelStore.getChannel(this.#getCurrentlySelectedChannelId());
+		if (!currentChannel) {
+			return false;
+		}
 		
-		if (dms) {
+		if (this.CHANNEL_TYPE.isPrivate(currentChannel.type)) {
-			const currentChannel = DOM.queryReactClass("selected", dms);
+			const privateChannel = this.#channelStore.getSortedPrivateChannels();
-			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel_']");
+			const currentIndex = privateChannel.findIndex(channel => channel.id === currentChannel.id);
-			const nextChannel = currentChannelContainer && currentChannelContainer.nextElementSibling;
 			
-			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel_")) {
+			if (currentIndex === -1 || currentIndex === privateChannel.length - 1) {
 				return false;
 			}
 			
-			const nextChannelLink = nextChannel.querySelector("a[href*='/@me/']");
+			this.#selectPrivateChannel(privateChannel[currentIndex + 1].id);
-			if (!nextChannelLink) {
-				return false;
-			}
-			
-			nextChannelLink.click();
-			nextChannelLink.scrollIntoView(true);
 			return true;
 		}
 		else {
-			const channelListEle = document.getElementById("channels");
+			const guildId = currentChannel.guild_id;
-			if (!channelListEle) {
+			
+			let isChannelOptedIn;
+			if (this.#guildSettings.isOptInEnabled(guildId)) {
+				const optedInChannels = this.#guildSettings.getOptedInChannels(guildId);
+				isChannelOptedIn = channel => optedInChannels.has(channel.id);
+			}
+			else {
+				isChannelOptedIn = _ => true;
+			}
+			
+			const guildChannelMap = this.#channelStore.getMutableGuildChannelsForGuild(guildId);
+			const guildChannels = Object.values(guildChannelMap)
+				.filter(channel => this.CHANNEL_TYPE.isNavigableGuildChannel(channel.type) && isChannelOptedIn(channel) && this.#hasPermission(this.PERMISSION.VIEW_CHANNEL, channel))
+				.sort((a, b) => a.position - b.position);
+			
+			const currentIndex = guildChannels.findIndex(channel => channel.id === currentChannel.id);
+			
+			if (currentIndex === -1 || currentIndex === guildChannels.length - 1) {
 				return false;
 			}
 			
-			function getLinkElement(channel) {
+			this.#transitionToGuildSync(guildId, {}, guildChannels[currentIndex + 1].id);
-				return channel.querySelector("a[href^='/channels/'][role='link']");
-			}
-			
-			const allTextChannels = Array.prototype.filter.call(channelListEle.querySelectorAll("[class*='containerDefault']"), ele => getLinkElement(ele) !== null);
-			let nextChannel = null;
-			
-			for (let index = 0; index < allTextChannels.length - 1; index++) {
-				if (allTextChannels[index].className.includes("selected_")) {
-					nextChannel = allTextChannels[index + 1];
-					break;
-				}
-			}
-			
-			if (nextChannel === null) {
-				return false;
-			}
-			
-			const nextChannelLink = getLinkElement(nextChannel);
-			if (!nextChannelLink) {
-				return false;
-			}
-			
-			nextChannelLink.click();
-			nextChannel.scrollIntoView(true);
 			return true;
 		}
 	}

app/Resources/Tracker/scripts/dom.js

@@ -1,6 +1,8 @@
 class DOM {
 	/**
 	 * Returns a child element by its ID. Parent defaults to the entire document.
+	 * @param {string} id
+	 * @param {HTMLElement?} [parent]
 	 * @returns {HTMLElement}
 	 */
 	static id(id, parent) {
@@ -9,6 +11,9 @@ class DOM {
 	
 	/**
 	 * Returns the first child element containing the specified obfuscated class. Parent defaults to the entire document.
+	 * @param {string} cls
+	 * @param {HTMLElement?} [parent]
+	 * @returns {HTMLElement}
 	 */
 	static queryReactClass(cls, parent) {
 		return (parent || document).querySelector(`[class*="${cls}_"]`);
@@ -55,31 +60,4 @@ class DOM {
 		const value = document.cookie.replace(new RegExp("(?:(?:^|.*;\\s*)" + name + "\\s*\\=\\s*([^;]*).*$)|^.*$"), "$1");
 		return value.length ? JSON.parse(decodeURIComponent(value)) : null;
 	}
-	
-	/**
-	 * Returns internal React state object of an element.
-	 */
-	static getReactProps(ele) {
-		const keys = Object.keys(ele || {});
-		let key = keys.find(key => key.startsWith("__reactInternalInstance"));
-		
-		if (key) {
-			// noinspection JSUnresolvedVariable
-			return ele[key].memoizedProps;
-		}
-		
-		key = keys.find(key => key.startsWith("__reactProps$"));
-		return key ? ele[key] : null;
-	}
-	
-	/**
-	 * Returns internal React state object of an element, or null if the retrieval throws.
-	 */
-	static tryGetReactProps(ele) {
-		try {
-			return this.getReactProps(ele);
-		} catch (e) {
-			return null;
-		}
-	}
 }

app/Resources/Tracker/scripts/gui.js

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

app/Resources/Tracker/scripts/settings.js

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

app/Resources/Tracker/scripts/state.js

@@ -58,64 +58,39 @@ const STATE = (function() {
 		}
 	};
 	
+	/**
+	 * @param {DiscordChannel} channel
+	 */
+	const getPrivateChannelName = function(channel) {
+		if (channel.name === "") {
+			return channel.rawRecipients.map(user => user.username).join(", ");
+		}
+		else {
+			return channel.name;
+		}
+	};
+	
+	/**
+	 * @param {Number} type
+	 */
+	const getChannelTypeName = function(type) {
+		if (type === DISCORD.CHANNEL_TYPE.DM) {
+			return "DM";
+		}
+		else if (type === DISCORD.CHANNEL_TYPE.GROUP_DM) {
+			return "GROUP";
+		}
+		else {
+			return "SERVER";
+		}
+	};
+	
 	const trackingStateChangedListeners = [];
 	let isTracking = false;
 	
 	const addedChannels = new Set();
 	const addedUsers = new Set();
 	
-	/**
-	 * @name DiscordUser
-	 * @property {String} id
-	 * @property {String} username
-	 * @property {String} discriminator
-	 * @property {String} [avatar]
-	 * @property {Boolean} [bot]
-	 */
-	
-	/**
-	 * @name DiscordMessage
-	 * @property {String} id
-	 * @property {String} channel_id
-	 * @property {DiscordUser} author
-	 * @property {String} content
-	 * @property {Date} timestamp
-	 * @property {Date|null} editedTimestamp
-	 * @property {DiscordAttachment[]} attachments
-	 * @property {Object[]} embeds
-	 * @property {DiscordMessageReaction[]} [reactions]
-	 * @property {DiscordMessageReference} [messageReference]
-	 * @property {Number} type
-	 * @property {String} state
-	 */
-	
-	/**
-	 * @name DiscordAttachment
-	 * @property {String} id
-	 * @property {String} filename
-	 * @property {String} [content_type]
-	 * @property {String} size
-	 * @property {String} url
-	 */
-	
-	/**
-	 * @name DiscordMessageReaction
-	 * @property {DiscordEmoji} emoji
-	 * @property {Number} count
-	 */
-	
-	/**
-	 * @name DiscordMessageReference
-	 * @property {String} [message_id]
-	 */
-	
-	/**
-	 * @name DiscordEmoji
-	 * @property {String|null} id
-	 * @property {String|null} name
-	 * @property {Boolean} animated
-	 */
-	
 	return {
 		setup(port, token) {
 			serverPort = port;
@@ -146,32 +121,51 @@ const STATE = (function() {
 			}
 		},
 		
+		/**
+		 * @param {?DiscordGuild} serverInfo
+		 * @param {DiscordChannel} channelInfo
+		 */
 		async addDiscordChannel(serverInfo, channelInfo) {
 			if (addedChannels.has(channelInfo.id)) {
 				return;
 			}
 			
 			const server = {
-				id: serverInfo.id,
+				type: getChannelTypeName(channelInfo.type)
-				name: serverInfo.name,
-				type: serverInfo.type
 			};
 			
 			const channel = {
 				id: channelInfo.id,
-				name: channelInfo.name
+				extra: {}
 			};
 			
-			if ("extra" in channelInfo) {
+			if (DISCORD.CHANNEL_TYPE.isPrivate(channelInfo.type)) {
-				const extra = channelInfo.extra;
+				server.id = channelInfo.id;
+				server.name = channel.name = getPrivateChannelName(channelInfo);
+			}
+			else if (serverInfo) {
+				server.id = serverInfo.id;
+				server.name = serverInfo.name;
+				channel.name = channelInfo.name;
+			}
+			else {
+				return;
+			}
 			
-				if ("parent" in extra) {
+			if ("nsfw" in channelInfo) {
-					channel.parent = extra.parent;
+				channel.extra.nsfw = channelInfo.nsfw;
-				}
+			}
 			
-				channel.position = extra.position;
+			if ("topic" in channelInfo) {
-				channel.topic = extra.topic;
+				channel.extra.topic = channelInfo.topic;
-				channel.nsfw = extra.nsfw;
+			}
+			
+			if ("position" in channelInfo) {
+				channel.extra.position = channelInfo.position;
+			}
+			
+			if (channelInfo.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || channelInfo.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || channelInfo.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
+				channel.extra.parent = channelInfo.parent_id;
 			}
 			
 			await post("/track-channel", { server, channel });
@@ -200,6 +194,10 @@ const STATE = (function() {
 						name: user.username
 					};
 					
+					if (user.globalName) {
+						obj.displayName = user.globalName;
+					}
+					
 					if (user.avatar) {
 						obj.avatar = user.avatar;
 					}
@@ -288,7 +286,7 @@ const STATE = (function() {
 				}
 				
 				if (msg.reactions.length > 0) {
-					obj.reactions = msg.reactions.map(reaction => {
+					obj.reactions = msg.reactions.filter(reaction => reaction.count > 0).map(reaction => {
 						const emoji = reaction.emoji;
 						
 						const mapped = {

app/Resources/Tracker/scripts/types.js

@@ -0,0 +1,82 @@
+/**
+ * @name DiscordGuild
+ * @property {String} id
+ * @property {String} name
+ */
+
+/**
+ * @name DiscordChannel
+ * @property {String} id
+ * @property {String} name
+ * @property {Number} type
+ * @property {String} [guild_id]
+ * @property {String} [parent_id]
+ * @property {Number} [position]
+ * @property {String} [topic]
+ * @property {Boolean} [nsfw]
+ * @property {DiscordUser[]} [rawRecipients]
+ */
+
+/**
+ * @name DiscordUser
+ * @property {String} id
+ * @property {String} username
+ * @property {String} discriminator
+ * @property {String} [globalName]
+ * @property {String} [avatar]
+ * @property {Boolean} [bot]
+ */
+
+/**
+ * @name DiscordMessage
+ * @property {String} id
+ * @property {String} channel_id
+ * @property {DiscordUser} author
+ * @property {String} content
+ * @property {Date} timestamp
+ * @property {Date|null} editedTimestamp
+ * @property {DiscordAttachment[]} attachments
+ * @property {Object[]} embeds
+ * @property {DiscordMessageReaction[]} [reactions]
+ * @property {DiscordMessageReference} [messageReference]
+ * @property {Number} type
+ * @property {String} state
+ */
+
+/**
+ * @name DiscordAttachment
+ * @property {String} id
+ * @property {String} filename
+ * @property {String} [content_type]
+ * @property {String} size
+ * @property {String} url
+ */
+
+/**
+ * @name DiscordMessageReaction
+ * @property {DiscordEmoji} emoji
+ * @property {Number} count
+ */
+
+/**
+ * @name DiscordMessageReference
+ * @property {String} [message_id]
+ */
+
+/**
+ * @name DiscordEmoji
+ * @property {String|null} id
+ * @property {String|null} name
+ * @property {Boolean} animated
+ */
+
+/**
+ * @name MessageData
+ * @type {Object}
+ * @property {String} channelId
+ * @property {Boolean} ready
+ * @property {Boolean} loadingMore
+ * @property {Boolean} hasMoreAfter
+ * @property {Boolean} hasMoreBefore
+ * @property {Array<DiscordMessage>} _array
+ */

app/Resources/Tracker/scripts/webpack.js

@@ -0,0 +1,98 @@
+/**
+ * Parts copied from Better Discord, licensed under Apache License 2.0.
+ *
+ * https://github.com/BetterDiscord/BetterDiscord/blob/78edeb77c60542a57884686c4ba98f997c886fad/renderer/src/modules/webpackmodules.js
+ * https://github.com/BetterDiscord/BetterDiscord/blob/78edeb77c60542a57884686c4ba98f997c886fad/LICENSE
+ */
+class WEBPACK {
+	static get require() {
+		if (this._require) {
+			return this._require;
+		}
+		
+		/**
+		 * @type {Object}
+		 * @property {Object} m
+		 * @property {Object} c
+		 */
+		let hookedRequire;
+		
+		const id = "dht-webpackmodules-" + new Date().getTime();
+		if (typeof (window["webpackChunkdiscord_app"]) !== "undefined") {
+			window["webpackChunkdiscord_app"].push([ [ id ], {}, internalRequire => hookedRequire = internalRequire ]);
+		}
+		
+		delete hookedRequire.m[id];
+		delete hookedRequire.c[id];
+		return this._require = hookedRequire;
+	}
+	
+	static getAllModules() {
+		return this.require.c;
+	}
+	
+	static filterByProps(...props) {
+		return module => props.every(prop => prop in module);
+	}
+	
+	static filterByPropsWithPredicate(predicate, ...props) {
+		return module => props.every(prop => prop in module && predicate(module[prop]));
+	}
+	
+	static findModules(filter) {
+		const defaultExport = true;
+		const moduleFilter = module => (typeof module === "object" || typeof module === "function") && filter(module);
+		
+		const results = [];
+		
+		for (const module of Object.values(this.getAllModules())) {
+			/**
+			 * @type {Object}
+			 * @property [Z]
+			 * @property [ZP]
+			 * @property [__esModule]
+			 * @property [default]
+			 */
+			const exports = module.exports;
+			if (!exports || exports === window || exports === document.documentElement || exports[Symbol.toStringTag] === "DOMTokenList") {
+				continue;
+			}
+			
+			let foundModule = null;
+			if (exports.Z && moduleFilter(exports.Z)) {
+				foundModule = defaultExport ? exports.Z : exports;
+			}
+			if (exports.ZP && moduleFilter(exports.ZP)) {
+				foundModule = defaultExport ? exports.ZP : exports;
+			}
+			if (exports.__esModule && exports.default && moduleFilter(exports.default)) {
+				foundModule = defaultExport ? exports.default : exports;
+			}
+			if (moduleFilter(exports)) {
+				foundModule = exports;
+			}
+			
+			if (foundModule) {
+				results.push(foundModule);
+			}
+		}
+		
+		return results;
+	}
+	
+	static findModule(name, filter) {
+		const modules = this.findModules(filter);
+		if (modules.length === 1) {
+			return modules[0];
+		}
+		
+		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length);
+		return null;
+	}
+	
+	static findFunction(name, additionalRequiredProps) {
+		const searchedProps = additionalRequiredProps ? [ name, ...additionalRequiredProps ] : [ name ];
+		const matchingModule = this.findModule("containing function " + name, this.filterByPropsWithPredicate(prop => typeof (prop) === "function", ...searchedProps));
+		return matchingModule == null ? null : matchingModule[name].bind(matchingModule);
+	}
+}

app/Resources/Tracker/styles/settings.css

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

app/Resources/Viewer/index.html

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

app/Resources/Viewer/scripts/bootstrap.mjs

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

app/Resources/Viewer/scripts/discord.mjs

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

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

app/Resources/Viewer/scripts/polyfills.mjs

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

app/Resources/Viewer/scripts/state.mjs

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

app/Resources/Viewer/styles/menu.css

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

app/Resources/Viewer/styles/messages.css

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

app/Server/Data/DownloadStatus.cs

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

app/Server/Data/EmojiFlags.cs

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

app/Server/Data/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/Data/Settings/SettingsKey.cs

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

app/Server/Data/User.cs

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

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/DummyDatabaseFile.cs

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

app/Server/Database/Export/ViewerJson.cs

@@ -14,10 +14,10 @@ static class ViewerJson {
 		public required string Name { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public string? Avatar { get; init; }
+		public string? DisplayName { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-		public string? Tag { get; init; }
+		public string? Avatar { get; init; }
 	}
 	
 	public sealed class JsonServer {

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,11 +65,11 @@ static class ViewerJsonExport {
 	private static async Task<Dictionary<Snowflake, ViewerJson.JsonUser>> GenerateUserList(IDatabaseFile db, CancellationToken cancellationToken) {
 		var users = new Dictionary<Snowflake, ViewerJson.JsonUser>();
 		
-		await foreach (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,
 				Avatar = user.AvatarUrl,
-				Tag = user.Discriminator
 			};
 		}
 		
@@ -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/IDatabaseFile.cs

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

app/Server/Database/Import/FakeSnowflake.cs

@@ -11,7 +11,7 @@ public sealed class FakeSnowflake {
 	private ulong id;
 	
 	public FakeSnowflake() {
-		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/ISettingsRepository.cs

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

app/Server/Database/Repositories/IUserRepository.cs

@@ -17,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

@@ -20,7 +20,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 	
 	internal sealed class NewDownloadCollector : IAsyncDisposable {
 		private readonly SqliteDownloadRepository repository;
-		private bool hasAdded = false;
+		private bool hasChanged = false;
 		
 		private readonly SqliteCommand metadataCmd;
 		
@@ -31,7 +31,16 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 				"""
 				INSERT INTO download_metadata (normalized_url, download_url, status, type, size)
 				VALUES (:normalized_url, :download_url, :status, :type, :size)
-				ON CONFLICT DO NOTHING
+				ON CONFLICT (normalized_url)
+				DO UPDATE SET
+					download_url = excluded.download_url,
+					type = IFNULL(excluded.type, type),
+					size = IFNULL(excluded.size, size)
+				WHERE status != :success
+				  AND (download_url != excluded.download_url
+				    OR (excluded.type IS NOT NULL AND type IS NOT excluded.type)
+				    OR (excluded.size IS NOT NULL AND size IS NOT excluded.size)
+				  )
 				"""
 			);
 			metadataCmd.Add(":normalized_url", SqliteType.Text);
@@ -39,6 +48,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			metadataCmd.Add(":status", SqliteType.Integer);
 			metadataCmd.Add(":type", SqliteType.Text);
 			metadataCmd.Add(":size", SqliteType.Integer);
+			metadataCmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
 		}
 		
 		public async Task Add(Data.Download download) {
@@ -47,11 +57,11 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			metadataCmd.Set(":status", (int) download.Status);
 			metadataCmd.Set(":type", download.Type);
 			metadataCmd.Set(":size", download.Size);
-			hasAdded |= await metadataCmd.ExecuteNonQueryAsync() > 0;
+			hasChanged |= await metadataCmd.ExecuteNonQueryAsync() > 0;
 		}
 		
 		public void OnCommitted() {
-			if (hasAdded) {
+			if (hasChanged) {
 				repository.UpdateTotalCount();
 			}
 		}
@@ -90,7 +100,8 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 					"""
 					INSERT INTO download_blobs (normalized_url, blob)
 					VALUES (:normalized_url, ZEROBLOB(:blob_length))
-					ON CONFLICT (normalized_url) DO UPDATE SET blob = excluded.blob
+					ON CONFLICT (normalized_url)
+					DO UPDATE SET blob = excluded.blob
 					RETURNING rowid
 					"""
 				);
@@ -166,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),
 		};
 	}
 	
@@ -195,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;
 			}
@@ -253,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);
 			
@@ -270,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),
 				});
 			}
 		}
@@ -281,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) {
@@ -310,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

@@ -14,17 +14,9 @@ using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository {
+sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : BaseSqliteRepository(Log), IMessageRepository {
 	private static readonly Log Log = Log.ForType<SqliteMessageRepository>();
 	
-	private readonly SqliteConnectionPool pool;
-	private readonly SqliteDownloadRepository downloads;
-
-	public SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : base(Log) {
-		this.pool = pool;
-		this.downloads = downloads;
-	}
-
 	public async Task Add(IReadOnlyList<Message> messages) {
 		if (messages.Count == 0) {
 			return;
@@ -47,28 +39,10 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 				("sender_id", SqliteType.Integer),
 				("channel_id", SqliteType.Integer),
 				("text", SqliteType.Text),
-				("timestamp", SqliteType.Integer)
+				("timestamp", SqliteType.Integer),
 			]);
 			
-			await using var deleteEditTimestampCmd = DeleteByMessageId(conn, "edit_timestamps");
+			await using var attachmentCmd = conn.Upsert("attachments", [
-			await using var deleteRepliedToCmd = DeleteByMessageId(conn, "replied_to");
-
-			await using var deleteAttachmentsCmd = DeleteByMessageId(conn, "attachments");
-			await using var deleteEmbedsCmd = DeleteByMessageId(conn, "embeds");
-			await using var deleteReactionsCmd = DeleteByMessageId(conn, "reactions");
-
-			await using var editTimestampCmd = conn.Insert("edit_timestamps", [
-				("message_id", SqliteType.Integer),
-				("edit_timestamp", SqliteType.Integer)
-			]);
-
-			await using var repliedToCmd = conn.Insert("replied_to", [
-				("message_id", SqliteType.Integer),
-				("replied_to_id", SqliteType.Integer)
-			]);
-
-			await using var attachmentCmd = conn.Insert("attachments", [
-				("message_id", SqliteType.Integer),
 				("attachment_id", SqliteType.Integer),
 				("name", SqliteType.Text),
 				("type", SqliteType.Text),
@@ -76,25 +50,47 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 				("download_url", SqliteType.Text),
 				("size", SqliteType.Integer),
 				("width", SqliteType.Integer),
-				("height", SqliteType.Integer)
+				("height", SqliteType.Integer),
 			]);
 			
-			await using var embedCmd = conn.Insert("embeds", [
+			await using var deleteMessageEditTimestampCmd = DeleteByMessageId(conn, "message_edit_timestamps");
+			await using var deleteMessageRepliedToCmd = DeleteByMessageId(conn, "message_replied_to");
+			
+			await using var deleteMessageAttachmentsCmd = DeleteByMessageId(conn, "message_attachments");
+			await using var deleteMessageEmbedsCmd = DeleteByMessageId(conn, "message_embeds");
+			await using var deleteMessageReactionsCmd = DeleteByMessageId(conn, "message_reactions");
+			
+			await using var messageEditTimestampCmd = conn.Insert("message_edit_timestamps", [
 				("message_id", SqliteType.Integer),
-				("json", SqliteType.Text)
+				("edit_timestamp", SqliteType.Integer),
 			]);
 			
-			await using var reactionCmd = conn.Insert("reactions", [
+			await using var messageRepliedToCmd = conn.Insert("message_replied_to", [
+				("message_id", SqliteType.Integer),
+				("replied_to_id", SqliteType.Integer),
+			]);
+			
+			await using var messageAttachmentCmd = conn.Insert("message_attachments", [
+				("message_id", SqliteType.Integer),
+				("attachment_id", SqliteType.Integer),
+			]);
+			
+			await using var messageEmbedCmd = conn.Insert("message_embeds", [
+				("message_id", SqliteType.Integer),
+				("json", SqliteType.Text),
+			]);
+			
+			await using var messageReactionCmd = conn.Insert("message_reactions", [
 				("message_id", SqliteType.Integer),
 				("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);
@@ -104,29 +100,30 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 				messageCmd.Set(":timestamp", message.Timestamp);
 				await messageCmd.ExecuteNonQueryAsync();
 				
-				await ExecuteDeleteByMessageId(deleteEditTimestampCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteMessageEditTimestampCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteRepliedToCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteMessageRepliedToCmd, messageId);
 				
-				await ExecuteDeleteByMessageId(deleteAttachmentsCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteMessageAttachmentsCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteEmbedsCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteMessageEmbedsCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteReactionsCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteMessageReactionsCmd, messageId);
 				
 				if (message.EditTimestamp is {} timestamp) {
-					editTimestampCmd.Set(":message_id", messageId);
+					messageEditTimestampCmd.Set(":message_id", messageId);
-					editTimestampCmd.Set(":edit_timestamp", timestamp);
+					messageEditTimestampCmd.Set(":edit_timestamp", timestamp);
-					await editTimestampCmd.ExecuteNonQueryAsync();
+					await messageEditTimestampCmd.ExecuteNonQueryAsync();
 				}
 				
 				if (message.RepliedToId is {} repliedToId) {
-					repliedToCmd.Set(":message_id", messageId);
+					messageRepliedToCmd.Set(":message_id", messageId);
-					repliedToCmd.Set(":replied_to_id", repliedToId);
+					messageRepliedToCmd.Set(":replied_to_id", repliedToId);
-					await repliedToCmd.ExecuteNonQueryAsync();
+					await messageRepliedToCmd.ExecuteNonQueryAsync();
 				}
 				
 				if (!message.Attachments.IsEmpty) {
-					foreach (var attachment in message.Attachments) {
+					foreach (Attachment attachment in message.Attachments) {
-						attachmentCmd.Set(":message_id", messageId);
+						object attachmentId = attachment.Id;
-						attachmentCmd.Set(":attachment_id", attachment.Id);
+						
+						attachmentCmd.Set(":attachment_id", attachmentId);
 						attachmentCmd.Set(":name", attachment.Name);
 						attachmentCmd.Set(":type", attachment.Type);
 						attachmentCmd.Set(":normalized_url", attachment.NormalizedUrl);
@@ -136,15 +133,19 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 						attachmentCmd.Set(":height", attachment.Height);
 						await attachmentCmd.ExecuteNonQueryAsync();
 						
+						messageAttachmentCmd.Set(":message_id", messageId);
+						messageAttachmentCmd.Set(":attachment_id", attachmentId);
+						await messageAttachmentCmd.ExecuteNonQueryAsync();
+						
 						await downloadCollector.Add(DownloadLinkExtractor.FromAttachment(attachment));
 					}
 				}
 				
 				if (!message.Embeds.IsEmpty) {
-					foreach (var embed in message.Embeds) {
+					foreach (Embed embed in message.Embeds) {
-						embedCmd.Set(":message_id", messageId);
+						messageEmbedCmd.Set(":message_id", messageId);
-						embedCmd.Set(":json", embed.Json);
+						messageEmbedCmd.Set(":json", embed.Json);
-						await embedCmd.ExecuteNonQueryAsync();
+						await messageEmbedCmd.ExecuteNonQueryAsync();
 						
 						if (DownloadLinkExtractor.TryFromEmbedJson(embed.Json) is {} download) {
 							await downloadCollector.Add(download);
@@ -153,13 +154,13 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 				}
 				
 				if (!message.Reactions.IsEmpty) {
-					foreach (var reaction in message.Reactions) {
+					foreach (Reaction reaction in message.Reactions) {
-						reactionCmd.Set(":message_id", messageId);
+						messageReactionCmd.Set(":message_id", messageId);
-						reactionCmd.Set(":emoji_id", reaction.EmojiId);
+						messageReactionCmd.Set(":emoji_id", reaction.EmojiId);
-						reactionCmd.Set(":emoji_name", reaction.EmojiName);
+						messageReactionCmd.Set(":emoji_name", reaction.EmojiName);
-						reactionCmd.Set(":emoji_flags", (int) reaction.EmojiFlags);
+						messageReactionCmd.Set(":emoji_flags", (int) reaction.EmojiFlags);
-						reactionCmd.Set(":count", reaction.Count);
+						messageReactionCmd.Set(":count", reaction.Count);
-						await reactionCmd.ExecuteNonQueryAsync();
+						await messageReactionCmd.ExecuteNonQueryAsync();
 						
 						if (reaction.EmojiId is {} emojiId) {
 							await downloadCollector.Add(DownloadLinkExtractor.FromEmoji(emojiId, reaction.EmojiFlags));
@@ -221,7 +222,8 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 			"""
 			SELECT attachment_id, name, type, normalized_url, download_url, size, width, height
 			FROM attachments
-			WHERE message_id = :message_id
+			JOIN message_attachments USING (attachment_id)
+			WHERE message_attachments.message_id = :message_id
 			""";
 		
 		await using var attachmentCmd = new MessageToManyCommand<Attachment>(conn, AttachmentSql, static reader => new Attachment {
@@ -238,18 +240,18 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 		const string EmbedSql =
 			"""
 			SELECT json
-			FROM embeds
+			FROM message_embeds
 			WHERE message_id = :message_id
 			""";
 		
 		await using var embedCmd = new MessageToManyCommand<Embed>(conn, EmbedSql, static reader => new Embed {
-			Json = reader.GetString(0)
+			Json = reader.GetString(0),
 		});
 		
 		const string ReactionSql =
 			"""
 			SELECT emoji_id, emoji_name, emoji_flags, count
-			FROM reactions
+			FROM message_reactions
 			WHERE message_id = :message_id
 			""";
 		
@@ -262,10 +264,10 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 		
 		await using var messageCmd = conn.Command(
 			$"""
-			 SELECT m.message_id, m.sender_id, m.channel_id, m.text, m.timestamp, et.edit_timestamp, rt.replied_to_id
+			 SELECT m.message_id, m.sender_id, m.channel_id, m.text, m.timestamp, met.edit_timestamp, mrt.replied_to_id
 			 FROM messages m
-			 LEFT JOIN edit_timestamps et ON m.message_id = et.message_id
+			 LEFT JOIN message_edit_timestamps met ON m.message_id = met.message_id
-			 LEFT JOIN replied_to rt ON m.message_id = rt.message_id
+			 LEFT JOIN message_replied_to mrt ON m.message_id = mrt.message_id
 			 {filter.GenerateConditions("m").BuildWhereClause()}
 			 """
 		);
@@ -285,7 +287,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 				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),
 			};
 		}
 	}
@@ -301,17 +303,24 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 		}
 	}
 	
-	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

@@ -0,0 +1,58 @@
+using System;
+using System.Threading.Tasks;
+using DHT.Server.Data.Settings;
+using DHT.Server.Database.Repositories;
+using DHT.Server.Database.Sqlite.Utils;
+using Microsoft.Data.Sqlite;
+
+namespace DHT.Server.Database.Sqlite.Repositories;
+
+sealed class SqliteSettingsRepository(SqliteConnectionPool pool) : ISettingsRepository {
+	public Task Set<T>(SettingsKey<T> key, T value) {
+		return Set(setter => setter.Set(key, value));
+	}
+	
+	public async Task Set(Func<ISettingsRepository.ISetter, Task> setter) {
+		await using var conn = await pool.Take();
+		await conn.BeginTransactionAsync();
+		
+		await using var cmd = conn.Command(
+			"""
+			INSERT INTO metadata (key, value)
+			VALUES (:key, :value)
+			ON CONFLICT (key)
+			DO UPDATE SET value = excluded.value
+			"""
+		);
+		
+		cmd.Add(":key", SqliteType.Text);
+		cmd.Add(":value", SqliteType.Text);
+		
+		await setter(new Setter(cmd));
+		
+		await cmd.ExecuteNonQueryAsync();
+		await conn.CommitTransactionAsync();
+	}
+	
+	private sealed class Setter(SqliteCommand cmd) : ISettingsRepository.ISetter {
+		public async Task Set<T>(SettingsKey<T> key, T value) {
+			cmd.Set(":key", key.Key);
+			cmd.Set(":value", key.ToString(value));
+			await cmd.ExecuteNonQueryAsync();
+		}
+	}
+	
+	public async Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue) {
+		string? value;
+		
+		await using (var conn = await pool.Take()) {
+			await using var cmd = conn.Command("SELECT value FROM metadata WHERE key = :key");
+			cmd.AddAndSet(":key", SqliteType.Text, key.Key);
+			
+			await using var reader = await cmd.ExecuteReaderAsync();
+			value = await reader.ReadAsync() ? reader.GetString(0) : null;
+		}
+		
+		return value != null && key.FromString(value, out T convertedValue) ? convertedValue : defaultValue;
+	}
+}

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

@@ -29,15 +29,17 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 			await using var cmd = conn.Upsert("users", [
 				("id", SqliteType.Integer),
 				("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);
 				cmd.Set(":avatar_url", user.AvatarUrl);
 				cmd.Set(":discriminator", user.Discriminator);
 				await cmd.ExecuteNonQueryAsync();
@@ -62,16 +64,27 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 	public async IAsyncEnumerable<User> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();
 		
-		await using var cmd = conn.Command("SELECT id, name, avatar_url, discriminator FROM users");
+		await using var cmd = conn.Command("SELECT id, name, display_name, avatar_url, discriminator FROM users");
 		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 		
 		while (await reader.ReadAsync(cancellationToken)) {
 			yield return new User {
 				Id = reader.GetUint64(0),
 				Name = reader.GetString(1),
-				AvatarUrl = reader.IsDBNull(2) ? null : reader.GetString(2),
+				DisplayName = reader.IsDBNull(2) ? null : reader.GetString(2),
-				Discriminator = reader.IsDBNull(3) ? null : reader.GetString(3),
+				AvatarUrl = reader.IsDBNull(3) ? null : reader.GetString(3),
+				Discriminator = reader.IsDBNull(4) ? null : reader.GetString(4),
 			};
 		}
 	}
+	
+	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,10 +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 SqliteSchema.CreateMessageRepliedToTable(conn);
+		                        CREATE TABLE edit_timestamps (
+		                        	message_id     INTEGER PRIMARY KEY NOT NULL,
+		                        	edit_timestamp INTEGER NOT NULL
+		                        )
+		                        """);
+		
+		await conn.ExecuteAsync("""
+		                        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)
@@ -27,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

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+
+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...", finishedItems: 0, totalItems: 1);
+		await conn.ExecuteAsync("ALTER TABLE users ADD display_name TEXT");
+	}
+}

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

@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using DHT.Server.Database.Sqlite.Utils;
+
+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...", finishedItems: 0, totalItems: 3);
+		await SqliteSchema.CreateMessageAttachmentsTable(conn);
+		
+		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...", finishedItems: 2, totalItems: 3);
+		await conn.ExecuteAsync("DROP INDEX attachments_message_ix");
+		await conn.ExecuteAsync("ALTER TABLE attachments DROP COLUMN message_id");
+		
+		await conn.ExecuteAsync("ALTER TABLE embeds RENAME TO message_embeds");
+		await conn.ExecuteAsync("ALTER TABLE edit_timestamps RENAME TO message_edit_timestamps");
+		await conn.ExecuteAsync("ALTER TABLE replied_to RENAME TO message_replied_to");
+		await conn.ExecuteAsync("ALTER TABLE reactions RENAME TO message_reactions");
+	}
+}

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -39,6 +39,7 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 	
 	public string Path { get; }
 	
+	public ISettingsRepository Settings => settings;
 	public IUserRepository Users => users;
 	public IServerRepository Servers => servers;
 	public IChannelRepository Channels => channels;
@@ -47,6 +48,7 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 	
 	private readonly SqliteConnectionPool pool;
 	
+	private readonly SqliteSettingsRepository settings;
 	private readonly SqliteUserRepository users;
 	private readonly SqliteServerRepository servers;
 	private readonly SqliteChannelRepository channels;
@@ -58,6 +60,7 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 		this.pool = pool;
 		
 		downloads = new SqliteDownloadRepository(pool);
+		settings = new SqliteSettingsRepository(pool);
 		users = new SqliteUserRepository(pool, downloads);
 		servers = new SqliteServerRepository(pool);
 		channels = new SqliteChannelRepository(pool);

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 = 7;
+	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;
 			}
@@ -48,6 +48,7 @@ sealed class SqliteSchema {
 		                        CREATE TABLE users (
 		                        	id            INTEGER PRIMARY KEY NOT NULL,
 		                        	name          TEXT NOT NULL,
+		                        	display_name  TEXT,
 		                        	avatar_url    TEXT,
 		                        	discriminator TEXT
 		                        )
@@ -85,7 +86,6 @@ sealed class SqliteSchema {
 		
 		await conn.ExecuteAsync("""
 		                        CREATE TABLE attachments (
-		                        	message_id     INTEGER NOT NULL,
 		                        	attachment_id  INTEGER NOT NULL PRIMARY KEY NOT NULL,
 		                        	name           TEXT NOT NULL,
 		                        	type           TEXT,
@@ -98,51 +98,49 @@ sealed class SqliteSchema {
 		                        """);
 		
 		await conn.ExecuteAsync("""
-		                        CREATE TABLE embeds (
+		                        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
 		                        )
 		                        """);
 		
 		await conn.ExecuteAsync("""
-		                        CREATE TABLE reactions (
+		                        CREATE TABLE message_reactions (
 		                        	message_id  INTEGER NOT NULL,
 		                        	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 CreateMessageEditTimestampTable(conn);
+		await conn.ExecuteAsync("""
-		await CreateMessageRepliedToTable(conn);
+		                        CREATE TABLE message_edit_timestamps (
-		await CreateDownloadTables(conn);
+		                        	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 INDEX attachments_message_ix ON attachments(message_id)");
+		await conn.ExecuteAsync("""
-		await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON embeds(message_id)");
+		                        CREATE TABLE message_replied_to (
-		await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON reactions(message_id)");
+		                        	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 CreateDownloadTables(conn);
+		await CreateMessageAttachmentsTable(conn);
+		
+		await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON message_embeds(message_id)");
+		await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON message_reactions(message_id)");
 		
 		await conn.ExecuteAsync("INSERT INTO metadata (key, value) VALUES ('version', " + Version + ")");
 	}
 	
-	internal static async Task CreateMessageEditTimestampTable(ISqliteConnection conn) {
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE edit_timestamps (
-		                        	message_id     INTEGER PRIMARY KEY NOT NULL,
-		                        	edit_timestamp INTEGER NOT NULL
-		                        )
-		                        """);
-	}
-
-	internal static async Task CreateMessageRepliedToTable(ISqliteConnection conn) {
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE replied_to (
-		                        	message_id    INTEGER PRIMARY KEY NOT NULL,
-		                        	replied_to_id INTEGER NOT NULL
-		                        )
-		                        """);
-	}
-
 	internal static async Task CreateDownloadTables(ISqliteConnection conn) {
 		await conn.ExecuteAsync("""
 		                        CREATE TABLE download_metadata (
@@ -163,6 +161,18 @@ sealed class SqliteSchema {
 		                        """);
 	}
 	
+	internal static async Task CreateMessageAttachmentsTable(ISqliteConnection conn) {
+		await conn.ExecuteAsync("""
+		                        CREATE TABLE message_attachments (
+		                        	message_id    INTEGER NOT NULL,
+		                        	attachment_id INTEGER NOT NULL,
+		                        	PRIMARY KEY (message_id, attachment_id),
+		                            FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE,
+		                            FOREIGN KEY (attachment_id) REFERENCES attachments (attachment_id) ON UPDATE CASCADE ON DELETE CASCADE
+		                        )
+		                        """);
+	}
+	
 	private async Task UpgradeSchemas(int dbVersion, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
 		var upgrades = new Dictionary<int, ISchemaUpgrade> {
 			{ 1, new SqliteSchemaUpgradeTo2() },
@@ -171,14 +181,17 @@ sealed class SqliteSchema {
 			{ 4, new SqliteSchemaUpgradeTo5() },
 			{ 5, new SqliteSchemaUpgradeTo6() },
 			{ 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;