[WIP] Replace ASP.NET Core with Sisk library

app/Desktop/App.axaml

@@ -51,6 +51,7 @@
 
         <Style Selector="Expander">
             <Setter Property="MinHeight" Value="40" />
+            <Setter Property="Padding" Value="12" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
 

app/Desktop/Dialogs/Progress/DelayedProgressDialog.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Threading;
+
+namespace DHT.Desktop.Dialogs.Progress;
+
+static class DelayedProgressDialog {
+	public static async ValueTask Await(Func<Task> taskProvider, TimeSpan delay, Window window, string progressDialogTitle, string progressDialogDescription) {
+		Dispatcher.UIThread.VerifyAccess();
+		
+		Task task = Task.Run(taskProvider);
+		if (task.IsCompleted) {
+			return;
+		}
+		
+		// Freeze the UI thread for a short while in case the task finishes quickly.
+		_ = Task.WhenAny(Task.Delay(delay), task).GetAwaiter().GetResult();
+		
+		if (!task.IsCompleted) {
+			await ProgressDialog.ShowIndeterminate(window, progressDialogTitle, progressDialogDescription, _ => task);
+		}
+	}
+}

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

@@ -2,13 +2,12 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Utils.Logging;
 
 namespace DHT.Desktop.Dialogs.Progress;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class ProgressDialog : Window {
-	private static readonly Log Log = Log.ForType<ProgressDialog>();
+	private static readonly TimeSpan MinimumShowDuration = TimeSpan.FromMilliseconds(500);
 	
 	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
 		var dialog = new ProgressDialog();
@@ -43,6 +42,7 @@ public sealed partial class ProgressDialog : Window {
 	}
 	
 	private bool isFinished = false;
+	private DateTime startTime = DateTime.Now;
 	private Task progressTask = Task.CompletedTask;
 	
 	public ProgressDialog() {
@@ -50,6 +50,8 @@ public sealed partial class ProgressDialog : Window {
 	}
 	
 	public void OnOpened(object? sender, EventArgs e) {
+		startTime = DateTime.Now;
+		
 		if (DataContext is ProgressDialogModel model) {
 			progressTask = Task.Run(model.StartTask);
 			progressTask.ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
@@ -60,8 +62,14 @@ public sealed partial class ProgressDialog : Window {
 		e.Cancel = !isFinished;
 	}
 	
-	private void OnFinished(Task task) {
+	private async Task OnFinished(Task task) {
 		isFinished = true;
+		
+		TimeSpan elapsedTime = DateTime.Now - startTime;
+		if (elapsedTime < MinimumShowDuration) {
+			await Task.Delay(MinimumShowDuration - elapsedTime);
+		}
+		
 		Close();
 	}
 	

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

@@ -29,7 +29,7 @@
     <StackPanel>
         <Button Command="{Binding OnClickToggleServerButton}" Content="{Binding ToggleServerButtonText}" IsEnabled="{Binding IsToggleServerButtonEnabled}" />
         <TextBlock TextWrapping="Wrap" Margin="0 15">
-            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script again.
+            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script or connection code again.
         </TextBlock>
         <WrapPanel>
             <StackPanel>

app/Desktop/Main/MainWindowModel.cs

@@ -4,6 +4,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Screens;
 using DHT.Desktop.Server;
 using DHT.Server;
@@ -104,32 +105,33 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 	}
 	
 	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
+		await DisposeContent();
+		
+		Title = DefaultTitle;
+		CurrentScreen = welcomeScreen;
+		
+		await DisposeState();
+		
+		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
+	}
+	
+	private async Task DisposeContent() {
 		if (mainContentScreenModel != null) {
 			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
 			await mainContentScreenModel.DisposeAsync();
 			mainContentScreenModel = null;
 		}
-		
-		await DisposeState();
-		
-		Title = DefaultTitle;
-		CurrentScreen = welcomeScreen;
-		
-		welcomeScreenModel.DatabaseSelected += OnDatabaseSelected;
 	}
 	
 	private async Task DisposeState() {
 		if (state != null) {
-			await state.DisposeAsync();
+			await DelayedProgressDialog.Await(() => state.DisposeAsync().AsTask(), TimeSpan.FromMilliseconds(200), window, "Close Database", "Please wait for the database to close...");
 			state = null;
 		}
 	}
 	
 	public async ValueTask DisposeAsync() {
-		if (mainContentScreenModel != null) {
+		await DisposeContent();
-			await mainContentScreenModel.DisposeAsync();
-		}
-		
 		await DisposeState();
 	}
 }

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -74,7 +74,7 @@ sealed class DebugPageModel {
 			Id = RandomId(rand),
 			Name = RandomName("u"),
 			DisplayName = RandomName("u"),
-			AvatarUrl = null,
+			AvatarHash = null,
 			Discriminator = rand.Next(minValue: 0, maxValue: 9999).ToString(),
 		}).ToArray();
 		

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -180,8 +180,8 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 				HashSet<string> reachableNormalizedUrls = [];
 				HashSet<string> orphanedNormalizedUrls = [];
 				
-				await foreach (Download download in state.Db.Downloads.FindAllDownloadableUrls()) {
+				await foreach (FileUrl fileUrl in state.Db.Downloads.FindReachableFiles()) {
-					reachableNormalizedUrls.Add(download.NormalizedUrl);
+					reachableNormalizedUrls.Add(fileUrl.NormalizedUrl);
 				}
 				
 				await foreach (Download download in state.Db.Downloads.Get()) {

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -11,25 +11,47 @@
         <pages:TrackingPageModel />
     </Design.DataContext>
 
-    <StackPanel Spacing="10">
+    <UserControl.Styles>
-        <TextBlock TextWrapping="Wrap">
+        <Style Selector="TextBlock">
-            <TextBlock.Text>
+            <Setter Property="TextWrapping" Value="Wrap" />
-                <MultiBinding StringFormat="To start tracking messages, copy the tracking script and paste it into the console of either the Discord app, or your browser. The console is usually opened by pressing {0}.">
+        </Style>
-                    <Binding Path="OpenDevToolsShortcutText" />
+        <Style Selector="WrapPanel > Button">
-                </MultiBinding>
+            <Setter Property="Margin" Value="0 0 10 10" />
-            </TextBlock.Text>
+        </Style>
-        </TextBlock>
+    </UserControl.Styles>
-        <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="10">
+
-            <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick" IsEnabled="{Binding IsCopyTrackingScriptButtonEnabled}">Copy Tracking Script</Button>
+    <StackPanel Spacing="20">
-        </StackPanel>
+        <Expander Header="Method 1: Manual" IsExpanded="True">
-        <TextBlock TextWrapping="Wrap" Margin="0 5 0 0">
+            <StackPanel Orientation="Vertical" Spacing="10">
-            <TextBlock.Text>
+                <TextBlock>
-                <MultiBinding StringFormat="By default, the Discord app does not allow opening the console. The button below will change a hidden setting in the Discord app that controls whether the {0} shortcut is enabled.">
+                    <TextBlock.Text>
-                    <Binding Path="OpenDevToolsShortcutText" />
+                        <MultiBinding StringFormat="Use {0} to open Dev Tools in your browser or the Discord app, copy the tracking script, and paste it into the console.">
-                </MultiBinding>
+                            <Binding Path="OpenDevToolsShortcutText" />
-            </TextBlock.Text>
+                        </MultiBinding>
-        </TextBlock>
+                    </TextBlock.Text>
-        <Button DockPanel.Dock="Right" Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
+                </TextBlock>
+                <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick">Copy Tracking Script</Button>
+                <TextBlock Margin="0 5 0 0">
+                    By default, the Discord app blocks the Dev Tools shortcut. The button below changes a hidden setting to unblock the shortcut.
+                </TextBlock>
+                <Button Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
+            </StackPanel>
+        </Expander>
+        <Expander Header="Method 2: Userscript" IsExpanded="True" Padding="12 12 12 2.5">
+            <StackPanel Orientation="Vertical" Spacing="10">
+                <TextBlock>
+                    Requires a userscript manager in your browser. The userscript adds a DHT icon next to the Help icon on Discord.
+                    If the icon does not appear, update this app and reinstall the userscript.
+                </TextBlock>
+                <TextBlock>
+                    Copy the Connection Code, click the DHT icon, and paste the code into the prompt.
+                </TextBlock>
+                <WrapPanel>
+                    <Button Command="{Binding OnClickInstallOrUpdateUserscript}">Install or Update Userscript</Button>
+                    <Button x:Name="CopyConnectionCode" Click="CopyConnectionScriptButton_OnClick">Copy Connection Code</Button>
+                </WrapPanel>
+            </StackPanel>
+        </Expander>
     </StackPanel>
 
 </UserControl>

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

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
@@ -8,24 +9,36 @@ namespace DHT.Desktop.Main.Pages;
 
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
 public sealed partial class TrackingPage : UserControl {
-	private bool isCopyingScript;
+	private readonly HashSet<Button> copyingButtons = new (ReferenceEqualityComparer.Instance);
 	
 	public TrackingPage() {
 		InitializeComponent();
 	}
 	
 	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+		await HandleCopyButton(CopyTrackingScript, "Script Copied!", static model => model.OnClickCopyTrackingScript());
+	}
+	
+	public async void CopyConnectionScriptButton_OnClick(object? sender, RoutedEventArgs e) {
+		await HandleCopyButton(CopyConnectionCode, "Code Copied!", static model => model.OnClickCopyConnectionCode());
+	}
+	
+	private async Task HandleCopyButton(Button button, string copiedText, Func<TrackingPageModel, Task<bool>> onClick) {
 		if (DataContext is TrackingPageModel model) {
-			object? originalText = CopyTrackingScript.Content;
+			object? originalText = button.Content;
-			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;
+			button.MinWidth = button.Bounds.Width;
 			
-			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
+			if (await onClick(model) && copyingButtons.Add(button)) {
-				isCopyingScript = true;
+				button.IsEnabled = false;
-				CopyTrackingScript.Content = "Script Copied!";
+				button.Content = copiedText;
 				
-				await Task.Delay(TimeSpan.FromSeconds(2));
+				try {
-				CopyTrackingScript.Content = originalText;
+					await Task.Delay(TimeSpan.FromSeconds(2));
-				isCopyingScript = false;
+				} finally {
+					copyingButtons.Remove(button);
+					button.IsEnabled = true;
+					button.Content = originalText;
+				}
 			}
 		}
 	}

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -1,20 +1,22 @@
 using System;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
+using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
 using DHT.Desktop.Server;
+using DHT.Utils.Logging;
 using PropertyChanged.SourceGenerator;
 using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages;
 
 sealed partial class TrackingPageModel {
-	[Notify(Setter.Private)]
+	private static readonly Log Log = Log.ForType<TrackingPageModel>();
-	private bool isCopyTrackingScriptButtonEnabled = true;
 	
 	[Notify(Setter.Private)]
 	private bool? areDevToolsEnabled = null;
@@ -51,32 +53,9 @@ sealed partial class TrackingPageModel {
 	}
 	
 	public async Task<bool> OnClickCopyTrackingScript() {
-		IsCopyTrackingScriptButtonEnabled = false;
+		string url = ServerConfiguration.HttpHost + $"/get-tracking-script?token={HttpUtility.UrlEncode(ServerConfiguration.Token)}";
-		
-		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 script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);
-		
+		return await TryCopy(script, "Copy Tracking Script");
-		IClipboard? clipboard = window.Clipboard;
-		if (clipboard == null) {
-			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
-			return false;
-		}
-		
-		try {
-			await clipboard.SetTextAsync(script);
-			return true;
-		} catch {
-			await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
-			return false;
-		}
 	}
 	
 	private async Task InitializeDevToolsToggle() {
@@ -132,4 +111,44 @@ sealed partial class TrackingPageModel {
 				throw new ArgumentOutOfRangeException();
 		}
 	}
+	
+	public async Task OnClickInstallOrUpdateUserscript() {
+		try {
+			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/get-userscript/dht.user.js");
+		} catch (Exception e) {
+			await Dialog.ShowOk(window, "Install or Update Userscript", "Could not open the browser: " + e.Message);
+		}
+	}
+	
+	[GeneratedRegex("^[a-zA-Z0-9]{1,100}$")]
+	private static partial Regex ConnectionCodeTokenRegex();
+	
+	public async Task<bool> OnClickCopyConnectionCode() {
+		const string Title = "Copy Connection Code";
+		
+		if (ConnectionCodeTokenRegex().IsMatch(ServerConfiguration.Token)) {
+			return await TryCopy(ServerConfiguration.Port + ":" + ServerConfiguration.Token, Title);
+		}
+		else {
+			await Dialog.ShowOk(window, Title, "The internal server token cannot be used to create a connection code.\n\nCheck the 'Advanced' tab and ensure the token is 1-100 characters long, and only contains plain letters and numbers.");
+			return false;
+		}
+	}
+	
+	private async Task<bool> TryCopy(string script, string errorDialogTitle) {
+		IClipboard? clipboard = window.Clipboard;
+		if (clipboard == null) {
+			await Dialog.ShowOk(window, errorDialogTitle, "Clipboard is not available on this system.");
+			return false;
+		}
+		
+		try {
+			await clipboard.SetTextAsync(script);
+			return true;
+		} catch (Exception e) {
+			Log.Error(e);
+			await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
+			return false;
+		}
+	}
 }

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -51,10 +51,9 @@ sealed partial class ViewerPageModel : IDisposable {
 	
 	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();
-			SystemUtils.OpenUrl(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
+			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
 		} catch (Exception e) {
 			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
 		}

app/Desktop/Server/ServerConfiguration.cs

@@ -5,4 +5,6 @@ namespace DHT.Desktop.Server;
 static class ServerConfiguration {
 	public static ushort Port { get; set; } = ServerUtils.FindAvailablePort(min: 50000, max: 60000);
 	public static string Token { get; set; } = ServerUtils.GenerateRandomToken(20);
+	
+	public static string HttpHost => "http://127.0.0.1:" + Port;
 }

app/Resources/Tracker/loader/dht.user.js

@@ -0,0 +1,273 @@
+// ==UserScript==
+// @name         Discord History Tracker
+// @license      MIT
+// @namespace    https://chylex.com
+// @homepageURL  https://dht.chylex.com/
+// @supportURL   https://github.com/chylex/Discord-History-Tracker/issues
+// @include      https://discord.com/*
+// @run-at       document-idle
+// @grant        none
+// @noframes
+// ==/UserScript==
+
+function startMutationObserver(callback) {
+	let hasDebounceStarted = false;
+	
+	function handleMutations(mutations, observer) {
+		if (hasDebounceStarted) {
+			return;
+		}
+		
+		hasDebounceStarted = true;
+		window.setTimeout(() => {
+			hasDebounceStarted = false;
+			callback(observer);
+		}, 20);
+	}
+	
+	new MutationObserver(handleMutations).observe(document.body, { childList: true, subtree: true });
+}
+
+startMutationObserver(observer => {
+	const triggerButton = installConnectDialogButton();
+	if (triggerButton === null) {
+		return;
+	}
+	
+	observer.disconnect();
+	
+	startMutationObserver(() => {
+		if (!triggerButton.isConnected) {
+			getHelpIcon()?.parentElement.parentElement.insertAdjacentElement("afterend", triggerButton);
+		}
+	});
+});
+
+function installConnectDialogButton() {
+	const helpIcon = getHelpIcon();
+	if (!helpIcon) {
+		return null;
+	}
+	
+	const helpIconWrapper = helpIcon.parentElement;
+	const helpIconLink = helpIconWrapper.parentElement;
+	
+	helpIconLink.insertAdjacentHTML("afterend", `
+<div id="dht-connector-show-dialog" role="button" class="${helpIconWrapper.getAttribute("class")}">
+  <svg viewBox="0 0 24 20" fill="currentColor" class="${helpIcon.getAttribute("class")}" style="width: auto;">
+    <path d="M7.446,9.924c-0,0.846 -0.105,1.593 -0.315,2.234c-0.21,0.644 -0.497,1.181 -0.86,1.615c-0.365,0.431 -0.795,0.761 -1.292,0.982c-0.494,0.22 -1.029,0.332 -1.605,0.332l-3.374,-0l0,-10.174l3.021,0c0.645,0 1.239,0.1 1.781,0.296c0.542,0.198 1.011,0.501 1.4,0.911c0.391,0.408 0.695,0.928 0.914,1.56c0.22,0.629 0.33,1.378 0.33,2.244Zm-1.765,-0c0,-0.592 -0.067,-1.1 -0.198,-1.524c-0.134,-0.422 -0.318,-0.77 -0.554,-1.042c-0.236,-0.272 -0.518,-0.473 -0.848,-0.604c-0.332,-0.128 -0.697,-0.195 -1.096,-0.195l-1.237,-0l0,6.882l1.483,0c0.351,0 0.676,-0.076 0.977,-0.224c0.298,-0.15 0.556,-0.372 0.776,-0.668c0.22,-0.295 0.389,-0.663 0.513,-1.101c0.122,-0.439 0.184,-0.947 0.184,-1.524Z"/>
+    <path d="M14.147,15.087l-0,-4.362l-3.637,-0l-0,4.362l-1.748,-0l-0,-10.174l1.748,0l-0,4.052l3.637,-0l-0,-4.052l1.75,0l0,10.174l-1.75,-0Z"/>
+    <path d="M21.297,6.559l-0,8.528l-1.748,-0l-0,-8.528l-2.699,-0l0,-1.646l7.15,0l0,1.646l-2.703,-0Z"/>
+  </svg>
+</div>
+`);
+	
+	const button = document.getElementById("dht-connector-show-dialog");
+	button.addEventListener("click", showConnectDialog);
+	return button;
+}
+
+function getHelpIcon() {
+	return document.querySelector("div[class*='bar_'] a[href$='://support.discord.com'] > div[class*='clickable'] > svg");
+}
+
+function showConnectDialog() {
+	if (window.DHT_LOADED) {
+		alert("Discord History Tracker is already loaded.");
+		return;
+	}
+	
+	const dialogElement = document.createElement("dialog");
+	dialogElement.id = "dht-connector-dialog";
+	dialogElement.innerHTML = `
+<form id="dht-connector-dialog-form">
+  <label for="dht-connector-dialog-input-code">Connection Code</label>
+  <input id="dht-connector-dialog-input-code" type="text">
+  <p id="dht-connector-dialog-input-error"></p>
+  
+  <div id="dht-connector-dialog-buttons">
+    <button type="submit" id="dht-connector-dialog-button-connect">Connect</button>
+    <button type="button" id="dht-connector-dialog-button-close">Cancel</button>
+  </div>
+</form>
+<style>
+  #dht-connector-dialog {
+    width: 300px;
+    padding: 18px;
+    font-size: 16px;
+    border: none;
+    border-radius: 8px;
+    background-color: #313338;
+  }
+  
+  #dht-connector-dialog::backdrop {
+    background-color: rgba(0, 0, 0, 0.6);
+  }
+  
+  #dht-connector-dialog label {
+    display: block;
+    margin: 0 0 9px;
+    font-weight: 500;
+    letter-spacing: .02em;
+    color: #fbfbfb;
+  }
+  
+  #dht-connector-dialog-input-error {
+    margin: 11px 1px;
+    color: #ff484c;
+    font-size: 15px;
+    font-weight: 500;
+  }
+  
+  #dht-connector-dialog input[type="text"] {
+    box-sizing: border-box;
+    width: 100%;
+    padding: 12px 10px;
+    border: 1px solid rgba(151, 151, 159, 0.2);
+    border-radius: 8px;
+    color: #efeff0;
+    background-color: #1d1d21;
+  }
+  
+  #dht-connector-dialog-buttons {
+    margin-top: 15px;
+    display: flex;
+    justify-content: end;
+    gap: 12px;
+  }
+  
+  #dht-connector-dialog button {
+    padding: 8px 16px;
+    border: none;
+    border-radius: 8px;
+    font-size: 14px;
+    font-weight: 500;
+    color: #fff;
+    background-color: #5865f2;
+    transition: background-color 200ms ease, color 200ms ease;
+  }
+  
+  #dht-connector-dialog button:hover {
+    background-color: #4752c4;
+  }
+  
+  #dht-connector-dialog button[disabled] {
+    cursor: not-allowed;
+    opacity: 0.5;
+  }
+</style>
+	`;
+	
+	document.body.insertAdjacentElement("beforeend", dialogElement);
+	
+	const formElement = document.getElementById("dht-connector-dialog-form");
+	const codeErrorElement = document.getElementById("dht-connector-dialog-input-error");
+	const codeInputElement = document.getElementById("dht-connector-dialog-input-code");
+	const connectButtonElement = document.getElementById("dht-connector-dialog-button-connect");
+	const closeButtonElement = document.getElementById("dht-connector-dialog-button-close");
+	
+	dialogElement.addEventListener("close", function() {
+		dialogElement.remove();
+	});
+	
+	closeButtonElement.addEventListener("click", function() {
+		dialogElement.close();
+	});
+	
+	codeInputElement.addEventListener("paste", function() {
+		setTimeout(async function() {
+			const code = parseConnectionCode(codeInputElement.value);
+			if (code !== null) {
+				await onSubmit(code);
+			}
+		}, 0);
+	});
+	
+	formElement.addEventListener("submit", async function(e) {
+		e.preventDefault();
+		
+		const code = parseConnectionCode(codeInputElement.value);
+		if (code === null) {
+			codeErrorElement.innerText = "Code is not valid.";
+		}
+		else {
+			await onSubmit(code);
+		}
+	});
+	
+	let isSubmitting = false;
+	
+	async function onSubmit(code) {
+		if (isSubmitting) {
+			return;
+		}
+		
+		isSubmitting = true;
+		connectButtonElement.setAttribute("disabled", "");
+		try {
+			await loadTrackingScript(code);
+		} catch (e) {
+			onError("Could not load tracking script.", e);
+		} finally {
+			isSubmitting = false;
+			connectButtonElement.removeAttribute("disabled");
+		}
+	}
+	
+	async function loadTrackingScript(code) {
+		const trackingScript = await getTrackingScript(code.port, code.token);
+		
+		if (dialogElement.isConnected) {
+			// noinspection DynamicallyGeneratedCodeJS
+			eval(trackingScript);
+			dialogElement.close();
+		}
+	}
+	
+	function onError(message, e) {
+		console.error(message, e);
+		codeErrorElement.innerText = message;
+	}
+	
+	dialogElement.showModal();
+}
+
+/**
+ * @param {string} code
+ * @return {?{port: number, token: string}}
+ */
+function parseConnectionCode(code) {
+	if (code.length > 5 + 1 + 100) {
+		return null;
+	}
+	
+	const match = code.match(/^(\d{1,5}):([a-zA-Z0-9]{1,100})$/);
+	if (!match) {
+		return null;
+	}
+	
+	const port = Number(match[1]);
+	if (port < 0 || port > 65535) {
+		return null;
+	}
+	
+	return { port, token: match[2] };
+}
+
+async function getTrackingScript(port, token) {
+	const url = "http://127.0.0.1:" + port + "/get-tracking-script?token=" + encodeURIComponent(token);
+	const response = await fetch(url, {
+		credentials: "omit",
+		signal: AbortSignal.timeout(2000),
+	});
+	
+	if (!response.ok) {
+		throw response.status + " " + response.statusText;
+	}
+	
+	if (response.headers.get("X-DHT") !== "1") {
+		throw "Invalid response";
+	}
+	
+	return await response.text();
+}

app/Resources/Tracker/scripts/state.js

@@ -142,11 +142,19 @@ const STATE = (function() {
 			if (DISCORD.CHANNEL_TYPE.isPrivate(channelInfo.type)) {
 				server.id = channelInfo.id;
 				server.name = channel.name = getPrivateChannelName(channelInfo);
+				
+				if (channelInfo.icon) {
+					server.icon = channelInfo.icon;
+				}
 			}
 			else if (serverInfo) {
 				server.id = serverInfo.id;
 				server.name = serverInfo.name;
 				channel.name = channelInfo.name;
+				
+				if (serverInfo.icon) {
+					server.icon = serverInfo.icon;
+				}
 			}
 			else {
 				return;

app/Resources/Tracker/scripts/types.js

@@ -2,6 +2,7 @@
  * @name DiscordGuild
  * @property {String} id
  * @property {String} name
+ * @property {String|null|undefined} [icon]
  */
 
 /**
@@ -14,6 +15,7 @@
  * @property {Number} [position]
  * @property {String} [topic]
  * @property {Boolean} [nsfw]
+ * @property {String|null|undefined} [icon]
  * @property {DiscordUser[]} [rawRecipients]
  */
 

app/Resources/Viewer/index.html

@@ -1,96 +1,89 @@
 <!DOCTYPE html>
 <html lang="en">
-
+  <head>
-<head>
+    <meta charset="utf-8">
-  <meta charset="utf-8">
+    <meta name="referrer" content="no-referrer">
-  <meta name="referrer" content="no-referrer">
+    
-
+    <title>Discord Offline History</title>
-  <title>Discord Offline History</title>
+    
-
+    <link rel="icon" href="favicon.ico">
-  <link rel="icon" href="favicon.ico">
+    
-
+    <link rel="stylesheet" href="styles/main.css">
-  <link rel="stylesheet" href="styles/main.css">
+    <link rel="stylesheet" href="styles/menu.css">
-  <link rel="stylesheet" href="styles/menu.css">
+    <link rel="stylesheet" href="styles/channels.css">
-  <link rel="stylesheet" href="styles/channels.css">
+    <link rel="stylesheet" href="styles/messages.css">
-  <link rel="stylesheet" href="styles/servers.css">
+    <link rel="stylesheet" href="styles/modal.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);
-  <script type="text/javascript">
+		window.DHT_SERVER_TOKEN = query.get("token");
-    const query = new URLSearchParams(location.search);
+		window.DHT_SERVER_SESSION = query.get("session");
-    window.DHT_SERVER_TOKEN = query.get("token");
+    </script>
-    window.DHT_SERVER_SESSION = query.get("session");
+    <script type="module" src="scripts/bootstrap.mjs"></script>
-  </script>
+  </head>
-  <script type="module" src="scripts/bootstrap.mjs"></script>
+  <body>
-</head>
+    <div id="menu">
-
+      <button id="btn-settings">Settings</button>
-<body>
+      
-  <div id="menu">
+      <div class="splitter"></div>
-    <button id="btn-settings">Settings</button>
+      
-
+      <div> <!-- needed to stop the select from messing up -->
-    <div class="splitter"></div>
+        <select id="opt-messages-per-page">
-
+          <option value="50">50 messages per page&nbsp;</option>
-    <div> <!-- needed to stop the select from messing up -->
+          <option value="100">100 messages per page&nbsp;</option>
-      <select id="opt-messages-per-page">
+          <option value="250">250 messages per page&nbsp;</option>
-        <option value="50">50 messages per page&nbsp;</option>
+          <option value="500">500 messages per page&nbsp;</option>
-        <option value="100">100 messages per page&nbsp;</option>
+          <option value="1000">1000 messages per page&nbsp;</option>
-        <option value="250">250 messages per page&nbsp;</option>
+          <option value="0">All messages&nbsp;</option>
-        <option value="500">500 messages per page&nbsp;</option>
+        </select>
-        <option value="1000">1000 messages per page&nbsp;</option>
+      </div>
-        <option value="0">All messages&nbsp;</option>
+      
-      </select>
+      <div class="nav">
+        <button id="nav-first" data-nav="first" class="icon">&laquo;</button>
+        <button id="nav-prev" data-nav="prev" class="icon">&lsaquo;</button>
+        <button id="nav-pick" data-nav="pick">Page <span id="nav-page-current">1</span>/<span id="nav-page-total">?</span></button>
+        <button id="nav-next" data-nav="next" class="icon">&rsaquo;</button>
+        <button id="nav-last" data-nav="last" class="icon">&raquo;</button>
+      </div>
+      
+      <div class="splitter"></div>
+      
+      <div> <!-- needed to stop the select from messing up -->
+        <select id="opt-messages-filter">
+          <option value="">No filter&nbsp;</option>
+          <option value="user">Filter messages by user&nbsp;</option>
+          <option value="contents">Filter messages by contents&nbsp;</option>
+          <option value="withimages">Only messages with images&nbsp;</option>
+          <option value="withdownloads">Only messages with downloads&nbsp;</option>
+          <option value="edited">Only edited messages&nbsp;</option>
+        </select>
+      </div>
+      
+      <div id="opt-filter-list">
+        <select id="opt-filter-user" data-filter-type="user">
+          <option value="">Select user...</option>
+        </select>
+        <input id="opt-filter-contents" type="text" data-filter-type="contents" placeholder="Messages containing...">
+        <input type="hidden" data-filter-type="withimages" value="1">
+        <input type="hidden" data-filter-type="withdownloads" value="1">
+        <input type="hidden" data-filter-type="edited" value="1">
+      </div>
+      
+      <div class="separator"></div>
+      
+      <button id="btn-about">About</button>
     </div>
-
+    
-    <div class="nav">
+    <div id="app">
-      <button id="nav-first" data-nav="first" class="icon">&laquo;</button>
+      <div id="channels">
-      <button id="nav-prev" data-nav="prev" class="icon">&lsaquo;</button>
+        <div class="loading"></div>
-      <button id="nav-pick" data-nav="pick">Page <span id="nav-page-current">1</span>/<span
+      </div>
-          id="nav-page-total">?</span></button>
+      <div id="messages"></div>
-      <button id="nav-next" data-nav="next" class="icon">&rsaquo;</button>
-      <button id="nav-last" data-nav="last" class="icon">&raquo;</button>
     </div>
-
+    
-    <div class="splitter"></div>
+    <div id="modal">
-
+      <div id="overlay"></div>
-    <div> <!-- needed to stop the select from messing up -->
+      <div id="dialog"></div>
-      <select id="opt-messages-filter">
-        <option value="">No filter&nbsp;</option>
-        <option value="user">Filter messages by user&nbsp;</option>
-        <option value="contents">Filter messages by contents&nbsp;</option>
-        <option value="withimages">Only messages with images&nbsp;</option>
-        <option value="withdownloads">Only messages with downloads&nbsp;</option>
-        <option value="edited">Only edited messages&nbsp;</option>
-      </select>
     </div>
-
+  </body>
-    <div id="opt-filter-list">
+</html>
-      <select id="opt-filter-user" data-filter-type="user">
-        <option value="">Select user...</option>
-      </select>
-      <input id="opt-filter-contents" type="text" data-filter-type="contents" placeholder="Messages containing...">
-      <input type="hidden" data-filter-type="withimages" value="1">
-      <input type="hidden" data-filter-type="withdownloads" value="1">
-      <input type="hidden" data-filter-type="edited" value="1">
-    </div>
-
-    <div class="separator"></div>
-
-    <button id="btn-about">About</button>
-  </div>
-
-  <div id="app">
-    <div id="servers">
-    </div>
-    <div id="channels">
-      <div class="loading"></div>
-    </div>
-    <div id="messages"></div>
-  </div>
-
-  <div id="modal">
-    <div id="overlay"></div>
-    <div id="dialog"></div>
-  </div>
-</body>
-
-</html>

app/Resources/Viewer/scripts/bootstrap.mjs

@@ -2,7 +2,6 @@ import discord from "./discord.mjs";
 import gui from "./gui.mjs";
 import state from "./state.mjs";
 import "./polyfills.mjs";
-import servers from "./servers.mjs";
 
 window.DISCORD = discord;
 
@@ -26,12 +25,10 @@ document.addEventListener("DOMContentLoaded", () => {
 	
 	state.onUsersRefreshed(users => {
 		gui.updateUserList(users);
-		servers.update()
 	});
 	
 	state.onChannelsRefreshed((channels, selected) => {
 		gui.updateChannelList(channels, selected, state.selectChannel);
-		servers.update()
 	});
 	
 	state.onMessagesRefreshed(messages => {

app/Resources/Viewer/scripts/discord.mjs

@@ -113,17 +113,16 @@ export default (function() {
 	return {
 		setup() {
 			templateChannelServer = new template([
-				"<div class='channel ServerChannel' data-channel='{id}' server-id='{serverId}' server-name='{server.name}' server-type='{server.type}'>",
+				"<div class='channel' 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>-->",
+				"<span class='server'>{server.name} ({server.type})</span>",
 				"</div>"
 			].join(""));
 			
 			templateChannelPrivate = new template([
-				"<div class='channel UserChannel' data-channel='{id}' server-id='0' server-name='{server.name}' server-type='{server.type}'>",
+				"<div class='channel' data-channel='{id}'>",
-				"<div class='avatar'>{icon}</div>",
 				"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
-				"<!--<span class='server'>{server.name} ({server.type})</span>-->",
+				"<span class='server'>({server.type})</span>",
 				"</div>"
 			].join(""));
 			
@@ -157,32 +156,32 @@ export default (function() {
 			
 			// noinspection HtmlUnknownTarget
 			templateAttachmentDownload = new template([
-				"<a href='{url}'  class='embed download'>Download {name}</a>"
+				"<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>"
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
 			templateEmbedImageWithSize = new template([
-				"<a href='{url}'  class='embed thumbnail loading'><img src='{src}' width='{width}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
+				"<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>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
 			templateEmbedRich = new template([
-				"<div class='embed download'><a href='{url}'  class='title'>{title}</a><p class='desc'>{description}</p></div>"
+				"<div class='embed download'><a href='{url}' class='title'>{title}</a><p class='desc'>{description}</p></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
 			templateEmbedRichNoDescription = new template([
-				"<div class='embed download'><a href='{url}'  class='title'>{title}</a></div>"
+				"<div class='embed download'><a href='{url}' class='title'>{title}</a></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
 			templateEmbedUrl = new template([
-				"<a href='{url}'  class='embed download'>{url}</a>"
+				"<a href='{url}' class='embed download'>{url}</a>"
 			].join(""));
 			
 			templateEmbedUnsupported = new template([

app/Resources/Viewer/scripts/gui.mjs

@@ -59,9 +59,9 @@ export default (function() {
 		const linkGH = "https://github.com/chylex/Discord-History-Tracker";
 		
 		showModal(560, `
-<p>Discord History Tracker is developed by <a  href='https://chylex.com'>chylex</a> as an <a  href='${linkGH}/blob/master/LICENSE.md'>open source</a> project.</p>
+<p>Discord History Tracker is developed by <a href='https://chylex.com'>chylex</a> as an <a href='${linkGH}/blob/master/LICENSE.md'>open source</a> project.</p>
-<p>Please, report any issues and suggestions to the <a  href='${linkGH}/issues'>tracker</a>. If you want to support the development, please spread the word and consider <a  href='https://www.patreon.com/chylex'>becoming a patron</a> or <a  href='https://ko-fi.com/chylex'>buying me a coffee</a>. Any support is appreciated!</p>
+<p>Please, report any issues and suggestions to the <a href='${linkGH}/issues'>tracker</a>. If you want to support the development, please spread the word and consider <a href='https://www.patreon.com/chylex'>becoming a patron</a> or <a href='https://ko-fi.com/chylex'>buying me a coffee</a>. Any support is appreciated!</p>
-<p><a href='${linkGH}/issues'>Issue Tracker</a> &nbsp;&mdash;&nbsp; <a  href='${linkGH}'>GitHub Repository</a> &nbsp;&mdash;&nbsp; <a  href='https://twitter.com/chylexmc'>Developer's Twitter</a></p>`);
+<p><a href='${linkGH}/issues'>Issue Tracker</a> &nbsp;&mdash;&nbsp; <a href='${linkGH}'>GitHub Repository</a> &nbsp;&mdash;&nbsp; <a href='https://twitter.com/chylexmc'>Developer's Twitter</a></p>`);
 	};
 	
 	return {

app/Resources/Viewer/scripts/servers.mjs

@@ -1,109 +0,0 @@
-import state from "./state.mjs";
-
-const servers = (() => {
-    let currentServerId = "0";
-
-    function getIcon(name) {
-        return name.split(" ").map(word => {
-            if (word.startsWith("[") && word.length > 1) return word[1];
-            return word[0] || "";
-        }).join("");
-    }
-
-    function update() {
-        const channels = document.querySelectorAll("#channels .channel");
-        const serversMap = new Map();
-
-        // Check if there are any channels with server-id 0 (DM)
-        const hasDMChannels = Array.from(channels).some(channel => {
-            return channel.getAttribute("server-id") === "0";
-        });
-
-        if (hasDMChannels) {
-            serversMap.set("0", {
-                id: "0",
-                name: "DM",
-                icon: "DM",
-            });
-        }
-
-        channels.forEach(channel => {
-            const serverId = channel.getAttribute("server-id") || "0";
-            const serverType = channel.getAttribute("server-type");
-            const serverName = channel.getAttribute("server-name");
-
-            if (serverType === "server" && !serversMap.has(serverId)) {
-                serversMap.set(serverId, {
-                    id: serverId,
-                    name: serverName,
-                    icon: getIcon(serverName),
-                });
-            }
-        });
-
-        const serversDiv = document.getElementById("servers");
-        serversDiv.innerHTML = "";
-
-        if (hasDMChannels) {
-            const dmServer = serversMap.get("0");
-            const dmElement = document.createElement("div");
-            dmElement.className = `Server${dmServer.id === currentServerId ? " active" : ""}`;
-            dmElement.id = "DM";
-            dmElement.dataset.serverId = dmServer.id;
-            dmElement.innerHTML = `
-                <div class="icon">DM</div>
-                <div class="name" title="Direct Messages">Direct Messages</div>
-            `;
-            dmElement.addEventListener("click", () => selectServer(dmServer.id));
-            serversDiv.appendChild(dmElement);
-        }
-
-        serversMap.forEach(server => {
-            if (server.id === "0") return; // Skip DM since it's already added
-
-            const serverElement = document.createElement("div");
-            serverElement.className = `Server${server.id === currentServerId ? " active" : ""}`;
-            serverElement.dataset.serverId = server.id;
-            serverElement.innerHTML = `
-                <div class="icon">${server.icon}</div>
-                <div class="name" title="${server.name}">${server.name}</div>
-            `;
-            serverElement.addEventListener("click", () => selectServer(server.id));
-            serversDiv.appendChild(serverElement);
-        });
-
-        if (!serversMap.has(currentServerId)) {
-            currentServerId = "0";
-        }
-
-        updateChannelVisibility();
-    }
-
-    function selectServer(serverId) {
-        // Remove active class from all servers
-        document.querySelectorAll("#servers .Server").forEach(server => {
-            server.classList.remove("active");
-        });
-
-        // Add active class to the selected server
-        const selectedServer = document.querySelector(`#servers .Server[data-server-id="${serverId}"]`);
-        if (selectedServer) {
-            selectedServer.classList.add("active");
-        }
-
-        currentServerId = serverId;
-        updateChannelVisibility();
-        state.selectChannel(null);
-    }
-
-    function updateChannelVisibility() {
-        document.querySelectorAll("#channels .channel").forEach(channel => {
-            const channelServerId = channel.getAttribute("server-id") || "0";
-            channel.classList.toggle("visible", channelServerId === currentServerId);
-        });
-    }
-
-    return { update };
-})();
-
-export default servers;

app/Resources/Viewer/scripts/state.mjs

@@ -2,229 +2,192 @@ import settings from "./settings.mjs";
 import processor from "./processor.mjs";
 
 // noinspection FunctionWithInconsistentReturnsJS
-export default (function () {
+export default (function() {
 	/**
 	 * @type {{}}
 	 * @property {{}} users
 	 * @property {{}} servers
 	 * @property {{}} channels
 	 */
-
-
-	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);
-
-
 	let loadedFileMeta;
 	let loadedFileData;
-
+	
 	let loadedMessages;
-
+	
 	let filterFunction;
 	let selectedChannel;
 	let currentPage;
 	let messagesPerPage;
-
+	
-	const getUser = function (id) {
+	const getUser = function(id) {
 		return loadedFileMeta.users[id] || { "name": "<unknown>" };
 	};
-
+	
-	const getUserList = function () {
+	const getUserList = function() {
 		return loadedFileMeta ? loadedFileMeta.users : [];
 	};
-
+	
-	const getServer = function (id) {
+	const getServer = function(id) {
 		return loadedFileMeta.servers[id] || { "name": "<unknown>", "type": "unknown" };
 	};
-
+	
-	const getUserIDByName = function (name) {
+	const generateChannelHierarchy = function() {
-		for (let userId in loadedFileMeta.users) {
-			let user = loadedFileMeta.users[userId];
-			if (user.name === name) {
-				return userId;
-			}
-		}
-		return 0;
-	};
-
-	const getUserByName = function (name) {
-		for (let userId in loadedFileMeta.users) {
-			let user = loadedFileMeta.users[userId];
-			if (user.name === name) {
-				return user;
-			}
-		}
-		return 0;
-	};
-
-	const generateChannelHierarchy = function () {
 		/**
 		 * @type {Map<string, Set>}
 		 */
 		const hierarchy = new Map();
-
+		
 		if (!loadedFileMeta) {
 			return hierarchy;
 		}
-
+		
 		/**
 		 * @returns {Set}
 		 */
 		function getChildren(parentId) {
 			let children = hierarchy.get(parentId);
-
+			
 			if (!children) {
 				children = new Set();
 				hierarchy.set(parentId, children);
 			}
-
+			
 			return children;
 		}
-
+		
-		for (const [id, channel] of Object.entries(loadedFileMeta.channels)) {
+		for (const [ id, channel ] of Object.entries(loadedFileMeta.channels)) {
 			getChildren(channel.parent || "").add(id);
 		}
-
+		
 		const unreachableIds = new Set(hierarchy.keys());
-
+		
 		function reachIds(parentId) {
 			unreachableIds.delete(parentId);
-
+			
 			const children = hierarchy.get(parentId);
-
+			
 			if (children) {
 				for (const id of children) {
 					reachIds(id);
 				}
 			}
 		}
-
+		
 		reachIds("");
-
+		
 		const rootChildren = getChildren("");
-
+		
 		for (const unreachableId of unreachableIds) {
 			for (const id of hierarchy.get(unreachableId)) {
 				rootChildren.add(id);
 			}
-
+			
 			hierarchy.delete(unreachableId);
 		}
-
+		
 		return hierarchy;
 	};
-
+	
-	const generateChannelOrder = function () {
+	const generateChannelOrder = function() {
 		if (!loadedFileMeta) {
 			return {};
 		}
-
+		
 		const channels = loadedFileMeta.channels;
 		const hierarchy = generateChannelHierarchy();
-
+		
 		function getSortedSubTree(parentId) {
 			const children = hierarchy.get(parentId);
 			if (!children) {
 				return [];
 			}
-
+			
 			const sortedChildren = Array.from(children);
-
+			
 			sortedChildren.sort((id1, id2) => {
 				const c1 = channels[id1];
 				const c2 = channels[id2];
 				const s1 = getServer(c1.server);
 				const s2 = getServer(c2.server);
-
+				
 				return s1.type.localeCompare(s2.type, "en") ||
 					s1.name.toLocaleLowerCase().localeCompare(s2.name.toLocaleLowerCase(), undefined, { numeric: true }) ||
 					(c1.position || -1) - (c2.position || -1) ||
 					c1.name.toLocaleLowerCase().localeCompare(c2.name.toLocaleLowerCase(), undefined, { numeric: true });
 			});
-
+			
 			const subTree = [];
-
+			
 			for (const id of sortedChildren) {
 				subTree.push(id);
 				subTree.push(...getSortedSubTree(id));
 			}
-
+			
 			return subTree;
 		}
-
+		
 		const orderArray = getSortedSubTree("");
 		const orderMap = {};
-
+		
 		for (let i = 0; i < orderArray.length; i++) {
 			orderMap[orderArray[i]] = i;
 		}
-
+		
 		return orderMap;
 	};
-
+	
-	const getChannelList = function () {
+	const getChannelList = function() {
 		if (!loadedFileMeta) {
 			return [];
 		}
-
+		
 		const channels = loadedFileMeta.channels;
 		const channelOrder = generateChannelOrder();
-
+		
-
 		return Object.keys(channels).map(key => ({
 			"id": key,
-			"serverId": channels[key].server,
 			"name": channels[key].name,
 			"server": getServer(channels[key].server),
 			"msgcount": getFilteredMessageKeys(key).length,
 			"topic": channels[key].topic || "",
 			"nsfw": channels[key].nsfw || false,
-			"icon": getServer(channels[key].server).type === "group"
-				? `<!--<span>${channels[key].name.split(" ").map(word => word[0]).join("")}</span>-->` //Discord default naming without a icon
-				: `<img src='${fileUrlProcessor("https://cdn.discordapp.com/avatars/" + getUserIDByName(channels[key].name) + "/" + getUserByName(channels[key].name).avatar)}'>`
 		})).sort((ac, bc) => {
 			return channelOrder[ac.id] - channelOrder[bc.id];
 		});
 	};
-
+	
-	const getMessages = function (channel) {
+	const getMessages = function(channel) {
 		return loadedFileData[channel] || {};
 	};
-
+	
-	const getMessageById = function (id) {
+	const getMessageById = function(id) {
 		for (const messages of Object.values(loadedFileData)) {
 			if (id in messages) {
 				return messages[id];
 			}
 		}
-
+		
 		return null;
 	};
-
+	
-	const getMessageChannel = function (id) {
+	const getMessageChannel = function(id) {
-		for (const [channel, messages] of Object.entries(loadedFileData)) {
+		for (const [ channel, messages ] of Object.entries(loadedFileData)) {
 			if (id in messages) {
 				return channel;
 			}
 		}
-
+		
 		return null;
 	};
-
+	
-	const getMessageList = function () {
+	const getMessageList = function() {
 		if (!loadedMessages) {
 			return [];
 		}
-
+		
 		const messages = getMessages(selectedChannel);
 		const startIndex = messagesPerPage * (root.getCurrentPage() - 1);
-
+		
 		return loadedMessages.slice(startIndex, !messagesPerPage ? undefined : startIndex + messagesPerPage).map(key => {
 			/**
 			 * @type {{}}
@@ -240,35 +203,35 @@ export default (function () {
 			const message = messages[key];
 			const user = getUser(message.u);
 			const avatar = user.avatar ? { id: message.u, path: user.avatar } : null;
-
+			
 			const obj = {
 				user,
 				avatar,
 				"timestamp": message.t,
 				"jump": key,
 			};
-
+			
 			if ("m" in message) {
 				obj["contents"] = message.m;
 			}
-
+			
 			if ("e" in message) {
 				obj["embeds"] = message.e.map(embed => JSON.parse(embed));
 			}
-
+			
 			if ("a" in message) {
 				obj["attachments"] = message.a;
 			}
-
+			
 			if ("te" in message) {
 				obj["edit"] = message.te;
 			}
-
+			
 			if ("r" in message) {
 				const replyMessage = getMessageById(message.r);
 				const replyUser = replyMessage ? getUser(replyMessage.u) : null;
 				const replyAvatar = replyUser && replyUser.avatar ? { id: replyMessage.u, path: replyUser.avatar } : null;
-
+				
 				obj["reply"] = replyMessage ? {
 					"id": message.r,
 					"user": replyUser,
@@ -276,212 +239,212 @@ export default (function () {
 					"contents": replyMessage.m
 				} : null;
 			}
-
+			
 			if ("re" in message) {
 				obj["reactions"] = message.re;
 			}
-
+			
 			return obj;
 		});
 	};
-
+	
 	let eventOnUsersRefreshed;
 	let eventOnChannelsRefreshed;
 	let eventOnMessagesRefreshed;
-
+	
-	const triggerUsersRefreshed = function () {
+	const triggerUsersRefreshed = function() {
 		eventOnUsersRefreshed && eventOnUsersRefreshed(getUserList());
 	};
-
+	
-	const triggerChannelsRefreshed = function (selectedChannel) {
+	const triggerChannelsRefreshed = function(selectedChannel) {
 		eventOnChannelsRefreshed && eventOnChannelsRefreshed(getChannelList(), selectedChannel);
 	};
-
+	
-	const triggerMessagesRefreshed = function () {
+	const triggerMessagesRefreshed = function() {
 		eventOnMessagesRefreshed && eventOnMessagesRefreshed(getMessageList());
 	};
-
+	
-	const getFilteredMessageKeys = function (channel) {
+	const getFilteredMessageKeys = function(channel) {
 		const messages = getMessages(channel);
 		let keys = Object.keys(messages);
-
+		
 		if (filterFunction) {
 			keys = keys.filter(key => filterFunction(messages[key]));
 		}
-
+		
 		return keys;
 	};
-
+	
 	const root = {
 		onChannelsRefreshed(callback) {
 			eventOnChannelsRefreshed = callback;
 		},
-
+		
 		onMessagesRefreshed(callback) {
 			eventOnMessagesRefreshed = callback;
 		},
-
+		
 		onUsersRefreshed(callback) {
 			eventOnUsersRefreshed = callback;
 		},
-
+		
 		uploadFile(meta, data) {
 			if (loadedFileMeta != null) {
 				throw "A file is already loaded!";
 			}
-
+			
 			if (typeof meta !== "object" || typeof data !== "object") {
 				throw "Invalid file format!";
 			}
-
+			
 			loadedFileMeta = meta;
 			loadedFileData = data;
 			loadedMessages = null;
-
+			
 			selectedChannel = null;
 			currentPage = 1;
-
+			
 			triggerUsersRefreshed();
 			triggerChannelsRefreshed();
 			triggerMessagesRefreshed();
-
+			
 			settings.onSettingsChanged(() => triggerMessagesRefreshed());
 		},
-
+		
 		getChannelName(channel) {
 			const channelObj = loadedFileMeta.channels[channel];
 			return (channelObj && channelObj.name) || channel;
 		},
-
+		
 		getUserName(user) {
 			const userObj = loadedFileMeta.users[user];
 			return (userObj && userObj.name) || user;
 		},
-
+		
 		getUserDisplayName(user) {
 			const userObj = loadedFileMeta.users[user];
 			return (userObj && (userObj.displayName || userObj.name)) || user;
 		},
-
+		
 		selectChannel(channel) {
 			currentPage = 1;
 			selectedChannel = channel;
-
+			
 			loadedMessages = getFilteredMessageKeys(channel).sort(processor.SORTER.oldestToNewest);
 			triggerMessagesRefreshed();
 		},
-
+		
 		setMessagesPerPage(amount) {
 			messagesPerPage = amount;
 			triggerMessagesRefreshed();
 		},
-
+		
 		updateCurrentPage(action) {
 			switch (action) {
 				case "first":
 					currentPage = 1;
 					break;
-
+				
 				case "prev":
 					currentPage = Math.max(1, currentPage - 1);
 					break;
-
+				
 				case "next":
 					currentPage = Math.min(this.getPageCount(), currentPage + 1);
 					break;
-
+				
 				case "last":
 					currentPage = this.getPageCount();
 					break;
-
+				
 				case "pick":
 					const page = parseInt(prompt("Select page:", currentPage), 10);
-
+					
 					if (!page && page !== 0) {
 						return;
 					}
-
+					
 					currentPage = Math.max(1, Math.min(this.getPageCount(), page));
 					break;
 			}
-
+			
 			triggerMessagesRefreshed();
 		},
-
+		
 		getCurrentPage() {
 			const total = this.getPageCount();
-
+			
 			if (currentPage > total && total > 0) {
 				currentPage = total;
 			}
-
+			
 			return currentPage || 1;
 		},
-
+		
 		getPageCount() {
 			return !loadedMessages ? 0 : (!messagesPerPage ? 1 : Math.ceil(loadedMessages.length / messagesPerPage));
 		},
-
+		
 		navigateToMessage(id) {
 			if (!loadedMessages) {
 				return -1;
 			}
-
+			
 			const channel = getMessageChannel(id);
-
+			
 			if (channel !== null && channel !== selectedChannel) {
 				triggerChannelsRefreshed(channel);
 				this.selectChannel(channel);
 			}
-
+			
 			const index = loadedMessages.indexOf(id);
-
+			
 			if (index === -1) {
 				return -1;
 			}
-
+			
 			currentPage = Math.max(1, Math.min(this.getPageCount(), 1 + Math.floor(index / messagesPerPage)));
 			triggerMessagesRefreshed();
 			return index % messagesPerPage;
 		},
-
+		
 		setActiveFilter(filter) {
 			switch (filter ? filter.type : "") {
 				case "user":
 					filterFunction = processor.FILTER.byUser(filter.value);
 					break;
-
+				
 				case "contents":
 					filterFunction = processor.FILTER.byContents(filter.value);
 					break;
-
+				
 				case "withimages":
 					filterFunction = processor.FILTER.withImages();
 					break;
-
+				
 				case "withdownloads":
 					filterFunction = processor.FILTER.withDownloads();
 					break;
-
+				
 				case "edited":
 					filterFunction = processor.FILTER.isEdited();
 					break;
-
+				
 				default:
 					filterFunction = null;
 					break;
 			}
-
+			
 			this.hasActiveFilter = filterFunction != null;
-
+			
 			triggerChannelsRefreshed(selectedChannel);
-
+			
 			if (selectedChannel) {
 				this.selectChannel(selectedChannel); // resets current page and updates messages
 			}
 		}
 	};
-
+	
 	root.hasActiveFilter = false;
 	return root;
 })();

app/Resources/Viewer/scripts/template.mjs

@@ -6,23 +6,17 @@ export default class {
 	constructor(contents) {
 		this.contents = contents;
 	};
-	7
-	apply(obj, processor) {
-
-		//Keys to not escape
-		const allowHTMLKeys = new Set(["icon"]); //Example with more: Set(["icon", "description", "content"]);
 	
+	apply(obj, processor) {
 		return this.contents.replace(TEMPLATE_REGEX, (full, match) => {
 			const value = match.split(".").reduce((o, property) => o[property], obj);
-	
+			
 			if (processor) {
 				const updated = processor(match, value);
-				return typeof updated === "undefined" ? (allowHTMLKeys.has(match) ? value : dom.escapeHTML(value)) : updated;
+				return typeof updated === "undefined" ? dom.escapeHTML(value) : updated;
 			}
-
+			
-	
+			return dom.escapeHTML(value);
-			return allowHTMLKeys.has(match) ? value : dom.escapeHTML(value);
 		});
 	}
-	
 }

app/Resources/Viewer/styles/channels.css

@@ -4,104 +4,37 @@
   max-width: 300px;
   overflow-y: auto;
   color: #eee;
-  background-color: #2B2D31;
+  background-color: #1c1e22;
   font-size: 15px;
-  padding: 2px;
 }
 
-#channels>div.loading {
+#channels > div.loading {
   margin: 0 auto;
   width: 150px;
   height: 150px;
 }
 
-#channels>div.loading {
+#channels > div.channel {
-  background-color: rgba(0, 0, 0, 0) !important;
-}
-
-
-#channels>div.channel.visible {
-  display: flex !important;
-}
-
-#channels>div.channel {
-  display: none !important;
-
   cursor: pointer;
-  padding: 5px 8px;
+  padding: 10px 12px;
-
+  border-bottom: 1px solid #333333;
-  color: #eee;
-  font-size: 15px;
-
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  align-items: flex-start;
-
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-
-  border-radius: 5px;
 }
 
-
+#channels > div.channel:hover, #channels > div.channel.active {
-.ServerChannel {
+  background-color: #282b30;
-  padding: 8px 8px !important;
 }
 
-#channels>div.channel:hover,
-#channels>div.channel.active {
-  background-color: rgba(78, 80, 88, 0.6);
-}
-
-#channels>div.channel.active>.info>.name {
-  color: oklab(0.999994 0.0000455678 0.0000200868);
-}
-
-
 #channels .info {
   display: flex;
-  width: 100%;
+  height: 16px;
-}
+  margin-bottom: 4px;
-
-.ServerChannel>.info {
-  padding: 0px !important;
-}
-
-.UserChannel>.info {
-  align-self: center;
-  padding-left: 6px !important;
-  align-items: center;
-
-  width: 150px !important;
-}
-
-
-[server-type="group"]>.info {
-  padding: 6px;
-
-  width: 172px !important;
-}
-
-.UserChannel>.info>.name {
-  min-height: 18px;
 }
 
 #channels .name {
   flex-grow: 1;
-  overflow-x: hidden;
-  overflow-y: clip;
   text-overflow: ellipsis;
   white-space: nowrap;
-  color: oklab(0.686636 -0.00407365 -0.0149199);
+  overflow: hidden;
-  font-weight: 500;
-  font-size: 16px;
-  /* max-width: 200px; */
-}
-
-.ServerChannel .name {
-  height: 18px;
 }
 
 #channels .tag {
@@ -113,25 +46,3 @@
   padding: 2px 5px;
   font-size: 11px;
 }
-
-
-#channels>div:hover,
-#channels>div.active {
-  background-color: #404249
-}
-
-#channels>div>.avatar {
-  padding: 0;
-  margin: 0;
-}
-
-#channels>div>.avatar>* {
-  width: 30px;
-
-  min-width: 30px;
-  min-height: 30px;
-  /*Make not loaded images be 30px*/
-
-  border-radius: 100%;
-  font-size: 1em;
-}

app/Resources/Viewer/styles/main.css

@@ -1,6 +1,6 @@
 body {
   font-family: Whitney, "Helvetica Neue", Helvetica, Verdana, "Lucida Grande", sans-serif;
-    line-height: 1;
+  line-height: 1;
   margin: 0;
   padding: 0;
   overflow: hidden;
@@ -17,10 +17,6 @@ body {
   --loading-backdrop: rgba(0, 0, 0, 0);
 }
 
-.loading:hover {
-  background-color: rgba(0, 0, 0, 0) !important;
-}
-
 .loading::after {
   content: "";
   background: var(--loading-backdrop)

app/Resources/Viewer/styles/menu.css

@@ -4,8 +4,8 @@
   align-items: stretch;
   gap: 8px;
   padding: 8px;
-  background-color: #313338;
+  background-color: #17181c;
-  border-bottom: 2px solid #27292D
+  border-bottom: 1px dotted #5d626b;
 }
 
 #menu .splitter {
@@ -23,9 +23,7 @@
   cursor: default;
 }
 
-#menu button,
+#menu button, #menu select, #menu input[type="text"] {
-#menu select,
-#menu input[type="text"] {
   height: 31px;
   padding: 0 10px;
   background-color: #7289da;
@@ -56,30 +54,28 @@
   flex-direction: row;
 }
 
-#menu .nav>button {
+#menu .nav > button {
   font-size: 14px;
 }
 
-#menu .nav>button.icon {
+#menu .nav > button.icon {
   font-family: Lucida Console, monospace;
   font-size: 17px;
   padding: 0 8px;
 }
 
-#menu .nav>button,
+#menu .nav > button, #menu .nav > p {
-#menu .nav>p {
   margin: 0 1px;
 }
 
-#opt-filter-list>select,
+#opt-filter-list > select, #opt-filter-list > input {
-#opt-filter-list>input {
   display: none;
 }
 
-#opt-filter-list>.active {
+#opt-filter-list > .active {
   display: block;
 }
 
 #btn-about {
   margin-left: auto;
-}
+}

app/Resources/Viewer/styles/messages.css

@@ -4,15 +4,10 @@
   background-color: #36393e;
 }
 
-#messages>div {
+#messages > div {
-  padding: 0 4px 0 24px;
+  margin: 0 24px;
-
+  padding: 4px 0 12px;
-  margin-bottom: 17px;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.04);
-}
-
-
-#messages>div:hover {
-  background-color: oklab(0.0846607 0.00000385568 0.00000169128 / 0.06);
 }
 
 #messages h2 {
@@ -28,9 +23,7 @@
   align-content: flex-start;
 }
 
-
+#messages .avatar-wrapper > div {
-
-#messages .avatar-wrapper>div {
   flex: 1 1 auto;
 }
 
@@ -57,9 +50,14 @@
   font-size: 12px;
   font-weight: 500;
   letter-spacing: 0;
-  margin-left: 5px;
 }
 
+#messages .info::before {
+  content: "\2022";
+  text-align: center;
+  display: inline-block;
+  width: 14px;
+}
 
 #messages .jump {
   cursor: pointer;
@@ -68,22 +66,20 @@
 }
 
 .message {
-  margin-top: 2px;
+  margin-top: 6px;
-  color: oklab(0.89908 -0.00192907 -0.0048306);
+  color: rgba(255, 255, 255, 0.7);
-  font-size: 16px;
+  font-size: 15px;
   line-height: 1.1em;
   white-space: pre-wrap;
   word-wrap: break-word;
 }
 
-.message .link,
+.message .link, .reply-message .link {
-.reply-message .link {
   color: #7289da;
   background-color: rgba(115, 139, 215, 0.1);
 }
 
-.message a,
+.message a, .reply-message a {
-.reply-message a {
   color: #0096cf;
   text-decoration: none;
 }
@@ -130,8 +126,7 @@
   border-radius: 3px;
 }
 
-.message .embed:first-child,
+.message .embed:first-child, .message .download + .download {
-.message .download+.download {
   margin-top: 0;
 }
 
@@ -262,4 +257,4 @@
 .reactions .count {
   color: rgba(255, 255, 255, 0.45);
   font-size: 14px;
-}
+}

app/Resources/Viewer/styles/servers.css

@@ -1,77 +0,0 @@
-#servers {
-    width: 76px;
-    background-color: #1e1f22;
-    padding: 0px;
-}
-
-.Server {
-    width: 54px;
-    height: 54px;
-    margin-left: 11px;
-    margin-top: 8px;
-    border-radius: 100%;
-    transition: .15s ease-out;
-    cursor: pointer;
-    background-color: #313338;
-    display: flex;
-    align-items: center;
-}
-
-.Server:hover {
-    border-radius: 20px;
-    background-color: #5865f2;
-}
-
-.Server.active {
-    border-radius: 20px;
-    background-color: #5865f2;
-}
-
-.ServerImg {
-    width: 100%;
-    height: 100%;
-}
-
-svg.ServerImg {
-    width: 100%;
-    height: 70%;
-    /* margin-top: 15%; */
-    color: white;
-}
-
-#servers .Server .icon {
-    font-weight: bold;
-    font-size: 1.5em;
-    text-align: center;
-    word-wrap: break-word;
-    white-space: normal;
-    overflow: hidden;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-    color: white;
-}
-
-#servers .Server .name {
-    display: none;
-    font-weight: bold;
-    white-space: normal;
-    word-wrap: break-word;
-    text-align: center;
-}
-#servers .Server .name {
-    display: none;
-}
-
-#servers .Server:hover .name {
-    display: block;
-    position: absolute;
-    background: rgba(0, 0, 0, 0.8);
-    color: white;
-    padding: 5px;
-    border-radius: 4px;
-    margin-left: 60px;
-    white-space: nowrap;
-}

app/Server/Data/FileUrl.cs

@@ -0,0 +1,9 @@
+namespace DHT.Server.Data;
+
+public readonly record struct FileUrl(string NormalizedUrl, string DownloadUrl, string? Type) {
+	public FileUrl(string url, string? type) : this(url, url, type) {}
+	
+	public Download ToPendingDownload() {
+		return new Download(NormalizedUrl, DownloadUrl, DownloadStatus.Pending, Type, size: null);
+	}
+}

app/Server/Data/Server.cs

@@ -1,7 +1,12 @@
+using DHT.Server.Download;
+
 namespace DHT.Server.Data;
 
 public readonly struct Server {
 	public ulong Id { get; init; }
 	public string Name { get; init; }
 	public ServerType? Type { get; init; }
+	public string? IconHash { get; init; }
+	
+	internal FileUrl? IconUrl => Type == null || IconHash == null ? null : DownloadLinkExtractor.ServerIcon(Type.Value, Id, IconHash);
 }

app/Server/Data/User.cs

@@ -1,9 +1,13 @@
+using DHT.Server.Download;
+
 namespace DHT.Server.Data;
 
 public readonly struct User {
 	public ulong Id { get; init; }
 	public string Name { get; init; }
 	public string? DisplayName { get; init; }
-	public string? AvatarUrl { get; init; }
+	public string? AvatarHash { get; init; }
 	public string? Discriminator { get; init; }
+	
+	internal FileUrl? AvatarUrl => AvatarHash == null ? null : DownloadLinkExtractor.UserAvatar(Id, AvatarHash);
 }

app/Server/Database/Export/ViewerJson.cs

@@ -23,6 +23,9 @@ static class ViewerJson {
 	public sealed class JsonServer {
 		public required string Name { get; init; }
 		public required string Type { get; init; }
+		
+		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+		public string? IconUrl { get; init; }
 	}
 	
 	public sealed class JsonChannel {

app/Server/Database/Export/ViewerJsonExport.cs

@@ -90,7 +90,7 @@ static class ViewerJsonExport {
 			users[user.Id] = new ViewerJson.JsonUser {
 				Name = user.Name,
 				DisplayName = user.DisplayName,
-				Avatar = user.AvatarUrl,
+				Avatar = user.AvatarHash,
 			};
 		}
 		
@@ -108,6 +108,7 @@ static class ViewerJsonExport {
 			servers[server.Id] = new ViewerJson.JsonServer {
 				Name = server.Name,
 				Type = ServerTypes.ToJsonViewerString(server.Type),
+				IconUrl = server.IconUrl?.DownloadUrl,
 			};
 		}
 		

app/Server/Database/Import/LegacyArchiveImport.cs

@@ -10,15 +10,12 @@ using DHT.Server.Data;
 using DHT.Utils.Collections;
 using DHT.Utils.Http;
 using DHT.Utils.Logging;
-using Microsoft.AspNetCore.StaticFiles;
 
 namespace DHT.Server.Database.Import;
 
 public static class LegacyArchiveImport {
 	private static readonly Log Log = Log.ForType(typeof(LegacyArchiveImport));
 	
-	private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
-	
 	public static async Task<bool> Read(Stream stream, IDatabaseFile db, FakeSnowflake fakeSnowflake, Func<Data.Server[], Task<Dictionary<Data.Server, ulong>?>> askForServerIds) {
 		Perf perf = Log.Start();
 		JsonElement root = await JsonSerializer.DeserializeAsync(stream, JsonElementContext.Default.JsonElement);
@@ -106,7 +103,7 @@ public static class LegacyArchiveImport {
 			users[userindex[userId]] = new User {
 				Id = userId,
 				Name = userObj.RequireString("name", path),
-				AvatarUrl = userObj.HasKey("avatar") ? userObj.RequireString("avatar", path) : null,
+				AvatarHash = userObj.HasKey("avatar") ? userObj.RequireString("avatar", path) : null,
 				Discriminator = userObj.HasKey("tag") ? userObj.RequireString("tag", path) : null,
 			};
 		}
@@ -189,7 +186,7 @@ public static class LegacyArchiveImport {
 		return attachmentsArray.Select(attachmentObj => {
 			string url = attachmentObj.RequireString("url", path);
 			string name = url[(url.LastIndexOf('/') + 1)..];
-			string? type = ContentTypeProvider.TryGetContentType(name, out string? contentType) ? contentType : null;
+			string? type = MimeTypes.TryGetByFileExtension(name, out var mimeType) ? mimeType : null;
 			
 			return new Attachment {
 				Id = fakeSnowflake.Next(),

app/Server/Database/Repositories/IDownloadRepository.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using DHT.Server.Data;
 using DHT.Server.Data.Aggregations;
 using DHT.Server.Data.Filters;
 using DHT.Server.Download;
@@ -34,7 +35,7 @@ public interface IDownloadRepository {
 	
 	Task Remove(ICollection<string> normalizedUrls);
 	
-	IAsyncEnumerable<Data.Download> FindAllDownloadableUrls(CancellationToken cancellationToken = default);
+	IAsyncEnumerable<FileUrl> FindReachableFiles(CancellationToken cancellationToken = default);
 	
 	internal sealed class Dummy : IDownloadRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
@@ -79,8 +80,8 @@ public interface IDownloadRepository {
 			return Task.CompletedTask;
 		}
 		
-		public IAsyncEnumerable<Data.Download> FindAllDownloadableUrls(CancellationToken cancellationToken) {
+		public IAsyncEnumerable<FileUrl> FindReachableFiles(CancellationToken cancellationToken) {
-			return AsyncEnumerable.Empty<Data.Download>();
+			return AsyncEnumerable.Empty<FileUrl>();
 		}
 	}
 }

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

@@ -62,6 +62,15 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			hasChanged |= await metadataCmd.ExecuteNonQueryAsync() > 0;
 		}
 		
+		public Task AddIfNotNull(Data.Download? download) {
+			if (download != null) {
+				return Add(download);
+			}
+			else {
+				return Task.CompletedTask;
+			}
+		}
+		
 		public void OnCommitted() {
 			if (hasChanged) {
 				repository.UpdateTotalCount();
@@ -361,14 +370,17 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		UpdateTotalCount();
 	}
 	
-	public async IAsyncEnumerable<Data.Download> FindAllDownloadableUrls([EnumeratorCancellation] CancellationToken cancellationToken = default) {
+	public async IAsyncEnumerable<FileUrl> FindReachableFiles([EnumeratorCancellation] CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();
 		
-		await using (var cmd = conn.Command("SELECT normalized_url, download_url, type, size FROM attachments")) {
+		await using (var cmd = conn.Command("SELECT type, normalized_url, download_url FROM attachments")) {
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 			
 			while (await reader.ReadAsync(cancellationToken)) {
-				yield return DownloadLinkExtractor.FromAttachment(reader.GetString(0), reader.GetString(1), reader.IsDBNull(2) ? null : reader.GetString(2), reader.GetUint64(3));
+				string? type = reader.IsDBNull(0) ? null : reader.GetString(0);
+				string normalizedUrl = reader.GetString(1);
+				string downloadUrl = reader.GetString(2);
+				yield return new FileUrl(normalizedUrl, downloadUrl, type);
 			}
 		}
 		
@@ -376,8 +388,31 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 			
 			while (await reader.ReadAsync(cancellationToken)) {
-				var result = await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0));
+				if (await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0)) is {} result) {
-				if (result is not null) {
+					yield return result;
+				}
+			}
+		}
+		
+		await using (var cmd = conn.Command("SELECT DISTINCT emoji_id, emoji_flags FROM message_reactions WHERE emoji_id IS NOT NULL")) {
+			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+			
+			while (await reader.ReadAsync(cancellationToken)) {
+				ulong emojiId = reader.GetUint64(0);
+				EmojiFlags emojiFlags = (EmojiFlags) reader.GetInt16(1);
+				yield return DownloadLinkExtractor.Emoji(emojiId, emojiFlags);
+			}
+		}
+		
+		await using (var cmd = conn.Command("SELECT id, type, icon_hash FROM servers WHERE icon_hash IS NOT NULL")) {
+			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
+			
+			while (await reader.ReadAsync(cancellationToken)) {
+				ulong id = reader.GetUint64(0);
+				ServerType? type = ServerTypes.FromString(reader.GetString(1));
+				string iconHash = reader.GetString(2);
+				
+				if (DownloadLinkExtractor.ServerIcon(type, id, iconHash) is {} result) {
 					yield return result;
 				}
 			}
@@ -387,15 +422,9 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 			
 			while (await reader.ReadAsync(cancellationToken)) {
-				yield return DownloadLinkExtractor.FromUserAvatar(reader.GetUint64(0), reader.GetString(1));
+				ulong id = reader.GetUint64(0);
-			}
+				string avatarHash = reader.GetString(1);
-		}
+				yield return DownloadLinkExtractor.UserAvatar(id, avatarHash);
-		
-		await using (var cmd = conn.Command("SELECT DISTINCT emoji_id, emoji_flags FROM message_reactions WHERE emoji_id IS NOT NULL")) {
-			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
-			
-			while (await reader.ReadAsync(cancellationToken)) {
-				yield return DownloadLinkExtractor.FromEmoji(reader.GetUint64(0), (EmojiFlags) reader.GetInt16(1));
 			}
 		}
 	}

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

@@ -10,6 +10,7 @@ using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Utils;
 using DHT.Server.Download;
 using DHT.Utils.Logging;
+using JetBrains.Annotations;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
@@ -17,15 +18,16 @@ namespace DHT.Server.Database.Sqlite.Repositories;
 sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : BaseSqliteRepository(Log), IMessageRepository {
 	private static readonly Log Log = Log.ForType<SqliteMessageRepository>();
 	
+	// Moved outside the Add method due to language injections not working in local methods.
+	private static SqliteCommand DeleteByMessageId(ISqliteConnection conn, [LanguageInjection("sql", Prefix = "SELECT * FROM ")] string tableName) {
+		return conn.Delete(tableName, ("message_id", SqliteType.Integer));
+	}
+	
 	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();
@@ -137,7 +139,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 						messageAttachmentCmd.Set(":attachment_id", attachmentId);
 						await messageAttachmentCmd.ExecuteNonQueryAsync();
 						
-						await downloadCollector.Add(DownloadLinkExtractor.FromAttachment(attachment));
+						await downloadCollector.Add(new Data.Download(attachment.NormalizedUrl, attachment.DownloadUrl, DownloadStatus.Pending, attachment.Type, attachment.Size));
 					}
 				}
 				
@@ -148,7 +150,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 						await messageEmbedCmd.ExecuteNonQueryAsync();
 						
 						if (DownloadLinkExtractor.TryFromEmbedJson(embed.Json) is {} download) {
-							await downloadCollector.Add(download);
+							await downloadCollector.Add(download.ToPendingDownload());
 						}
 					}
 				}
@@ -163,7 +165,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 						await messageReactionCmd.ExecuteNonQueryAsync();
 						
 						if (reaction.EmojiId is {} emojiId) {
-							await downloadCollector.Add(DownloadLinkExtractor.FromEmoji(emojiId, reaction.EmojiFlags));
+							await downloadCollector.Add(DownloadLinkExtractor.Emoji(emojiId, reaction.EmojiFlags).ToPendingDownload());
 						}
 					}
 				}

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

@@ -10,15 +10,9 @@ using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
+sealed class SqliteServerRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : BaseSqliteRepository(Log), 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();
@@ -27,13 +21,18 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 				("id", SqliteType.Integer),
 				("name", SqliteType.Text),
 				("type", SqliteType.Text),
+				("icon_hash", SqliteType.Text),
 			]);
 			
+			await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
+			
 			foreach (Data.Server server in servers) {
 				cmd.Set(":id", server.Id);
 				cmd.Set(":name", server.Name);
 				cmd.Set(":type", ServerTypes.ToString(server.Type));
+				cmd.Set(":icon_hash", server.IconHash);
 				await cmd.ExecuteNonQueryAsync();
+				await downloadCollector.AddIfNotNull(server.IconUrl?.ToPendingDownload());
 			}
 			
 			await conn.CommitTransactionAsync();
@@ -50,7 +49,7 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 	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 cmd = conn.Command("SELECT id, name, type, icon_hash FROM servers");
 		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 		
 		while (await reader.ReadAsync(cancellationToken)) {
@@ -58,6 +57,7 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 				Id = reader.GetUint64(0),
 				Name = reader.GetString(1),
 				Type = ServerTypes.FromString(reader.GetString(2)),
+				IconHash = reader.IsDBNull(3) ? null : reader.GetString(3),
 			};
 		}
 	}

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

@@ -5,23 +5,14 @@ using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database.Repositories;
 using DHT.Server.Database.Sqlite.Utils;
-using DHT.Server.Download;
 using DHT.Utils.Logging;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
+sealed class SqliteUserRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : BaseSqliteRepository(Log), IUserRepository {
 	private static readonly Log Log = Log.ForType<SqliteUserRepository>();
 	
-	private readonly SqliteConnectionPool pool;
-	private readonly SqliteDownloadRepository downloads;
-	
-	public SqliteUserRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : base(Log) {
-		this.pool = pool;
-		this.downloads = downloads;
-	}
-	
 	public async Task Add(IReadOnlyList<User> users) {
 		await using (var conn = await pool.Take()) {
 			await conn.BeginTransactionAsync();
@@ -40,13 +31,10 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 				cmd.Set(":id", user.Id);
 				cmd.Set(":name", user.Name);
 				cmd.Set(":display_name", user.DisplayName);
-				cmd.Set(":avatar_url", user.AvatarUrl);
+				cmd.Set(":avatar_url", user.AvatarHash);
 				cmd.Set(":discriminator", user.Discriminator);
 				await cmd.ExecuteNonQueryAsync();
-				
+				await downloadCollector.AddIfNotNull(user.AvatarUrl?.ToPendingDownload());
-				if (user.AvatarUrl is {} avatarUrl) {
-					await downloadCollector.Add(DownloadLinkExtractor.FromUserAvatar(user.Id, avatarUrl));
-				}
 			}
 			
 			await conn.CommitTransactionAsync();
@@ -72,7 +60,7 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 				Id = reader.GetUint64(0),
 				Name = reader.GetString(1),
 				DisplayName = reader.IsDBNull(2) ? null : reader.GetString(2),
-				AvatarUrl = reader.IsDBNull(3) ? null : reader.GetString(3),
+				AvatarHash = reader.IsDBNull(3) ? null : reader.GetString(3),
 				Discriminator = reader.IsDBNull(4) ? null : reader.GetString(4),
 			};
 		}

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

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

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

@@ -124,7 +124,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
 			await using var reader = await embedCmd.ExecuteReaderAsync();
 			
 			while (await reader.ReadAsync()) {
-				await InsertDownload(insertCmd, await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0)));
+				await InsertDownload(insertCmd, (await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0)))?.ToPendingDownload());
 			}
 		}
 		
@@ -134,7 +134,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
 			await using var reader = await avatarCmd.ExecuteReaderAsync();
 			
 			while (await reader.ReadAsync()) {
-				await InsertDownload(insertCmd, DownloadLinkExtractor.FromUserAvatar(reader.GetUint64(0), reader.GetString(1)));
+				await InsertDownload(insertCmd, DownloadLinkExtractor.UserAvatar(reader.GetUint64(0), reader.GetString(1)).ToPendingDownload());
 			}
 		}
 		
@@ -144,7 +144,7 @@ sealed class SqliteSchemaUpgradeTo7 : ISchemaUpgrade {
 			await using var reader = await avatarCmd.ExecuteReaderAsync();
 			
 			while (await reader.ReadAsync()) {
-				await InsertDownload(insertCmd, DownloadLinkExtractor.FromEmoji(reader.GetUint64(0), (EmojiFlags) reader.GetInt16(1)));
+				await InsertDownload(insertCmd, DownloadLinkExtractor.Emoji(reader.GetUint64(0), (EmojiFlags) reader.GetInt16(1)).ToPendingDownload());
 			}
 		}
 		

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -66,16 +66,16 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 		downloads = new SqliteDownloadRepository(pool);
 		settings = new SqliteSettingsRepository(pool);
 		users = new SqliteUserRepository(pool, downloads);
-		servers = new SqliteServerRepository(pool);
+		servers = new SqliteServerRepository(pool, downloads);
 		channels = new SqliteChannelRepository(pool);
 		messages = new SqliteMessageRepository(pool, downloads);
 	}
 	
 	public async ValueTask DisposeAsync() {
-		users.Dispose();
-		servers.Dispose();
-		channels.Dispose();
 		messages.Dispose();
+		channels.Dispose();
+		servers.Dispose();
+		users.Dispose();
 		downloads.Dispose();
 		await pool.DisposeAsync();
 	}

app/Server/Database/Sqlite/SqliteSchema.cs

@@ -13,7 +13,7 @@ using Microsoft.Data.Sqlite;
 namespace DHT.Server.Database.Sqlite;
 
 sealed class SqliteSchema(CustomSqliteConnection conn) {
-	internal const int Version = 10;
+	internal const int Version = 11;
 	
 	private static readonly Log Log = Log.ForType<SqliteSchema>();
 	
@@ -92,9 +92,10 @@ sealed class SqliteSchema(CustomSqliteConnection conn) {
 		
 		await conn.ExecuteAsync("""
 		                        CREATE TABLE servers (
-		                        	id   INTEGER PRIMARY KEY NOT NULL,
+		                        	id        INTEGER PRIMARY KEY NOT NULL,
-		                        	name TEXT NOT NULL,
+		                        	name      TEXT NOT NULL,
-		                        	type TEXT NOT NULL
+		                        	type      TEXT NOT NULL,
+		                        	icon_hash TEXT
 		                        )
 		                        """);
 		
@@ -222,6 +223,7 @@ sealed class SqliteSchema(CustomSqliteConnection conn) {
 			{ 7, new SqliteSchemaUpgradeTo8() },
 			{ 8, new SqliteSchemaUpgradeTo9() },
 			{ 9, new SqliteSchemaUpgradeTo10() },
+			{ 10, new SqliteSchemaUpgradeTo11() },
 		};
 		
 		Perf perf = Log.Start("from version " + dbVersion);

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

@@ -30,7 +30,7 @@ static class SqliteExtensions {
 		return (long) (await command.ExecuteScalarAsync())!;
 	}
 	
-	public static SqliteCommand Insert(this ISqliteConnection conn, string tableName, (string Name, SqliteType Type)[] columns) {
+	public static SqliteCommand Insert(this ISqliteConnection conn, [LanguageInjection("sql", Prefix = "SELECT * FROM ")] string tableName, (string Name, SqliteType Type)[] columns) {
 		string columnNames = string.Join(separator: ',', columns.Select(static c => c.Name));
 		string columnParams = string.Join(separator: ',', columns.Select(static c => ':' + c.Name));
 		
@@ -41,7 +41,7 @@ static class SqliteExtensions {
 		return cmd;
 	}
 	
-	public static SqliteCommand Upsert(this ISqliteConnection conn, string tableName, (string Name, SqliteType Type)[] columns) {
+	public static SqliteCommand Upsert(this ISqliteConnection conn, [LanguageInjection("sql", Prefix = "SELECT * FROM ")] string tableName, (string Name, SqliteType Type)[] columns) {
 		string columnNames = string.Join(separator: ',', columns.Select(static c => c.Name));
 		string columnParams = string.Join(separator: ',', columns.Select(static c => ':' + c.Name));
 		string columnUpdates = string.Join(separator: ',', columns.Skip(1).Select(static c => c.Name + " = excluded." + c.Name));
@@ -55,7 +55,7 @@ static class SqliteExtensions {
 		return cmd;
 	}
 	
-	public static SqliteCommand Delete(this ISqliteConnection conn, string tableName, (string Name, SqliteType Type) column) {
+	public static SqliteCommand Delete(this ISqliteConnection conn, [LanguageInjection("sql", Prefix = "SELECT * FROM ")] string tableName, (string Name, SqliteType Type) column) {
 		var cmd = conn.Command("DELETE FROM " + tableName + " WHERE " + column.Name + " = :" + column.Name);
 		CreateParameters(cmd, [column]);
 		return cmd;

app/Server/Download/DownloadLinkExtractor.cs

@@ -12,30 +12,28 @@ namespace DHT.Server.Download;
 static class DownloadLinkExtractor {
 	private static readonly Log Log = Log.ForType(typeof(DownloadLinkExtractor));
 	
-	public static Data.Download FromUserAvatar(ulong userId, string avatarPath) {
+	public static FileUrl? ServerIcon(ServerType? type, ulong id, string iconHash) {
-		string url = $"https://cdn.discordapp.com/avatars/{userId}/{avatarPath}.webp";
+		return type switch {
-		return new Data.Download(url, url, DownloadStatus.Pending, MediaTypeNames.Image.Webp, size: null);
+			ServerType.Server => new FileUrl($"https://cdn.discordapp.com/icons/{id}/{iconHash}.webp", MediaTypeNames.Image.Webp),
+			ServerType.Group  => new FileUrl($"https://cdn.discordapp.com/channel-icons/{id}/{iconHash}.webp", MediaTypeNames.Image.Webp),
+			_                 => null,
+		};
 	}
 	
-	public static Data.Download FromEmoji(ulong emojiId, EmojiFlags flags) {
+	public static FileUrl UserAvatar(ulong id, string avatarHash) {
+		return new FileUrl($"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.webp", MediaTypeNames.Image.Webp);
+	}
+	
+	public static FileUrl Emoji(ulong emojiId, EmojiFlags flags) {
 		bool isAnimated = flags.HasFlag(EmojiFlags.Animated);
 		
 		string ext = isAnimated ? "gif" : "webp";
 		string type = isAnimated ? MediaTypeNames.Image.Gif : MediaTypeNames.Image.Webp;
 		
-		string url = $"https://cdn.discordapp.com/emojis/{emojiId}.{ext}";
+		return new FileUrl($"https://cdn.discordapp.com/emojis/{emojiId}.{ext}", type);
-		return new Data.Download(url, url, DownloadStatus.Pending, type, size: null);
 	}
 	
-	public static Data.Download FromAttachment(Attachment attachment) {
+	public static async Task<FileUrl?> TryFromEmbedJson(Stream jsonStream) {
-		return FromAttachment(attachment.NormalizedUrl, attachment.DownloadUrl, attachment.Type, attachment.Size);
-	}
-	
-	public static Data.Download FromAttachment(string normalizedUrl, string downloadUrl, string? type, ulong size) {
-		return new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Pending, type, size);
-	}
-	
-	public static async Task<Data.Download?> TryFromEmbedJson(Stream jsonStream) {
 		try {
 			return FromEmbed(await JsonSerializer.DeserializeAsync(jsonStream, DiscordEmbedJsonContext.Default.DiscordEmbedJson));
 		} catch (Exception e) {
@@ -44,7 +42,7 @@ static class DownloadLinkExtractor {
 		}
 	}
 	
-	public static Data.Download? TryFromEmbedJson(string json) {
+	public static FileUrl? TryFromEmbedJson(string json) {
 		try {
 			return FromEmbed(JsonSerializer.Deserialize(json, DiscordEmbedJsonContext.Default.DiscordEmbedJson));
 		} catch (Exception e) {
@@ -53,21 +51,17 @@ static class DownloadLinkExtractor {
 		}
 	}
 	
-	private static Data.Download? FromEmbed(DiscordEmbedJson? embed) {
+	private static FileUrl? FromEmbed(DiscordEmbedJson? embed) {
-		if (embed is { Type: "image", Image.Url: {} imageUrl }) {
+		return embed switch {
-			return FromEmbedImage(imageUrl);
+			{ Type: "image", Image.Url: {} imageUrl } => FromEmbedImage(imageUrl),
-		}
+			{ Type: "video", Video.Url: {} videoUrl } => FromEmbedVideo(videoUrl),
-		else if (embed is { Type: "video", Video.Url: {} videoUrl }) {
+			_                                         => null,
-			return FromEmbedVideo(videoUrl);
+		};
-		}
-		else {
-			return null;
-		}
 	}
 	
-	private static Data.Download? FromEmbedImage(string url) {
+	private static FileUrl? FromEmbedImage(string url) {
 		if (DiscordCdn.NormalizeUrlAndReturnIfCdn(url, out string normalizedUrl)) {
-			return new Data.Download(normalizedUrl, url, DownloadStatus.Pending, GuessImageType(normalizedUrl), size: null);
+			return new FileUrl(normalizedUrl, url, GuessImageType(normalizedUrl));
 		}
 		else {
 			Log.Debug("Skipping non-CDN image url: " + url);
@@ -75,9 +69,9 @@ static class DownloadLinkExtractor {
 		}
 	}
 	
-	private static Data.Download? FromEmbedVideo(string url) {
+	private static FileUrl? FromEmbedVideo(string url) {
 		if (DiscordCdn.NormalizeUrlAndReturnIfCdn(url, out string normalizedUrl)) {
-			return new Data.Download(normalizedUrl, url, DownloadStatus.Pending, GuessVideoType(normalizedUrl), size: null);
+			return new FileUrl(normalizedUrl, url, GuessVideoType(normalizedUrl));
 		}
 		else {
 			Log.Debug("Skipping non-CDN video url: " + url);

app/Server/Endpoints/BaseEndpoint.cs

@@ -1,56 +1,58 @@
 using System;
 using System.Net;
+using System.Net.Http;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
-using DHT.Server.Database;
 using DHT.Utils.Http;
 using DHT.Utils.Logging;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Entity;
-using Microsoft.Extensions.Primitives;
+using Sisk.Core.Http;
 
 namespace DHT.Server.Endpoints;
 
-abstract class BaseEndpoint(IDatabaseFile db) {
+abstract class BaseEndpoint {
 	private static readonly Log Log = Log.ForType<BaseEndpoint>();
 	
-	protected IDatabaseFile Db { get; } = db;
+	public async Task<HttpResponse> Handle(HttpRequest request) {
-	
-	public async Task Handle(HttpContext ctx) {
-		HttpResponse response = ctx.Response;
-		
 		try {
-			response.StatusCode = (int) HttpStatusCode.OK;
+			return await Respond(request);
-			await Respond(ctx.Request, response, ctx.RequestAborted);
 		} catch (OperationCanceledException) {
 			throw;
 		} catch (HttpException e) {
 			Log.Error(e);
-			response.StatusCode = (int) e.StatusCode;
+			return new HttpResponse(e.StatusCode).WithContent(e.Message);
-			if (response.HasStarted) {
-				Log.Warn("Response has already started, cannot write status message: " + e.Message);
-			}
-			else {
-				await response.WriteAsync(e.Message);
-			}
 		} catch (Exception e) {
 			Log.Error(e);
-			response.StatusCode = (int) HttpStatusCode.InternalServerError;
+			return new HttpResponse(HttpStatusCode.InternalServerError);
 		}
 	}
 	
-	protected abstract Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken);
+	protected abstract Task<HttpResponse> Respond(HttpRequest request);
 	
 	protected static async Task<JsonElement> ReadJson(HttpRequest request) {
 		try {
-			return await request.ReadFromJsonAsync(JsonElementContext.Default.JsonElement);
+			return await request.GetJsonContentAsync(JsonElementContext.Default.JsonElement);
 		} catch (JsonException) {
 			throw new HttpException(HttpStatusCode.UnsupportedMediaType, "This endpoint only accepts JSON.");
 		}
 	}
 	
+	protected static Task<HttpResponse> WriteFileIfFound(string relativeFilePath, byte[]? bytes) {
+		if (bytes == null) {
+			throw new HttpException(HttpStatusCode.NotFound, "File not found: " + relativeFilePath);
+		}
+		
+		HttpResponse response = new HttpResponse(new ByteArrayContent(bytes));
+		
+		if (MimeTypes.TryGetByFileExtension(relativeFilePath, out var mimeType)) {
+			response.Headers.Set(HttpKnownHeaderNames.ContentType, mimeType);
+		}
+		
+		return Task.FromResult(response);
+	}
+	
 	protected static Guid GetSessionId(HttpRequest request) {
-		if (request.Query.TryGetValue("session", out StringValues sessionIdValue) && sessionIdValue.Count == 1 && Guid.TryParse(sessionIdValue[0], out Guid sessionId)) {
+		if (request.Query.TryGetValue("session", out StringValue sessionIdValue) && !sessionIdValue.IsNull && Guid.TryParse(sessionIdValue, out Guid sessionId)) {
 			return sessionId;
 		}
 		else {

app/Server/Endpoints/GetDownloadedFileEndpoint.cs

@@ -5,22 +5,39 @@ using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
 using DHT.Server.Download;
-using DHT.Utils.Http;
+using Sisk.Core.Http;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Http.Streams;
 
 namespace DHT.Server.Endpoints;
 
-sealed class GetDownloadedFileEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
+sealed class GetDownloadedFileEndpoint(IDatabaseFile db) : BaseEndpoint {
-	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
-		string url = WebUtility.UrlDecode((string) request.RouteValues["url"]!);
+		string url = WebUtility.UrlDecode(request.RouteParameters.GetItem("url"));
 		string normalizedUrl = DiscordCdn.NormalizeUrl(url);
 		
-		if (!await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, WriteDataTo(response), cancellationToken)) {
+		HttpResponseStreamManager response = request.GetResponseStream();
-			response.Redirect(url, permanent: false);
+		
+		if (!await db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, WriteDataTo(response), CancellationToken.None)) {
+			response.SetStatus(HttpStatusCode.Redirect);
+			response.SetHeader(HttpKnownHeaderNames.Location, url);
 		}
+		
+		return response.Close();
 	}
 	
-	private static Func<Data.Download, Stream, CancellationToken, Task> WriteDataTo(HttpResponse response) {
+	private static Func<Data.Download, Stream, CancellationToken, Task> WriteDataTo(HttpResponseStreamManager response) {
-		return (download, stream, cancellationToken) => response.WriteStreamAsync(download.Type, download.Size, stream, cancellationToken);
+		return (download, stream, cancellationToken) => {
+			response.SetStatus(HttpStatusCode.OK);
+			response.SetHeader(HttpKnownHeaderNames.ContentType, download.Type);
+			
+			if (download.Size is {} size) {
+				response.SetContentLength((long) size);
+			}
+			else {
+				response.SendChunked = true;
+			}
+			
+			return stream.CopyToAsync(response.ResponseStream, cancellationToken);
+		};
 	}
 }

app/Server/Endpoints/GetTrackingScriptEndpoint.cs

@@ -1,17 +1,15 @@
 using System.Net.Mime;
-using System.Threading;
+using System.Text;
 using System.Threading.Tasks;
 using System.Web;
-using DHT.Server.Database;
 using DHT.Server.Service;
-using DHT.Utils.Http;
 using DHT.Utils.Resources;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters, ResourceLoader resources) : BaseEndpoint(db) {
+sealed class GetTrackingScriptEndpoint(ServerParameters parameters, ResourceLoader resources) : BaseEndpoint {
-	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
 		string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
 		string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + parameters.Port + ";")
 		                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(parameters.Token))
@@ -20,7 +18,8 @@ sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parame
 		                         .Replace("/*[CSS-SETTINGS]*/", await resources.ReadTextAsync("Tracker/styles/settings.css"))
 		                         .Replace("/*[DEBUGGER]*/", request.Query.ContainsKey("debug") ? "debugger;" : "");
 		
-		response.Headers.Append("X-DHT", "1");
+		return new HttpResponse()
-		await response.WriteTextAsync(MediaTypeNames.Text.JavaScript, script, cancellationToken);
+		       .WithHeader("X-DHT", "1")
+		       .WithContent(script, Encoding.UTF8, MediaTypeNames.Text.JavaScript);
 	}
 }

app/Server/Endpoints/GetUserscriptEndpoint.cs

@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+using DHT.Utils.Resources;
+using Sisk.Core.Http;
+
+namespace DHT.Server.Endpoints;
+
+// [ServerAuthorizationMiddleware.NoAuthorization]
+sealed class GetUserscriptEndpoint(ResourceLoader resources) : BaseEndpoint {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
+		const string FileName = "dht.user.js";
+		const string ResourcePath = "Tracker/loader/" + FileName;
+		
+		byte[]? resourceBytes = await resources.ReadBytesAsyncIfExists(ResourcePath);
+		return await WriteFileIfFound(FileName, resourceBytes);
+	}
+}

app/Server/Endpoints/GetViewerMessagesEndpoint.cs

@@ -1,19 +1,27 @@
 using System;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
 using DHT.Server.Database.Export;
 using DHT.Server.Service.Viewer;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Http;
+using Sisk.Core.Http.Streams;
 
 namespace DHT.Server.Endpoints;
 
-sealed class GetViewerMessagesEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
+sealed class GetViewerMessagesEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint {
-	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
 		Guid sessionId = GetSessionId(request);
 		ViewerSession session = viewerSessions.Get(sessionId);
 		
-		response.ContentType = "application/x-ndjson";
+		HttpResponseStreamManager response = request.GetResponseStream();
-		return ViewerJsonExport.GetMessages(response.Body, Db, session.MessageFilter, cancellationToken);
+		response.SendChunked = true;
+		response.SetStatus(HttpStatusCode.OK);
+		response.SetHeader(HttpKnownHeaderNames.ContentType, "application/x-ndjson");
+		
+		await ViewerJsonExport.GetMessages(response.ResponseStream, db, session.MessageFilter, CancellationToken.None);
+		
+		return response.Close();
 	}
 }

app/Server/Endpoints/GetViewerMetadataEndpoint.cs

@@ -1,20 +1,28 @@
 using System;
+using System.Net;
 using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
 using DHT.Server.Database.Export;
 using DHT.Server.Service.Viewer;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Http;
+using Sisk.Core.Http.Streams;
 
 namespace DHT.Server.Endpoints;
 
-sealed class GetViewerMetadataEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
+sealed class GetViewerMetadataEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint {
-	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
 		Guid sessionId = GetSessionId(request);
 		ViewerSession session = viewerSessions.Get(sessionId);
 		
-		response.ContentType = MediaTypeNames.Application.Json;
+		HttpResponseStreamManager response = request.GetResponseStream();
-		return ViewerJsonExport.GetMetadata(response.Body, Db, session.MessageFilter, cancellationToken);
+		response.SendChunked = true;
+		response.SetStatus(HttpStatusCode.OK);
+		response.SetHeader(HttpKnownHeaderNames.ContentType, MediaTypeNames.Application.Json);
+		
+		await ViewerJsonExport.GetMetadata(response.ResponseStream, db, session.MessageFilter, CancellationToken.None);
+		
+		return response.Close();
 	}
 }

app/Server/Endpoints/TrackChannelEndpoint.cs

@@ -1,22 +1,23 @@
 using System.Net;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Utils.Http;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class TrackChannelEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
+sealed class TrackChannelEndpoint(IDatabaseFile db) : BaseEndpoint {
-	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
 		JsonElement root = await ReadJson(request);
 		Data.Server server = ReadServer(root.RequireObject("server"), "server");
 		Channel channel = ReadChannel(root.RequireObject("channel"), "channel", server.Id);
 		
-		await Db.Servers.Add([server]);
+		await db.Servers.Add([server]);
-		await Db.Channels.Add([channel]);
+		await db.Channels.Add([channel]);
+		
+		return new HttpResponse();
 	}
 	
 	private static Data.Server ReadServer(JsonElement json, string path) {
@@ -24,6 +25,7 @@ sealed class TrackChannelEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 			Id = json.RequireSnowflake("id", path),
 			Name = json.RequireString("name", path),
 			Type = ServerTypes.FromString(json.RequireString("type", path)) ?? throw new HttpException(HttpStatusCode.BadRequest, "Server type must be either 'SERVER', 'GROUP', or 'DM'."),
+			IconHash = json.HasKey("icon") ? json.RequireString("icon", path) : null,
 		};
 	}
 	

app/Server/Endpoints/TrackMessagesEndpoint.cs

@@ -12,15 +12,15 @@ using DHT.Server.Database;
 using DHT.Server.Download;
 using DHT.Utils.Collections;
 using DHT.Utils.Http;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
+sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint {
 	private const string HasNewMessages = "1";
 	private const string NoNewMessages = "0";
 	
-	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
 		JsonElement root = await ReadJson(request);
 		
 		if (root.ValueKind != JsonValueKind.Array) {
@@ -38,11 +38,11 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 		}
 		
 		var addedMessageFilter = new MessageFilter { MessageIds = addedMessageIds };
-		bool anyNewMessages = await Db.Messages.Count(addedMessageFilter, CancellationToken.None) < addedMessageIds.Count;
+		bool anyNewMessages = await db.Messages.Count(addedMessageFilter, CancellationToken.None) < addedMessageIds.Count;
 		
-		await Db.Messages.Add(messages);
+		await db.Messages.Add(messages);
 		
-		await response.WriteTextAsync(anyNewMessages ? HasNewMessages : NoNewMessages, cancellationToken);
+		return new HttpResponse().WithContent(anyNewMessages ? HasNewMessages : NoNewMessages);
 	}
 	
 	private static Message ReadMessage(JsonElement json, string path) {

app/Server/Endpoints/TrackUsersEndpoint.cs

@@ -1,16 +1,15 @@
 using System.Net;
 using System.Text.Json;
-using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database;
 using DHT.Utils.Http;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
+sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint {
-	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
 		JsonElement root = await ReadJson(request);
 		
 		if (root.ValueKind != JsonValueKind.Array) {
@@ -24,7 +23,9 @@ sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 			users[i++] = ReadUser(user, "user");
 		}
 		
-		await Db.Users.Add(users);
+		await db.Users.Add(users);
+		
+		return new HttpResponse();
 	}
 	
 	private static User ReadUser(JsonElement json, string path) {
@@ -32,7 +33,7 @@ sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 			Id = json.RequireSnowflake("id", path),
 			Name = json.RequireString("name", path),
 			DisplayName = json.HasKey("displayName") ? json.RequireString("displayName", path) : null,
-			AvatarUrl = json.HasKey("avatar") ? json.RequireString("avatar", path) : null,
+			AvatarHash = json.HasKey("avatar") ? json.RequireString("avatar", path) : null,
 			Discriminator = json.HasKey("discriminator") ? json.RequireString("discriminator", path) : null,
 		};
 	}

app/Server/Endpoints/ViewerEndpoint.cs

@@ -1,28 +1,23 @@
 using System.Collections.Generic;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using DHT.Server.Database;
-using DHT.Utils.Http;
 using DHT.Utils.Resources;
-using Microsoft.AspNetCore.Http;
+using Sisk.Core.Http;
-using Microsoft.AspNetCore.StaticFiles;
 
 namespace DHT.Server.Endpoints;
 
-sealed class ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : BaseEndpoint(db) {
+// [ServerAuthorizationMiddleware.NoAuthorization]
-	private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
+sealed class ViewerEndpoint(ResourceLoader resources) : BaseEndpoint {
-	
 	private readonly Dictionary<string, byte[]?> cache = new ();
 	private readonly SemaphoreSlim cacheSemaphore = new (1);
 	
-	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+	protected override async Task<HttpResponse> Respond(HttpRequest request) {
-		string path = (string?) request.RouteValues["path"] ?? "index.html";
+		string path = request.RouteParameters.GetValue("path") ?? "index.html";
 		string resourcePath = "Viewer/" + path;
 		
 		byte[]? resourceBytes;
 		
-		await cacheSemaphore.WaitAsync(cancellationToken);
+		await cacheSemaphore.WaitAsync();
 		try {
 			if (!cache.TryGetValue(resourcePath, out resourceBytes)) {
 				cache[resourcePath] = resourceBytes = await resources.ReadBytesAsyncIfExists(resourcePath);
@@ -31,12 +26,6 @@ sealed class ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : BaseEn
 			cacheSemaphore.Release();
 		}
 		
-		if (resourceBytes == null) {
+		return await WriteFileIfFound(path, resourceBytes);
-			throw new HttpException(HttpStatusCode.NotFound, "File not found: " + path);
-		}
-		else {
-			string? contentType = ContentTypeProvider.TryGetContentType(path, out string? type) ? type : null;
-			await response.WriteFileAsync(contentType, resourceBytes, cancellationToken);
-		}
 	}
 }

app/Server/Server.csproj

@@ -6,12 +6,9 @@
     <PackageId>DiscordHistoryTrackerServer</PackageId>
   </PropertyGroup>
   
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-  
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.7" />
+    <PackageReference Include="Sisk.HttpServer" Version="1.4.2" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
   
@@ -29,6 +26,11 @@
       <Link>Resources/Tracker/%(RecursiveDir)%(Filename)%(Extension)</Link>
       <Visible>false</Visible>
     </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Tracker/loader/**">
+      <LogicalName>Tracker\loader\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Tracker/loader/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </EmbeddedResource>
     <EmbeddedResource Include="../Resources/Tracker/scripts/**">
       <LogicalName>Tracker\scripts\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
       <Link>Resources/Tracker/scripts/%(RecursiveDir)%(Filename)%(Extension)</Link>

app/Server/Service/Middlewares/ServerAuthorizationMiddleware.cs

@@ -1,44 +1,45 @@
-using System.Net;
+// using System;
-using System.Threading.Tasks;
+// using System.Net;
-using DHT.Utils.Logging;
+// using System.Reflection;
-using Microsoft.AspNetCore.Http;
+// using System.Threading.Tasks;
-using Microsoft.Extensions.Primitives;
+// using DHT.Utils.Logging;
-
+// using Microsoft.AspNetCore.Http;
-namespace DHT.Server.Service.Middlewares;
+// using Microsoft.Extensions.Primitives;
-
+//
-sealed class ServerAuthorizationMiddleware {
+// namespace DHT.Server.Service.Middlewares;
-	private static readonly Log Log = Log.ForType<ServerAuthorizationMiddleware>();
+//
-	
+// sealed class ServerAuthorizationMiddleware(RequestDelegate next, ServerParameters serverParameters) {
-	private readonly RequestDelegate next;
+// 	private static readonly Log Log = Log.ForType<ServerAuthorizationMiddleware>();
-	private readonly ServerParameters serverParameters;
+// 	
-	
+// 	public async Task InvokeAsync(HttpContext context) {
-	public ServerAuthorizationMiddleware(RequestDelegate next, ServerParameters serverParameters) {
+// 		if (SkipAuthorization(context) || CheckToken(context.Request)) {
-		this.next = next;
+// 			await next(context);
-		this.serverParameters = serverParameters;
+// 		}
-	}
+// 		else {
-	
+// 			context.Response.StatusCode = (int) HttpStatusCode.Forbidden;
-	public async Task InvokeAsync(HttpContext context) {
+// 		}
-		HttpRequest request = context.Request;
+// 	}
-		
+// 	
-		bool success = HttpMethods.IsGet(request.Method)
+// 	private static bool SkipAuthorization(HttpContext context) {
-			               ? CheckToken(request.Query["token"])
+// 		return context.GetEndpoint()?.RequestDelegate?.Target?.GetType().GetCustomAttribute<NoAuthorization>() != null;
-			               : CheckToken(request.Headers["X-DHT-Token"]);
+// 	}
-		
+// 	
-		if (success) {
+// 	private bool CheckToken(HttpRequest request) {
-			await next(context);
+// 		return HttpMethods.IsGet(request.Method)
-		}
+// 			       ? CheckToken(request.Query["token"])
-		else {
+// 			       : CheckToken(request.Headers["X-DHT-Token"]);
-			context.Response.StatusCode = (int) HttpStatusCode.Forbidden;
+// 	}
-		}
+// 	
-	}
+// 	private bool CheckToken(StringValues token) {
-	
+// 		if (token.Count == 1 && token[0] == serverParameters.Token) {
-	private bool CheckToken(StringValues token) {
+// 			return true;
-		if (token.Count == 1 && token[0] == serverParameters.Token) {
+// 		}
-			return true;
+// 		else {
-		}
+// 			Log.Error("Invalid token: " + (token.Count == 1 ? token[0] : "<missing>"));
-		else {
+// 			return false;
-			Log.Error("Invalid token: " + (token.Count == 1 ? token[0] : "<missing>"));
+// 		}
-			return false;
+// 	}
-		}
+// 	
-	}
+// 	[AttributeUsage(AttributeTargets.Class)]
-}
+// 	public sealed class NoAuthorization : Attribute;
+// }

app/Server/Service/Middlewares/ServerLoggingMiddleware.cs

@@ -1,40 +1,40 @@
-using System;
+// using System;
-using System.Diagnostics;
+// using System.Diagnostics;
-using System.Threading.Tasks;
+// using System.Threading.Tasks;
-using DHT.Utils.Logging;
+// using DHT.Utils.Logging;
-using Microsoft.AspNetCore.Http;
+// using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
+// using Microsoft.AspNetCore.Http.Extensions;
-
+//
-namespace DHT.Server.Service.Middlewares;
+// namespace DHT.Server.Service.Middlewares;
-
+//
-sealed class ServerLoggingMiddleware(RequestDelegate next) {
+// sealed class ServerLoggingMiddleware(RequestDelegate next) {
-	private static readonly Log Log = Log.ForType<ServerLoggingMiddleware>();
+// 	private static readonly Log Log = Log.ForType<ServerLoggingMiddleware>();
-	
+// 	
-	public async Task InvokeAsync(HttpContext context) {
+// 	public async Task InvokeAsync(HttpContext context) {
-		var stopwatch = Stopwatch.StartNew();
+// 		var stopwatch = Stopwatch.StartNew();
-		try {
+// 		try {
-			await next(context);
+// 			await next(context);
-		} catch (OperationCanceledException) {
+// 		} catch (OperationCanceledException) {
-			OnFinished(stopwatch, context);
+// 			OnFinished(stopwatch, context);
-			throw;
+// 			throw;
-		}
+// 		}
-		
+// 		
-		OnFinished(stopwatch, context);
+// 		OnFinished(stopwatch, context);
-	}
+// 	}
-	
+// 	
-	private static void OnFinished(Stopwatch stopwatch, HttpContext context) {
+// 	private static void OnFinished(Stopwatch stopwatch, HttpContext context) {
-		stopwatch.Stop();
+// 		stopwatch.Stop();
-		
+// 		
-		HttpRequest request = context.Request;
+// 		HttpRequest request = context.Request;
-		long requestLength = request.ContentLength ?? 0L;
+// 		long requestLength = request.ContentLength ?? 0L;
-		long elapsedMs = stopwatch.ElapsedMilliseconds;
+// 		long elapsedMs = stopwatch.ElapsedMilliseconds;
-		
+// 		
-		if (context.RequestAborted.IsCancellationRequested) {
+// 		if (context.RequestAborted.IsCancellationRequested) {
-			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms");
+// 			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms");
-		}
+// 		}
-		else {
+// 		else {
-			int responseStatus = context.Response.StatusCode;
+// 			int responseStatus = context.Response.StatusCode;
-			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
+// 			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
-		}
+// 		}
-	}
+// 	}
-}
+// }

app/Server/Service/ServerManager.cs

@@ -1,21 +1,24 @@
 using System;
+using System.Net;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
+using DHT.Server.Endpoints;
 using DHT.Server.Service.Viewer;
 using DHT.Utils.Logging;
 using DHT.Utils.Resources;
-using Microsoft.AspNetCore.Hosting;
+using Sisk.Core.Entity;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Sisk.Core.Http;
-using Microsoft.Extensions.DependencyInjection;
+using Sisk.Core.Http.Hosting;
+using Router = Sisk.Core.Routing.Router;
 
 namespace DHT.Server.Service;
 
 public sealed class ServerManager {
 	private static readonly Log Log = Log.ForType(typeof(ServerManager));
 	
-	private IWebHost? server;
+	private HttpServerHostContext? server;
 	public bool IsRunning => server != null;
 	
 	public event EventHandler<Status>? StatusChanged;
@@ -48,35 +51,59 @@ public sealed class ServerManager {
 	public async Task Stop() {
 		await semaphore.WaitAsync();
 		try {
-			await StopInternal();
+			StopInternal();
 		} finally {
 			semaphore.Release();
 		}
 	}
 	
 	private async Task StartInternal(ushort port, string token) {
-		await StopInternal();
+		StopInternal();
 		
 		StatusChanged?.Invoke(this, Status.Starting);
 		
-		void AddServices(IServiceCollection services) {
+		ServerParameters parameters = new ServerParameters(port, token);
-			services.AddSingleton(typeof(IDatabaseFile), db);
+		ResourceLoader resources = new ResourceLoader(Assembly.GetExecutingAssembly());
-			services.AddSingleton(typeof(ServerParameters), new ServerParameters(port, token));
+		
-			services.AddSingleton(typeof(ResourceLoader), new ResourceLoader(Assembly.GetExecutingAssembly()));
+		static void ConfigureServer(HttpServerConfiguration config) {
-			services.AddSingleton(typeof(ViewerSessions), viewerSessions);
+			config.AsyncRequestProcessing = true;
+			config.IncludeRequestIdHeader = false;
+			config.MaximumContentLength = 0;
+			config.SendSiskHeader = false;
+			config.ThrowExceptions = false;
 		}
 		
-		void SetKestrelOptions(KestrelServerOptions options) {
+		void ConfigureRoutes(Router router) {
-			options.Limits.MaxRequestBodySize = null;
+			router.CallbackErrorHandler = static (exception, _) => {
-			options.Limits.MinResponseDataRate = null;
+				Log.Error(exception);
-			options.ListenLocalhost(port, static listenOptions => listenOptions.Protocols = HttpProtocols.Http1);
+				return new HttpResponse(HttpStatusCode.InternalServerError).WithContent("An error occurred.");
+			};
+			
+			router.MapGet("/get-downloaded-file/<url>", new GetDownloadedFileEndpoint(db).Handle);
+			router.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(parameters, resources).Handle);
+			router.MapGet("/get-userscript/<ignored>", new GetUserscriptEndpoint(resources).Handle);
+			router.MapGet("/get-viewer-messages", new GetViewerMessagesEndpoint(db, viewerSessions).Handle);
+			router.MapGet("/get-viewer-metadata", new GetViewerMetadataEndpoint(db, viewerSessions).Handle);
+			router.MapGet("/viewer/<<path>>", new ViewerEndpoint(resources).Handle);
+			
+			router.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
+			router.MapPost("/track-messages", new TrackMessagesEndpoint(db).Handle);
+			router.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
 		}
 		
-		IWebHost newServer = new WebHostBuilder()
+		string[] allowedOrigins = [
-		                     .ConfigureServices(AddServices)
+			"https://discord.com",
-		                     .UseKestrel(SetKestrelOptions)
+			"https://ptb.discord.com",
-		                     .UseStartup<Startup>()
+			"https://canary.discord.com",
-		                     .Build();
+			"https://discordapp.com",
+		];
+		
+		HttpServerHostContext newServer = HttpServer.CreateBuilder()
+		                                            .UseListeningPort(new ListeningPort(secure: false, "127.0.0.1", port))
+		                                            .UseCors(new CrossOriginResourceSharingHeaders(allowOrigins: allowedOrigins, exposeHeaders: [ "X-DHT" ]))
+		                                            .UseConfiguration(ConfigureServer)
+		                                            .UseRouter(ConfigureRoutes)
+		                                            .Build();
 		
 		Log.Info("Starting server on port " + port + "...");
 		
@@ -95,7 +122,7 @@ public sealed class ServerManager {
 		StatusChanged?.Invoke(this, Status.Started);
 	}
 	
-	private async Task StopInternal() {
+	private void StopInternal() {
 		if (server == null) {
 			return;
 		}
@@ -103,7 +130,7 @@ public sealed class ServerManager {
 		StatusChanged?.Invoke(this, Status.Stopping);
 		
 		Log.Info("Stopping server...");
-		await server.StopAsync();
+		server.Dispose();
 		Log.Info("Server stopped");
 		
 		server.Dispose();

app/Server/Service/ServerStartup.cs

@@ -1,62 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using DHT.Server.Database;
-using DHT.Server.Endpoints;
-using DHT.Server.Service.Middlewares;
-using DHT.Server.Service.Viewer;
-using DHT.Utils.Resources;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http.Json;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace DHT.Server.Service;
-
-sealed class Startup {
-	private static readonly string[] AllowedOrigins = [
-		"https://discord.com",
-		"https://ptb.discord.com",
-		"https://canary.discord.com",
-		"https://discordapp.com",
-	];
-	
-	public void ConfigureServices(IServiceCollection services) {
-		services.Configure<JsonOptions>(static options => {
-			options.SerializerOptions.NumberHandling = JsonNumberHandling.Strict;
-		});
-		
-		services.AddCors(static cors => {
-			cors.AddDefaultPolicy(static builder => {
-				builder.WithOrigins(AllowedOrigins).AllowCredentials().AllowAnyMethod().AllowAnyHeader().WithExposedHeaders("X-DHT");
-			});
-		});
-		
-		services.AddRoutingCore();
-	}
-	
-	[SuppressMessage("ReSharper", "UnusedMember.Global")]
-	public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime, IDatabaseFile db, ServerParameters parameters, ResourceLoader resources, ViewerSessions viewerSessions) {
-		app.UseMiddleware<ServerLoggingMiddleware>();
-		app.UseCors();
-		
-		app.Map("/viewer", node => {
-			node.UseRouting();
-			node.UseEndpoints(endpoints => {
-				endpoints.MapGet("/{**path}", new ViewerEndpoint(db, resources).Handle);
-			});
-		});
-		
-		app.UseMiddleware<ServerAuthorizationMiddleware>();
-		
-		app.UseRouting();
-		app.UseEndpoints(endpoints => {
-			endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(db, parameters, resources).Handle);
-			endpoints.MapGet("/get-viewer-metadata", new GetViewerMetadataEndpoint(db, viewerSessions).Handle);
-			endpoints.MapGet("/get-viewer-messages", new GetViewerMessagesEndpoint(db, viewerSessions).Handle);
-			endpoints.MapGet("/get-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
-			endpoints.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
-			endpoints.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
-			endpoints.MapPost("/track-messages", new TrackMessagesEndpoint(db).Handle);
-		});
-	}
-}

app/Utils/Http/HttpExtensions.cs

@@ -1,34 +0,0 @@
-using System.IO;
-using System.Net.Mime;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-
-namespace DHT.Utils.Http;
-
-public static class HttpExtensions {
-	public static Task WriteTextAsync(this HttpResponse response, string text, CancellationToken cancellationToken) {
-		return WriteTextAsync(response, MediaTypeNames.Text.Plain, text, cancellationToken);
-	}
-	
-	public static async Task WriteTextAsync(this HttpResponse response, string contentType, string text, CancellationToken cancellationToken) {
-		response.ContentType = contentType;
-		await response.StartAsync(cancellationToken);
-		await response.WriteAsync(text, Encoding.UTF8, cancellationToken);
-	}
-	
-	public static async Task WriteFileAsync(this HttpResponse response, string? contentType, byte[] bytes, CancellationToken cancellationToken) {
-		response.ContentType = contentType ?? string.Empty;
-		response.ContentLength = bytes.Length;
-		await response.StartAsync(cancellationToken);
-		await response.Body.WriteAsync(bytes, cancellationToken);
-	}
-	
-	public static async Task WriteStreamAsync(this HttpResponse response, string? contentType, ulong? contentLength, Stream source, CancellationToken cancellationToken) {
-		response.ContentType = contentType ?? string.Empty;
-		response.ContentLength = (long?) contentLength;
-		await response.StartAsync(cancellationToken);
-		await source.CopyToAsync(response.Body, cancellationToken);
-	}
-}

app/Utils/Http/MimeTypes.cs

@@ -0,0 +1,399 @@
+using System.Collections.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+
+namespace DHT.Utils.Http;
+
+public static class MimeTypes {
+	// Copied from https://github.com/dotnet/aspnetcore/blob/main/src/Middleware/StaticFiles/src/FileExtensionContentTypeProvider.cs
+	// Original belongs to the .NET Foundation, licensed under the MIT license.
+	private static readonly FrozenDictionary<string, string> ByFileExtension = new Dictionary<string, string> {
+		{ ".323", "text/h323" },
+		{ ".3g2", "video/3gpp2" },
+		{ ".3gp2", "video/3gpp2" },
+		{ ".3gp", "video/3gpp" },
+		{ ".3gpp", "video/3gpp" },
+		{ ".aac", "audio/aac" },
+		{ ".aaf", "application/octet-stream" },
+		{ ".aca", "application/octet-stream" },
+		{ ".accdb", "application/msaccess" },
+		{ ".accde", "application/msaccess" },
+		{ ".accdt", "application/msaccess" },
+		{ ".acx", "application/internet-property-stream" },
+		{ ".adt", "audio/vnd.dlna.adts" },
+		{ ".adts", "audio/vnd.dlna.adts" },
+		{ ".afm", "application/octet-stream" },
+		{ ".ai", "application/postscript" },
+		{ ".aif", "audio/x-aiff" },
+		{ ".aifc", "audio/aiff" },
+		{ ".aiff", "audio/aiff" },
+		{ ".appcache", "text/cache-manifest" },
+		{ ".application", "application/x-ms-application" },
+		{ ".art", "image/x-jg" },
+		{ ".asd", "application/octet-stream" },
+		{ ".asf", "video/x-ms-asf" },
+		{ ".asi", "application/octet-stream" },
+		{ ".asm", "text/plain" },
+		{ ".asr", "video/x-ms-asf" },
+		{ ".asx", "video/x-ms-asf" },
+		{ ".atom", "application/atom+xml" },
+		{ ".au", "audio/basic" },
+		{ ".avi", "video/x-msvideo" },
+		{ ".avif", "image/avif" },
+		{ ".axs", "application/olescript" },
+		{ ".bas", "text/plain" },
+		{ ".bcpio", "application/x-bcpio" },
+		{ ".bin", "application/octet-stream" },
+		{ ".bmp", "image/bmp" },
+		{ ".c", "text/plain" },
+		{ ".cab", "application/vnd.ms-cab-compressed" },
+		{ ".calx", "application/vnd.ms-office.calx" },
+		{ ".cat", "application/vnd.ms-pki.seccat" },
+		{ ".cdf", "application/x-cdf" },
+		{ ".chm", "application/octet-stream" },
+		{ ".class", "application/x-java-applet" },
+		{ ".clp", "application/x-msclip" },
+		{ ".cmx", "image/x-cmx" },
+		{ ".cnf", "text/plain" },
+		{ ".cod", "image/cis-cod" },
+		{ ".cpio", "application/x-cpio" },
+		{ ".cpp", "text/plain" },
+		{ ".crd", "application/x-mscardfile" },
+		{ ".crl", "application/pkix-crl" },
+		{ ".crt", "application/x-x509-ca-cert" },
+		{ ".csh", "application/x-csh" },
+		{ ".css", "text/css" },
+		{ ".csv", "text/csv" }, // https://tools.ietf.org/html/rfc7111#section-5.1
+		{ ".cur", "application/octet-stream" },
+		{ ".dcr", "application/x-director" },
+		{ ".deploy", "application/octet-stream" },
+		{ ".der", "application/x-x509-ca-cert" },
+		{ ".dib", "image/bmp" },
+		{ ".dir", "application/x-director" },
+		{ ".disco", "text/xml" },
+		{ ".dlm", "text/dlm" },
+		{ ".doc", "application/msword" },
+		{ ".docm", "application/vnd.ms-word.document.macroEnabled.12" },
+		{ ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document" },
+		{ ".dot", "application/msword" },
+		{ ".dotm", "application/vnd.ms-word.template.macroEnabled.12" },
+		{ ".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template" },
+		{ ".dsp", "application/octet-stream" },
+		{ ".dtd", "text/xml" },
+		{ ".dvi", "application/x-dvi" },
+		{ ".dvr-ms", "video/x-ms-dvr" },
+		{ ".dwf", "drawing/x-dwf" },
+		{ ".dwp", "application/octet-stream" },
+		{ ".dxr", "application/x-director" },
+		{ ".eml", "message/rfc822" },
+		{ ".emz", "application/octet-stream" },
+		{ ".eot", "application/vnd.ms-fontobject" },
+		{ ".eps", "application/postscript" },
+		{ ".etx", "text/x-setext" },
+		{ ".evy", "application/envoy" },
+		{ ".exe", "application/vnd.microsoft.portable-executable" }, // https://www.iana.org/assignments/media-types/application/vnd.microsoft.portable-executable
+		{ ".fdf", "application/vnd.fdf" },
+		{ ".fif", "application/fractals" },
+		{ ".fla", "application/octet-stream" },
+		{ ".flr", "x-world/x-vrml" },
+		{ ".flv", "video/x-flv" },
+		{ ".gif", "image/gif" },
+		{ ".gtar", "application/x-gtar" },
+		{ ".gz", "application/x-gzip" },
+		{ ".h", "text/plain" },
+		{ ".hdf", "application/x-hdf" },
+		{ ".hdml", "text/x-hdml" },
+		{ ".hhc", "application/x-oleobject" },
+		{ ".hhk", "application/octet-stream" },
+		{ ".hhp", "application/octet-stream" },
+		{ ".hlp", "application/winhlp" },
+		{ ".hqx", "application/mac-binhex40" },
+		{ ".hta", "application/hta" },
+		{ ".htc", "text/x-component" },
+		{ ".htm", "text/html" },
+		{ ".html", "text/html" },
+		{ ".htt", "text/webviewhtml" },
+		{ ".hxt", "text/html" },
+		{ ".ical", "text/calendar" },
+		{ ".icalendar", "text/calendar" },
+		{ ".ico", "image/x-icon" },
+		{ ".ics", "text/calendar" },
+		{ ".ief", "image/ief" },
+		{ ".ifb", "text/calendar" },
+		{ ".iii", "application/x-iphone" },
+		{ ".inf", "application/octet-stream" },
+		{ ".ins", "application/x-internet-signup" },
+		{ ".isp", "application/x-internet-signup" },
+		{ ".IVF", "video/x-ivf" },
+		{ ".jar", "application/java-archive" },
+		{ ".java", "application/octet-stream" },
+		{ ".jck", "application/liquidmotion" },
+		{ ".jcz", "application/liquidmotion" },
+		{ ".jfif", "image/pjpeg" },
+		{ ".jpb", "application/octet-stream" },
+		{ ".jpe", "image/jpeg" },
+		{ ".jpeg", "image/jpeg" },
+		{ ".jpg", "image/jpeg" },
+		{ ".js", "text/javascript" },
+		{ ".json", "application/json" },
+		{ ".jsx", "text/jscript" },
+		{ ".latex", "application/x-latex" },
+		{ ".lit", "application/x-ms-reader" },
+		{ ".lpk", "application/octet-stream" },
+		{ ".lsf", "video/x-la-asf" },
+		{ ".lsx", "video/x-la-asf" },
+		{ ".lzh", "application/octet-stream" },
+		{ ".m13", "application/x-msmediaview" },
+		{ ".m14", "application/x-msmediaview" },
+		{ ".m1v", "video/mpeg" },
+		{ ".m2ts", "video/vnd.dlna.mpeg-tts" },
+		{ ".m3u", "audio/x-mpegurl" },
+		{ ".m4a", "audio/mp4" },
+		{ ".m4v", "video/mp4" },
+		{ ".man", "application/x-troff-man" },
+		{ ".manifest", "application/x-ms-manifest" },
+		{ ".map", "text/plain" },
+		{ ".markdown", "text/markdown" },
+		{ ".md", "text/markdown" },
+		{ ".mdb", "application/x-msaccess" },
+		{ ".mdp", "application/octet-stream" },
+		{ ".me", "application/x-troff-me" },
+		{ ".mht", "message/rfc822" },
+		{ ".mhtml", "message/rfc822" },
+		{ ".mid", "audio/mid" },
+		{ ".midi", "audio/mid" },
+		{ ".mix", "application/octet-stream" },
+		{ ".mjs", "text/javascript" },
+		{ ".mmf", "application/x-smaf" },
+		{ ".mno", "text/xml" },
+		{ ".mny", "application/x-msmoney" },
+		{ ".mov", "video/quicktime" },
+		{ ".movie", "video/x-sgi-movie" },
+		{ ".mp2", "video/mpeg" },
+		{ ".mp3", "audio/mpeg" },
+		{ ".mp4", "video/mp4" },
+		{ ".mp4v", "video/mp4" },
+		{ ".mpa", "video/mpeg" },
+		{ ".mpe", "video/mpeg" },
+		{ ".mpeg", "video/mpeg" },
+		{ ".mpg", "video/mpeg" },
+		{ ".mpp", "application/vnd.ms-project" },
+		{ ".mpv2", "video/mpeg" },
+		{ ".ms", "application/x-troff-ms" },
+		{ ".msi", "application/octet-stream" },
+		{ ".mso", "application/octet-stream" },
+		{ ".mvb", "application/x-msmediaview" },
+		{ ".mvc", "application/x-miva-compiled" },
+		{ ".nc", "application/x-netcdf" },
+		{ ".nsc", "video/x-ms-asf" },
+		{ ".nws", "message/rfc822" },
+		{ ".ocx", "application/octet-stream" },
+		{ ".oda", "application/oda" },
+		{ ".odc", "text/x-ms-odc" },
+		{ ".ods", "application/oleobject" },
+		{ ".oga", "audio/ogg" },
+		{ ".ogg", "video/ogg" },
+		{ ".ogv", "video/ogg" },
+		{ ".ogx", "application/ogg" },
+		{ ".one", "application/onenote" },
+		{ ".onea", "application/onenote" },
+		{ ".onetoc", "application/onenote" },
+		{ ".onetoc2", "application/onenote" },
+		{ ".onetmp", "application/onenote" },
+		{ ".onepkg", "application/onenote" },
+		{ ".osdx", "application/opensearchdescription+xml" },
+		{ ".otf", "font/otf" },
+		{ ".p10", "application/pkcs10" },
+		{ ".p12", "application/x-pkcs12" },
+		{ ".p7b", "application/x-pkcs7-certificates" },
+		{ ".p7c", "application/pkcs7-mime" },
+		{ ".p7m", "application/pkcs7-mime" },
+		{ ".p7r", "application/x-pkcs7-certreqresp" },
+		{ ".p7s", "application/pkcs7-signature" },
+		{ ".pbm", "image/x-portable-bitmap" },
+		{ ".pcx", "application/octet-stream" },
+		{ ".pcz", "application/octet-stream" },
+		{ ".pdf", "application/pdf" },
+		{ ".pfb", "application/octet-stream" },
+		{ ".pfm", "application/octet-stream" },
+		{ ".pfx", "application/x-pkcs12" },
+		{ ".pgm", "image/x-portable-graymap" },
+		{ ".pko", "application/vnd.ms-pki.pko" },
+		{ ".pma", "application/x-perfmon" },
+		{ ".pmc", "application/x-perfmon" },
+		{ ".pml", "application/x-perfmon" },
+		{ ".pmr", "application/x-perfmon" },
+		{ ".pmw", "application/x-perfmon" },
+		{ ".png", "image/png" },
+		{ ".pnm", "image/x-portable-anymap" },
+		{ ".pnz", "image/png" },
+		{ ".pot", "application/vnd.ms-powerpoint" },
+		{ ".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12" },
+		{ ".potx", "application/vnd.openxmlformats-officedocument.presentationml.template" },
+		{ ".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12" },
+		{ ".ppm", "image/x-portable-pixmap" },
+		{ ".pps", "application/vnd.ms-powerpoint" },
+		{ ".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12" },
+		{ ".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow" },
+		{ ".ppt", "application/vnd.ms-powerpoint" },
+		{ ".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12" },
+		{ ".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation" },
+		{ ".prf", "application/pics-rules" },
+		{ ".prm", "application/octet-stream" },
+		{ ".prx", "application/octet-stream" },
+		{ ".ps", "application/postscript" },
+		{ ".psd", "application/octet-stream" },
+		{ ".psm", "application/octet-stream" },
+		{ ".psp", "application/octet-stream" },
+		{ ".pub", "application/x-mspublisher" },
+		{ ".qt", "video/quicktime" },
+		{ ".qtl", "application/x-quicktimeplayer" },
+		{ ".qxd", "application/octet-stream" },
+		{ ".ra", "audio/x-pn-realaudio" },
+		{ ".ram", "audio/x-pn-realaudio" },
+		{ ".rar", "application/octet-stream" },
+		{ ".ras", "image/x-cmu-raster" },
+		{ ".rf", "image/vnd.rn-realflash" },
+		{ ".rgb", "image/x-rgb" },
+		{ ".rm", "application/vnd.rn-realmedia" },
+		{ ".rmi", "audio/mid" },
+		{ ".roff", "application/x-troff" },
+		{ ".rpm", "audio/x-pn-realaudio-plugin" },
+		{ ".rtf", "application/rtf" },
+		{ ".rtx", "text/richtext" },
+		{ ".scd", "application/x-msschedule" },
+		{ ".sct", "text/scriptlet" },
+		{ ".sea", "application/octet-stream" },
+		{ ".setpay", "application/set-payment-initiation" },
+		{ ".setreg", "application/set-registration-initiation" },
+		{ ".sgml", "text/sgml" },
+		{ ".sh", "application/x-sh" },
+		{ ".shar", "application/x-shar" },
+		{ ".sit", "application/x-stuffit" },
+		{ ".sldm", "application/vnd.ms-powerpoint.slide.macroEnabled.12" },
+		{ ".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide" },
+		{ ".smd", "audio/x-smd" },
+		{ ".smi", "application/octet-stream" },
+		{ ".smx", "audio/x-smd" },
+		{ ".smz", "audio/x-smd" },
+		{ ".snd", "audio/basic" },
+		{ ".snp", "application/octet-stream" },
+		{ ".spc", "application/x-pkcs7-certificates" },
+		{ ".spl", "application/futuresplash" },
+		{ ".spx", "audio/ogg" },
+		{ ".src", "application/x-wais-source" },
+		{ ".ssm", "application/streamingmedia" },
+		{ ".sst", "application/vnd.ms-pki.certstore" },
+		{ ".stl", "application/vnd.ms-pki.stl" },
+		{ ".sv4cpio", "application/x-sv4cpio" },
+		{ ".sv4crc", "application/x-sv4crc" },
+		{ ".svg", "image/svg+xml" },
+		{ ".svgz", "image/svg+xml" },
+		{ ".swf", "application/x-shockwave-flash" },
+		{ ".t", "application/x-troff" },
+		{ ".tar", "application/x-tar" },
+		{ ".tcl", "application/x-tcl" },
+		{ ".tex", "application/x-tex" },
+		{ ".texi", "application/x-texinfo" },
+		{ ".texinfo", "application/x-texinfo" },
+		{ ".tgz", "application/x-compressed" },
+		{ ".thmx", "application/vnd.ms-officetheme" },
+		{ ".thn", "application/octet-stream" },
+		{ ".tif", "image/tiff" },
+		{ ".tiff", "image/tiff" },
+		{ ".toc", "application/octet-stream" },
+		{ ".tr", "application/x-troff" },
+		{ ".trm", "application/x-msterminal" },
+		{ ".ts", "video/vnd.dlna.mpeg-tts" },
+		{ ".tsv", "text/tab-separated-values" },
+		{ ".ttc", "application/x-font-ttf" },
+		{ ".ttf", "application/x-font-ttf" },
+		{ ".tts", "video/vnd.dlna.mpeg-tts" },
+		{ ".txt", "text/plain" },
+		{ ".u32", "application/octet-stream" },
+		{ ".uls", "text/iuls" },
+		{ ".ustar", "application/x-ustar" },
+		{ ".vbs", "text/vbscript" },
+		{ ".vcf", "text/x-vcard" },
+		{ ".vcs", "text/plain" },
+		{ ".vdx", "application/vnd.ms-visio.viewer" },
+		{ ".vml", "text/xml" },
+		{ ".vsd", "application/vnd.visio" },
+		{ ".vss", "application/vnd.visio" },
+		{ ".vst", "application/vnd.visio" },
+		{ ".vsto", "application/x-ms-vsto" },
+		{ ".vsw", "application/vnd.visio" },
+		{ ".vsx", "application/vnd.visio" },
+		{ ".vtx", "application/vnd.visio" },
+		{ ".wasm", "application/wasm" },
+		{ ".wav", "audio/wav" },
+		{ ".wax", "audio/x-ms-wax" },
+		{ ".wbmp", "image/vnd.wap.wbmp" },
+		{ ".wcm", "application/vnd.ms-works" },
+		{ ".wdb", "application/vnd.ms-works" },
+		{ ".webm", "video/webm" },
+		{ ".webmanifest", "application/manifest+json" }, // https://w3c.github.io/manifest/#media-type-registration
+		{ ".webp", "image/webp" },
+		{ ".wks", "application/vnd.ms-works" },
+		{ ".wm", "video/x-ms-wm" },
+		{ ".wma", "audio/x-ms-wma" },
+		{ ".wmd", "application/x-ms-wmd" },
+		{ ".wmf", "application/x-msmetafile" },
+		{ ".wml", "text/vnd.wap.wml" },
+		{ ".wmlc", "application/vnd.wap.wmlc" },
+		{ ".wmls", "text/vnd.wap.wmlscript" },
+		{ ".wmlsc", "application/vnd.wap.wmlscriptc" },
+		{ ".wmp", "video/x-ms-wmp" },
+		{ ".wmv", "video/x-ms-wmv" },
+		{ ".wmx", "video/x-ms-wmx" },
+		{ ".wmz", "application/x-ms-wmz" },
+		{ ".woff", "application/font-woff" }, // https://www.w3.org/TR/WOFF/#appendix-b
+		{ ".woff2", "font/woff2" }, // https://www.w3.org/TR/WOFF2/#IMT
+		{ ".wps", "application/vnd.ms-works" },
+		{ ".wri", "application/x-mswrite" },
+		{ ".wrl", "x-world/x-vrml" },
+		{ ".wrz", "x-world/x-vrml" },
+		{ ".wsdl", "text/xml" },
+		{ ".wtv", "video/x-ms-wtv" },
+		{ ".wvx", "video/x-ms-wvx" },
+		{ ".x", "application/directx" },
+		{ ".xaf", "x-world/x-vrml" },
+		{ ".xaml", "application/xaml+xml" },
+		{ ".xap", "application/x-silverlight-app" },
+		{ ".xbap", "application/x-ms-xbap" },
+		{ ".xbm", "image/x-xbitmap" },
+		{ ".xdr", "text/plain" },
+		{ ".xht", "application/xhtml+xml" },
+		{ ".xhtml", "application/xhtml+xml" },
+		{ ".xla", "application/vnd.ms-excel" },
+		{ ".xlam", "application/vnd.ms-excel.addin.macroEnabled.12" },
+		{ ".xlc", "application/vnd.ms-excel" },
+		{ ".xlm", "application/vnd.ms-excel" },
+		{ ".xls", "application/vnd.ms-excel" },
+		{ ".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12" },
+		{ ".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12" },
+		{ ".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" },
+		{ ".xlt", "application/vnd.ms-excel" },
+		{ ".xltm", "application/vnd.ms-excel.template.macroEnabled.12" },
+		{ ".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template" },
+		{ ".xlw", "application/vnd.ms-excel" },
+		{ ".xml", "text/xml" },
+		{ ".xof", "x-world/x-vrml" },
+		{ ".xpm", "image/x-xpixmap" },
+		{ ".xps", "application/vnd.ms-xpsdocument" },
+		{ ".xsd", "text/xml" },
+		{ ".xsf", "text/xml" },
+		{ ".xsl", "text/xml" },
+		{ ".xslt", "text/xml" },
+		{ ".xsn", "application/octet-stream" },
+		{ ".xtp", "application/octet-stream" },
+		{ ".xwd", "image/x-xwindowdump" },
+		{ ".z", "application/x-compress" },
+		{ ".zip", "application/x-zip-compressed" },
+	}.ToFrozenDictionary();
+	
+	public static bool TryGetByFileExtension(string filePath, [NotNullWhen(true)] out string? mimeType) {
+		return ByFileExtension.TryGetValue(Path.GetExtension(filePath), out mimeType);
+	}
+}

app/Utils/Utils.csproj

@@ -10,10 +10,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-  
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />