WIP

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

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

app/.idea/.idea.DiscordHistoryTracker/.idea/codeStyles/Project.xml

@@ -13,10 +13,10 @@
     <CssCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </CssCodeStyleSettings>
-    <DB2CodeStyleSettings version="7">
+    <DB2CodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </DB2CodeStyleSettings>
-    <DerbyCodeStyleSettings version="7">
+    <DerbyCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </DerbyCodeStyleSettings>
     <GoCodeStyleSettings>
@@ -26,10 +26,10 @@
       <option name="WRAP_FUNC_PARAMS" value="5" />
       <option name="WRAP_FUNC_RESULT" value="5" />
     </GoCodeStyleSettings>
-    <H2CodeStyleSettings version="7">
+    <H2CodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </H2CodeStyleSettings>
-    <HSQLCodeStyleSettings version="7">
+    <HSQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </HSQLCodeStyleSettings>
     <HTMLCodeStyleSettings>
@@ -85,10 +85,10 @@
     <LessCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </LessCodeStyleSettings>
-    <MSSQLCodeStyleSettings version="7">
+    <MSSQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </MSSQLCodeStyleSettings>
-    <MySQLCodeStyleSettings version="7">
+    <MySQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </MySQLCodeStyleSettings>
     <Objective-C>
@@ -98,7 +98,7 @@
       <option name="SPACE_BEFORE_INIT_LIST" value="true" />
       <option name="SPACE_AFTER_DICTIONARY_LITERAL_COLON" value="false" />
     </Objective-C>
-    <OracleCodeStyleSettings version="7">
+    <OracleCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </OracleCodeStyleSettings>
     <PHPCodeStyleSettings>
@@ -116,7 +116,7 @@
       <option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
       <option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
     </PHPCodeStyleSettings>
-    <PostgresCodeStyleSettings version="7">
+    <PostgresCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </PostgresCodeStyleSettings>
     <Properties>
@@ -143,16 +143,13 @@
       <option name="INDENT_WHEN_CASES" value="true" />
       <option name="CHAIN_CALLS_ALIGNMENT" value="2" />
     </Ruby>
-    <SQLiteCodeStyleSettings version="7">
+    <SQLiteCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </SQLiteCodeStyleSettings>
     <ScssCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </ScssCodeStyleSettings>
-    <Shell_Script>
-      <option name="KEEP_COLUMN_ALIGNMENT_PADDING" value="true" />
-    </Shell_Script>
-    <SqlCodeStyleSettings version="7">
+    <SqlCodeStyleSettings version="6">
       <option name="KEYWORD_CASE" value="2" />
       <option name="TYPE_CASE" value="2" />
       <option name="CUSTOM_TYPE_CASE" value="2" />
@@ -176,10 +173,9 @@
       <option name="CONSTRAINT_WRAP_3" value="true" />
       <option name="CONSTRAINT_WRAP_4" value="true" />
       <option name="VIEW_INDENT_QUERY" value="true" />
-      <option name="IMP_LOOP_LOOP_INDENT" value="false" />
       <option name="EXPR_CASE_WHEN_WRAP" value="false" />
     </SqlCodeStyleSettings>
-    <SybaseCodeStyleSettings version="7">
+    <SybaseCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </SybaseCodeStyleSettings>
     <TypeScriptCodeStyleSettings version="0">
@@ -207,11 +203,6 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
-    <codeStyleSettings language="Gherkin">
-      <indentOptions>
-        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
     <codeStyleSettings language="Groovy">
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
@@ -291,13 +282,6 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
-    <codeStyleSettings language="Markdown">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
     <codeStyleSettings language="ObjectiveC">
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
@@ -358,6 +342,7 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="Rust">
+      <option name="RIGHT_MARGIN" value="140" />
       <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
@@ -372,7 +357,6 @@
     </codeStyleSettings>
     <codeStyleSettings language="SCSS">
       <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
@@ -383,6 +367,13 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="Shell Script">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="TOML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -436,9 +427,6 @@
     </codeStyleSettings>
     <codeStyleSettings language="liquid">
       <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>

app/.idea/.idea.DiscordHistoryTracker/.idea/inspectionProfiles/Project.xml

@@ -91,6 +91,7 @@
     <inspection_tool class="ComparatorNotSerializable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CompareToUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ComparisonOfShortAndChar" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ComposeMissingKeys" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="ConditionSignal" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ConditionalExpression" enabled="true" level="INFORMATION" enabled_by_default="true">
       <option name="ignoreSimpleAssignmentsAndReturns" value="true" />
@@ -361,7 +362,7 @@
     </inspection_tool>
     <inspection_tool class="LocalVariableDeclarationSideOnly" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="LocalVariableNamingConventionJS" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_regex" value="[a-z][A-Za-z0-9]*" />
+      <option name="m_regex" value="[a-z][A-Za-z]*" />
       <option name="m_minLength" value="0" />
       <option name="m_maxLength" value="99" />
     </inspection_tool>

app/.idea/.idea.DiscordHistoryTracker/.idea/libraries/Generated_files.xml

@@ -0,0 +1,22 @@
+<component name="libraryTable">
+  <library name="Generated files" type="javaScript">
+    <properties>
+      <sourceFilesUrls>
+        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/discord.js" />
+        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/dom.js" />
+        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/gui.js" />
+        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/settings.js" />
+        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/state.js" />
+      </sourceFilesUrls>
+    </properties>
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/discord.js" />
+      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/dom.js" />
+      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/gui.js" />
+      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/settings.js" />
+      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/state.js" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

app/Desktop/Arguments.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop;
@@ -9,16 +8,15 @@ sealed class Arguments {
 	
 	private const int FirstArgument = 1;
 
-	public static Arguments Empty => new (Array.Empty<string>());
+	public static Arguments Empty => new(Array.Empty<string>());
 
 	public bool Console { get; }
 	public string? DatabaseFile { get; }
 	public ushort? ServerPort { get; }
 	public string? ServerToken { get; }
-	public byte? ConcurrentDownloads { get; }
 
-	public Arguments(IReadOnlyList<string> args) {
-		for (int i = FirstArgument; i < args.Count; i++) {
+	public Arguments(string[] args) {
+		for (int i = FirstArgument; i < args.Length; i++) {
 			string key = args[i];
 
 			switch (key) {
@@ -37,7 +35,7 @@ sealed class Arguments {
 				value = key;
 				key = "-db";
 			}
-			else if (i >= args.Count - 1) {
+			else if (i >= args.Length - 1) {
 				Log.Warn("Missing value for command line argument: " + key);
 				continue;
 			}
@@ -51,11 +49,11 @@ sealed class Arguments {
 					continue;
 
 				case "-port": {
-					if (!ushort.TryParse(value, out var port)) {
-						Log.Warn("Invalid port number: " + value);
+					if (ushort.TryParse(value, out var port)) {
+						ServerPort = port;
 					}
 					else {
-						ServerPort = port;
+						Log.Warn("Invalid port number: " + value);
 					}
 
 					continue;
@@ -65,20 +63,6 @@ sealed class Arguments {
 					ServerToken = value;
 					continue;
 
-				case "-concurrentdownloads":
-					if (!ulong.TryParse(value, out var concurrentDownloads) || concurrentDownloads == 0) {
-						Log.Warn("Invalid concurrent downloads count: " + value);
-					}
-					else if (concurrentDownloads > 10) {
-						Log.Warn("Limiting concurrent downloads to 10");
-						ConcurrentDownloads = 10;
-					}
-					else {
-						ConcurrentDownloads = (byte) concurrentDownloads;
-					}
-					
-					continue;
-
 				default:
 					Log.Warn("Unknown command line argument: " + key);
 					break;

app/Desktop/Common/BytesValueConverter.cs

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

app/Desktop/Common/DatabaseGui.cs

@@ -1,15 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
+using Avalonia.Threading;
 using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Server.Database.Exceptions;
 using DHT.Server.Database.Sqlite;
-using DHT.Server.Database.Sqlite.Schema;
 using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Common;
@@ -19,9 +20,9 @@ static class DatabaseGui {
 
 	private const string DatabaseFileInitialName = "archive.dht";
 
-	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = [
-		FileDialogs.CreateFilter("Discord History Tracker Database", ["dht"])
-	];
+	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = new List<FilePickerFileType> {
+		FileDialogs.CreateFilter("Discord History Tracker Database", new [] { "dht" })
+	};
 
 	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
 		return await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
@@ -43,10 +44,15 @@ static class DatabaseGui {
 	}
 
 	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, ISchemaUpgradeCallbacks schemaUpgradeCallbacks) {
+		var prevSynchronizationContext = SynchronizationContext.Current;
+		SynchronizationContext.SetSynchronizationContext(new AvaloniaSynchronizationContext());
+		var taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
+		SynchronizationContext.SetSynchronizationContext(prevSynchronizationContext);
+		
 		IDatabaseFile? file = null;
 
 		try {
-			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks);
+			file = await SqliteDatabaseFile.OpenOrCreate(path, schemaUpgradeCallbacks, taskScheduler);
 		} catch (InvalidDatabaseVersionException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
 		} catch (DatabaseTooNewException ex) {

app/Desktop/Desktop.csproj

@@ -21,9 +21,7 @@
     <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
   </ItemGroup>
   
   <ItemGroup>
@@ -32,6 +30,10 @@
   
   <ItemGroup>
     <Compile Include="..\Version.cs" Link="Version.cs" />
+    <Compile Update="Dialogs\TextBox\TextBoxDialog.axaml.cs">
+      <DependentUpon>CheckBoxDialog.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   
   <ItemGroup>
@@ -39,6 +41,11 @@
     <EmbeddedResource Include="Resources/tracker-loader.js">
       <LogicalName>tracker-loader.js</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Viewer/**">
+      <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </EmbeddedResource>
   </ItemGroup>
   
 </Project>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

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

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

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

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

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

app/Desktop/Dialogs/Progress/IProgressCallback.cs

@@ -4,6 +4,5 @@ namespace DHT.Desktop.Dialogs.Progress;
 
 interface IProgressCallback {
 	Task Update(string message, int finishedItems, int totalItems);
-	Task UpdateIndeterminate(string message);
 	Task Hide();
 }

app/Desktop/Dialogs/Progress/ProgressDialog.axaml

@@ -40,7 +40,7 @@
                         <TextBlock DockPanel.Dock="Right" Text="{Binding Items}" Classes="items" />
                         <TextBlock DockPanel.Dock="Left" Text="{Binding Message}" />
                     </DockPanel>
-                    <ProgressBar IsIndeterminate="{Binding IsIndeterminate}" Value="{Binding Progress}" />
+                    <ProgressBar Value="{Binding Progress}" />
                 </StackPanel>
             </DataTemplate>
         </ItemsRepeater.ItemTemplate>

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

@@ -7,58 +7,6 @@ namespace DHT.Desktop.Dialogs.Progress;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class ProgressDialog : Window {
-	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
-		var taskCompletionSource = new TaskCompletionSource();
-		var dialog = new ProgressDialog();
-		
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			try {
-				await action(dialog, callbacks[0]);
-				taskCompletionSource.SetResult();
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
-		await dialog.ShowProgressDialog(owner);
-		await taskCompletionSource.Task;
-	}
-	
-	internal static async Task ShowIndeterminate(Window owner, string title, string message, Func<ProgressDialog, Task> action) {
-		var taskCompletionSource = new TaskCompletionSource();
-		var dialog = new ProgressDialog();
-		
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			await callbacks[0].UpdateIndeterminate(message);
-			try {
-				await action(dialog);
-				taskCompletionSource.SetResult();
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
-		await dialog.ShowProgressDialog(owner);
-		await taskCompletionSource.Task;
-	}
-	
-	internal static async Task<T> ShowIndeterminate<T>(Window owner, string title, string message, Func<ProgressDialog, Task<T>> action) {
-		var taskCompletionSource = new TaskCompletionSource<T>();
-		var dialog = new ProgressDialog();
-
-		dialog.DataContext = new ProgressDialogModel(title, async callbacks => {
-			await callbacks[0].UpdateIndeterminate(message);
-			try {
-				taskCompletionSource.SetResult(await action(dialog));
-			} catch (Exception e) {
-				taskCompletionSource.SetException(e);
-			}
-		});
-		
-		await dialog.ShowProgressDialog(owner);
-		return await taskCompletionSource.Task;
-	}
-
 	private bool isFinished = false;
 	private Task progressTask = Task.CompletedTask;
 

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -4,10 +4,11 @@ using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Threading;
 using DHT.Desktop.Common;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
-sealed class ProgressDialogModel {
+sealed class ProgressDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 
 	public IReadOnlyList<ProgressItem> Items { get; } = Array.Empty<ProgressItem>();
@@ -17,10 +18,9 @@ sealed class ProgressDialogModel {
 	[Obsolete("Designer")]
 	public ProgressDialogModel() {}
 
-	public ProgressDialogModel(string title, TaskRunner task, int progressItems = 1) {
-		this.Title = title;
-		this.task = task;
+	public ProgressDialogModel(TaskRunner task, int progressItems = 1) {
 		this.Items = Enumerable.Range(0, progressItems).Select(static _ => new ProgressItem()).ToArray();
+		this.task = task;
 	}
 
 	internal async Task StartTask() {
@@ -43,16 +43,6 @@ sealed class ProgressDialogModel {
 				item.Message = message;
 				item.Items = totalItems == 0 ? string.Empty : finishedItems.Format() + " / " + totalItems.Format();
 				item.Progress = totalItems == 0 ? 0 : 100 * finishedItems / totalItems;
-				item.IsIndeterminate = false;
-			});
-		}
-
-		public async Task UpdateIndeterminate(string message) {
-			await Dispatcher.UIThread.InvokeAsync(() => {
-				item.Message = message;
-				item.Items = string.Empty;
-				item.Progress = 0;
-				item.IsIndeterminate = true;
 			});
 		}
 

app/Desktop/Dialogs/Progress/ProgressItem.cs

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

app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs

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

app/Desktop/Dialogs/TextBox/TextBoxItem.cs

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

app/Desktop/Discord/DiscordAppSettings.cs

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

app/Desktop/Discord/DiscordAppSettingsJsonContext.cs

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

app/Desktop/Main/Controls/AttachmentFilterPanel.axaml

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

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

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

app/Desktop/Main/Controls/AttachmentFilterPanelModel.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

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

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -2,25 +2,22 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Reactive.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.CheckBox;
 using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
-using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
+using DHT.Server.Database;
+using DHT.Utils.Models;
 using DHT.Utils.Tasks;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
-	private static readonly HashSet<string> FilterProperties = [
+sealed class MessageFilterPanelModel : BaseModel, IDisposable {
+	private static readonly HashSet<string> FilterProperties = new () {
 		nameof(FilterByDate),
 		nameof(StartDate),
 		nameof(EndDate),
@@ -28,7 +25,7 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		nameof(IncludedChannels),
 		nameof(FilterByUser),
 		nameof(IncludedUsers)
-	];
+	};
 
 	public string FilterStatisticsText { get; private set; } = "";
 
@@ -36,76 +33,91 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 
 	public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
 
-	[ObservableProperty]
 	private bool filterByDate = false;
-
-	[ObservableProperty]
 	private DateTime? startDate = null;
-
-	[ObservableProperty]
 	private DateTime? endDate = null;
-
-	[ObservableProperty]
 	private bool filterByChannel = false;
-
-	[ObservableProperty]
 	private HashSet<ulong>? includedChannels = null;
-
-	[ObservableProperty]
 	private bool filterByUser = false;
-
-	[ObservableProperty]
 	private HashSet<ulong>? includedUsers = null;
 
-	[ObservableProperty]
+	public bool FilterByDate {
+		get => filterByDate;
+		set => Change(ref filterByDate, value);
+	}
+
+	public DateTime? StartDate {
+		get => startDate;
+		set => Change(ref startDate, value);
+	}
+
+	public DateTime? EndDate {
+		get => endDate;
+		set => Change(ref endDate, value);
+	}
+
+	public bool FilterByChannel {
+		get => filterByChannel;
+		set => Change(ref filterByChannel, value);
+	}
+
+	public HashSet<ulong> IncludedChannels {
+		get => includedChannels ?? db.GetAllChannels().Select(static channel => channel.Id).ToHashSet();
+		set => Change(ref includedChannels, value);
+	}
+
+	public bool FilterByUser {
+		get => filterByUser;
+		set => Change(ref filterByUser, value);
+	}
+
+	public HashSet<ulong> IncludedUsers {
+		get => includedUsers ?? db.GetAllUsers().Select(static user => user.Id).ToHashSet();
+		set => Change(ref includedUsers, value);
+	}
+
 	private string channelFilterLabel = "";
 
-	[ObservableProperty]
+	public string ChannelFilterLabel {
+		get => channelFilterLabel;
+		set => Change(ref channelFilterLabel, value);
+	}
+
 	private string userFilterLabel = "";
 
+	public string UserFilterLabel {
+		get => userFilterLabel;
+		set => Change(ref userFilterLabel, value);
+	}
+
 	private readonly Window window;
-	private readonly State state;
+	private readonly IDatabaseFile db;
 	private readonly string verb;
 
-	private readonly RestartableTask<long> exportedMessageCountTask;
+	private readonly AsyncValueComputer<long> exportedMessageCountComputer;
 	private long? exportedMessageCount;
-	
-	private readonly IDisposable messageCountSubscription;
 	private long? totalMessageCount;
 
-	private readonly IDisposable channelCountSubscription;
-	private long? totalChannelCount;
-	
-	private readonly IDisposable userCountSubscription;
-	private long? totalUserCount;
-
 	[Obsolete("Designer")]
-	public MessageFilterPanelModel() : this(null!, State.Dummy) {}
+	public MessageFilterPanelModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-	public MessageFilterPanelModel(Window window, State state, string verb = "Matches") {
+	public MessageFilterPanelModel(Window window, IDatabaseFile db, string verb = "Matches") {
 		this.window = window;
-		this.state = state;
+		this.db = db;
 		this.verb = verb;
 
-		this.exportedMessageCountTask = new RestartableTask<long>(SetExportedMessageCount, TaskScheduler.FromCurrentSynchronizationContext());
-		
-		this.messageCountSubscription = state.Db.Messages.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnMessageCountChanged);
-		this.channelCountSubscription = state.Db.Channels.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnChannelCountChanged);
-		this.userCountSubscription = state.Db.Users.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnUserCountChanged);
+		this.exportedMessageCountComputer = AsyncValueComputer<long>.WithResultProcessor(SetExportedMessageCount).Build();
 
 		UpdateFilterStatistics();
 		UpdateChannelFilterLabel();
 		UpdateUserFilterLabel();
 
 		PropertyChanged += OnPropertyChanged;
+		db.Statistics.PropertyChanged += OnDbStatisticsChanged;
 	}
 
 	public void Dispose() {
-		exportedMessageCountTask.Cancel();
-		
-		messageCountSubscription.Dispose();
-		channelCountSubscription.Dispose();
-		userCountSubscription.Dispose();
+		db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
 	}
 
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
@@ -122,54 +134,30 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		}
 	}
 
-	private void OnMessageCountChanged(long newMessageCount) {
-		totalMessageCount = newMessageCount;
+	private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName == nameof(DatabaseStatistics.TotalMessages)) {
+			totalMessageCount = db.Statistics.TotalMessages;
 			UpdateFilterStatistics();
 		}
-
-	private void OnChannelCountChanged(long newChannelCount) {
-		totalChannelCount = newChannelCount;
+		else if (e.PropertyName == nameof(DatabaseStatistics.TotalChannels)) {
 			UpdateChannelFilterLabel();
 		}
-	
-	private void OnUserCountChanged(long newUserCount) {
-		totalUserCount = newUserCount;
+		else if (e.PropertyName == nameof(DatabaseStatistics.TotalUsers)) {
 			UpdateUserFilterLabel();
 		}
-
-	private void UpdateChannelFilterLabel() {
-		if (totalChannelCount.HasValue) {
-			long total = totalChannelCount.Value;
-			long included = FilterByChannel && IncludedChannels != null ? IncludedChannels.Count : total;
-			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
-		}
-		else {
-			ChannelFilterLabel = "Loading...";
-		}
-	}
-
-	private void UpdateUserFilterLabel() {
-		if (totalUserCount.HasValue) {
-			long total = totalUserCount.Value;
-			long included = FilterByUser && IncludedUsers != null ? IncludedUsers.Count : total;
-			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
-		}
-		else {
-			UserFilterLabel = "Loading...";
-		}
 	}
 
 	private void UpdateFilterStatistics() {
 		var filter = CreateFilter();
 		if (filter.IsEmpty) {
-			exportedMessageCountTask.Cancel();
+			exportedMessageCountComputer.Cancel();
 			exportedMessageCount = totalMessageCount;
 			UpdateFilterStatisticsText();
 		}
 		else {
 			exportedMessageCount = null;
 			UpdateFilterStatisticsText();
-			exportedMessageCountTask.Restart(cancellationToken => state.Db.Messages.Count(filter, cancellationToken));
+			exportedMessageCountComputer.Compute(() => db.CountMessages(filter));
 		}
 	}
 
@@ -186,12 +174,12 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 		OnPropertyChanged(nameof(FilterStatisticsText));
 	}
 
-	public async Task OpenChannelFilterDialog() {
-		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
+	public async void OpenChannelFilterDialog() {
+		var servers = db.GetAllServers().ToDictionary(static server => server.Id);
 		var items = new List<CheckBoxItem<ulong>>();
-			var servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
+		var included = IncludedChannels;
 
-			await foreach (var channel in state.Db.Channels.Get()) {
+		foreach (var channel in db.GetAllChannels()) {
 			var channelId = channel.Id;
 			var channelName = channel.Name;
 
@@ -221,63 +209,68 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 
 			items.Add(new CheckBoxItem<ulong>(channelId) {
 				Title = title,
-					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId)
+				Checked = included.Contains(channelId)
 			});
 		}
 
-			return items;
-		}
-
-		const string Title = "Included Channels";
-
-		List<CheckBoxItem<ulong>> items;
-		try {
-			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading channels...", PrepareChannelItems);
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, Title, "Error loading channels: " + e.Message);
-			return;
-		}
-
-		var result = await OpenIdFilterDialog(Title, items);
+		var result = await OpenIdFilterDialog(window, "Included Channels", items);
 		if (result != null) {
 			IncludedChannels = result;
 		}
 	}
 
-	public async Task OpenUserFilterDialog() {
-		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
-			var checkBoxItems = new List<CheckBoxItem<ulong>>();
+	public async void OpenUserFilterDialog() {
+		var items = new List<CheckBoxItem<ulong>>();
+		var included = IncludedUsers;
 
-			await foreach (var user in state.Db.Users.Get()) {
+		foreach (var user in db.GetAllUsers()) {
 			var name = user.Name;
 			var discriminator = user.Discriminator;
 
-				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
+			items.Add(new CheckBoxItem<ulong>(user.Id) {
 				Title = discriminator == null ? name : name + " #" + discriminator,
-					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id)
+				Checked = included.Contains(user.Id)
 			});
 		}
 
-			return checkBoxItems;
-		}
-
-		const string Title = "Included Users";
-
-		List<CheckBoxItem<ulong>> items;
-		try {
-			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, Title, "Error loading users: " + e.Message);
-			return;
-		}
-
-		var result = await OpenIdFilterDialog(Title, items);
+		var result = await OpenIdFilterDialog(window, "Included Users", items);
 		if (result != null) {
 			IncludedUsers = result;
 		}
 	}
 
-	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, List<CheckBoxItem<ulong>> items) {
+	private void UpdateChannelFilterLabel() {
+		long total = db.Statistics.TotalChannels;
+		long included = FilterByChannel ? IncludedChannels.Count : total;
+		ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+	}
+
+	private void UpdateUserFilterLabel() {
+		long total = db.Statistics.TotalUsers;
+		long included = FilterByUser ? IncludedUsers.Count : total;
+		UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
+	}
+
+	public MessageFilter CreateFilter() {
+		MessageFilter filter = new();
+
+		if (FilterByDate) {
+			filter.StartDate = StartDate;
+			filter.EndDate = EndDate?.AddDays(1).AddMilliseconds(-1);
+		}
+
+		if (FilterByChannel) {
+			filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
+		}
+
+		if (FilterByUser) {
+			filter.UserIds = new HashSet<ulong>(IncludedUsers);
+		}
+
+		return filter;
+	}
+
+	private static async Task<HashSet<ulong>?> OpenIdFilterDialog(Window window, string title, List<CheckBoxItem<ulong>> items) {
 		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
 
 		var model = new CheckBoxDialogModel<ulong>(items) {
@@ -289,23 +282,4 @@ sealed partial class MessageFilterPanelModel : ObservableObject, IDisposable {
 
 		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
 	}
-
-	public MessageFilter CreateFilter() {
-		MessageFilter filter = new ();
-
-		if (FilterByDate) {
-			filter.StartDate = StartDate;
-			filter.EndDate = EndDate?.AddDays(1).AddMilliseconds(-1);
-		}
-
-		if (FilterByChannel && IncludedChannels != null) {
-			filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
-		}
-
-		if (FilterByUser && IncludedUsers != null) {
-			filter.UserIds = new HashSet<ulong>(IncludedUsers);
-		}
-
-		return filter;
-	}
 }

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -1,95 +1,96 @@
 using System;
-using System.Threading.Tasks;
 using Avalonia.Controls;
-using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Server;
-using DHT.Server;
+using DHT.Server.Database;
 using DHT.Server.Service;
-using DHT.Utils.Logging;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposable {
-	private static readonly Log Log = Log.ForType<ServerConfigurationPanelModel>();
-	
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
+sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
 	private string inputPort;
 
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasMadeChanges))]
+	public string InputPort {
+		get => inputPort;
+		set {
+			Change(ref inputPort, value);
+			OnPropertyChanged(nameof(HasMadeChanges));
+		}
+	}
+
 	private string inputToken;
 
-	public bool HasMadeChanges => ServerConfiguration.Port.ToString() != InputPort || ServerConfiguration.Token != InputToken;
+	public string InputToken {
+		get => inputToken;
+		set {
+			Change(ref inputToken, value);
+			OnPropertyChanged(nameof(HasMadeChanges));
+		}
+	}
+
+	public bool HasMadeChanges => ServerManager.Port.ToString() != InputPort || ServerManager.Token != InputToken;
 
-	[ObservableProperty(Setter = Access.Private)]
 	private bool isToggleServerButtonEnabled = true;
 
-	public string ToggleServerButtonText => server.IsRunning ? "Stop Server" : "Start Server";
+	public bool IsToggleServerButtonEnabled {
+		get => isToggleServerButtonEnabled;
+		set => Change(ref isToggleServerButtonEnabled, value);
+	}
+
+	public string ToggleServerButtonText => serverManager.IsRunning ? "Stop Server" : "Start Server";
+
+	public event EventHandler<StatusBarModel.Status>? ServerStatusChanged;
 
 	private readonly Window window;
-	private readonly ServerManager server;
+	private readonly ServerManager serverManager;
 
 	[Obsolete("Designer")]
-	public ServerConfigurationPanelModel() : this(null!, State.Dummy) {}
+	public ServerConfigurationPanelModel() : this(null!, new ServerManager(DummyDatabaseFile.Instance)) {}
 
-	public ServerConfigurationPanelModel(Window window, State state) {
+	public ServerConfigurationPanelModel(Window window, ServerManager serverManager) {
 		this.window = window;
-		this.server = state.Server;
-		this.inputPort = ServerConfiguration.Port.ToString();
-		this.inputToken = ServerConfiguration.Token;
+		this.serverManager = serverManager;
+		this.inputPort = ServerManager.Port.ToString();
+		this.inputToken = ServerManager.Token;
+	}
 
-		server.StatusChanged += OnServerStatusChanged;
+	public void Initialize() {
+		ServerLauncher.ServerStatusChanged += ServerLauncherOnServerStatusChanged;
 	}
 
 	public void Dispose() {
-		server.StatusChanged -= OnServerStatusChanged;
+		ServerLauncher.ServerStatusChanged -= ServerLauncherOnServerStatusChanged;
 	}
 
-	private void OnServerStatusChanged(object? sender, ServerManager.Status e) {
-		Dispatcher.UIThread.InvokeAsync(UpdateServerStatus);
-	}
-
-	private void UpdateServerStatus() {
+	private void ServerLauncherOnServerStatusChanged(object? sender, EventArgs e) {
+		ServerStatusChanged?.Invoke(this, serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped);
 		OnPropertyChanged(nameof(ToggleServerButtonText));
-	}
-
-	private async Task StartServer() {
-		IsToggleServerButtonEnabled = false;
-		
-		try {
-			await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
-		}
-		
-		UpdateServerStatus();
 		IsToggleServerButtonEnabled = true;
 	}
 
-	private async Task StopServer() {
+	private void BeforeServerStart() {
 		IsToggleServerButtonEnabled = false;
-		
-		try {
-			await server.Stop();
-		} catch (Exception e) {
-			Log.Error(e);
-			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
+		ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Starting);
 	}
 
-		UpdateServerStatus();
-		IsToggleServerButtonEnabled = true;
+	private void StartServer() {
+		BeforeServerStart();
+		serverManager.Launch();
 	}
 
-	public async Task OnClickToggleServerButton() {
-		if (server.IsRunning) {
-			await StopServer();
+	private void StopServer() {
+		IsToggleServerButtonEnabled = false;
+		ServerStatusChanged?.Invoke(this, StatusBarModel.Status.Stopping);
+		serverManager.Stop();
+	}
+
+	public void OnClickToggleServerButton() {
+		if (serverManager.IsRunning) {
+			StopServer();
 		}
 		else {
-			await StartServer();
+			StartServer();
 		}
 	}
 
@@ -97,22 +98,19 @@ sealed partial class ServerConfigurationPanelModel : ObservableObject, IDisposab
 		InputToken = ServerUtils.GenerateRandomToken(20);
 	}
 
-	public async Task OnClickApplyChanges() {
+	public async void OnClickApplyChanges() {
 		if (!ushort.TryParse(InputPort, out ushort port)) {
 			await Dialog.ShowOk(window, "Invalid Port", "Port must be a number between 0 and 65535.");
 			return;
 		}
 
-		ServerConfiguration.Port = port;
-		ServerConfiguration.Token = inputToken;
-		
+		BeforeServerStart();
+		serverManager.Relaunch(port, InputToken);
 		OnPropertyChanged(nameof(HasMadeChanges));
-		
-		await StartServer();
 	}
 
 	public void OnClickCancelChanges() {
-		InputPort = ServerConfiguration.Port.ToString();
-		InputToken = ServerConfiguration.Token;
+		InputPort = ServerManager.Port.ToString();
+		InputToken = ServerManager.Token;
 	}
 }

app/Desktop/Main/Controls/StatusBar.axaml

@@ -40,22 +40,22 @@
     <StackPanel Orientation="Horizontal" Margin="6 3">
         <StackPanel Orientation="Vertical" Width="65">
             <TextBlock Classes="label">Status</TextBlock>
-            <TextBlock FontSize="12" Margin="0 3 0 0" Text="{Binding ServerStatusText}" />
+            <TextBlock FontSize="12" Margin="0 3 0 0" Text="{Binding StatusText}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Servers</TextBlock>
-            <TextBlock Classes="value" Text="{Binding ServerCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalServers, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Channels</TextBlock>
-            <TextBlock Classes="value" Text="{Binding ChannelCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalChannels, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Messages</TextBlock>
-            <TextBlock Classes="value" Text="{Binding MessageCount, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalMessages, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
     </StackPanel>
 

app/Desktop/Main/Controls/StatusBarModel.cs

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

app/Desktop/Main/MainWindow.axaml

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

app/Desktop/Main/MainWindow.axaml.cs

@@ -1,16 +1,14 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
+using System.IO;
 using Avalonia.Controls;
-using DHT.Utils.Logging;
+using DHT.Desktop.Main.Pages;
 using JetBrains.Annotations;
 
 namespace DHT.Desktop.Main;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class MainWindow : Window {
-	private static readonly Log Log = Log.ForType<MainWindow>();
-	
 	[UsedImplicitly]
 	public MainWindow() {
 		InitializeComponent();
@@ -22,23 +20,16 @@ public sealed partial class MainWindow : Window {
 		DataContext = new MainWindowModel(this, args);
 	}
 
-	public async void OnClosing(object? sender, WindowClosingEventArgs e) {
-		e.Cancel = true;
-		Closing -= OnClosing;
-
-		try {
-			await Dispose();
-		} finally {
-			Close();
-		}
+	public void OnClosed(object? sender, EventArgs e) {
+		if (DataContext is IDisposable disposable) {
+			disposable.Dispose();
 		}
 
-	private async Task Dispose() {
-		if (DataContext is MainWindowModel model) {
+		foreach (var temporaryFile in ViewerPageModel.TemporaryFiles) {
 			try {
-				await model.DisposeAsync();
-			} catch (Exception ex) {
-				Log.Error("Caught exception while disposing window: " + ex);
+				File.Delete(temporaryFile);
+			} catch (Exception) {
+				// ignored
 			}
 		}
 	}

app/Desktop/Main/MainWindowModel.cs

@@ -1,38 +1,33 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Screens;
 using DHT.Desktop.Server;
-using DHT.Server;
 using DHT.Server.Database;
-using DHT.Utils.Logging;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main;
 
-sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
+sealed class MainWindowModel : BaseModel, IDisposable {
 	private const string DefaultTitle = "Discord History Tracker";
 
-	private static readonly Log Log = Log.ForType<MainWindowModel>();
+	public string Title { get; private set; } = DefaultTitle;
 
-	[ObservableProperty(Setter = Access.Private)]
-	private string title = DefaultTitle;
-
-	[ObservableProperty(Setter = Access.Private)]
-	private UserControl currentScreen;
+	public UserControl CurrentScreen { get; private set; }
 
 	private readonly WelcomeScreen welcomeScreen;
 	private readonly WelcomeScreenModel welcomeScreenModel;
 
+	private MainContentScreen? mainContentScreen;
 	private MainContentScreenModel? mainContentScreenModel;
 
 	private readonly Window window;
-	private readonly int? concurrentDownloads;
 
-	private State? state;
+	private IDatabaseFile? db;
 
 	[Obsolete("Designer")]
 	public MainWindowModel() : this(null!, Arguments.Empty) {}
@@ -41,10 +36,10 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		this.window = window;
 
 		welcomeScreenModel = new WelcomeScreenModel(window);
-		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
-
 		welcomeScreen = new WelcomeScreen { DataContext = welcomeScreenModel };
-		currentScreen = welcomeScreen;
+		CurrentScreen = welcomeScreen;
+
+		welcomeScreenModel.PropertyChanged += WelcomeScreenModelOnPropertyChanged;
 
 		var dbFile = args.DatabaseFile;
 		if (!string.IsNullOrWhiteSpace(dbFile)) {
@@ -68,63 +63,54 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		}
 
 		if (args.ServerPort != null) {
-			ServerConfiguration.Port = args.ServerPort.Value;
+			ServerManager.Port = args.ServerPort.Value;
 		}
 
 		if (args.ServerToken != null) {
-			ServerConfiguration.Token = args.ServerToken;
+			ServerManager.Token = args.ServerToken;
+		}
 	}
 
-		concurrentDownloads = args.ConcurrentDownloads;
-	}
-
-	private async void OnDatabaseSelected(object? sender, IDatabaseFile db) {
-		welcomeScreenModel.DatabaseSelected -= OnDatabaseSelected;
-		
-		await DisposeState();
-		
-		state = new State(db, concurrentDownloads);
-
-		try {
-			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
-		} catch (Exception ex) {
-			Log.Error(ex);
-			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
-		}
-
-		mainContentScreenModel = new MainContentScreenModel(window, state);
-		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-		
-		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
-		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
-
-		window.Focus();
-	}
-
-	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
+	private async void WelcomeScreenModelOnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName == nameof(welcomeScreenModel.Db)) {
 			if (mainContentScreenModel != null) {
 				mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
 				mainContentScreenModel.Dispose();
-			mainContentScreenModel = null;
 			}
 
-		await DisposeState();
+			db?.Dispose();
+			db = welcomeScreenModel.Db;
 
+			if (db == null) {
 				Title = DefaultTitle;
+				mainContentScreenModel = null;
+				mainContentScreen = null;
 				CurrentScreen = welcomeScreen;
-
-		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
+			}
+			else {
+				Title = Path.GetFileName(db.Path) + " - " + DefaultTitle;
+				mainContentScreenModel = new MainContentScreenModel(window, db);
+				await mainContentScreenModel.Initialize();
+				mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
+				mainContentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
+				CurrentScreen = mainContentScreen;
 			}
 
-	private async Task DisposeState() {
-		if (state != null) {
-			await state.DisposeAsync();
-			state = null;
+			OnPropertyChanged(nameof(CurrentScreen));
+			OnPropertyChanged(nameof(Title));
+
+			window.Focus();
 		}
 	}
 
-	public async ValueTask DisposeAsync() {
+	private void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
+		welcomeScreenModel.CloseDatabase();
+	}
+
+	public void Dispose() {
+		welcomeScreenModel.Dispose();
 		mainContentScreenModel?.Dispose();
-		await DisposeState();
+		db?.Dispose();
+		db = null;
 	}
 }

app/Desktop/Main/Pages/AdvancedPageModel.cs

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

app/Desktop/Main/Pages/AttachmentsPage.axaml

@@ -5,11 +5,11 @@
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
              xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="DHT.Desktop.Main.Pages.DownloadsPage"
-             x:DataType="pages:DownloadsPageModel">
+             x:Class="DHT.Desktop.Main.Pages.AttachmentsPage"
+             x:DataType="pages:AttachmentsPageModel">
 
     <Design.DataContext>
-        <pages:DownloadsPageModel />
+        <pages:AttachmentsPageModel />
     </Design.DataContext>
 
     <UserControl.Styles>
@@ -31,20 +31,24 @@
     </UserControl.Styles>
 
     <StackPanel Orientation="Vertical" Spacing="20">
-        <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-        <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
+        <DockPanel>
+            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" DockPanel.Dock="Left" />
+            <TextBlock Text="{Binding DownloadMessage}" Margin="10 0 0 0" VerticalAlignment="Center" DockPanel.Dock="Left" />
+            <ProgressBar Value="{Binding DownloadProgress}" IsVisible="{Binding IsDownloading}" Margin="15 0" VerticalAlignment="Center" DockPanel.Dock="Right" />
+        </DockPanel>
+        <controls:AttachmentFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !IsDownloading, RelativeSource={RelativeSource AncestorType=pages:AttachmentsPageModel}}" />
         <StackPanel Orientation="Vertical" Spacing="12">
             <Expander Header="Download Status" IsExpanded="True">
                 <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
                     <DataGrid.Columns>
-                        <DataGridTextColumn Header="State" Binding="{Binding State, Mode=OneWay}" Width="*" />
-                        <DataGridTextColumn Header="Files" Binding="{Binding Items, Mode=OneWay, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
-                        <DataGridTextColumn Header="Size" Binding="{Binding SizeText, Mode=OneWay}" Width="*" CellStyleClasses="right" />
+                        <DataGridTextColumn Header="State" Binding="{Binding State}" Width="*" />
+                        <DataGridTextColumn Header="Attachments" Binding="{Binding Items, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
+                        <DataGridTextColumn Header="Size" Binding="{Binding Size, Converter={StaticResource BytesValueConverter}}" Width="*" CellStyleClasses="right" />
                     </DataGrid.Columns>
                 </DataGrid>
             </Expander>
             <StackPanel Orientation="Horizontal" Spacing="10">
-                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
+                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding HasFailedDownloads}">Retry Failed Downloads</Button>
             </StackPanel>
         </StackPanel>
     </StackPanel>

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

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

app/Desktop/Main/Pages/AttachmentsPageModel.cs

@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Threading;
+using Avalonia.Threading;
+using DHT.Desktop.Common;
+using DHT.Desktop.Main.Controls;
+using DHT.Server.Data;
+using DHT.Server.Data.Aggregations;
+using DHT.Server.Data.Filters;
+using DHT.Server.Database;
+using DHT.Server.Download;
+using DHT.Utils.Models;
+using DHT.Utils.Tasks;
+
+namespace DHT.Desktop.Main.Pages;
+
+sealed class AttachmentsPageModel : BaseModel, IDisposable {
+	private static readonly DownloadItemFilter EnqueuedItemFilter = new() {
+		IncludeStatuses = new HashSet<DownloadStatus> {
+			DownloadStatus.Enqueued
+		}
+	};
+
+	private bool isThreadDownloadButtonEnabled = true;
+
+	public string ToggleDownloadButtonText => downloadThread == null ? "Start Downloading" : "Stop Downloading";
+
+	public bool IsToggleDownloadButtonEnabled {
+		get => isThreadDownloadButtonEnabled;
+		set => Change(ref isThreadDownloadButtonEnabled, value);
+	}
+
+	public string DownloadMessage { get; set; } = "";
+	public double DownloadProgress => allItemsCount is null or 0 ? 0.0 : 100.0 * doneItemsCount / allItemsCount.Value;
+
+	public AttachmentFilterPanelModel FilterModel { get; }
+
+	private readonly StatisticsRow statisticsEnqueued = new ("Enqueued");
+	private readonly StatisticsRow statisticsDownloaded = new ("Downloaded");
+	private readonly StatisticsRow statisticsFailed = new ("Failed");
+	private readonly StatisticsRow statisticsSkipped = new ("Skipped");
+
+	public List<StatisticsRow> StatisticsRows {
+		get {
+			return new List<StatisticsRow> {
+				statisticsEnqueued,
+				statisticsDownloaded,
+				statisticsFailed,
+				statisticsSkipped
+			};
+		}
+	}
+
+	public bool IsDownloading => downloadThread != null;
+	public bool HasFailedDownloads => statisticsFailed.Items > 0;
+
+	private readonly IDatabaseFile db;
+	private readonly AsyncValueComputer<DownloadStatusStatistics>.Single downloadStatisticsComputer;
+	private BackgroundDownloadThread? downloadThread;
+
+	private int doneItemsCount;
+	private int? allItemsCount;
+
+	public AttachmentsPageModel() : this(DummyDatabaseFile.Instance) {}
+
+	public AttachmentsPageModel(IDatabaseFile db) {
+		this.db = db;
+		this.FilterModel = new AttachmentFilterPanelModel(db);
+
+		this.downloadStatisticsComputer = AsyncValueComputer<DownloadStatusStatistics>.WithResultProcessor(UpdateStatistics).WithOutdatedResults().BuildWithComputer(db.GetDownloadStatusStatistics);
+		this.downloadStatisticsComputer.Recompute();
+
+		db.Statistics.PropertyChanged += OnDbStatisticsChanged;
+	}
+
+	public void Dispose() {
+		db.Statistics.PropertyChanged -= OnDbStatisticsChanged;
+
+		FilterModel.Dispose();
+		DisposeDownloadThread();
+	}
+
+	private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+		if (e.PropertyName == nameof(DatabaseStatistics.TotalAttachments)) {
+			if (IsDownloading) {
+				EnqueueDownloadItems();
+			}
+			else {
+				downloadStatisticsComputer.Recompute();
+			}
+		}
+		else if (e.PropertyName == nameof(DatabaseStatistics.TotalDownloads)) {
+			downloadStatisticsComputer.Recompute();
+		}
+	}
+
+	private void EnqueueDownloadItems() {
+		var filter = FilterModel.CreateFilter();
+		filter.DownloadItemRule = AttachmentFilter.DownloadItemRules.OnlyNotPresent;
+		db.EnqueueDownloadItems(filter);
+
+		downloadStatisticsComputer.Recompute();
+	}
+
+	private void UpdateStatistics(DownloadStatusStatistics statusStatistics) {
+		var hadFailedDownloads = HasFailedDownloads;
+
+		statisticsEnqueued.Items = statusStatistics.EnqueuedCount;
+		statisticsEnqueued.Size = statusStatistics.EnqueuedSize;
+
+		statisticsDownloaded.Items = statusStatistics.SuccessfulCount;
+		statisticsDownloaded.Size = statusStatistics.SuccessfulSize;
+
+		statisticsFailed.Items = statusStatistics.FailedCount;
+		statisticsFailed.Size = statusStatistics.FailedSize;
+
+		statisticsSkipped.Items = statusStatistics.SkippedCount;
+		statisticsSkipped.Size = statusStatistics.SkippedSize;
+
+		OnPropertyChanged(nameof(StatisticsRows));
+
+		if (hadFailedDownloads != HasFailedDownloads) {
+			OnPropertyChanged(nameof(HasFailedDownloads));
+		}
+
+		allItemsCount = doneItemsCount + statisticsEnqueued.Items;
+		UpdateDownloadMessage();
+	}
+
+	private void UpdateDownloadMessage() {
+		DownloadMessage = IsDownloading ? doneItemsCount.Format() + " / " + (allItemsCount?.Format() ?? "?") : "";
+
+		OnPropertyChanged(nameof(DownloadMessage));
+		OnPropertyChanged(nameof(DownloadProgress));
+	}
+
+	private void DownloadThreadOnOnItemFinished(object? sender, DownloadItem e) {
+		Interlocked.Increment(ref doneItemsCount);
+
+		Dispatcher.UIThread.Invoke(UpdateDownloadMessage);
+		downloadStatisticsComputer.Recompute();
+	}
+
+	private void DownloadThreadOnOnServerStopped(object? sender, EventArgs e) {
+		downloadStatisticsComputer.Recompute();
+		IsToggleDownloadButtonEnabled = true;
+	}
+
+	public void OnClickToggleDownload() {
+		if (downloadThread == null) {
+			EnqueueDownloadItems();
+			downloadThread = new BackgroundDownloadThread(db);
+			downloadThread.OnItemFinished += DownloadThreadOnOnItemFinished;
+			downloadThread.OnServerStopped += DownloadThreadOnOnServerStopped;
+		}
+		else {
+			IsToggleDownloadButtonEnabled = false;
+			DisposeDownloadThread();
+
+			db.RemoveDownloadItems(EnqueuedItemFilter, FilterRemovalMode.RemoveMatching);
+
+			doneItemsCount = 0;
+			allItemsCount = null;
+			UpdateDownloadMessage();
+		}
+
+		OnPropertyChanged(nameof(ToggleDownloadButtonText));
+		OnPropertyChanged(nameof(IsDownloading));
+	}
+
+	public void OnClickRetryFailedDownloads() {
+		var allExceptFailedFilter = new DownloadItemFilter {
+			IncludeStatuses = new HashSet<DownloadStatus> {
+				DownloadStatus.Enqueued,
+				DownloadStatus.Success
+			}
+		};
+
+		db.RemoveDownloadItems(allExceptFailedFilter, FilterRemovalMode.KeepMatching);
+
+		if (IsDownloading) {
+			EnqueueDownloadItems();
+		}
+	}
+
+	private void DisposeDownloadThread() {
+		if (downloadThread != null) {
+			downloadThread.OnItemFinished -= DownloadThreadOnOnItemFinished;
+			downloadThread.StopThread();
+		}
+
+		downloadThread = null;
+	}
+
+	public sealed class StatisticsRow {
+		public string State { get; }
+		public int Items { get; set; }
+		public ulong? Size { get; set; }
+
+		public StatisticsRow(string state) {
+			State = state;
+		}
+	}
+}

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -14,16 +14,16 @@ using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Dialogs.TextBox;
-using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Server.Database.Import;
-using DHT.Server.Database.Sqlite.Schema;
+using DHT.Server.Database.Sqlite;
 using DHT.Utils.Logging;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Pages; 
 
-sealed class DatabasePageModel {
+sealed class DatabasePageModel : BaseModel {
 	private static readonly Log Log = Log.ForType<DatabasePageModel>();
 
 	public IDatabaseFile Db { get; }
@@ -33,14 +33,14 @@ sealed class DatabasePageModel {
 	private readonly Window window;
 
 	[Obsolete("Designer")]
-	public DatabasePageModel() : this(null!, State.Dummy) {}
+	public DatabasePageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-	public DatabasePageModel(Window window, State state) {
+	public DatabasePageModel(Window window, IDatabaseFile db) {
 		this.window = window;
-		this.Db = state.Db;
+		this.Db = db;
 	}
 
-	public async Task OpenDatabaseFolder() {
+	public async void OpenDatabaseFolder() {
 		string file = Db.Path;
 		string? folder = Path.GetDirectoryName(file);
 
@@ -71,11 +71,18 @@ sealed class DatabasePageModel {
 		DatabaseClosed?.Invoke(this, EventArgs.Empty);
 	}
 
-	public async Task MergeWithDatabase() {
+	public async void MergeWithDatabase() {
 		var 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));
+		if (paths.Length == 0) {
+			return;
 		}
+
+		ProgressDialog progressDialog = new ProgressDialog();
+		progressDialog.DataContext = new ProgressDialogModel(async callbacks => await MergeWithDatabaseFromPaths(Db, paths, progressDialog, callbacks[0])) {
+			Title = "Database Merge"
+		};
+
+		await progressDialog.ShowProgressDialog(window);
 	}
 
 	private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
@@ -89,10 +96,10 @@ sealed class DatabasePageModel {
 			}
 
 			try {
-				await target.AddFrom(db);
+				target.AddFrom(db);
 				return true;
 			} finally {
-				await db.DisposeAsync();
+				db.Dispose();
 			}
 		});
 	}
@@ -132,16 +139,23 @@ sealed class DatabasePageModel {
 		}
 	}
 
-	public async Task ImportLegacyArchive() {
+	public async void ImportLegacyArchive() {
 		var paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Legacy DHT Archive",
 			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
 			AllowMultiple = true
 		});
 			
-		if (paths.Length > 0) {
-			await ProgressDialog.Show(window, "Legacy Archive Import", async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
+		if (paths.Length == 0) {
+			return;
 		}
+
+		ProgressDialog progressDialog = new ProgressDialog();
+		progressDialog.DataContext = new ProgressDialogModel(async callbacks => await ImportLegacyArchiveFromPaths(Db, paths, progressDialog, callbacks[0])) {
+			Title = "Legacy Archive Import"
+		};
+
+		await progressDialog.ShowProgressDialog(window);
 	}
 
 	private static async Task ImportLegacyArchiveFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
@@ -193,7 +207,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);
+		var oldStatistics = target.SnapshotStatistics();
 
 		int successful = 0;
 		int finished = 0;
@@ -224,26 +238,14 @@ sealed class DatabasePageModel {
 			return;
 		}
 
-		var newStatistics = await DatabaseStatistics.Take(target);
-		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, newStatistics, successful, total, itemName));
+		await Dialog.ShowOk(dialog, neutralDialogTitle, GetImportDialogMessage(oldStatistics, target.SnapshotStatistics(), successful, total, itemName));
 	}
 
-	private sealed record DatabaseStatistics(long ServerCount, long ChannelCount, long UserCount, long MessageCount) {
-		public static async Task<DatabaseStatistics> Take(IDatabaseFile db) {
-			return new DatabaseStatistics(
-				await db.Servers.Count(),
-				await db.Channels.Count(),
-				await db.Users.Count(),
-				await db.Messages.Count()
-			);
-		}
-	}
-
-	private static string GetImportDialogMessage(DatabaseStatistics oldStatistics, DatabaseStatistics newStatistics, int successfulItems, int totalItems, string itemName) {
-		long newServers = newStatistics.ServerCount - oldStatistics.ServerCount;
-		long newChannels = newStatistics.ChannelCount - oldStatistics.ChannelCount;
-		long newUsers = newStatistics.UserCount - oldStatistics.UserCount;
-		long newMessages = newStatistics.MessageCount - oldStatistics.MessageCount;
+	private static string GetImportDialogMessage(DatabaseStatisticsSnapshot oldStatistics, DatabaseStatisticsSnapshot newStatistics, int successfulItems, int totalItems, string itemName) {
+		long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
+		long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
+		long newUsers = newStatistics.TotalUsers - oldStatistics.TotalUsers;
+		long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
 
 		StringBuilder message = new StringBuilder();
 		message.Append("Processed ");

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -6,26 +6,26 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
-using DHT.Server;
 using DHT.Server.Data;
+using DHT.Server.Database;
 using DHT.Server.Service;
+using DHT.Utils.Models;
 
-namespace DHT.Desktop.Main.Pages;
-
-sealed class DebugPageModel {
+namespace DHT.Desktop.Main.Pages {
+	sealed class DebugPageModel : BaseModel {
 		public string GenerateChannels { get; set; } = "0";
 		public string GenerateUsers { get; set; } = "0";
 		public string GenerateMessages { get; set; } = "0";
 
 		private readonly Window window;
-	private readonly State state;
+		private readonly IDatabaseFile db;
 
 		[Obsolete("Designer")]
-	public DebugPageModel() : this(null!, State.Dummy) {}
+		public DebugPageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-	public DebugPageModel(Window window, State state) {
+		public DebugPageModel(Window window, IDatabaseFile db) {
 			this.window = window;
-		this.state = state;
+			this.db = db;
 		}
 
 		public async void OnClickAddRandomDataToDatabase() {
@@ -44,7 +44,13 @@ sealed class DebugPageModel {
 				return;
 			}
 
-		await ProgressDialog.Show(window, "Generating Random Data", async (_, callback) => await GenerateRandomData(channels, users, messages, callback));
+			ProgressDialog progressDialog = new ProgressDialog {
+				DataContext = new ProgressDialogModel(async callbacks => await GenerateRandomData(channels, users, messages, callbacks[0])) {
+					Title = "Generating Random Data"
+				}
+			};
+
+			await progressDialog.ShowProgressDialog(window);
 		}
 
 		private const int BatchSize = 500;
@@ -77,9 +83,12 @@ sealed class DebugPageModel {
 				Discriminator = rand.Next(0, 9999).ToString(),
 			}).ToArray();
 
-		await state.Db.Users.Add(users);
-		await state.Db.Servers.Add([server]);
-		await state.Db.Channels.Add(channels);
+			db.AddServer(server);
+			db.AddUsers(users);
+
+			foreach (var channel in channels) {
+				db.AddChannel(channel);
+			}
 
 			var now = DateTimeOffset.Now;
 			int batchIndex = 0;
@@ -102,13 +111,13 @@ sealed class DebugPageModel {
 						Timestamp = timeMillis,
 						EditTimestamp = editMillis,
 						RepliedToId = null,
-					Attachments = ImmutableList<Attachment>.Empty,
-					Embeds = ImmutableList<Embed>.Empty,
-					Reactions = ImmutableList<Reaction>.Empty,
+						Attachments = ImmutableArray<Attachment>.Empty,
+						Embeds = ImmutableArray<Embed>.Empty,
+						Reactions = ImmutableArray<Reaction>.Empty,
 					};
 				}).ToArray();
 
-			await state.Db.Messages.Add(messages);
+				db.AddMessages(messages);
 
 				messageCount -= BatchSize;
 				await callback.Update("Adding messages in batches of " + BatchSize, ++batchIndex, batchCount);
@@ -129,7 +138,7 @@ sealed class DebugPageModel {
 			return options[(int) Math.Floor(options.Length * rand.NextDouble() * rand.NextDouble())];
 		}
 
-	private static readonly string[] RandomWords = [
+		private static readonly string[] RandomWords = {
 			"apple", "apricot", "artichoke", "arugula", "asparagus", "avocado",
 			"banana", "bean", "beechnut", "beet", "blackberry", "blackcurrant", "blueberry", "boysenberry", "bramble", "broccoli",
 			"cabbage", "cacao", "cantaloupe", "caper", "carambola", "carrot", "cauliflower", "celery", "chard", "cherry", "chokeberry", "citron", "clementine", "coconut", "corn", "crabapple", "cranberry", "cucumber", "currant",
@@ -152,22 +161,25 @@ 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));
 			return string.Join(' ', Enumerable.Range(0, wordCount).Select(_ => RandomWords[rand.Next(RandomWords.Length)]));
 		}
+	}
 }
 #else
-namespace DHT.Desktop.Main.Pages;
+using DHT.Utils.Models;
 
-sealed class DebugPageModel {
+namespace DHT.Desktop.Main.Pages {
+	sealed class DebugPageModel : BaseModel {
 		public string GenerateChannels { get; set; } = "0";
 		public string GenerateUsers { get; set; } = "0";
 		public string GenerateMessages { get; set; } = "0";
 
 		public void OnClickAddRandomDataToDatabase() {}
+	}
 }
 #endif

app/Desktop/Main/Pages/DownloadsPageModel.cs

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

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -16,7 +16,7 @@
             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>
         <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="10">
-            <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick" IsEnabled="{Binding IsCopyTrackingScriptButtonEnabled}">Copy Tracking Script</Button>
+            <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick">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.

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,39 +1,35 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
+using DHT.Utils.Models;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class TrackingPageModel : ObservableObject {
-	[ObservableProperty(Setter = Access.Private)]
-	private bool isCopyTrackingScriptButtonEnabled = true;
+sealed class TrackingPageModel : BaseModel {
+	private bool areDevToolsEnabled;
 
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
-	private bool? areDevToolsEnabled = null;
+	private bool AreDevToolsEnabled {
+		get => areDevToolsEnabled;
+		set {
+			Change(ref areDevToolsEnabled, value);
+			OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
+		}
+	}
 
-	[ObservableProperty(Setter = Access.Private)]
-	[NotifyPropertyChangedFor(nameof(ToggleAppDevToolsButtonText))]
-	private bool isToggleAppDevToolsButtonEnabled = false;
+	public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
 
 	public string ToggleAppDevToolsButtonText {
 		get {
-			if (!AreDevToolsEnabled.HasValue) {
-				return "Loading...";
-			}
-
 			if (!IsToggleAppDevToolsButtonEnabled) {
 				return "Unavailable";
 			}
 
-			return AreDevToolsEnabled.Value ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+			return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
 		}
 	}
 
@@ -44,22 +40,21 @@ sealed partial class TrackingPageModel : ObservableObject {
 
 	public TrackingPageModel(Window window) {
 		this.window = window;
+	}
 
-		Task.Factory.StartNew(InitializeDevToolsToggle, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.FromCurrentSynchronizationContext());
+	public async Task Initialize() {
+		bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
+		if (devToolsEnabled.HasValue) {
+			AreDevToolsEnabled = devToolsEnabled.Value;
+		}
+		else {
+			IsToggleAppDevToolsButtonEnabled = false;
+			OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
+		}
 	}
 	
 	public async Task<bool> OnClickCopyTrackingScript() {
-		IsCopyTrackingScriptButtonEnabled = false;
-
-		try {
-			return await CopyTrackingScript();
-		} finally {
-			IsCopyTrackingScriptButtonEnabled = true;
-		}
-	}
-
-	private async Task<bool> CopyTrackingScript() {
-		string url = $"http://127.0.0.1:{ServerConfiguration.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
+		string url = $"http://127.0.0.1:{ServerManager.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerManager.Token)}";
 		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
 
 		var clipboard = window.Clipboard;
@@ -77,26 +72,10 @@ sealed partial class TrackingPageModel : ObservableObject {
 		}
 	}
 
-	private async Task InitializeDevToolsToggle() {
-		bool? devToolsEnabled = await Task.Run(DiscordAppSettings.AreDevToolsEnabled);
-
-		if (devToolsEnabled.HasValue) {
-			AreDevToolsEnabled = devToolsEnabled.Value;
-			IsToggleAppDevToolsButtonEnabled = true;
-		}
-		else {
-			IsToggleAppDevToolsButtonEnabled = false;
-		}
-	}
-
-	public async Task OnClickToggleAppDevTools() {
+	public async void OnClickToggleAppDevTools() {
 		const string DialogTitle = "Discord App Settings File";
 
-		if (!AreDevToolsEnabled.HasValue) {
-			return;
-		}
-
-		bool oldState = AreDevToolsEnabled.Value;
+		bool oldState = AreDevToolsEnabled;
 		bool newState = !oldState;
 
 		switch (await DiscordAppSettings.ConfigureDevTools(newState)) {

app/Desktop/Main/Pages/ViewerPage.axaml

@@ -21,6 +21,7 @@
     <StackPanel Orientation="Vertical" Spacing="20">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
             <Button Command="{Binding OnClickOpenViewer}" Margin="0 0 5 0">Open Viewer</Button>
+            <Button Command="{Binding OnClickSaveViewer}" Margin="5 0 0 0">Save Viewer</Button>
         </StackPanel>
         <controls:MessageFilterPanel DataContext="{Binding FilterModel}" />
         <Expander Header="Database Tools">

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -1,41 +1,53 @@
 using System;
+using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.IO;
+using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Platform.Storage;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
-using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Server;
-using DHT.Server;
 using DHT.Server.Data.Filters;
-using DHT.Server.Service.Viewer;
+using DHT.Server.Database;
+using DHT.Server.Database.Export;
+using DHT.Server.Database.Export.Strategy;
+using DHT.Utils.Models;
+using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class ViewerPageModel : ObservableObject, IDisposable {
+sealed class ViewerPageModel : BaseModel, IDisposable {
+	public static readonly ConcurrentBag<string> TemporaryFiles = new ();
+
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
-	[ObservableProperty]
 	private bool hasFilters = false;
 
+	public bool HasFilters {
+		get => hasFilters;
+		set => Change(ref hasFilters, value);
+	}
+
 	public MessageFilterPanelModel FilterModel { get; }
 
 	private readonly Window window;
-	private readonly State state;
+	private readonly IDatabaseFile db;
 
 	[Obsolete("Designer")]
-	public ViewerPageModel() : this(null!, State.Dummy) {}
+	public ViewerPageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
-	public ViewerPageModel(Window window, State state) {
+	public ViewerPageModel(Window window, IDatabaseFile db) {
 		this.window = window;
-		this.state = state;
+		this.db = db;
 
-		FilterModel = new MessageFilterPanelModel(window, state, "Will export");
+		FilterModel = new MessageFilterPanelModel(window, db, "Will export");
 		FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
 	}
 
@@ -47,37 +59,93 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {
 		HasFilters = FilterModel.HasAnyFilters;
 	}
 
+	private async Task WriteViewerFile(string path, IViewerExportStrategy strategy) {
+		const string ArchiveTag = "/*[ARCHIVE]*/";
+
+		string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
+		string viewerTemplate = indexFile.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
+		                                 .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
+		
+		viewerTemplate = strategy.ProcessViewerTemplate(viewerTemplate);
+
+		int viewerArchiveTagStart = viewerTemplate.IndexOf(ArchiveTag);
+		int viewerArchiveTagEnd = viewerArchiveTagStart + ArchiveTag.Length;
+
+		string jsonTempFile = path + ".tmp";
+
+		await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
+			await ViewerJsonExport.Generate(jsonStream, strategy, db, FilterModel.CreateFilter());
+
+			char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
+			jsonStream.Position = 0;
+
+			await using (var outputStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
+			await using (var outputWriter = new StreamWriter(outputStream, Encoding.UTF8)) {
+				await outputWriter.WriteAsync(viewerTemplate[..viewerArchiveTagStart]);
+
+				using (var jsonReader = new StreamReader(jsonStream, Encoding.UTF8)) {
+					int readBytes;
+					while ((readBytes = await jsonReader.ReadAsync(jsonBuffer, 0, jsonBuffer.Length)) > 0) {
+						string jsonChunk = new string(jsonBuffer, 0, readBytes);
+						await outputWriter.WriteAsync(HttpUtility.JavaScriptStringEncode(jsonChunk));
+					}
+				}
+
+				await outputWriter.WriteAsync(viewerTemplate[viewerArchiveTagEnd..]);
+			}
+		}
+
+		File.Delete(jsonTempFile);
+	}
+
 	public async void OnClickOpenViewer() {
-		try {
-			string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
-			string serverToken = ServerConfiguration.Token;
-			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
+		string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
+		string filenameBase = Path.GetFileNameWithoutExtension(db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
+		string fullPath = Path.Combine(rootPath, filenameBase + ".html");
+		int counter = 0;
 
-			Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId)) {
-				UseShellExecute = true
+		while (File.Exists(fullPath)) {
+			++counter;
+			fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
+		}
+
+		TemporaryFiles.Add(fullPath);
+
+		Directory.CreateDirectory(rootPath);
+		await WriteViewerFile(fullPath, new LiveViewerExportStrategy(ServerManager.Port, ServerManager.Token));
+
+		Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
+	}
+
+	private static readonly FilePickerFileType[] ViewerFileTypes = {
+		FileDialogs.CreateFilter("Discord History Viewer", new string[] { "html" }),
+	};
+	
+	public async void OnClickSaveViewer() {
+		string? path = await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
+			Title = "Save Viewer",
+			FileTypeChoices = ViewerFileTypes,
+			SuggestedFileName = Path.GetFileNameWithoutExtension(db.Path) + ".html",
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(db.Path)),
 		});
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
+
+		if (path != null) {
+			await WriteViewerFile(path, StandaloneViewerExportStrategy.Instance);
 		}
 	}
 
-	public async Task OnClickApplyFiltersToDatabase() {
+	public async void OnClickApplyFiltersToDatabase() {
 		var filter = FilterModel.CreateFilter();
-		var 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?")) {
-				await ApplyFilterToDatabase(filter, FilterRemovalMode.KeepMatching);
+			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
+				db.RemoveMessages(filter, FilterRemovalMode.KeepMatching);
 			}
 		}
 		else if (DatabaseToolFilterModeRemove) {
-			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", messageCount.Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
-				await ApplyFilterToDatabase(filter, FilterRemovalMode.RemoveMatching);
+			if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
+				db.RemoveMessages(filter, FilterRemovalMode.RemoveMatching);
 			}
 		}
 	}
-
-	private async Task ApplyFilterToDatabase(MessageFilter filter, FilterRemovalMode removalMode) {
-		await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Removing messages...", _ => state.Db.Messages.Remove(filter, removalMode));
-	}
 }

app/Desktop/Main/Screens/MainContentScreen.axaml

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

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -1,20 +1,27 @@
 using System;
+using System.Threading.Tasks;
 using Avalonia.Controls;
+using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Main.Pages;
-using DHT.Server;
+using DHT.Desktop.Server;
+using DHT.Server.Database;
+using DHT.Server.Service;
+using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Main.Screens;
 
 sealed class MainContentScreenModel : IDisposable {
+	private static readonly Log Log = Log.ForType<MainContentScreenModel>();
+
 	public DatabasePage DatabasePage { get; }
 	private DatabasePageModel DatabasePageModel { get; }
 
 	public TrackingPage TrackingPage { get; }
 	private TrackingPageModel TrackingPageModel { get; }
 
-	public DownloadsPage DownloadsPage { get; }
-	private DownloadsPageModel DownloadsPageModel { get; }
+	public AttachmentsPage AttachmentsPage { get; }
+	private AttachmentsPageModel AttachmentsPageModel { get; }
 
 	public ViewerPage ViewerPage { get; }
 	private ViewerPageModel ViewerPageModel { get; }
@@ -42,39 +49,71 @@ sealed class MainContentScreenModel : IDisposable {
 		}
 	}
 
-	[Obsolete("Designer")]
-	public MainContentScreenModel() : this(null!, State.Dummy) {}
+	private readonly Window window;
+	private readonly ServerManager serverManager;
 
-	public MainContentScreenModel(Window window, State state) {
-		DatabasePageModel = new DatabasePageModel(window, state);
+	[Obsolete("Designer")]
+	public MainContentScreenModel() : this(null!, DummyDatabaseFile.Instance) {}
+
+	public MainContentScreenModel(Window window, IDatabaseFile db) {
+		this.window = window;
+		this.serverManager = new ServerManager(db);
+
+		ServerLauncher.ServerManagementExceptionCaught += ServerLauncherOnServerManagementExceptionCaught;
+
+		DatabasePageModel = new DatabasePageModel(window, db);
 		DatabasePage = new DatabasePage { DataContext = DatabasePageModel };
 
 		TrackingPageModel = new TrackingPageModel(window);
 		TrackingPage = new TrackingPage { DataContext = TrackingPageModel };
 
-		DownloadsPageModel = new DownloadsPageModel(state);
-		DownloadsPage = new DownloadsPage { DataContext = DownloadsPageModel };
+		AttachmentsPageModel = new AttachmentsPageModel(db);
+		AttachmentsPage = new AttachmentsPage { DataContext = AttachmentsPageModel };
 
-		ViewerPageModel = new ViewerPageModel(window, state);
+		ViewerPageModel = new ViewerPageModel(window, db);
 		ViewerPage = new ViewerPage { DataContext = ViewerPageModel };
 
-		AdvancedPageModel = new AdvancedPageModel(window, state);
+		AdvancedPageModel = new AdvancedPageModel(window, db, serverManager);
 		AdvancedPage = new AdvancedPage { DataContext = AdvancedPageModel };
 
 		#if DEBUG
-		DebugPageModel = new DebugPageModel(window, state);
+		DebugPageModel = new DebugPageModel(window, db);
 		DebugPage = new DebugPage { DataContext = DebugPageModel };
 		#else
 			DebugPage = null;
 		#endif
 
-		StatusBarModel = new StatusBarModel(state);
+		StatusBarModel = new StatusBarModel(db.Statistics);
+
+		AdvancedPageModel.ServerConfigurationModel.ServerStatusChanged += OnServerStatusChanged;
+		DatabaseClosed += OnDatabaseClosed;
+
+		StatusBarModel.CurrentStatus = serverManager.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped;
+	}
+
+	public async Task Initialize() {
+		await TrackingPageModel.Initialize();
+		AdvancedPageModel.Initialize();
+		serverManager.Launch();
 	}
 
 	public void Dispose() {
-		DownloadsPageModel.Dispose();
+		ServerLauncher.ServerManagementExceptionCaught -= ServerLauncherOnServerManagementExceptionCaught;
+		AttachmentsPageModel.Dispose();
 		ViewerPageModel.Dispose();
-		AdvancedPageModel.Dispose();
-		StatusBarModel.Dispose();
+		serverManager.Dispose();
+	}
+
+	private void OnServerStatusChanged(object? sender, StatusBarModel.Status e) {
+		StatusBarModel.CurrentStatus = e;
+	}
+
+	private void OnDatabaseClosed(object? sender, EventArgs e) {
+		serverManager.Stop();
+	}
+
+	private async void ServerLauncherOnServerManagementExceptionCaught(object? sender, Exception ex) {
+		Log.Error(ex);
+		await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
 	}
 }

app/Desktop/Main/Screens/WelcomeScreen.axaml

@@ -32,7 +32,7 @@
             <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button Command="{Binding OpenOrCreateDatabase}" IsEnabled="{Binding IsOpenOrCreateDatabaseButtonEnabled}">Open or Create Database</Button>
+                <Button Command="{Binding OpenOrCreateDatabase}">Open or Create Database</Button>
                 <Button Command="{Binding ShowAboutDialog}">About</Button>
                 <Button Command="{Binding Exit}">Exit</Button>
             </StackPanel>

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -3,22 +3,20 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Server.Database;
-using DHT.Server.Database.Sqlite.Schema;
+using DHT.Server.Database.Sqlite;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed partial class WelcomeScreenModel : ObservableObject {
+sealed class WelcomeScreenModel : BaseModel, IDisposable {
 	public string Version => Program.Version;
 
-	[ObservableProperty(Setter = Access.Private)]
-	private bool isOpenOrCreateDatabaseButtonEnabled = true;
-	
-	public event EventHandler<IDatabaseFile>? DatabaseSelected; 
+	public IDatabaseFile? Db { get; private set; }
+	public bool HasDatabase => Db != null;
 
 	private readonly Window window;
 
@@ -31,25 +29,23 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 		this.window = window;
 	}
 
-	public async Task OpenOrCreateDatabase() {
-		IsOpenOrCreateDatabaseButtonEnabled = false;
-		try {
+	public async void OpenOrCreateDatabase() {
 		var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
 		if (path != null) {
 			await OpenOrCreateDatabaseFromPath(path);
 		}
-		} finally {
-			IsOpenOrCreateDatabaseButtonEnabled = true;
-		}
 	}
 
 	public async Task OpenOrCreateDatabaseFromPath(string path) {
-		dbFilePath = path;
-		
-		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
-		if (db != null) {
-			DatabaseSelected?.Invoke(this, db);
+		if (Db != null) {
+			Db = null;
 		}
+
+		dbFilePath = path;
+		Db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
+
+		OnPropertyChanged(nameof(Db));
+		OnPropertyChanged(nameof(HasDatabase));
 	}
 
 	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {
@@ -72,7 +68,11 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 				await Task.Delay(TimeSpan.FromMilliseconds(600));
 			}
 
-			await new ProgressDialog { DataContext = new ProgressDialogModel("Upgrading Database", StartUpgrade, progressItems: 3) }.ShowProgressDialog(window);
+			await new ProgressDialog {
+				DataContext = new ProgressDialogModel(StartUpgrade, progressItems: 3) {
+					Title = "Upgrading Database"
+				}
+			}.ShowProgressDialog(window);
 		}
 
 		private sealed class ProgressReporter : ISchemaUpgradeCallbacks.IProgressReporter {
@@ -109,11 +109,22 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 		}
 	}
 
-	public async Task ShowAboutDialog() {
-		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(window);
+	public void CloseDatabase() {
+		Dispose();
+		OnPropertyChanged(nameof(Db));
+		OnPropertyChanged(nameof(HasDatabase));
+	}
+
+	public async void ShowAboutDialog() {
+		await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(this.window);
 	}
 
 	public void Exit() {
 		window.Close();
 	}
+
+	public void Dispose() {
+		Db?.Dispose();
+		Db = null;
+	}
 }

app/Desktop/Server/ServerConfiguration.cs

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

app/Desktop/Server/ServerManager.cs

@@ -0,0 +1,50 @@
+using System;
+using DHT.Server.Database;
+using DHT.Server.Service;
+
+namespace DHT.Desktop.Server;
+
+sealed class ServerManager : IDisposable {
+	public static ushort Port { get; set; } = ServerUtils.FindAvailablePort(50000, 60000);
+	public static string Token { get; set; } = ServerUtils.GenerateRandomToken(20);
+
+	private static ServerManager? instance;
+
+	public bool IsRunning => ServerLauncher.IsRunning;
+
+	private readonly IDatabaseFile db;
+
+	public ServerManager(IDatabaseFile db) {
+		if (db != DummyDatabaseFile.Instance) {
+			if (instance != null) {
+				throw new InvalidOperationException("Only one instance of ServerManager can exist at the same time!");
+			}
+
+			instance = this;
+		}
+
+		this.db = db;
+	}
+
+	public void Launch() {
+		ServerLauncher.Relaunch(Port, Token, db);
+	}
+
+	public void Relaunch(ushort port, string token) {
+		Port = port;
+		Token = token;
+		Launch();
+	}
+
+	public void Stop() {
+		ServerLauncher.Stop();
+	}
+
+	public void Dispose() {
+		Stop();
+
+		if (instance == this) {
+			instance = null;
+		}
+	}
+}

app/Directory.Build.props

@@ -2,7 +2,7 @@
   
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <LangVersion>12</LangVersion>
+    <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   

app/NuGet.Config

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

app/Resources/Tracker/scripts/state.js

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

app/Resources/Viewer/index.html

@@ -2,24 +2,17 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="referrer" content="no-referrer">
-    
     <title>Discord Offline History</title>
     
-    <link rel="icon" href="favicon.ico">
-    
-    <link rel="stylesheet" href="styles/main.css">
-    <link rel="stylesheet" href="styles/menu.css">
-    <link rel="stylesheet" href="styles/channels.css">
-    <link rel="stylesheet" href="styles/messages.css">
-    <link rel="stylesheet" href="styles/modal.css">
-    
     <script type="text/javascript">
-		const query = new URLSearchParams(location.search);
-		window.DHT_SERVER_TOKEN = query.get("token");
-		window.DHT_SERVER_SESSION = query.get("session");
+		window.DHT_EMBEDDED = "/*[ARCHIVE]*/";
+		window.DHT_SERVER_URL = "/*[SERVER_URL]*/";
+    window.DHT_SERVER_TOKEN = "/*[SERVER_TOKEN]*/";
+		/*[JS]*/
     </script>
-    <script type="module" src="scripts/bootstrap.mjs"></script>
+    <style>
+      /*[CSS]*/
+    </style>
   </head>
   <body>
     <div id="menu">
@@ -73,9 +66,7 @@
     </div>
     
     <div id="app">
-      <div id="channels">
-        <div class="loading"></div>
-      </div>
+      <div id="channels"></div>
       <div id="messages"></div>
     </div>
     

app/Resources/Viewer/scripts/bootstrap.js

@@ -0,0 +1,39 @@
+document.addEventListener("DOMContentLoaded", () => {
+	DISCORD.setup();
+	GUI.setup();
+	
+	GUI.onOptionMessagesPerPageChanged(() => {
+		STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
+	});
+	
+	STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
+	
+	GUI.onOptMessageFilterChanged(filter => {
+		STATE.setActiveFilter(filter);
+	});
+	
+	GUI.onNavigationButtonClicked(action => {
+		STATE.updateCurrentPage(action);
+	});
+	
+	STATE.onUsersRefreshed(users => {
+		GUI.updateUserList(users);
+	});
+	
+	STATE.onChannelsRefreshed((channels, selected) => {
+		GUI.updateChannelList(channels, selected, STATE.selectChannel);
+	});
+	
+	STATE.onMessagesRefreshed(messages => {
+		GUI.updateNavigation(STATE.getCurrentPage(), STATE.getPageCount());
+		GUI.updateMessageList(messages);
+		GUI.scrollMessagesToTop();
+	});
+	
+	try {
+		STATE.uploadFile(JSON.parse(window.DHT_EMBEDDED));
+	} catch (e) {
+		console.error(e);
+		alert("Could not parse embedded file, see console for details.");
+	}
+});

app/Resources/Viewer/scripts/bootstrap.mjs

@@ -1,110 +0,0 @@
-import discord from "./discord.mjs";
-import gui from "./gui.mjs";
-import state from "./state.mjs";
-
-window.DISCORD = discord;
-
-document.addEventListener("DOMContentLoaded", () => {
-	discord.setup();
-	gui.setup();
-	
-	gui.onOptionMessagesPerPageChanged(() => {
-		state.setMessagesPerPage(gui.getOptionMessagesPerPage());
-	});
-	
-	state.setMessagesPerPage(gui.getOptionMessagesPerPage());
-	
-	gui.onOptMessageFilterChanged(filter => {
-		state.setActiveFilter(filter);
-	});
-	
-	gui.onNavigationButtonClicked(action => {
-		state.updateCurrentPage(action);
-	});
-	
-	state.onUsersRefreshed(users => {
-		gui.updateUserList(users);
-	});
-	
-	state.onChannelsRefreshed((channels, selected) => {
-		gui.updateChannelList(channels, selected, state.selectChannel);
-	});
-	
-	state.onMessagesRefreshed(messages => {
-		gui.updateNavigation(state.getCurrentPage(), state.getPageCount());
-		gui.updateMessageList(messages);
-		gui.scrollMessagesToTop();
-	});
-	
-	async function fetchUrl(path, contentType) {
-		const response = await fetch("/" + path + "?token=" + encodeURIComponent(window.DHT_SERVER_TOKEN) + "&session=" + encodeURIComponent(window.DHT_SERVER_SESSION), {
-			method: "GET",
-			headers: {
-				"Content-Type": contentType,
-			},
-			credentials: "omit",
-			redirect: "error",
-		});
-		
-		if (!response.ok) {
-			throw "Unexpected response status: " + response.statusText;
-		}
-		
-		return response;
-	}
-	
-	async function processLines(response, callback) {
-		let body = "";
-		
-		for await (const chunk of response.body.pipeThrough(new TextDecoderStream("utf-8"))) {
-			body += chunk;
-			
-			let startIndex = 0;
-			
-			while (true) {
-				const endIndex = body.indexOf("\n", startIndex);
-				if (endIndex === -1) {
-					break;
-				}
-				
-				callback(body.substring(startIndex, endIndex));
-				startIndex = endIndex + 1;
-			}
-			
-			body = body.substring(startIndex);
-		}
-		
-		if (body !== "") {
-			callback(body);
-		}
-	}
-	
-	async function loadData() {
-		try {
-			const metadataResponse = await fetchUrl("get-viewer-metadata", "application/json");
-			const metadataJson = await metadataResponse.json();
-			
-			const messagesResponse = await fetchUrl("get-viewer-messages", "application/x-ndjson");
-			const messages = {};
-			
-			await processLines(messagesResponse, line => {
-				const message = JSON.parse(line);
-				const channel = message.c;
-				
-				const channelMessages = messages[channel] || (messages[channel] = {});
-				channelMessages[message.id] = message;
-				
-				delete message.id;
-				delete message.c;
-			});
-			
-			state.uploadFile(metadataJson, messages);
-		} catch (e) {
-			console.error(e);
-			alert("Could not load data, see console for details.");
-			document.querySelector("#channels > div.loading").remove();
-		}
-	}
-	
-	loadData();
-});

app/Resources/Viewer/scripts/discord.js

@@ -1,10 +1,4 @@
-import discord from "./discord.mjs";
-import dom from "./dom.mjs";
-import template from "./template.mjs";
-import settings from "./settings.mjs";
-import state from "./state.mjs";
-
-export default (function() {
+const DISCORD = (function() {
 	const regex = {
 		formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
 		formatItalic1: /\*([\s\S]+?)\*(?!\*)/g,
@@ -41,24 +35,10 @@ export default (function() {
 	let templateReaction;
 	let templateReactionCustom;
 	
-	const fileUrlProcessor = function(serverToken) {
-		if (typeof serverToken === "string") {
-			return url => "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
-		}
-		else {
-			return url => url;
-		}
-	}(window.DHT_SERVER_TOKEN);
-	
-	const getEmoji = function(name, id, extension) {
-		const tag = ":" + name + ":";
-		return "<img src='" + fileUrlProcessor("https://cdn.discordapp.com/emojis/" + id + "." + extension) + "' alt='" + tag + "' title='" + tag + "' class='emoji'>";
-	};
-	
 	const processMessageContents = function(contents) {
-		let processed = dom.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
+		let processed = DOM.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
 		
-		if (settings.enableFormatting) {
+		if (SETTINGS.enableFormatting) {
 			const escapeHtmlMatch = (full, match) => "&#" + match.charCodeAt(0) + ";";
 			
 			processed = processed
@@ -74,33 +54,29 @@ export default (function() {
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		
-		const animatedEmojiExtension = settings.enableAnimatedEmoji ? "gif" : "webp";
+		const animatedEmojiExtension = SETTINGS.enableAnimatedEmoji ? "gif" : "png";
 		
 		// noinspection HtmlUnknownTarget
 		processed = processed
 			.replace(regex.formatUrl, "<a href='$1' target='_blank' rel='noreferrer'>$1</a>")
-			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + state.getChannelName(match) + "</span>")
-			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (state.getUserTag(match) || "????") + "'>@" + state.getUserName(match) + "</span>")
-			.replace(regex.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
-			.replace(regex.customEmojiAnimated, (full, m1, m2) => getEmoji(m1, m2, animatedEmojiExtension));
+			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + STATE.getChannelName(match) + "</span>")
+			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (STATE.getUserTag(match) || "????") + "'>@" + STATE.getUserName(match) + "</span>")
+			.replace(regex.customEmojiStatic, "<img src='https://cdn.discordapp.com/emojis/$2.png' alt=':$1:' title=':$1:' class='emoji'>")
+			.replace(regex.customEmojiAnimated, "<img src='https://cdn.discordapp.com/emojis/$2." + animatedEmojiExtension + "' alt=':$1:' title=':$1:' class='emoji'>");
 		
 		return "<p>" + processed + "</p>";
 	};
 	
-	const getAvatarUrlObject = function(avatar) {
-		return { url: fileUrlProcessor("https://cdn.discordapp.com/avatars/" + avatar.id + "/" + avatar.path + ".webp") };
-	};
-	
 	const getImageEmbed = function(url, image) {
-		if (!settings.enableImagePreviews) {
+		if (!SETTINGS.enableImagePreviews) {
 			return "";
 		}
 		
 		if (image.width && image.height) {
-			return templateEmbedImageWithSize.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url), width: image.width, height: image.height });
+			return templateEmbedImageWithSize.apply({ url, src: image.url, width: image.width, height: image.height });
 		}
 		else {
-			return templateEmbedImage.apply({ url: fileUrlProcessor(url), src: fileUrlProcessor(image.url) });
+			return templateEmbedImage.apply({ url, src: image.url });
 		}
 	};
 	
@@ -112,21 +88,21 @@ export default (function() {
 	
 	return {
 		setup() {
-			templateChannelServer = new template([
-				"<div class='channel' data-channel='{id}'>",
+			templateChannelServer = new TEMPLATE([
+				"<div data-channel='{id}'>",
 				"<div class='info' title='{topic}'><strong class='name'>#{name}</strong>{nsfw}<span class='tag'>{msgcount}</span></div>",
 				"<span class='server'>{server.name} ({server.type})</span>",
 				"</div>"
 			].join(""));
 			
-			templateChannelPrivate = new template([
-				"<div class='channel' data-channel='{id}'>",
+			templateChannelPrivate = new TEMPLATE([
+				"<div data-channel='{id}'>",
 				"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
 				"<span class='server'>({server.type})</span>",
 				"</div>"
 			].join(""));
 			
-			templateMessageNoAvatar = new template([
+			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>",
@@ -135,7 +111,7 @@ export default (function() {
 				"</div>"
 			].join(""));
 			
-			templateMessageWithAvatar = new template([
+			templateMessageWithAvatar = new TEMPLATE([
 				"<div>",
 				"<div class='reply-message reply-message-with-avatar'>{reply}</div>",
 				"<div class='avatar-wrapper'>",
@@ -149,52 +125,50 @@ export default (function() {
 				"</div>"
 			].join(""));
 			
-			// noinspection HtmlUnknownTarget
-			templateUserAvatar = new template([
-				"<img src='{url}' alt=''>"
+			templateUserAvatar = new TEMPLATE([
+				"<img src='https://cdn.discordapp.com/avatars/{id}/{path}.webp?size=128' alt=''>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateAttachmentDownload = new template([
+			templateAttachmentDownload = new TEMPLATE([
 				"<a href='{url}' class='embed download'>Download {name}</a>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedImage = new template([
-				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
+			templateEmbedImage = new TEMPLATE([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedImageWithSize = new template([
-				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
+			templateEmbedImageWithSize = new TEMPLATE([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedRich = new template([
+			templateEmbedRich = new TEMPLATE([
 				"<div class='embed download'><a href='{url}' class='title'>{title}</a><p class='desc'>{description}</p></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedRichNoDescription = new template([
+			templateEmbedRichNoDescription = new TEMPLATE([
 				"<div class='embed download'><a href='{url}' class='title'>{title}</a></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedUrl = new template([
+			templateEmbedUrl = new TEMPLATE([
 				"<a href='{url}' class='embed download'>{url}</a>"
 			].join(""));
 			
-			templateEmbedUnsupported = new template([
+			templateEmbedUnsupported = new TEMPLATE([
 				"<div class='embed download'><p>(Unsupported embed)</p></div>"
 			].join(""));
 			
-			templateReaction = new template([
+			templateReaction = new TEMPLATE([
 				"<span class='reaction-wrapper'><span class='reaction-emoji'>{n}</span><span class='count'>{c}</span></span>"
 			].join(""));
 			
-			// noinspection HtmlUnknownTarget
-			templateReactionCustom = new template([
-				"<span class='reaction-wrapper'><img src='{url}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
+			templateReactionCustom = new TEMPLATE([
+				"<span class='reaction-wrapper'><img src='https://cdn.discordapp.com/emojis/{id}.{ext}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
 			].join(""));
 		},
 		
@@ -210,7 +184,7 @@ export default (function() {
 		},
 		
 		isImageAttachment(attachment) {
-			const url = dom.tryParseUrl(attachment.url);
+			const url = DOM.tryParseUrl(attachment.url);
 			return url != null && isImageUrl(url);
 		},
 		
@@ -223,15 +197,15 @@ export default (function() {
 		},
 		
 		getMessageHTML(message) { // noinspection FunctionWithInconsistentReturnsJS
-			return (settings.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
+			return (SETTINGS.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
 				if (property === "avatar") {
-					return value ? templateUserAvatar.apply(getAvatarUrlObject(value)) : "";
+					return value ? templateUserAvatar.apply(value) : "";
 				}
 				else if (property === "user.tag") {
 					return value ? value : "????";
 				}
 				else if (property === "timestamp") {
-					return dom.getHumanReadableTime(value);
+					return DOM.getHumanReadableTime(value);
 				}
 				else if (property === "contents") {
 					return value && value.length > 0 ? processMessageContents(value) : "";
@@ -268,24 +242,22 @@ export default (function() {
 					}
 					
 					return value.map(attachment => {
-						const url = fileUrlProcessor(attachment.url);
-						
-						if (!discord.isImageAttachment(attachment) || !settings.enableImagePreviews) {
-							return templateAttachmentDownload.apply({ url, name: attachment.name });
+						if (!DISCORD.isImageAttachment(attachment) || !SETTINGS.enableImagePreviews) {
+							return templateAttachmentDownload.apply(attachment);
 						}
 						else if ("width" in attachment && "height" in attachment) {
-							return templateEmbedImageWithSize.apply({ url, src: url, width: attachment.width, height: attachment.height });
+							return templateEmbedImageWithSize.apply({ url: attachment.url, src: attachment.url, width: attachment.width, height: attachment.height });
 						}
 						else {
-							return templateEmbedImage.apply({ url, src: url });
+							return templateEmbedImage.apply({ url: attachment.url, src: attachment.url });
 						}
 					}).join("");
 				}
 				else if (property === "edit") {
-					return value ? "<span class='info edited'>Edited " + dom.getHumanReadableTime(value) + "</span>" : "";
+					return value ? "<span class='info edited'>Edited " + DOM.getHumanReadableTime(value) + "</span>" : "";
 				}
 				else if (property === "jump") {
-					return state.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
+					return STATE.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
 				}
 				else if (property === "reply") {
 					if (!value) {
@@ -293,7 +265,7 @@ export default (function() {
 					}
 					
 					const user = "<span class='reply-username' title='#" + (value.user.tag ? value.user.tag : "????") + "'>" + value.user.name + "</span>";
-					const avatar = settings.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
+					const avatar = SETTINGS.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(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;
@@ -305,10 +277,9 @@ export default (function() {
 					
 					return "<div class='reactions'>" + value.map(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
-							return templateReactionCustom.apply({ url, n: reaction.n, c: reaction.c });
+							// noinspection JSUnusedGlobalSymbols, JSUnresolvedVariable
+							reaction.ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "png";
+							return templateReactionCustom.apply(reaction);
 						}
 						else {
 							return templateReaction.apply(reaction);

app/Resources/Viewer/scripts/dom.js

@@ -8,12 +8,9 @@ const HTML_ENTITY_MAP = {
 
 const HTML_ENTITY_REGEX = /[&<>"']/g;
 
-export default class {
+class DOM {
 	/**
 	 * Returns a child element by its ID. Parent defaults to the entire document.
-	 * @param {string} id
-	 * @param {HTMLElement} [parent]
-	 * @returns {HTMLElement|null}
 	 */
 	static id(id, parent) {
 		return (parent || document).getElementById(id);
@@ -21,9 +18,6 @@ export default class {
 	
 	/**
 	 * Returns an array of all child elements containing the specified class. Parent defaults to the entire document.
-	 * @param {string} cls
-	 * @param {HTMLElement} [parent]
-	 * @returns {HTMLElement[]}
 	 */
 	static cls(cls, parent) {
 		return Array.prototype.slice.call((parent || document).getElementsByClassName(cls));
@@ -31,9 +25,6 @@ export default class {
 	
 	/**
 	 * Returns an array of all child elements that have the specified tag. Parent defaults to the entire document.
-	 * @param {string} tag
-	 * @param {HTMLElement} [parent]
-	 * @returns {HTMLElement[]}
 	 */
 	static tag(tag, parent) {
 		return Array.prototype.slice.call((parent || document).getElementsByTagName(tag));
@@ -41,9 +32,6 @@ export default class {
 	
 	/**
 	 * Returns the first child element containing the specified class. Parent defaults to the entire document.
-	 * @param {string} cls
-	 * @param {HTMLElement} [parent]
-	 * @returns {HTMLElement}
 	 */
 	static fcls(cls, parent) {
 		return (parent || document).getElementsByClassName(cls)[0];

app/Resources/Viewer/scripts/gui.js

@@ -1,16 +1,10 @@
-import dom from "./dom.mjs";
-import discord from "./discord.mjs";
-import settings from "./settings.mjs";
-import state from "./state.mjs";
-
-export default (function() {
+const GUI = (function() {
 	let eventOnOptMessagesPerPageChanged;
 	let eventOnOptMessageFilterChanged;
 	let eventOnNavButtonClicked;
 	
 	const getActiveFilter = function() {
-		/** @type HTMLSelectElement */
-		const active = dom.fcls("active", dom.id("opt-filter-list"));
+		const active = DOM.fcls("active", DOM.id("opt-filter-list"));
 		
 		return active && active.value !== "" ? {
 			"type": active.getAttribute("data-filter-type"),
@@ -23,12 +17,12 @@ export default (function() {
 	};
 	
 	const showModal = function(width, html) {
-		const dialog = dom.id("dialog");
+		const dialog = DOM.id("dialog");
 		dialog.innerHTML = html;
 		dialog.style.width = width + "px";
 		dialog.style.marginLeft = (-width / 2) + "px";
 		
-		dom.id("modal").classList.add("visible");
+		DOM.id("modal").classList.add("visible");
 		return dialog;
 	};
 	
@@ -44,9 +38,9 @@ export default (function() {
 <label><input id='dht-cfg-animemoji' type='checkbox'> Animated Emoji</label><br>`);
 		
 		const setupCheckBox = function(id, settingName) {
-			const ele = dom.id(id);
-			ele.checked = settings[settingName];
-			ele.addEventListener("change", () => settings[settingName] = ele.checked);
+			const ele = DOM.id(id);
+			ele.checked = SETTINGS[settingName];
+			ele.addEventListener("change", () => SETTINGS[settingName] = ele.checked);
 		};
 		
 		setupCheckBox("dht-cfg-imgpreviews", "enableImagePreviews");
@@ -71,20 +65,20 @@ export default (function() {
 		// ---------
 		
 		setup() {
-			const inputMessageFilter = dom.id("opt-messages-filter");
-			const containerFilterList = dom.id("opt-filter-list");
+			const inputMessageFilter = DOM.id("opt-messages-filter");
+			const containerFilterList = DOM.id("opt-filter-list");
 			
 			const resetActiveFilter = function() {
 				inputMessageFilter.value = "";
 				inputMessageFilter.dispatchEvent(new Event("change"));
 				
-				dom.id("opt-filter-contents").value = "";
+				DOM.id("opt-filter-contents").value = "";
 			};
 			
 			inputMessageFilter.value = ""; // required to prevent browsers from remembering old value
 			
 			inputMessageFilter.addEventListener("change", () => {
-				dom.cls("active", containerFilterList).forEach(ele => ele.classList.remove("active"));
+				DOM.cls("active", containerFilterList).forEach(ele => ele.classList.remove("active"));
 				
 				if (inputMessageFilter.value) {
 					containerFilterList.querySelector("[data-filter-type='" + inputMessageFilter.value + "']").classList.add("active");
@@ -97,11 +91,11 @@ export default (function() {
 				ele.addEventListener(ele.tagName === "SELECT" ? "change" : "input", () => triggerFilterChanged());
 			});
 			
-			dom.id("opt-messages-per-page").addEventListener("change", () => {
+			DOM.id("opt-messages-per-page").addEventListener("change", () => {
 				eventOnOptMessagesPerPageChanged && eventOnOptMessagesPerPageChanged();
 			});
 			
-			dom.tag("button", dom.fcls("nav")).forEach(button => {
+			DOM.tag("button", DOM.fcls("nav")).forEach(button => {
 				button.disabled = true;
 				
 				button.addEventListener("click", () => {
@@ -109,34 +103,34 @@ export default (function() {
 				});
 			});
 			
-			dom.id("btn-settings").addEventListener("click", () => {
+			DOM.id("btn-settings").addEventListener("click", () => {
 				showSettingsModal();
 			});
 			
-			dom.id("btn-about").addEventListener("click", () => {
+			DOM.id("btn-about").addEventListener("click", () => {
 				showInfoModal();
 			});
 			
-			dom.id("messages").addEventListener("click", e => {
+			DOM.id("messages").addEventListener("click", e => {
 				const jump = e.target.getAttribute("data-jump");
 				
 				if (jump) {
 					resetActiveFilter();
 					
-					const index = state.navigateToMessage(jump);
+					const index = STATE.navigateToMessage(jump);
 					
 					if (index === -1) {
 						alert("Message not found.");
 					}
 					else {
-						dom.id("messages").children[index].scrollIntoView();
+						DOM.id("messages").children[index].scrollIntoView();
 					}
 				}
 			});
 			
-			dom.id("overlay").addEventListener("click", () => {
-				dom.id("modal").classList.remove("visible");
-				dom.id("dialog").innerHTML = "";
+			DOM.id("overlay").addEventListener("click", () => {
+				DOM.id("modal").classList.remove("visible");
+				DOM.id("dialog").innerHTML = "";
 			});
 		},
 		
@@ -174,19 +168,19 @@ export default (function() {
 		 */
 		getOptionMessagesPerPage() {
 			/** @type HTMLInputElement */
-			const messagesPerPage = dom.id("opt-messages-per-page");
+			const messagesPerPage = DOM.id("opt-messages-per-page");
 			return parseInt(messagesPerPage.value, 10);
 		},
 		
 		updateNavigation(currentPage, totalPages) {
-			dom.id("nav-page-current").innerHTML = currentPage;
-			dom.id("nav-page-total").innerHTML = totalPages || "?";
+			DOM.id("nav-page-current").innerHTML = currentPage;
+			DOM.id("nav-page-total").innerHTML = totalPages || "?";
 			
-			dom.id("nav-first").disabled = currentPage === 1;
-			dom.id("nav-prev").disabled = currentPage === 1;
-			dom.id("nav-pick").disabled = (totalPages || 0) <= 1;
-			dom.id("nav-next").disabled = currentPage === (totalPages || 1);
-			dom.id("nav-last").disabled = currentPage === (totalPages || 1);
+			DOM.id("nav-first").disabled = currentPage === 1;
+			DOM.id("nav-prev").disabled = currentPage === 1;
+			DOM.id("nav-pick").disabled = (totalPages || 0) <= 1;
+			DOM.id("nav-next").disabled = currentPage === (totalPages || 1);
+			DOM.id("nav-last").disabled = currentPage === (totalPages || 1);
 		},
 		
 		// --------------
@@ -197,7 +191,7 @@ export default (function() {
 		 * Updates the channel list and sets up their click events. The callback is triggered whenever a channel is selected, and takes the channel ID as its argument.
 		 */
 		updateChannelList(channels, selected, callback) {
-			const eleChannels = dom.id("channels");
+			const eleChannels = DOM.id("channels");
 			
 			if (!channels) {
 				eleChannels.innerHTML = "";
@@ -207,11 +201,11 @@ export default (function() {
 					channels = channels.filter(channel => channel.msgcount > 0);
 				}
 				
-				eleChannels.innerHTML = channels.map(channel => discord.getChannelHTML(channel)).join("");
+				eleChannels.innerHTML = channels.map(channel => DISCORD.getChannelHTML(channel)).join("");
 				
 				Array.prototype.forEach.call(eleChannels.children, ele => {
 					ele.addEventListener("click", () => {
-						const currentChannel = dom.fcls("active", eleChannels);
+						const currentChannel = DOM.fcls("active", eleChannels);
 						
 						if (currentChannel) {
 							currentChannel.classList.remove("active");
@@ -230,12 +224,12 @@ export default (function() {
 		},
 		
 		updateMessageList(messages) {
-			dom.id("messages").innerHTML = messages ? messages.map(message => discord.getMessageHTML(message)).join("") : "";
+			DOM.id("messages").innerHTML = messages ? messages.map(message => DISCORD.getMessageHTML(message)).join("") : "";
 		},
 		
 		updateUserList(users) {
 			/** @type HTMLSelectElement */
-			const eleSelect = dom.id("opt-filter-user");
+			const eleSelect = DOM.id("opt-filter-user");
 			
 			while (eleSelect.length > 1) {
 				eleSelect.remove(1);
@@ -255,7 +249,7 @@ export default (function() {
 		},
 		
 		scrollMessagesToTop() {
-			dom.id("messages").scrollTop = 0;
+			DOM.id("messages").scrollTop = 0;
 		}
 	};
 })();

app/Resources/Viewer/scripts/processor.js

@@ -1,16 +1,16 @@
-import discord from "./discord.mjs";
+const PROCESSOR = {};
 
 // ------------------------
 // Global filter generators
 // ------------------------
 
-const filter = {
-	byUser: ((user) => message => message.u === user),
+PROCESSOR.FILTER = {
+	byUser: ((userindex) => message => message.u === userindex),
 	byTime: ((timeStart, timeEnd) => message => message.t >= timeStart && message.t <= timeEnd),
 	byContents: ((substr) => message => ("m" in message ? message.m : "").indexOf(substr) !== -1),
 	byRegex: ((regex) => message => regex.test("m" in message ? message.m : "")),
-	withImages: (() => message => (message.e && message.e.some(embed => embed.type === "image")) || (message.a && message.a.some(discord.isImageAttachment))),
-	withDownloads: (() => message => message.a && message.a.some(attachment => !discord.isImageAttachment(attachment))),
+	withImages: (() => message => (message.e && message.e.some(embed => embed.type === "image")) || (message.a && message.a.some(DISCORD.isImageAttachment))),
+	withDownloads: (() => message => message.a && message.a.some(attachment => !DISCORD.isImageAttachment(attachment))),
 	withEmbeds: (() => message => message.e && message.e.length > 0),
 	withAttachments: (() => message => message.a && message.a.length > 0),
 	isEdited: (() => message => ("te" in message) ? message.te : (message.f & 1) === 1)
@@ -20,7 +20,7 @@ const filter = {
 // Global sorters
 // --------------
 
-const sorter = {
+PROCESSOR.SORTER = {
 	oldestToNewest: (key1, key2) => {
 		if (key1.length === key2.length) {
 			return key1 > key2 ? 1 : key1 < key2 ? -1 : 0;
@@ -39,8 +39,3 @@ const sorter = {
 		}
 	}
 };
-
-export default {
-	FILTER: filter,
-	SORTER: sorter
-};

app/Resources/Viewer/scripts/settings.js

@@ -1,4 +1,4 @@
-export default (function() {
+const SETTINGS = (function() {
 	/**
 	 * @type {{}}
 	 * @property {Function} onSettingsChanged

app/Resources/Viewer/scripts/state.js

@@ -1,12 +1,10 @@
-import settings from "./settings.mjs";
-import processor from "./processor.mjs";
-
 // noinspection FunctionWithInconsistentReturnsJS
-export default (function() {
+const STATE = (function() {
 	/**
 	 * @type {{}}
 	 * @property {{}} users
-	 * @property {{}} servers
+	 * @property {String[]} userindex
+	 * @property {{}[]} servers
 	 * @property {{}} channels
 	 */
 	let loadedFileMeta;
@@ -19,16 +17,20 @@ export default (function() {
 	let currentPage;
 	let messagesPerPage;
 	
-	const getUser = function(id) {
-		return loadedFileMeta.users[id] || { "name": "<unknown>" };
+	const getUser = function(index) {
+		return loadedFileMeta.users[loadedFileMeta.userindex[index]] || { "name": "<unknown>" };
+	};
+	
+	const getUserId = function(index) {
+		return loadedFileMeta.userindex[index];
 	};
 	
 	const getUserList = function() {
 		return loadedFileMeta ? loadedFileMeta.users : [];
 	};
 	
-	const getServer = function(id) {
-		return loadedFileMeta.servers[id] || { "name": "<unknown>", "type": "unknown" };
+	const getServer = function(index) {
+		return loadedFileMeta.servers[index] || { "name": "<unknown>", "type": "unknown" };
 	};
 	
 	const generateChannelHierarchy = function() {
@@ -180,15 +182,32 @@ export default (function() {
 		return null;
 	};
 	
-	const getMessageList = function() {
+	const getMessageList = async function(abortSignal) {
 		if (!loadedMessages) {
 			return [];
 		}
 		
 		const messages = getMessages(selectedChannel);
 		const startIndex = messagesPerPage * (root.getCurrentPage() - 1);
+		const slicedMessages = loadedMessages.slice(startIndex, !messagesPerPage ? undefined : startIndex + messagesPerPage);
 		
-		return loadedMessages.slice(startIndex, !messagesPerPage ? undefined : startIndex + messagesPerPage).map(key => {
+		let messageTexts = null;
+		
+		if (window.DHT_SERVER_URL !== null) {
+			const messageIds = new Set(slicedMessages);
+			
+			for (const key of slicedMessages) {
+				const message = messages[key];
+				
+				if ("r" in message) {
+					messageIds.add(message.r);
+				}
+			}
+			
+			messageTexts = await getMessageTextsFromServer(messageIds, abortSignal);
+		}
+		
+		return slicedMessages.map(key => {
 			/**
 			 * @type {{}}
 			 * @property {Number} u
@@ -202,7 +221,7 @@ export default (function() {
 			 */
 			const message = messages[key];
 			const user = getUser(message.u);
-			const avatar = user.avatar ? { id: message.u, path: user.avatar } : null;
+			const avatar = user.avatar ? { id: getUserId(message.u), path: user.avatar } : null;
 			
 			const obj = {
 				user,
@@ -214,6 +233,9 @@ export default (function() {
 			if ("m" in message) {
 				obj["contents"] = message.m;
 			}
+			else if (messageTexts && key in messageTexts) {
+				obj["contents"] = messageTexts[key];
+			}
 			
 			if ("e" in message) {
 				obj["embeds"] = message.e.map(embed => JSON.parse(embed));
@@ -228,15 +250,16 @@ export default (function() {
 			}
 			
 			if ("r" in message) {
-				const replyMessage = getMessageById(message.r);
+				const replyId = message.r;
+				const replyMessage = getMessageById(replyId);
 				const replyUser = replyMessage ? getUser(replyMessage.u) : null;
-				const replyAvatar = replyUser && replyUser.avatar ? { id: replyMessage.u, path: replyUser.avatar } : null;
+				const replyAvatar = replyUser && replyUser.avatar ? { id: getUserId(replyMessage.u), path: replyUser.avatar } : null;
 				
 				obj["reply"] = replyMessage ? {
-					"id": message.r,
+					"id": replyId,
 					"user": replyUser,
 					"avatar": replyAvatar,
-					"contents": replyMessage.m
+					"contents": messageTexts != null && replyId in messageTexts ? messageTexts[replyId] : replyMessage.m,
 				} : null;
 			}
 			
@@ -248,9 +271,35 @@ export default (function() {
 		});
 	};
 	
+	const getMessageTextsFromServer = async function(messageIds, abortSignal) {
+		let idParams = "";
+		
+		for (const messageId of messageIds) {
+			idParams += "id=" + encodeURIComponent(messageId) + "&";
+		}
+		
+		const response = await fetch(DHT_SERVER_URL + "/get-messages?" + idParams + "token=" + encodeURIComponent(DHT_SERVER_TOKEN), {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+			},
+			credentials: "omit",
+			redirect: "error",
+			signal: abortSignal
+		});
+		
+		if (response.status === 200) {
+			return response.json();
+		}
+		else {
+			throw new Error("Server returned status " + response.status + " " + response.statusText);
+		}
+	};
+	
 	let eventOnUsersRefreshed;
 	let eventOnChannelsRefreshed;
 	let eventOnMessagesRefreshed;
+	let messageLoaderAborter = null;
 	
 	const triggerUsersRefreshed = function() {
 		eventOnUsersRefreshed && eventOnUsersRefreshed(getUserList());
@@ -261,7 +310,22 @@ export default (function() {
 	};
 	
 	const triggerMessagesRefreshed = function() {
-		eventOnMessagesRefreshed && eventOnMessagesRefreshed(getMessageList());
+		if (!eventOnMessagesRefreshed) {
+			return;
+		}
+		
+		if (messageLoaderAborter != null) {
+			messageLoaderAborter.abort();
+		}
+		
+		const aborter = new AbortController();
+		messageLoaderAborter = aborter;
+		
+		getMessageList(aborter.signal).then(eventOnMessagesRefreshed).finally(() => {
+			if (messageLoaderAborter === aborter) {
+				messageLoaderAborter = null;
+			}
+		});
 	};
 	
 	const getFilteredMessageKeys = function(channel) {
@@ -288,17 +352,20 @@ export default (function() {
 			eventOnUsersRefreshed = callback;
 		},
 		
-		uploadFile(meta, data) {
+		/**
+		 * @param {{ meta, data }} file
+		 */
+		uploadFile(file) {
 			if (loadedFileMeta != null) {
 				throw "A file is already loaded!";
 			}
 			
-			if (typeof meta !== "object" || typeof data !== "object") {
+			if (!file || typeof file.meta !== "object" || typeof file.data !== "object") {
 				throw "Invalid file format!";
 			}
 			
-			loadedFileMeta = meta;
-			loadedFileData = data;
+			loadedFileMeta = file.meta;
+			loadedFileData = file.data;
 			loadedMessages = null;
 			
 			selectedChannel = null;
@@ -308,7 +375,7 @@ export default (function() {
 			triggerChannelsRefreshed();
 			triggerMessagesRefreshed();
 			
-			settings.onSettingsChanged(() => triggerMessagesRefreshed());
+			SETTINGS.onSettingsChanged(() => triggerMessagesRefreshed());
 		},
 		
 		getChannelName(channel) {
@@ -330,7 +397,7 @@ export default (function() {
 			currentPage = 1;
 			selectedChannel = channel;
 			
-			loadedMessages = getFilteredMessageKeys(channel).sort(processor.SORTER.oldestToNewest);
+			loadedMessages = getFilteredMessageKeys(channel).sort(PROCESSOR.SORTER.oldestToNewest);
 			triggerMessagesRefreshed();
 		},
 		
@@ -411,23 +478,23 @@ export default (function() {
 		setActiveFilter(filter) {
 			switch (filter ? filter.type : "") {
 				case "user":
-					filterFunction = processor.FILTER.byUser(filter.value);
+					filterFunction = PROCESSOR.FILTER.byUser(loadedFileMeta.userindex.indexOf(filter.value));
 					break;
 				
 				case "contents":
-					filterFunction = processor.FILTER.byContents(filter.value);
+					filterFunction = PROCESSOR.FILTER.byContents(filter.value);
 					break;
 				
 				case "withimages":
-					filterFunction = processor.FILTER.withImages();
+					filterFunction = PROCESSOR.FILTER.withImages();
 					break;
 				
 				case "withdownloads":
-					filterFunction = processor.FILTER.withDownloads();
+					filterFunction = PROCESSOR.FILTER.withDownloads();
 					break;
 				
 				case "edited":
-					filterFunction = processor.FILTER.isEdited();
+					filterFunction = PROCESSOR.FILTER.isEdited();
 					break;
 				
 				default:

app/Resources/Viewer/scripts/template.js

@@ -1,8 +1,6 @@
-import dom from "./dom.mjs";
-
 const TEMPLATE_REGEX = /{([^{}]+?)}/g;
 
-export default class {
+class TEMPLATE {
 	constructor(contents) {
 		this.contents = contents;
 	};
@@ -13,10 +11,10 @@ export default class {
 			
 			if (processor) {
 				const updated = processor(match, value);
-				return typeof updated === "undefined" ? dom.escapeHTML(value) : updated;
+				return typeof updated === "undefined" ? DOM.escapeHTML(value) : updated;
 			}
 			
-			return dom.escapeHTML(value);
+			return DOM.escapeHTML(value);
 		});
 	}
 }

app/Resources/Viewer/styles/channels.css

@@ -3,24 +3,18 @@
   min-width: 215px;
   max-width: 300px;
   overflow-y: auto;
-  color: #eee;
   background-color: #1c1e22;
-  font-size: 15px;
 }
 
-#channels > div.loading {
-  margin: 0 auto;
-  width: 150px;
-  height: 150px;
-}
-
-#channels > div.channel {
+#channels > div {
   cursor: pointer;
   padding: 10px 12px;
+  color: #eee;
+  font-size: 15px;
   border-bottom: 1px solid #333333;
 }
 
-#channels > div.channel:hover, #channels > div.channel.active {
+#channels > div:hover, #channels > div.active {
   background-color: #282b30;
 }
 

app/Resources/Viewer/styles/main.css

@@ -11,20 +11,3 @@ body {
   display: flex;
   flex-direction: row;
 }
-
-.loading {
-  position: relative;
-  --loading-backdrop: rgba(0, 0, 0, 0);
-}
-
-.loading::after {
-  content: "";
-  background: var(--loading-backdrop)
-  url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
-  no-repeat center center;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}

app/Resources/Viewer/styles/messages.css

@@ -107,11 +107,23 @@
 }
 
 .message .thumbnail {
-  --loading-backdrop: rgba(0, 0, 0, 0.75);
+  position: relative;
   max-width: calc(100% - 20px);
   max-height: 320px;
 }
 
+.message .thumbnail.loading::after {
+  content: "";
+  background: rgba(0, 0, 0, 0.75)
+              url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
+              no-repeat center center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
 .message .thumbnail img {
   width: auto;
   max-width: 100%;

app/Server/Data/Aggregations/DownloadStatusStatistics.cs

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

app/Server/Data/Download.cs

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

app/Server/Data/DownloadStatus.cs

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

app/Server/Data/DownloadedAttachment.cs

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

app/Server/Data/Embeds/DiscordEmbedJson.cs

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

app/Server/Data/Embeds/DiscordEmbedJsonContext.cs

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

app/Server/Data/Filters/AttachmentFilter.cs

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

app/Server/Data/Filters/DownloadItemFilter.cs

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

app/Server/Data/Message.cs

@@ -10,7 +10,7 @@ public readonly struct Message {
 	public long Timestamp { get; init; }
 	public long? EditTimestamp { get; init; }
 	public ulong? RepliedToId { get; init; }
-	public ImmutableList<Attachment> Attachments { get; init; }
-	public ImmutableList<Embed> Embeds { get; init; }
-	public ImmutableList<Reaction> Reactions { get; init; }
+	public ImmutableArray<Attachment> Attachments { get; init; }
+	public ImmutableArray<Embed> Embeds { get; init; }
+	public ImmutableArray<Reaction> Reactions { get; init; }
 }

app/Server/Database/DatabaseExtensions.cs

@@ -1,34 +1,29 @@
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using DHT.Server.Data;
 
 namespace DHT.Server.Database;
 
 public static class DatabaseExtensions {
-	public static async Task AddFrom(this IDatabaseFile target, IDatabaseFile source) {
-		await target.Users.Add(await source.Users.Get().ToListAsync());
-		await target.Servers.Add(await source.Servers.Get().ToListAsync());
-		await target.Channels.Add(await source.Channels.Get().ToListAsync());
+	public static void AddFrom(this IDatabaseFile target, IDatabaseFile source) {
+		target.AddServers(source.GetAllServers());
+		target.AddChannels(source.GetAllChannels());
+		target.AddUsers(source.GetAllUsers().ToArray());
+		target.AddMessages(source.GetMessages().ToArray());
 
-		const int MessageBatchSize = 100;
-		List<Message> batchedMessages = new (MessageBatchSize);
-		
-		await foreach (var message in source.Messages.Get()) {
-			batchedMessages.Add(message);
-
-			if (batchedMessages.Count >= MessageBatchSize) {
-				await target.Messages.Add(batchedMessages);
-				batchedMessages.Clear();
+		foreach (var download in source.GetDownloadsWithoutData()) {
+			target.AddDownload(download.Status == DownloadStatus.Success ? source.GetDownloadWithData(download) : download);
 		}
 	}
 
-		await target.Messages.Add(batchedMessages);
-
-		await foreach (var download in source.Downloads.Get()) {
-			if (download.Status != DownloadStatus.Success || !await source.Downloads.GetDownloadData(download.NormalizedUrl, stream => target.Downloads.AddDownload(download, stream))) {
-				await target.Downloads.AddDownload(download, stream: null);
+	internal static void AddServers(this IDatabaseFile target, IEnumerable<Data.Server> servers) {
+		foreach (var server in servers) {
+			target.AddServer(server);
 		}
 	}
+
+	internal static void AddChannels(this IDatabaseFile target, IEnumerable<Channel> channels) {
+		foreach (var channel in channels) {
+			target.AddChannel(channel);
+		}
 	}
 }

app/Server/Database/DatabaseStatistics.cs

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

app/Server/Database/DatabaseStatisticsSnapshot.cs

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

app/Server/Database/DummyDatabaseFile.cs

@@ -1,28 +1,90 @@
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
-using DHT.Server.Database.Repositories;
+using DHT.Server.Data;
+using DHT.Server.Data.Aggregations;
+using DHT.Server.Data.Filters;
+using DHT.Server.Download;
 
 namespace DHT.Server.Database;
 
 [SuppressMessage("ReSharper", "ArrangeObjectCreationWhenTypeNotEvident")]
-sealed class DummyDatabaseFile : IDatabaseFile {
-	public static DummyDatabaseFile Instance { get; } = new ();
+public sealed class DummyDatabaseFile : IDatabaseFile {
+	public static DummyDatabaseFile Instance { get; } = new();
 
 	public string Path => "";
-	
-	public IUserRepository Users { get; } = new IUserRepository.Dummy();
-	public IServerRepository Servers { get; } = new IServerRepository.Dummy();
-	public IChannelRepository Channels { get; } = new IChannelRepository.Dummy();
-	public IMessageRepository Messages { get; } = new IMessageRepository.Dummy();
-	public IDownloadRepository Downloads { get; } = new IDownloadRepository.Dummy();
+	public DatabaseStatistics Statistics { get; } = new();
 
 	private DummyDatabaseFile() {}
 
-	public Task Vacuum() {
-		return Task.CompletedTask;
+	public DatabaseStatisticsSnapshot SnapshotStatistics() {
+		return new();
 	}
 
-	public ValueTask DisposeAsync() {
-		return ValueTask.CompletedTask;
+	public void AddServer(Data.Server server) {}
+
+	public List<Data.Server> GetAllServers() {
+		return new();
 	}
+
+	public void AddChannel(Channel channel) {}
+
+	public List<Channel> GetAllChannels() {
+		return new();
+	}
+
+	public void AddUsers(User[] users) {}
+
+	public List<User> GetAllUsers() {
+		return new();
+	}
+
+	public void AddMessages(Message[] messages) {}
+
+	public int CountMessages(MessageFilter? filter = null) {
+		return 0;
+	}
+
+	public List<Message> GetMessages(MessageFilter? filter = null, bool includeText = true) {
+		return new();
+	}
+
+	public HashSet<ulong> GetMessageIds(MessageFilter? filter = null) {
+		return new();
+	}
+
+	public void RemoveMessages(MessageFilter filter, FilterRemovalMode mode) {}
+
+	public int CountAttachments(AttachmentFilter? filter = null) {
+		return new();
+	}
+
+	public List<Data.Download> GetDownloadsWithoutData() {
+		return new();
+	}
+
+	public Data.Download GetDownloadWithData(Data.Download download) {
+		return download;
+	}
+
+	public DownloadedAttachment? GetDownloadedAttachment(string url) {
+		return null;
+	}
+
+	public void AddDownload(Data.Download download) {}
+
+	public void EnqueueDownloadItems(AttachmentFilter? filter = null) {}
+
+	public List<DownloadItem> GetEnqueuedDownloadItems(int count) {
+		return new();
+	}
+
+	public void RemoveDownloadItems(DownloadItemFilter? filter, FilterRemovalMode mode) {}
+
+	public DownloadStatusStatistics GetDownloadStatusStatistics() {
+		return new();
+	}
+
+	public void Vacuum() {}
+
+	public void Dispose() {}
 }

app/Server/Database/Exceptions/DatabaseTooNewException.cs

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

app/Server/Database/Export/Snowflake.cs

@@ -1,5 +1,3 @@
 namespace DHT.Server.Database.Export; 
 
-readonly record struct Snowflake(ulong Id) {
-	public static implicit operator Snowflake(ulong id) => new (id);
-}
+readonly record struct Snowflake(ulong Id);

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

@@ -0,0 +1,9 @@
+using DHT.Server.Data;
+
+namespace DHT.Server.Database.Export.Strategy;
+
+public interface IViewerExportStrategy {
+	bool IncludeMessageText { get; }
+	string ProcessViewerTemplate(string template);
+	string GetAttachmentUrl(Attachment attachment);
+}

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

@@ -0,0 +1,25 @@
+using System.Net;
+using DHT.Server.Data;
+
+namespace DHT.Server.Database.Export.Strategy;
+
+public sealed class LiveViewerExportStrategy : IViewerExportStrategy {
+	private readonly string safePort;
+	private readonly string safeToken;
+
+	public LiveViewerExportStrategy(ushort port, string token) {
+		this.safePort = port.ToString();
+		this.safeToken = WebUtility.UrlEncode(token);
+	}
+
+	public bool IncludeMessageText => false;
+
+	public string ProcessViewerTemplate(string template) {
+		return template.Replace("/*[SERVER_URL]*/", "http://127.0.0.1:" + safePort)
+		               .Replace("/*[SERVER_TOKEN]*/", WebUtility.UrlEncode(safeToken));
+	}
+
+	public string GetAttachmentUrl(Attachment attachment) {
+		return "http://127.0.0.1:" + safePort + "/get-attachment/" + WebUtility.UrlEncode(attachment.NormalizedUrl) + "?token=" + safeToken;
+	}
+}

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

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

app/Server/Database/Export/ViewerJson.cs

@@ -3,10 +3,14 @@ using System.Text.Json.Serialization;
 
 namespace DHT.Server.Database.Export;
 
-static class ViewerJson {
+sealed class ViewerJson {
+	public required JsonMeta Meta { get; init; }
+	public required Dictionary<Snowflake, Dictionary<Snowflake, JsonMessage>> Data { get; init; }
+
 	public sealed class JsonMeta {
 		public required Dictionary<Snowflake, JsonUser> Users { get; init; }
-		public required Dictionary<Snowflake, JsonServer> Servers { get; init; }
+		public required List<Snowflake> Userindex { get; init; }
+		public required List<JsonServer> Servers { get; init; }
 		public required Dictionary<Snowflake, JsonChannel> Channels { get; init; }
 	}
 	
@@ -26,7 +30,7 @@ static class ViewerJson {
 	}
 
 	public sealed class JsonChannel {
-		public required Snowflake Server { get; init; }
+		public required int Server { get; init; }
 		public required string Name { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -43,9 +47,7 @@ static class ViewerJson {
 	}
 
 	public sealed class JsonMessage {
-		public required Snowflake Id { get; init; }
-		public required Snowflake C { get; init; }
-		public required Snowflake U { get; init; }
+		public required int U { get; init; }
 		public required long T { get; init; }
 
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]

app/Server/Database/Export/ViewerJsonContext.cs

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

app/Server/Database/Export/ViewerJsonExport.cs

@@ -2,71 +2,80 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
+using DHT.Server.Database.Export.Strategy;
 using DHT.Utils.Logging;
 
 namespace DHT.Server.Database.Export;
 
-static class ViewerJsonExport {
+public 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) {
+	public static async Task Generate(Stream stream, IViewerExportStrategy strategy, IDatabaseFile db, MessageFilter? filter = null) {
 		var perf = Log.Start();
 
-		var includedChannels = new List<Channel>();
+		var includedUserIds = new HashSet<ulong>();
+		var includedChannelIds = new HashSet<ulong>();
 		var includedServerIds = new HashSet<ulong>();
 
-		var channelIdFilter = filter?.ChannelIds;
+		var includedMessages = db.GetMessages(filter, strategy.IncludeMessageText);
+		var includedChannels = new List<Channel>();
 
-		await foreach (var channel in db.Channels.Get(cancellationToken)) {
-			if (channelIdFilter == null || channelIdFilter.Contains(channel.Id)) {
+		foreach (var message in includedMessages) {
+			includedUserIds.Add(message.Sender);
+			includedChannelIds.Add(message.Channel);
+		}
+
+		foreach (var channel in db.GetAllChannels()) {
+			if (includedChannelIds.Contains(channel.Id)) {
 				includedChannels.Add(channel);
 				includedServerIds.Add(channel.Server);
 			}
 		}
 
-		var users = await GenerateUserList(db, cancellationToken);
-		var servers = await GenerateServerList(db, includedServerIds, cancellationToken);
-		var channels = GenerateChannelList(includedChannels);
-
-		var meta = new ViewerJson.JsonMeta {
-			Users = users,
-			Servers = servers,
-			Channels = channels
-		};
+		var users = GenerateUserList(db, includedUserIds, out var userindex, out var userIndices);
+		var servers = GenerateServerList(db, includedServerIds, out var serverindex);
+		var channels = GenerateChannelList(includedChannels, serverindex);
 
 		perf.Step("Collect database data");
 
-		await JsonSerializer.SerializeAsync(stream, meta, ViewerJsonMetadataContext.Default.JsonMeta, cancellationToken);
+		var value = new ViewerJson {
+			Meta = new ViewerJson.JsonMeta {
+				Users = users,
+				Userindex = userindex,
+				Servers = servers,
+				Channels = channels
+			},
+			Data = GenerateMessageList(includedMessages, userIndices, strategy)
+		};
+
+		perf.Step("Generate value object");
+
+		await JsonSerializer.SerializeAsync(stream, value, ViewerJsonContext.Default.ViewerJson);
 
 		perf.Step("Serialize to JSON");
 		perf.End();
 	}
 
-	public static async Task GetMessages(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
-		var perf = Log.Start();
-
-		ReadOnlyMemory<byte> newLine = "\n"u8.ToArray();
-		
-		await foreach(var message in GenerateMessageList(db, filter, cancellationToken)) {
-			await JsonSerializer.SerializeAsync(stream, message, ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
-			await stream.WriteAsync(newLine, cancellationToken);
-		}
-
-		perf.Step("Generate and serialize messages to JSON");
-		perf.End();
-	}
-
-	private static async Task<Dictionary<Snowflake, ViewerJson.JsonUser>> GenerateUserList(IDatabaseFile db, CancellationToken cancellationToken) {
+	private static Dictionary<Snowflake, ViewerJson.JsonUser> GenerateUserList(IDatabaseFile db, HashSet<ulong> userIds, out List<Snowflake> userindex, out Dictionary<ulong, int> userIndices) {
 		var users = new Dictionary<Snowflake, ViewerJson.JsonUser>();
+		userindex = new List<Snowflake>();
+		userIndices = new Dictionary<ulong, int>();
 
-		await foreach (var user in db.Users.Get(cancellationToken)) {
-			users[user.Id] = new ViewerJson.JsonUser {
+		foreach (var user in db.GetAllUsers()) {
+			var id = user.Id;
+			if (!userIds.Contains(id)) {
+				continue;
+			}
+
+			var idSnowflake = new Snowflake(id);
+			userIndices[id] = users.Count;
+			userindex.Add(idSnowflake);
+			
+			users[idSnowflake] = new ViewerJson.JsonUser {
 				Name = user.Name,
 				Avatar = user.AvatarUrl,
 				Tag = user.Discriminator
@@ -76,29 +85,35 @@ static class ViewerJsonExport {
 		return users;
 	}
 
-	private static async Task<Dictionary<Snowflake, ViewerJson.JsonServer>> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, CancellationToken cancellationToken) {
-		var servers = new Dictionary<Snowflake, ViewerJson.JsonServer>();
+	private static List<ViewerJson.JsonServer> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, out Dictionary<ulong, int> serverIndices) {
+		var servers = new List<ViewerJson.JsonServer>();
+		serverIndices = new Dictionary<ulong, int>();
 
-		await foreach (var server in db.Servers.Get(cancellationToken)) {
-			if (!serverIds.Contains(server.Id)) {
+		foreach (var server in db.GetAllServers()) {
+			var id = server.Id;
+			if (!serverIds.Contains(id)) {
 				continue;
 			}
 
-			servers[server.Id] = new ViewerJson.JsonServer {
+			serverIndices[id] = servers.Count;
+			
+			servers.Add(new ViewerJson.JsonServer {
 				Name = server.Name,
 				Type = ServerTypes.ToJsonViewerString(server.Type)
-			};
+			});
 		}
 
 		return servers;
 	}
 
-	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels) {
+	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels, Dictionary<ulong, int> serverIndices) {
 		var channels = new Dictionary<Snowflake, ViewerJson.JsonChannel>();
 
 		foreach (var channel in includedChannels) {
-			channels[channel.Id] = new ViewerJson.JsonChannel {
-				Server = channel.Server,
+			var channelIdSnowflake = new Snowflake(channel.Id);
+			
+			channels[channelIdSnowflake] = new ViewerJson.JsonChannel {
+				Server = serverIndices[channel.Server],
 				Name = channel.Name,
 				Parent = channel.ParentId?.ToString(),
 				Position = channel.Position,
@@ -110,20 +125,26 @@ static class ViewerJsonExport {
 		return channels;
 	}
 
-	private static async IAsyncEnumerable<ViewerJson.JsonMessage> GenerateMessageList(IDatabaseFile db, MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
-		await foreach (var message in db.Messages.Get(filter, cancellationToken)) {
-			yield return new ViewerJson.JsonMessage {
-				Id = message.Id,
-				C = message.Channel,
-				U = message.Sender,
+	private static Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>> GenerateMessageList(List<Message> includedMessages, Dictionary<ulong, int> userIndices, IViewerExportStrategy strategy) {
+		var data = new Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>>();
+
+		foreach (var grouping in includedMessages.GroupBy(static message => message.Channel)) {
+			var channelIdSnowflake = new Snowflake(grouping.Key);
+			var channelData = new Dictionary<Snowflake, ViewerJson.JsonMessage>();
+
+			foreach (var message in grouping) {
+				var messageIdSnowflake = new Snowflake(message.Id);
+				
+				channelData[messageIdSnowflake] = new ViewerJson.JsonMessage {
+					U = userIndices[message.Sender],
 					T = message.Timestamp,
 					M = string.IsNullOrEmpty(message.Text) ? null : message.Text,
 					Te = message.EditTimestamp,
 					R = message.RepliedToId?.ToString(),
 					
-				A = message.Attachments.IsEmpty ? null : message.Attachments.Select(static attachment => {
+					A = message.Attachments.IsEmpty ? null : message.Attachments.Select(attachment => {
 						var a = new ViewerJson.JsonMessageAttachment {
-						Url = attachment.DownloadUrl,
+							Url = strategy.GetAttachmentUrl(attachment),
 							Name = Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl
 						};
 
@@ -145,5 +166,10 @@ static class ViewerJsonExport {
 					}).ToArray()
 				};
 			}
+
+			data[channelIdSnowflake] = channelData;
+		}
+
+		return data;
 	}
 }

app/Server/Database/Export/ViewerJsonMessageContext.cs

@@ -1,11 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace DHT.Server.Database.Export;
-
-[JsonSourceGenerationOptions(
-	Converters = [typeof(SnowflakeJsonSerializer)],
-	PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
-	GenerationMode = JsonSourceGenerationMode.Default
-)]
-[JsonSerializable(typeof(ViewerJson.JsonMessage))]
-sealed partial class ViewerJsonMessageContext : JsonSerializerContext;

app/Server/Database/IDatabaseFile.cs

@@ -1,17 +1,43 @@
 using System;
-using System.Threading.Tasks;
-using DHT.Server.Database.Repositories;
+using System.Collections.Generic;
+using DHT.Server.Data;
+using DHT.Server.Data.Aggregations;
+using DHT.Server.Data.Filters;
+using DHT.Server.Download;
 
 namespace DHT.Server.Database;
 
-public interface IDatabaseFile : IAsyncDisposable {
+public interface IDatabaseFile : IDisposable {
 	string Path { get; }
+	DatabaseStatistics Statistics { get; }
+	DatabaseStatisticsSnapshot SnapshotStatistics();
 
-	IUserRepository Users { get; }
-	IServerRepository Servers { get; }
-	IChannelRepository Channels { get; }
-	IMessageRepository Messages { get; }
-	IDownloadRepository Downloads { get; }
+	void AddServer(Data.Server server);
+	List<Data.Server> GetAllServers();
 
-	Task Vacuum();
+	void AddChannel(Channel channel);
+	List<Channel> GetAllChannels();
+
+	void AddUsers(User[] users);
+	List<User> GetAllUsers();
+
+	void AddMessages(Message[] messages);
+	int CountMessages(MessageFilter? filter = null);
+	List<Message> GetMessages(MessageFilter? filter = null, bool includeText = true);
+	HashSet<ulong> GetMessageIds(MessageFilter? filter = null);
+	void RemoveMessages(MessageFilter filter, FilterRemovalMode mode);
+
+	int CountAttachments(AttachmentFilter? filter = null);
+
+	void AddDownload(Data.Download download);
+	List<Data.Download> GetDownloadsWithoutData();
+	Data.Download GetDownloadWithData(Data.Download download);
+	DownloadedAttachment? GetDownloadedAttachment(string url);
+
+	void EnqueueDownloadItems(AttachmentFilter? filter = null);
+	List<DownloadItem> GetEnqueuedDownloadItems(int count);
+	void RemoveDownloadItems(DownloadItemFilter? filter, FilterRemovalMode mode);
+	DownloadStatusStatistics GetDownloadStatusStatistics();
+
+	void Vacuum();
 }

app/Server/Database/Import/DiscordEmbedLegacyJsonContext.cs

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

app/Server/Database/Import/LegacyArchiveImport.cs

@@ -33,8 +33,10 @@ public static class LegacyArchiveImport {
 			var 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);
-			var oldChannelsById = await db.Channels.Get().ToDictionaryAsync(static channel => channel.Id, static channel => channel);
+			var oldServersById = db.GetAllServers().ToDictionary(static server => server.Id, static server => server);
+
+			var oldChannels = db.GetAllChannels();
+			var oldChannelsById = oldChannels.ToDictionary(static channel => channel.Id, static channel => channel);
 
 			foreach (var (channelId, serverIndex) in ReadChannelToServerIndexMapping(meta, servers)) {
 				if (oldChannelsById.TryGetValue(channelId, out var oldChannel) && oldServersById.TryGetValue(oldChannel.Server, out var oldServer) && newServersOnly.Remove(servers[serverIndex])) {
@@ -64,17 +66,17 @@ public static class LegacyArchiveImport {
 
 			perf.Step("Read channel list");
 
-			var oldMessageIds = await db.Messages.GetIds().ToHashSetAsync();
+			var oldMessageIds = db.GetMessageIds();
 			var newMessages = channels.SelectMany(channel => ReadMessages(data, channel, users, fakeSnowflake))
 			                          .Where(message => !oldMessageIds.Contains(message.Id))
 			                          .ToArray();
 
 			perf.Step("Read messages");
 
-			await db.Users.Add(users);
-			await db.Servers.Add(servers);
-			await db.Channels.Add(channels);
-			await db.Messages.Add(newMessages);
+			db.AddUsers(users);
+			db.AddServers(servers);
+			db.AddChannels(channels);
+			db.AddMessages(newMessages);
 
 			perf.Step("Import into database");
 		} catch (HttpException e) {
@@ -161,7 +163,7 @@ public static class LegacyArchiveImport {
 
 		var messagesObj = data.HasKey(channelIdStr) ? data.RequireObject(channelIdStr, DataPath) : (JsonElement?) null;
 		if (messagesObj == null) {
-			return [];
+			return Array.Empty<Message>();
 		}
 
 		return messagesObj.Value.EnumerateObject().Select(item => {
@@ -177,9 +179,9 @@ public static class LegacyArchiveImport {
 				Timestamp = messageObj.RequireLong("t", path),
 				EditTimestamp = messageObj.HasKey("te") ? messageObj.RequireLong("te", path) : null,
 				RepliedToId = messageObj.HasKey("r") ? messageObj.RequireSnowflake("r", path) : null,
-				Attachments = messageObj.HasKey("a") ? ReadMessageAttachments(messageObj.RequireArray("a", path), fakeSnowflake, path + ".a[]").ToImmutableList() : ImmutableList<Attachment>.Empty,
-				Embeds = messageObj.HasKey("e") ? ReadMessageEmbeds(messageObj.RequireArray("e", path), path + ".e[]").ToImmutableList() : ImmutableList<Embed>.Empty,
-				Reactions = messageObj.HasKey("re") ? ReadMessageReactions(messageObj.RequireArray("re", path), path + ".re[]").ToImmutableList() : ImmutableList<Reaction>.Empty,
+				Attachments = messageObj.HasKey("a") ? ReadMessageAttachments(messageObj.RequireArray("a", path), fakeSnowflake, path + ".a[]").ToImmutableArray() : ImmutableArray<Attachment>.Empty,
+				Embeds = messageObj.HasKey("e") ? ReadMessageEmbeds(messageObj.RequireArray("e", path), path + ".e[]").ToImmutableArray() : ImmutableArray<Embed>.Empty,
+				Reactions = messageObj.HasKey("re") ? ReadMessageReactions(messageObj.RequireArray("re", path), path + ".re[]").ToImmutableArray() : ImmutableArray<Reaction>.Empty,
 			};
 		}).ToArray();
 	}

app/Server/Database/Repositories/IChannelRepository.cs

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

app/Server/Database/Repositories/IDownloadRepository.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using DHT.Server.Data.Aggregations;
-using DHT.Server.Data.Filters;
-using DHT.Server.Download;
-
-namespace DHT.Server.Database.Repositories;
-
-public interface IDownloadRepository {
-	IObservable<long> TotalCount { get; }
-
-	Task AddDownload(Data.Download item, Stream? stream);
-
-	Task<long> Count(DownloadItemFilter filter, CancellationToken cancellationToken = default);
-	
-	Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken = default);
-	
-	IAsyncEnumerable<Data.Download> Get();
-
-	Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor);
-	
-	Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken = default);
-
-	IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, CancellationToken cancellationToken = default);
-	
-	Task MoveDownloadingItemsBackToQueue(CancellationToken cancellationToken = default);
-	
-	Task<int> RetryFailed(CancellationToken cancellationToken = default);
-
-	internal sealed class Dummy : IDownloadRepository {
-		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
-
-		public Task AddDownload(Data.Download item, Stream? stream) {
-			return Task.CompletedTask;
-		}
-
-		public Task<long> Count(DownloadItemFilter filter, CancellationToken cancellationToken) {
-			return Task.FromResult(0L);
-		}
-
-		public Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken) {
-			return Task.FromResult(new DownloadStatusStatistics());
-		}
-
-		public IAsyncEnumerable<Data.Download> Get() {
-			return AsyncEnumerable.Empty<Data.Download>();
-		}
-
-		public Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor) {
-			return Task.FromResult(false);
-		}
-
-		public Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken) {
-			return Task.FromResult(false);
-		}
-
-		public IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, CancellationToken cancellationToken) {
-			return AsyncEnumerable.Empty<DownloadItem>();
-		}
-
-		public Task MoveDownloadingItemsBackToQueue(CancellationToken cancellationToken) {
-			return Task.CompletedTask;
-		}
-
-		public Task<int> RetryFailed(CancellationToken cancellationToken) {
-			return Task.FromResult(0);
-		}
-	}
-}

app/Server/Database/Repositories/IMessageRepository.cs

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

app/Server/Database/Repositories/IServerRepository.cs

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

app/Server/Database/Repositories/IUserRepository.cs

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

app/Server/Database/Sqlite/ISchemaUpgradeCallbacks.cs

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

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

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

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

@@ -1,76 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using DHT.Server.Data;
-using DHT.Server.Database.Repositories;
-using DHT.Server.Database.Sqlite.Utils;
-using DHT.Utils.Logging;
-using Microsoft.Data.Sqlite;
-
-namespace DHT.Server.Database.Sqlite.Repositories;
-
-sealed class SqliteChannelRepository : BaseSqliteRepository, IChannelRepository {
-	private static readonly Log Log = Log.ForType<SqliteChannelRepository>();
-	
-	private readonly SqliteConnectionPool pool;
-
-	public SqliteChannelRepository(SqliteConnectionPool pool) : base(Log) {
-		this.pool = pool;
-	}
-
-	public async Task Add(IReadOnlyList<Channel> channels) {
-		await using (var conn = await pool.Take()) {
-			await conn.BeginTransactionAsync();
-			
-			await using var cmd = conn.Upsert("channels", [
-				("id", SqliteType.Integer),
-				("server", SqliteType.Integer),
-				("name", SqliteType.Text),
-				("parent_id", SqliteType.Integer),
-				("position", SqliteType.Integer),
-				("topic", SqliteType.Text),
-				("nsfw", SqliteType.Integer)
-			]);
-
-			foreach (var channel in channels) {
-				cmd.Set(":id", channel.Id);
-				cmd.Set(":server", channel.Server);
-				cmd.Set(":name", channel.Name);
-				cmd.Set(":parent_id", channel.ParentId);
-				cmd.Set(":position", channel.Position);
-				cmd.Set(":topic", channel.Topic);
-				cmd.Set(":nsfw", channel.Nsfw);
-				await cmd.ExecuteNonQueryAsync();
-			}
-
-			await conn.CommitTransactionAsync();
-		}
-
-		UpdateTotalCount();
-	}
-
-	public override async Task<long> Count(CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM channels", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
-	}
-
-	public async IAsyncEnumerable<Channel> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-
-		await using var cmd = conn.Command("SELECT id, server, name, parent_id, position, topic, nsfw FROM channels");
-		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-
-		while (await reader.ReadAsync(cancellationToken)) {
-			yield return new Channel {
-				Id = reader.GetUint64(0),
-				Server = reader.GetUint64(1),
-				Name = reader.GetString(2),
-				ParentId = reader.IsDBNull(3) ? null : reader.GetUint64(3),
-				Position = reader.IsDBNull(4) ? null : reader.GetInt32(4),
-				Topic = reader.IsDBNull(5) ? null : reader.GetString(5),
-				Nsfw = reader.IsDBNull(6) ? null : reader.GetBoolean(6),
-			};
-		}
-	}
-}

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

@@ -1,313 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using DHT.Server.Data;
-using DHT.Server.Data.Aggregations;
-using DHT.Server.Data.Filters;
-using DHT.Server.Database.Repositories;
-using DHT.Server.Database.Sqlite.Utils;
-using DHT.Server.Download;
-using DHT.Utils.Logging;
-using Microsoft.Data.Sqlite;
-
-namespace DHT.Server.Database.Sqlite.Repositories;
-
-sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRepository(Log), IDownloadRepository {
-	private static readonly Log Log = Log.ForType<SqliteDownloadRepository>();
-
-	internal sealed class NewDownloadCollector : IAsyncDisposable {
-		private readonly SqliteDownloadRepository repository;
-		private bool hasAdded = false;
-
-		private readonly SqliteCommand metadataCmd;
-
-		public NewDownloadCollector(SqliteDownloadRepository repository, ISqliteConnection conn) {
-			this.repository = repository;
-
-			metadataCmd = conn.Command(
-				"""
-				INSERT INTO download_metadata (normalized_url, download_url, status, type, size)
-				VALUES (:normalized_url, :download_url, :status, :type, :size)
-				ON CONFLICT DO NOTHING
-				"""
-			);
-			metadataCmd.Add(":normalized_url", SqliteType.Text);
-			metadataCmd.Add(":download_url", SqliteType.Text);
-			metadataCmd.Add(":status", SqliteType.Integer);
-			metadataCmd.Add(":type", SqliteType.Text);
-			metadataCmd.Add(":size", SqliteType.Integer);
-		}
-
-		public async Task Add(Data.Download download) {
-			metadataCmd.Set(":normalized_url", download.NormalizedUrl);
-			metadataCmd.Set(":download_url", download.DownloadUrl);
-			metadataCmd.Set(":status", (int) download.Status);
-			metadataCmd.Set(":type", download.Type);
-			metadataCmd.Set(":size", download.Size);
-			hasAdded |= await metadataCmd.ExecuteNonQueryAsync() > 0;
-		}
-
-		public void OnCommitted() {
-			if (hasAdded) {
-				repository.UpdateTotalCount();
-			}
-		}
-
-		public async ValueTask DisposeAsync() {
-			await metadataCmd.DisposeAsync();
-		}
-	}
-
-	public async Task AddDownload(Data.Download item, Stream? stream) {
-		await using (var conn = await pool.Take()) {
-			await conn.BeginTransactionAsync();
-			
-			await using var metadataCmd = conn.Upsert("download_metadata", [
-				("normalized_url", SqliteType.Text),
-				("download_url", SqliteType.Text),
-				("status", SqliteType.Integer),
-				("type", SqliteType.Text),
-				("size", SqliteType.Integer),
-			]);
-
-			metadataCmd.Set(":normalized_url", item.NormalizedUrl);
-			metadataCmd.Set(":download_url", item.DownloadUrl);
-			metadataCmd.Set(":status", (int) item.Status);
-			metadataCmd.Set(":type", item.Type);
-			metadataCmd.Set(":size", item.Size);
-			await metadataCmd.ExecuteNonQueryAsync();
-
-			if (stream == null) {
-				await using var deleteBlobCmd = conn.Command("DELETE FROM download_blobs WHERE normalized_url = :normalized_url");
-				deleteBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, item.NormalizedUrl);
-				await deleteBlobCmd.ExecuteNonQueryAsync();
-			}
-			else {
-				await using var upsertBlobCmd = conn.Command(
-					"""
-					INSERT INTO download_blobs (normalized_url, blob)
-					VALUES (:normalized_url, ZEROBLOB(:blob_length))
-					ON CONFLICT (normalized_url) DO UPDATE SET blob = excluded.blob
-					RETURNING rowid
-					"""
-				);
-				
-				upsertBlobCmd.AddAndSet(":normalized_url", SqliteType.Text, item.NormalizedUrl);
-				upsertBlobCmd.AddAndSet(":blob_length", SqliteType.Integer, item.Size);
-				long rowid = await upsertBlobCmd.ExecuteLongScalarAsync();
-
-				await using var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid);
-				await stream.CopyToAsync(blob);
-			}
-
-			await conn.CommitTransactionAsync();
-		}
-
-		UpdateTotalCount();
-	}
-
-	public override Task<long> Count(CancellationToken cancellationToken) {
-		return Count(filter: null, cancellationToken);
-	}
-
-	public async Task<long> Count(DownloadItemFilter? filter, CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM download_metadata" + filter.GenerateConditions().BuildWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
-	}
-
-	public async Task<DownloadStatusStatistics> GetStatistics(DownloadItemFilter nonSkippedFilter, CancellationToken cancellationToken) {
-		nonSkippedFilter.IncludeStatuses = null;
-		nonSkippedFilter.ExcludeStatuses = null;
-		string nonSkippedFilterConditions = nonSkippedFilter.GenerateConditions().Build();
-
-		await using var conn = await pool.Take();
-
-		await using var cmd = conn.Command(
-			$"""
-			 SELECT
-			 IFNULL(SUM(CASE WHEN (status = :downloading) OR (status = :pending AND {nonSkippedFilterConditions}) THEN 1 ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN (status = :downloading) OR (status = :pending AND {nonSkippedFilterConditions}) THEN IFNULL(size, 0) ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN ((status = :downloading) OR (status = :pending AND {nonSkippedFilterConditions})) AND size IS NULL THEN 1 ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status = :success THEN 1 ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status = :success THEN IFNULL(size, 0) ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status = :success AND size IS NULL THEN 1 ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status NOT IN (:pending, :downloading, :success) THEN 1 ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status NOT IN (:pending, :downloading, :success) THEN IFNULL(size, 0) ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status NOT IN (:pending, :downloading, :success) AND size IS NULL THEN 1 ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status = :pending AND NOT ({nonSkippedFilterConditions}) THEN 1 ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status = :pending AND NOT ({nonSkippedFilterConditions}) THEN IFNULL(size, 0) ELSE 0 END), 0),
-			 IFNULL(SUM(CASE WHEN status = :pending AND NOT ({nonSkippedFilterConditions}) AND size IS NULL THEN 1 ELSE 0 END), 0)
-			 FROM download_metadata
-			 """
-		);
-
-		cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
-		cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
-		cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
-
-		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-
-		if (!await reader.ReadAsync(cancellationToken)) {
-			return new DownloadStatusStatistics();
-		}
-
-		return new DownloadStatusStatistics {
-			PendingCount = reader.GetInt32(0),
-			PendingTotalSize = reader.GetUint64(1),
-			PendingWithUnknownSizeCount = reader.GetInt32(2),
-			SuccessfulCount = reader.GetInt32(3),
-			SuccessfulTotalSize = reader.GetUint64(4),
-			SuccessfulWithUnknownSizeCount = reader.GetInt32(5),
-			FailedCount = reader.GetInt32(6),
-			FailedTotalSize = reader.GetUint64(7),
-			FailedWithUnknownSizeCount = reader.GetInt32(8),
-			SkippedCount = reader.GetInt32(9),
-			SkippedTotalSize = reader.GetUint64(10),
-			SkippedWithUnknownSizeCount = reader.GetInt32(11)
-		};
-	}
-
-	public async IAsyncEnumerable<Data.Download> Get() {
-		await using var conn = await pool.Take();
-
-		await using var cmd = conn.Command("SELECT normalized_url, download_url, status, type, size FROM download_metadata");
-		await using var reader = await cmd.ExecuteReaderAsync();
-
-		while (await reader.ReadAsync()) {
-			string normalizedUrl = reader.GetString(0);
-			string downloadUrl = reader.GetString(1);
-			var status = (DownloadStatus) reader.GetInt32(2);
-			string? type = reader.IsDBNull(3) ? null : reader.GetString(3);
-			ulong? size = reader.IsDBNull(4) ? null : reader.GetUint64(4);
-
-			yield return new Data.Download(normalizedUrl, downloadUrl, status, type, size);
-		}
-	}
-
-	public async Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor) {
-		await using var conn = await pool.Take();
-
-		await using var cmd = conn.Command("SELECT rowid FROM download_blobs WHERE normalized_url = :normalized_url");
-		cmd.AddAndSet(":normalized_url", SqliteType.Text, normalizedUrl);
-		
-		long rowid;
-		
-		await using (var reader = await cmd.ExecuteReaderAsync()) {
-			if (!await reader.ReadAsync()) {
-				return false;
-			}
-
-			rowid = reader.GetInt64(0);
-		}
-		
-		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
-			await dataProcessor(blob);
-		}
-
-		return true;
-	}
-
-	public async Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-
-		await using var cmd = conn.Command(
-			"""
-			SELECT dm.download_url, dm.type, db.rowid FROM download_metadata dm
-			JOIN download_blobs db ON dm.normalized_url = db.normalized_url
-			WHERE dm.normalized_url = :normalized_url AND dm.status = :success IS NOT NULL
-			"""
-		);
-
-		cmd.AddAndSet(":normalized_url", SqliteType.Text, normalizedUrl);
-		cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
-
-		string downloadUrl;
-		string? type;
-		long rowid;
-		
-		await using (var reader = await cmd.ExecuteReaderAsync(cancellationToken)) {
-			if (!await reader.ReadAsync(cancellationToken)) {
-				return false;
-			}
-
-			downloadUrl = reader.GetString(0);
-			type = reader.IsDBNull(1) ? null : reader.GetString(1);
-			rowid = reader.GetInt64(2);
-		}
-		
-		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
-			await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob, cancellationToken);
-		}
-
-		return true;
-	}
-
-	public async IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
-		filter.IncludeStatuses = [DownloadStatus.Pending];
-		filter.ExcludeStatuses = null;
-
-		var found = new List<DownloadItem>();
-
-		await using var conn = await pool.Take();
-
-		var sql = $"""
-		           SELECT normalized_url, download_url, type, size
-		           FROM download_metadata
-		           {filter.GenerateConditions().BuildWhereClause()}
-		           LIMIT :limit
-		           """;
-
-		await using (var cmd = conn.Command(sql)) {
-			cmd.AddAndSet(":limit", SqliteType.Integer, Math.Max(0, count));
-
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-
-			while (await reader.ReadAsync(cancellationToken)) {
-				found.Add(new DownloadItem {
-					NormalizedUrl = reader.GetString(0),
-					DownloadUrl = reader.GetString(1),
-					Type = reader.IsDBNull(2) ? null : reader.GetString(2),
-					Size = reader.IsDBNull(3) ? null : reader.GetUint64(3)
-				});
-			}
-		}
-
-		if (found.Count != 0) {
-			await using var cmd = conn.Command("UPDATE download_metadata SET status = :downloading WHERE normalized_url = :normalized_url AND status = :pending");
-			cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
-			cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
-			cmd.Add(":normalized_url", SqliteType.Text);
-
-			foreach (var item in found) {
-				cmd.Set(":normalized_url", item.NormalizedUrl);
-
-				if (await cmd.ExecuteNonQueryAsync(cancellationToken) == 1) {
-					yield return item;
-				}
-			}
-		}
-	}
-
-	public async Task MoveDownloadingItemsBackToQueue(CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-
-		await using var cmd = conn.Command("UPDATE download_metadata SET status = :pending WHERE status = :downloading");
-		cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
-		cmd.AddAndSet(":downloading", SqliteType.Integer, (int) DownloadStatus.Downloading);
-		await cmd.ExecuteNonQueryAsync(cancellationToken);
-	}
-
-	public async Task<int> RetryFailed(CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-
-		await using var cmd = conn.Command("UPDATE download_metadata SET status = :pending WHERE status = :generic_error OR (status > :last_custom_code AND status != :success)");
-		cmd.AddAndSet(":pending", SqliteType.Integer, (int) DownloadStatus.Pending);
-		cmd.AddAndSet(":generic_error", SqliteType.Integer, (int) DownloadStatus.GenericError);
-		cmd.AddAndSet(":last_custom_code", SqliteType.Integer, (int) DownloadStatus.LastCustomCode);
-		cmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
-		return await cmd.ExecuteNonQueryAsync(cancellationToken);
-	}
-}

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

@@ -1,317 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using DHT.Server.Data;
-using DHT.Server.Data.Filters;
-using DHT.Server.Database.Repositories;
-using DHT.Server.Database.Sqlite.Utils;
-using DHT.Server.Download;
-using DHT.Utils.Logging;
-using Microsoft.Data.Sqlite;
-
-namespace DHT.Server.Database.Sqlite.Repositories;
-
-sealed class SqliteMessageRepository : BaseSqliteRepository, 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;
-		}
-
-		static SqliteCommand DeleteByMessageId(ISqliteConnection conn, string tableName) {
-			return conn.Delete(tableName, ("message_id", SqliteType.Integer));
-		}
-
-		static async Task ExecuteDeleteByMessageId(SqliteCommand cmd, object id) {
-			cmd.Set(":message_id", id);
-			await cmd.ExecuteNonQueryAsync();
-		}
-
-		await using (var conn = await pool.Take()) {
-			await conn.BeginTransactionAsync();
-
-			await using var messageCmd = conn.Upsert("messages", [
-				("message_id", SqliteType.Integer),
-				("sender_id", SqliteType.Integer),
-				("channel_id", SqliteType.Integer),
-				("text", SqliteType.Text),
-				("timestamp", SqliteType.Integer)
-			]);
-
-			await using var deleteEditTimestampCmd = DeleteByMessageId(conn, "edit_timestamps");
-			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),
-				("normalized_url", SqliteType.Text),
-				("download_url", SqliteType.Text),
-				("size", SqliteType.Integer),
-				("width", SqliteType.Integer),
-				("height", SqliteType.Integer)
-			]);
-
-			await using var embedCmd = conn.Insert("embeds", [
-				("message_id", SqliteType.Integer),
-				("json", SqliteType.Text)
-			]);
-
-			await using var reactionCmd = conn.Insert("reactions", [
-				("message_id", SqliteType.Integer),
-				("emoji_id", SqliteType.Integer),
-				("emoji_name", SqliteType.Text),
-				("emoji_flags", SqliteType.Integer),
-				("count", SqliteType.Integer)
-			]);
-			
-			await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
-
-			foreach (var message in messages) {
-				object messageId = message.Id;
-
-				messageCmd.Set(":message_id", messageId);
-				messageCmd.Set(":sender_id", message.Sender);
-				messageCmd.Set(":channel_id", message.Channel);
-				messageCmd.Set(":text", message.Text);
-				messageCmd.Set(":timestamp", message.Timestamp);
-				await messageCmd.ExecuteNonQueryAsync();
-
-				await ExecuteDeleteByMessageId(deleteEditTimestampCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteRepliedToCmd, messageId);
-
-				await ExecuteDeleteByMessageId(deleteAttachmentsCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteEmbedsCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteReactionsCmd, messageId);
-
-				if (message.EditTimestamp is {} timestamp) {
-					editTimestampCmd.Set(":message_id", messageId);
-					editTimestampCmd.Set(":edit_timestamp", timestamp);
-					await editTimestampCmd.ExecuteNonQueryAsync();
-				}
-
-				if (message.RepliedToId is {} repliedToId) {
-					repliedToCmd.Set(":message_id", messageId);
-					repliedToCmd.Set(":replied_to_id", repliedToId);
-					await repliedToCmd.ExecuteNonQueryAsync();
-				}
-
-				if (!message.Attachments.IsEmpty) {
-					foreach (var attachment in message.Attachments) {
-						attachmentCmd.Set(":message_id", messageId);
-						attachmentCmd.Set(":attachment_id", attachment.Id);
-						attachmentCmd.Set(":name", attachment.Name);
-						attachmentCmd.Set(":type", attachment.Type);
-						attachmentCmd.Set(":normalized_url", attachment.NormalizedUrl);
-						attachmentCmd.Set(":download_url", attachment.DownloadUrl);
-						attachmentCmd.Set(":size", attachment.Size);
-						attachmentCmd.Set(":width", attachment.Width);
-						attachmentCmd.Set(":height", attachment.Height);
-						await attachmentCmd.ExecuteNonQueryAsync();
-						
-						await downloadCollector.Add(DownloadLinkExtractor.FromAttachment(attachment));
-					}
-				}
-
-				if (!message.Embeds.IsEmpty) {
-					foreach (var embed in message.Embeds) {
-						embedCmd.Set(":message_id", messageId);
-						embedCmd.Set(":json", embed.Json);
-						await embedCmd.ExecuteNonQueryAsync();
-
-						if (DownloadLinkExtractor.TryFromEmbedJson(embed.Json) is {} download) {
-							await downloadCollector.Add(download);
-						}
-					}
-				}
-
-				if (!message.Reactions.IsEmpty) {
-					foreach (var reaction in message.Reactions) {
-						reactionCmd.Set(":message_id", messageId);
-						reactionCmd.Set(":emoji_id", reaction.EmojiId);
-						reactionCmd.Set(":emoji_name", reaction.EmojiName);
-						reactionCmd.Set(":emoji_flags", (int) reaction.EmojiFlags);
-						reactionCmd.Set(":count", reaction.Count);
-						await reactionCmd.ExecuteNonQueryAsync();
-
-						if (reaction.EmojiId is {} emojiId) {
-							await downloadCollector.Add(DownloadLinkExtractor.FromEmoji(emojiId, reaction.EmojiFlags));
-						}
-					}
-				}
-			}
-
-			await conn.CommitTransactionAsync();
-			downloadCollector.OnCommitted();
-		}
-
-		UpdateTotalCount();
-	}
-
-	public override Task<long> Count(CancellationToken cancellationToken) {
-		return Count(filter: null, cancellationToken);
-	}
-	
-	public async Task<long> Count(MessageFilter? filter, CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM messages" + filter.GenerateConditions().BuildWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
-	}
-
-	private sealed class MessageToManyCommand<T> : IAsyncDisposable {
-		private readonly SqliteCommand cmd;
-		private readonly Func<SqliteDataReader, T> readItem;
-
-		public MessageToManyCommand(ISqliteConnection conn, string sql, Func<SqliteDataReader, T> readItem) {
-			this.cmd = conn.Command(sql);
-			this.cmd.Add(":message_id", SqliteType.Integer);
-
-			this.readItem = readItem;
-		}
-
-		public async Task<ImmutableList<T>> GetItems(ulong messageId) {
-			cmd.Set(":message_id", messageId);
-
-			var items = ImmutableList<T>.Empty;
-
-			await using var reader = await cmd.ExecuteReaderAsync();
-
-			while (await reader.ReadAsync()) {
-				items = items.Add(readItem(reader));
-			}
-
-			return items;
-		}
-
-		public async ValueTask DisposeAsync() {
-			await cmd.DisposeAsync();
-		}
-	}
-
-	public async IAsyncEnumerable<Message> Get(MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-
-		const string AttachmentSql =
-			"""
-			SELECT attachment_id, name, type, normalized_url, download_url, size, width, height
-			FROM attachments
-			WHERE message_id = :message_id
-			""";
-
-		await using var attachmentCmd = new MessageToManyCommand<Attachment>(conn, AttachmentSql, static reader => new Attachment {
-			Id = reader.GetUint64(0),
-			Name = reader.GetString(1),
-			Type = reader.IsDBNull(2) ? null : reader.GetString(2),
-			NormalizedUrl = reader.GetString(3),
-			DownloadUrl = reader.GetString(4),
-			Size = reader.GetUint64(5),
-			Width = reader.IsDBNull(6) ? null : reader.GetInt32(6),
-			Height = reader.IsDBNull(7) ? null : reader.GetInt32(7),
-		});
-
-		const string EmbedSql =
-			"""
-			SELECT json
-			FROM embeds
-			WHERE message_id = :message_id
-			""";
-
-		await using var embedCmd = new MessageToManyCommand<Embed>(conn, EmbedSql, static reader => new Embed {
-			Json = reader.GetString(0)
-		});
-
-		const string ReactionSql =
-			"""
-			SELECT emoji_id, emoji_name, emoji_flags, count
-			FROM reactions
-			WHERE message_id = :message_id
-			""";
-
-		await using var reactionsCmd = new MessageToManyCommand<Reaction>(conn, ReactionSql, static reader => new Reaction {
-			EmojiId = reader.IsDBNull(0) ? null : reader.GetUint64(0),
-			EmojiName = reader.IsDBNull(1) ? null : reader.GetString(1),
-			EmojiFlags = (EmojiFlags) reader.GetInt16(2),
-			Count = reader.GetInt32(3),
-		});
-
-		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
-			 FROM messages m
-			 LEFT JOIN edit_timestamps et ON m.message_id = et.message_id
-			 LEFT JOIN replied_to rt ON m.message_id = rt.message_id
-			 {filter.GenerateConditions("m").BuildWhereClause()}
-			 """
-		);
-
-		await using var reader = await messageCmd.ExecuteReaderAsync(cancellationToken);
-
-		while (await reader.ReadAsync(cancellationToken)) {
-			ulong messageId = reader.GetUint64(0);
-
-			yield return new Message {
-				Id = messageId,
-				Sender = reader.GetUint64(1),
-				Channel = reader.GetUint64(2),
-				Text = reader.GetString(3),
-				Timestamp = reader.GetInt64(4),
-				EditTimestamp = reader.IsDBNull(5) ? null : reader.GetInt64(5),
-				RepliedToId = reader.IsDBNull(6) ? null : reader.GetUint64(6),
-				Attachments = await attachmentCmd.GetItems(messageId),
-				Embeds = await embedCmd.GetItems(messageId),
-				Reactions = await reactionsCmd.GetItems(messageId)
-			};
-		}
-	}
-
-	public async IAsyncEnumerable<ulong> GetIds(MessageFilter? filter) {
-		await using var conn = await pool.Take();
-		
-		await using var cmd = conn.Command("SELECT message_id FROM messages" + filter.GenerateConditions().BuildWhereClause());
-		await using var reader = await cmd.ExecuteReaderAsync();
-
-		while (await reader.ReadAsync()) {
-			yield return reader.GetUint64(0);
-		}
-	}
-
-	public async Task Remove(MessageFilter filter, FilterRemovalMode mode) {
-		await using (var conn = await pool.Take()) {
-			await conn.ExecuteAsync(
-				$"""
-				 -- noinspection SqlWithoutWhere
-				 DELETE FROM messages
-				 {filter.GenerateConditions(invert: mode == FilterRemovalMode.KeepMatching).BuildWhereClause()}
-				 """
-			);
-		}
-
-		UpdateTotalCount();
-	}
-}

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

@@ -1,64 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using DHT.Server.Data;
-using DHT.Server.Database.Repositories;
-using DHT.Server.Database.Sqlite.Utils;
-using DHT.Utils.Logging;
-using Microsoft.Data.Sqlite;
-
-namespace DHT.Server.Database.Sqlite.Repositories;
-
-sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
-	private static readonly Log Log = Log.ForType<SqliteServerRepository>();
-	
-	private readonly SqliteConnectionPool pool;
-
-	public SqliteServerRepository(SqliteConnectionPool pool) : base(Log) {
-		this.pool = pool;
-	}
-
-	public async Task Add(IReadOnlyList<Data.Server> servers) {
-		await using (var conn = await pool.Take()) {
-			await conn.BeginTransactionAsync();
-			
-			await using var cmd = conn.Upsert("servers", [
-				("id", SqliteType.Integer),
-				("name", SqliteType.Text),
-				("type", SqliteType.Text)
-			]);
-
-			foreach (var server in servers) {
-				cmd.Set(":id", server.Id);
-				cmd.Set(":name", server.Name);
-				cmd.Set(":type", ServerTypes.ToString(server.Type));
-				await cmd.ExecuteNonQueryAsync();
-			}
-
-			await conn.CommitTransactionAsync();
-		}
-
-		UpdateTotalCount();
-	}
-
-	public override async Task<long> Count(CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM servers", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
-	}
-
-	public async IAsyncEnumerable<Data.Server> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
-		await using var conn = await pool.Take();
-
-		await using var cmd = conn.Command("SELECT id, name, type FROM servers");
-		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-
-		while (await reader.ReadAsync(cancellationToken)) {
-			yield return new Data.Server {
-				Id = reader.GetUint64(0),
-				Name = reader.GetString(1),
-				Type = ServerTypes.FromString(reader.GetString(2)),
-			};
-		}
-	}
-}