Merge 5866d953f8 into 16509be56c

Closes #292

app/Desktop/App.axaml

@@ -55,21 +55,51 @@
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
 
+        <Style Selector="TreeViewItem:not(:empty) /template/ Panel#PART_ExpandCollapseChevronContainer">
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="Margin" Value="0 0 5 0" />
+        </Style>
+        <Style Selector="TreeViewItem:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
+            <Setter Property="Margin" Value="10 0" />
+        </Style>
+        <Style Selector="TreeViewItem[Level=0]:empty /template/ Panel#PART_ExpandCollapseChevronContainer">
+            <Setter Property="Margin" Value="0" />
+            <Setter Property="Width" Value="0" />
+        </Style>
+        <Style Selector="TreeViewItem /template/ ToggleButton#PART_ExpandCollapseChevron">
+            <Setter Property="Width" Value="18" />
+            <Setter Property="Height" Value="32" />
+        </Style>
+        <Style Selector="TreeViewItem /template/ ToggleButton#PART_ExpandCollapseChevron > Border">
+            <Setter Property="Padding" Value="2 10 3 10" />
+        </Style>
+
+        <Style Selector="TreeView.noSelection">
+            <Style Selector="^ TreeViewItem /template/ Border#PART_LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource TreeViewItemBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrush}" />
+            </Style>
+            <Style Selector="^ TreeViewItem /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForeground}" />
+            </Style>
+            <Style Selector="^ TreeViewItem:disabled /template/ Border#PART_LayoutRoot">
+                <Setter Property="Background" Value="{DynamicResource TreeViewItemBackgroundDisabled}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource TreeViewItemBorderBrushDisabled}" />
+            </Style>
+            <Style Selector="^ TreeViewItem:disabled /template/ Border#PART_LayoutRoot > ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource TreeViewItemForegroundDisabled}" />
+            </Style>
+        </Style>
+
         <Style Selector="Panel.buttons">
             <Setter Property="Margin" Value="0 20 0 0" />
         </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right">
+        <Style Selector="Panel.buttons > WrapPanel">
-            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="ItemSpacing" Value="8" />
         </Style>
         <Style Selector="Panel.buttons Button">
             <Setter Property="MinWidth" Value="80" />
         </Style>
-        <Style Selector="Panel.buttons > WrapPanel.left Button">
-            <Setter Property="Margin" Value="0 0 8 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right Button">
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
 
     </Application.Styles>
 

app/Desktop/Arguments.cs

@@ -69,7 +69,7 @@ sealed class Arguments {
 						Log.Warn("Invalid concurrent downloads count: " + value);
 					}
 					else if (concurrentDownloads > 10) {
-						Log.Warn("Limiting concurrent downloads to 10");
+						Log.Warn("Limiting concurrent downloads to 10.");
 						ConcurrentDownloads = 10;
 					}
 					else {

app/Desktop/Common/AvaloniaReflection.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections;
+using System.Reflection;
+using Avalonia.Interactivity;
+
+namespace DHT.Desktop.Common;
+
+static class AvaloniaReflection {
+	private static FieldInfo InteractiveEventHandlersField { get; } = typeof(Interactive).GetField("_eventHandlers", BindingFlags.Instance | BindingFlags.NonPublic)!;
+	
+	public static void Check() {
+		if (InteractiveEventHandlersField == null) {
+			throw new InvalidOperationException("Missing field: " + nameof(InteractiveEventHandlersField));
+		}
+		
+		if (InteractiveEventHandlersField.FieldType.ToString() != "System.Collections.Generic.Dictionary`2[Avalonia.Interactivity.RoutedEvent,System.Collections.Generic.List`1[Avalonia.Interactivity.Interactive+EventSubscription]]") {
+			throw new InvalidOperationException("Invalid field type: " + nameof(InteractiveEventHandlersField) + " = " + InteractiveEventHandlersField.FieldType);
+		}
+	}
+	
+	public static IList? GetEventHandler(Interactive target, RoutedEvent routedEvent) {
+		IDictionary? eventHandlers = (IDictionary?) InteractiveEventHandlersField.GetValue(target);
+		return (IList?) eventHandlers?[routedEvent];
+	}
+}

app/Desktop/Common/DatabaseGui.cs

@@ -52,7 +52,7 @@ static class DatabaseGui {
 		} catch (DatabaseTooNewException ex) {
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' was opened in a newer version of DHT (database version " + ex.DatabaseVersion + ", app version " + ex.CurrentVersion + ").");
 		} catch (Exception ex) {
-			Log.Error(ex);
+			Log.Error("Could not open database file: " + path, ex);
 			await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
 		}
 		

app/Desktop/Desktop.csproj

@@ -15,14 +15,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.2.3" />
+    <PackageReference Include="Avalonia" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.0" />
     <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.2.3" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.0" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
     <PackageReference Include="PropertyChanged.SourceGenerator" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -8,37 +8,44 @@
         x:DataType="namespace:CheckBoxDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="500" SizeToContent="Height" CanResize="False"
+        MinWidth="425" MinHeight="200"
+        Width="500" Height="395" CanResize="True"
         WindowStartupLocation="CenterOwner">
 
     <Window.DataContext>
         <namespace:CheckBoxDialogModel />
     </Window.DataContext>
 
-    <StackPanel Margin="20">
+    <Window.Styles>
-        <ScrollViewer MaxHeight="400">
+        <Style Selector="TreeViewItem">
-            <ItemsRepeater ItemsSource="{Binding Items}">
+            <Setter Property="IsExpanded" Value="True" />
-                <ItemsRepeater.ItemTemplate>
+        </Style>
-                    <DataTemplate>
+    </Window.Styles>
+
+    <DockPanel Margin="20 17 20 20">
+        <Panel Classes="buttons" DockPanel.Dock="Bottom">
+            <WrapPanel>
+                <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
+                <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
+            </WrapPanel>
+            <WrapPanel HorizontalAlignment="Right">
+                <Button Click="ClickOk">OK</Button>
+                <Button Click="ClickCancel">Cancel</Button>
+            </WrapPanel>
+        </Panel>
+        <ScrollViewer DockPanel.Dock="Top">
+            <TreeView Name="TreeView" Classes="noSelection" ItemsSource="{Binding RootItems}" ContainerPrepared="TreeViewOnContainerPrepared">
+                <TreeView.ItemTemplate>
+                    <TreeDataTemplate ItemsSource="{Binding Children}">
                         <CheckBox IsChecked="{Binding IsChecked}">
                             <Label>
                                 <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
                             </Label>
                         </CheckBox>
-                    </DataTemplate>
+                    </TreeDataTemplate>
-                </ItemsRepeater.ItemTemplate>
+                </TreeView.ItemTemplate>
-            </ItemsRepeater>
+            </TreeView>
         </ScrollViewer>
-        <Panel Classes="buttons">
+    </DockPanel>
-            <WrapPanel Classes="left">
-                <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
-                <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
-            </WrapPanel>
-            <WrapPanel Classes="right">
-                <Button Click="ClickOk">OK</Button>
-                <Button Click="ClickCancel">Cancel</Button>
-            </WrapPanel>
-        </Panel>
-    </StackPanel>
 
 </Window>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml.cs

@@ -1,6 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
 using Avalonia.Interactivity;
+using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
@@ -11,6 +14,36 @@ public sealed partial class CheckBoxDialog : Window {
 		InitializeComponent();
 	}
 	
+	private void TreeViewOnContainerPrepared(object? sender, ContainerPreparedEventArgs e) {
+		foreach (object? item in TreeView.Items) {
+			if (item != null && TreeView.ContainerFromItem(item) is TreeViewItem treeViewItem) {
+				treeViewItem.TemplateApplied += TreeViewItemOnTemplateApplied;
+				treeViewItem.GotFocus += TreeViewItemOnGotFocus;
+				treeViewItem.KeyDown += TreeViewItemOnKeyDown;
+			}
+		}
+	}
+	
+	private void TreeViewItemOnTemplateApplied(object? sender, TemplateAppliedEventArgs e) {
+		if (sender is TreeViewItem { HeaderPresenter: Interactive headerPresenter } ) {
+			// Removes support for double-clicking to expand.
+			AvaloniaReflection.GetEventHandler(headerPresenter, DoubleTappedEvent)?.Clear();
+		}
+	}
+	
+	private void TreeViewItemOnGotFocus(object? sender, GotFocusEventArgs e) {
+		if (e.NavigationMethod == NavigationMethod.Tab && sender is TreeViewItem treeViewItem && TreeView.SelectedItem == null) {
+			TreeView.SelectedItem = TreeView.ItemFromContainer(treeViewItem);
+		}
+	}
+	
+	private void TreeViewItemOnKeyDown(object? sender, KeyEventArgs e) {
+		if (e.Key == Key.Space && TreeView.SelectedItem is ICheckBoxItem item) {
+			item.IsChecked = item.IsChecked == false;
+			e.Handled = true;
+		}
+	}
+	
 	public void ClickOk(object? sender, RoutedEventArgs e) {
 		Close(DialogResult.OkCancel.Ok);
 	}

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel;
 using System.Linq;
 using PropertyChanged.SourceGenerator;
@@ -8,64 +9,65 @@ namespace DHT.Desktop.Dialogs.CheckBox;
 partial class CheckBoxDialogModel {
 	public string Title { get; init; } = "";
 	
-	private IReadOnlyList<CheckBoxItem> items = [];
+	private ImmutableArray<ICheckBoxItem> rootItems = [];
 	
-	public IReadOnlyList<CheckBoxItem> Items {
+	public ImmutableArray<ICheckBoxItem> RootItems {
-		get => items;
+		get => rootItems;
 		
 		protected set {
-			foreach (CheckBoxItem item in items) {
+			foreach (ICheckBoxItem item in ICheckBoxItem.GetAllRecursively(rootItems)) {
 				item.PropertyChanged -= OnItemPropertyChanged;
 			}
 			
-			items = value;
+			rootItems = value;
 			
-			foreach (CheckBoxItem item in items) {
+			foreach (ICheckBoxItem item in ICheckBoxItem.GetAllRecursively(rootItems)) {
 				item.PropertyChanged += OnItemPropertyChanged;
 			}
 		}
 	}
 	
-	private bool pauseCheckEvents = false;
+	protected IEnumerable<ICheckBoxItem> AllItems => ICheckBoxItem.GetAllRecursively(RootItems);
 	
-	[DependsOn(nameof(Items))]
+	[DependsOn(nameof(RootItems))]
-	public bool AreAllSelected => Items.All(static item => item.IsChecked);
+	public bool AreAllSelected => RootItems.All(static item => item.IsChecked == true);
 	
-	[DependsOn(nameof(Items))]
+	[DependsOn(nameof(RootItems))]
-	public bool AreNoneSelected => Items.All(static item => !item.IsChecked);
+	public bool AreNoneSelected => RootItems.All(static item => item.IsChecked == false);
+	
+	private bool pauseUpdatingBulkButtons = false;
 	
 	public void SelectAll() => SetAllChecked(true);
 	public void SelectNone() => SetAllChecked(false);
 	
 	private void SetAllChecked(bool isChecked) {
-		pauseCheckEvents = true;
+		pauseUpdatingBulkButtons = true;
 		
-		foreach (CheckBoxItem item in Items) {
+		foreach (ICheckBoxItem item in RootItems) {
 			item.IsChecked = isChecked;
 		}
 		
-		pauseCheckEvents = false;
+		pauseUpdatingBulkButtons = false;
 		UpdateBulkButtons();
 	}
 	
-	private void UpdateBulkButtons() {
-		OnPropertyChanged(new PropertyChangedEventArgs(nameof(Items)));
-	}
-	
 	private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-		if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.IsChecked)) {
+		if (e.PropertyName == nameof(ICheckBoxItem.IsChecked) && !pauseUpdatingBulkButtons) {
 			UpdateBulkButtons();
 		}
 	}
+	
+	private void UpdateBulkButtons() {
+		OnPropertyChanged(new PropertyChangedEventArgs(nameof(RootItems)));
+	}
 }
 
 sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
-	private new IReadOnlyList<CheckBoxItem<T>> Items { get; }
+	public IEnumerable<T> SelectedValues => AllItems.OfType<ICheckBoxItem.Leaf<T>>()
+	                                                .Where(static item => item.IsChecked == true)
+	                                                .Select(static item => item.Value);
 	
-	public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.IsChecked);
+	public CheckBoxDialogModel(ImmutableArray<ICheckBoxItem> items) {
-	
+		this.RootItems = items;
-	public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
-		this.Items = new List<CheckBoxItem<T>>(items);
-		base.Items = Items;
 	}
 }

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

@@ -1,20 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.ComponentModel;
+using System.Linq;
 using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Dialogs.CheckBox;
 
-partial class CheckBoxItem {
+partial interface ICheckBoxItem : INotifyPropertyChanged {
-	public string Title { get; init; } = "";
+	public string Title { get; }
-	public object? Item { get; init; } = null;
+	public bool? IsChecked { get; set; }
+	
+	public ImmutableArray<ICheckBoxItem> Children { get; }
+	
+	void NotifyIsCheckedChanged();
+	
+	public static IEnumerable<ICheckBoxItem> GetAllRecursively(IEnumerable<ICheckBoxItem> items) {
+		Stack<ICheckBoxItem> stack = new Stack<ICheckBoxItem>(items);
+		
+		while (stack.TryPop(out var item)) {
+			yield return item;
+			
+			foreach (ICheckBoxItem child in item.Children) {
+				stack.Push(child);
+			}
+		}
+	}
+	
+	sealed class NonLeaf : ICheckBoxItem {
+		public string Title { get; }
+		
+		public bool? IsChecked {
+			get {
+				if (Children.Count(static child => child.IsChecked == true) == Children.Length) {
+					return true;
+				}
+				else if (Children.Count(static child => child.IsChecked == false) == Children.Length) {
+					return false;
+				}
+				else {
+					return null;
+				}
+			}
+			
+			set {
+				foreach (ICheckBoxItem child in Children) {
+					if (child is Leaf leaf) {
+						leaf.SetCheckedFromParent(value);
+					}
+					else {
+						child.IsChecked = value;
+					}
+				}
+				
+				NotifyIsCheckedChanged();
+				parent?.NotifyIsCheckedChanged();
+			}
+		}
+		
+		public ImmutableArray<ICheckBoxItem> Children { get; }
+		
+		public event PropertyChangedEventHandler? PropertyChanged;
+		
+		private readonly ICheckBoxItem? parent;
+		
+		public NonLeaf(string title, ICheckBoxItem? parent, Func<ICheckBoxItem, ImmutableArray<ICheckBoxItem>> children) {
+			this.parent = parent;
+			this.Title = title;
+			this.Children = children(this);
+		}
+		
+		public void NotifyIsCheckedChanged() {
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsChecked)));
+		}
+	}
+	
+	partial class Leaf(string title, ICheckBoxItem? parent, bool isChecked) : ICheckBoxItem {
+		public string Title { get; } = title;
+		
+		public ImmutableArray<ICheckBoxItem> Children => ImmutableArray<ICheckBoxItem>.Empty;
+		
+		public readonly ICheckBoxItem? parent = parent;
 		
 		[Notify]
-	private bool isChecked = false;
+		private bool? isChecked = isChecked;
+		
+		private bool notifyParent = true;
+		
+		public void SetCheckedFromParent(bool? isChecked) {
+			notifyParent = false;
+			IsChecked = isChecked;
+			notifyParent = true;
 		}
 		
-sealed class CheckBoxItem<T> : CheckBoxItem {
+		private void OnIsCheckedChanged() {
-	public new T Item { get; }
+			if (notifyParent) {
+				parent?.NotifyIsCheckedChanged();
+			}
+		}
 		
-	public CheckBoxItem(T item) {
+		void ICheckBoxItem.NotifyIsCheckedChanged() {
-		this.Item = item;
+			OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsChecked)));
-		base.Item = item;
+		}
+	}
+	
+	sealed class Leaf<T>(string title, ICheckBoxItem? parent, T value, bool isChecked) : Leaf(title, parent, isChecked) {
+		public T Value => value;
 	}
 }

app/Desktop/Dialogs/CheckBox/CheckBoxItemList.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+
+namespace DHT.Desktop.Dialogs.CheckBox;
+
+sealed class CheckBoxItemList<TKey, TValue> where TKey : notnull {
+	private readonly List<INode> rootNodes = [];
+	private readonly Dictionary<TKey, List<INode>> parentNodes = [];
+	
+	public void AddParent(TKey key, string title) {
+		if (!parentNodes.ContainsKey(key)) {
+			List<INode> children = [];
+			rootNodes.Add(new INode.NonLeaf(title, children));
+			parentNodes[key] = children;
+		}
+	}
+	
+	public void Add(TValue value, string title, bool isChecked = false) {
+		rootNodes.Add(new INode.Leaf(title, value, isChecked));
+	}
+	
+	public void Add(TKey key, TValue value, string title, bool isChecked = false) {
+		parentNodes.GetValueOrDefault(key, rootNodes).Add(new INode.Leaf(title, value, isChecked));
+	}
+	
+	public ImmutableArray<ICheckBoxItem> ToCheckBoxItems() {
+		return [..rootNodes.Select(static node => node.ToCheckBoxItem(null))];
+	}
+	
+	private interface INode {
+		ICheckBoxItem ToCheckBoxItem(ICheckBoxItem? parent);
+		
+		sealed record NonLeaf(string Title, List<INode> Children) : INode {
+			public ICheckBoxItem ToCheckBoxItem(ICheckBoxItem? parent) {
+				return new ICheckBoxItem.NonLeaf(Title, parent, self => [..Children.Select(child => child.ToCheckBoxItem(self))]);
+			}
+		}
+		
+		sealed record Leaf(string Title, TValue Value, bool IsChecked) : INode {
+			public ICheckBoxItem ToCheckBoxItem(ICheckBoxItem? parent) {
+				return new ICheckBoxItem.Leaf<TValue>(Title, parent, Value, IsChecked);
+			}
+		}
+	}
+}

app/Desktop/Dialogs/Message/MessageDialog.axaml

@@ -25,7 +25,7 @@
     <StackPanel Margin="20">
         <TextBlock Text="{Binding Message}" />
         <Panel Classes="buttons">
-            <WrapPanel Classes="right">
+            <WrapPanel HorizontalAlignment="Right">
                 <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
                 <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
                 <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>

app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml

@@ -34,7 +34,7 @@
             </StackPanel>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel Classes="right">
+            <WrapPanel HorizontalAlignment="Right">
                 <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

app/Desktop/Discord/DiscordAppSettings.cs

@@ -42,8 +42,7 @@ static class DiscordAppSettings {
 			JsonObject settingsJson = await ReadSettingsJson();
 			return AreDevToolsEnabled(settingsJson);
 		} catch (Exception e) {
-			Log.Error("Cannot read settings file.");
+			Log.Error("Could not read settings file.", e);
-			Log.Error(e);
 			return null;
 		}
 	}
@@ -62,7 +61,7 @@ static class DiscordAppSettings {
 		} catch (JsonException) {
 			return SettingsJsonResult.InvalidJson;
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not read settings file.", e);
 			return SettingsJsonResult.ReadError;
 		}
 		
@@ -84,16 +83,14 @@ static class DiscordAppSettings {
 			
 			await WriteSettingsJson(json);
 		} catch (Exception e) {
-			Log.Error("An error occurred when writing settings file.");
+			Log.Error("Could not write settings file.", e);
-			Log.Error(e);
 			
 			if (File.Exists(JsonBackupFilePath)) {
 				try {
 					File.Move(JsonBackupFilePath, JsonFilePath, overwrite: true);
 					Log.Info("Restored settings file from backup.");
 				} catch (Exception e2) {
-					Log.Error("Cannot restore settings file from backup.");
+					Log.Error("Could not restore settings file from backup.", e2);
-					Log.Error(e2);
 				}
 			}
 			
@@ -103,8 +100,7 @@ static class DiscordAppSettings {
 		try {
 			File.Delete(JsonBackupFilePath);
 		} catch (Exception e) {
-			Log.Error("Cannot delete backup file.");
+			Log.Error("Could not delete backup file.", e);
-			Log.Error(e);
 		}
 		
 		return SettingsJsonResult.Success;

app/Desktop/Main/AboutWindow.axaml

@@ -3,12 +3,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:main="clr-namespace:DHT.Desktop.Main"
-        mc:Ignorable="d" d:DesignWidth="510" d:DesignHeight="375"
+        mc:Ignorable="d" d:DesignWidth="510" d:DesignHeight="425"
         x:Class="DHT.Desktop.Main.AboutWindow"
         x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="510" Height="375" CanResize="False"
+        Width="510" Height="425" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Design.DataContext>
@@ -21,7 +21,7 @@
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
         <Style Selector="Grid > Button">
-            <Setter Property="Margin" Value="0 4" />
+            <Setter Property="Margin" Value="0 3" />
             <Setter Property="Padding" Value="8 4" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
@@ -35,39 +35,49 @@
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" Spacing="8">
-            <Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
+            <Button Command="{Binding OpenOfficialWebsite}">Official Website</Button>
-            <Button Command="{Binding ShowIssueTracker}">Issue Tracker</Button>
+            <Button Command="{Binding OpenIssueTracker}">Issue Tracker</Button>
-            <Button Command="{Binding ShowSourceCode}">Source Code</Button>
+            <Button Command="{Binding OpenSourceCode}">Source Code</Button>
         </StackPanel>
 
-        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="*,115,95" Margin="0 10 0 0">
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="*,115,90" Margin="0 10 0 0">
             <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Third-Party Software</TextBlock>
             <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
             <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
 
             <TextBlock Grid.Row="2" Grid.Column="0">.NET</TextBlock>
             <TextBlock Grid.Row="2" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="2" Grid.Column="2" Command="{Binding ShowLibraryNetCore}">GitHub</Button>
+            <Button Grid.Row="2" Grid.Column="2" Command="{Binding OpenThirdPartyNetCore}">GitHub</Button>
 
             <TextBlock Grid.Row="3" Grid.Column="0">Avalonia</TextBlock>
             <TextBlock Grid.Row="3" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">GitHub</Button>
+            <Button Grid.Row="3" Grid.Column="2" Command="{Binding OpenThirdPartyAvalonia}">GitHub</Button>
 
             <TextBlock Grid.Row="4" Grid.Column="0">Rx.NET</TextBlock>
             <TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding OpenThirdPartyRxNet}">GitHub</Button>
 
             <TextBlock Grid.Row="5" Grid.Column="0">SQLite</TextBlock>
             <TextBlock Grid.Row="5" Grid.Column="1">Public Domain</TextBlock>
-            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Website</Button>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding OpenThirdPartySqlite}">Website</Button>
 
             <TextBlock Grid.Row="6" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
             <TextBlock Grid.Row="6" Grid.Column="1">Apache-2.0</TextBlock>
-            <Button Grid.Row="6" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
+            <Button Grid.Row="6" Grid.Column="2" Command="{Binding OpenThirdPartyMicrosoftDataSqlite}">NuGet</Button>
 
             <TextBlock Grid.Row="7" Grid.Column="0">PropertyChanged.SourceGenerator</TextBlock>
             <TextBlock Grid.Row="7" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryPropertyChangedSourceGenerator}">GitHub</Button>
+            <Button Grid.Row="7" Grid.Column="2" Command="{Binding OpenThirdPartyPropertyChangedSourceGenerator}">GitHub</Button>
+        </Grid>
+
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="*,115,90" Margin="0 5 0 0">
+            <TextBlock Grid.Row="0" Grid.Column="0" FontWeight="Bold">Additional Thanks</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
+            <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>
+
+            <TextBlock Grid.Row="2" Grid.Column="0">BetterDiscord, for Webpack hooks</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="1">Apache-2.0</TextBlock>
+            <Button Grid.Row="2" Grid.Column="2" Command="{Binding OpenThirdPartyBetterDiscord}">GitHub</Button>
         </Grid>
 
     </StackPanel>

app/Desktop/Main/AboutWindowModel.cs

@@ -3,39 +3,43 @@ using DHT.Desktop.Common;
 namespace DHT.Desktop.Main;
 
 sealed class AboutWindowModel {
-	public void ShowOfficialWebsite() {
+	public void OpenOfficialWebsite() {
 		SystemUtils.OpenUrl(Program.Website);
 	}
 	
-	public void ShowIssueTracker() {
+	public void OpenIssueTracker() {
 		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker/issues");
 	}
 	
-	public void ShowSourceCode() {
+	public void OpenSourceCode() {
 		SystemUtils.OpenUrl("https://github.com/chylex/Discord-History-Tracker");
 	}
 	
-	public void ShowLibraryNetCore() {
+	public void OpenThirdPartyNetCore() {
 		SystemUtils.OpenUrl("https://github.com/dotnet/core");
 	}
 	
-	public void ShowLibraryAvalonia() {
+	public void OpenThirdPartyAvalonia() {
 		SystemUtils.OpenUrl("https://github.com/AvaloniaUI/Avalonia");
 	}
 	
-	public void ShowLibraryPropertyChangedSourceGenerator() {
+	public void OpenThirdPartyPropertyChangedSourceGenerator() {
 		SystemUtils.OpenUrl("https://github.com/canton7/PropertyChanged.SourceGenerator");
 	}
 	
-	public void ShowLibrarySqlite() {
+	public void OpenThirdPartySqlite() {
 		SystemUtils.OpenUrl("https://www.sqlite.org");
 	}
 	
-	public void ShowLibrarySqliteAdoNet() {
+	public void OpenThirdPartyMicrosoftDataSqlite() {
 		SystemUtils.OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
 	}
 	
-	public void ShowLibraryRxNet() {
+	public void OpenThirdPartyRxNet() {
 		SystemUtils.OpenUrl("https://github.com/dotnet/reactive");
 	}
+	
+	public void OpenThirdPartyBetterDiscord() {
+		SystemUtils.OpenUrl("https://github.com/BetterDiscord/BetterDiscord");
+	}
 }

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

@@ -13,12 +13,8 @@
 
     <UserControl.Styles>
         <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Margin" Value="0 20 40 0" />
             <Setter Property="Spacing" Value="4" />
         </Style>
-        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
         <Style Selector="Grid > Label">
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
@@ -30,9 +26,9 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel>
+    <StackPanel Spacing="20">
         <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel>
+        <WrapPanel ItemSpacing="40" LineSpacing="20">
             <StackPanel>
                 <CheckBox IsChecked="{Binding LimitSize}">Limit Size</CheckBox>
                 <StackPanel Orientation="Horizontal">

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -109,8 +109,7 @@ sealed partial class DownloadItemFilterPanelModel : IAsyncDisposable {
 				await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
 			});
 		} catch (Exception e) {
-			Log.Error("Could not save download filter settings");
+			Log.Error("Could not save download filter settings.", e);
-			Log.Error(e);
 		}
 	}
 	

app/Desktop/Main/Controls/MessageFilterPanel.axaml

@@ -13,12 +13,8 @@
 
     <UserControl.Styles>
         <Style Selector="WrapPanel > StackPanel">
-            <Setter Property="Margin" Value="0 20 40 0" />
             <Setter Property="Spacing" Value="4" />
         </Style>
-        <Style Selector="WrapPanel > StackPanel:nth-last-child(1)">
-            <Setter Property="Margin" Value="0 20 0 0" />
-        </Style>
         <Style Selector="Grid > Label">
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
@@ -36,9 +32,9 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel>
+    <StackPanel Spacing="20">
         <TextBlock Text="{Binding FilterStatisticsText}" />
-        <WrapPanel>
+        <WrapPanel ItemSpacing="40" LineSpacing="20">
             <StackPanel>
                 <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
                 <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">

app/Desktop/Main/Controls/MessageFilterPanelModel.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.ReactiveUI;
@@ -185,51 +186,64 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		FilterStatisticsText = verb + " " + exportedMessageCountStr + " out of " + totalMessageCountStr + " message" + (totalMessageCount is null or 1 ? "." : "s.");
 	}
 	
+	[SuppressMessage("ReSharper", "NotAccessedPositionalProperty.Local")]
+	[SuppressMessage("ReSharper", "MemberCanBePrivate.Local")]
+	private readonly record struct ChannelFilterKey(byte Type, ulong? ServerId, string Title) : IComparable<ChannelFilterKey> {
+		public static ChannelFilterKey DirectMessages { get; } = new (Type: 1, ServerId: null, Title: "Direct Messages");
+		public static ChannelFilterKey GroupMessages { get; } = new (Type: 2, ServerId: null, Title: "Group Messages");
+		public static ChannelFilterKey Unknown { get; } = new (Type: 4, ServerId: null, Title: "Unknown");
+		
+		public static ChannelFilterKey For(DHT.Server.Data.Server server) {
+			return server.Type switch {
+				ServerType.Server        => new ChannelFilterKey(Type: 3, server.Id, "Server - " + server.Name),
+				ServerType.Group         => GroupMessages,
+				ServerType.DirectMessage => DirectMessages,
+				_                        => Unknown,
+			};
+		}
+		
+		public bool Equals(ChannelFilterKey other) {
+			return Type == other.Type && ServerId == other.ServerId;
+		}
+		
+		public override int GetHashCode() {
+			return HashCode.Combine(Type, ServerId);
+		}
+		
+		public int CompareTo(ChannelFilterKey other) {
+			int result = Type.CompareTo(other.Type);
+			if (result != 0) {
+				return result;
+			}
+			else {
+				return Title.CompareTo(other.Title);
+			}
+		}
+	}
+	
 	public async Task OpenChannelFilterDialog() {
-		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
+		async Task<ImmutableArray<ICheckBoxItem>> PrepareChannelItems(ProgressDialog dialog) {
-			var items = new List<CheckBoxItem<ulong>>();
+			CheckBoxItemList<ChannelFilterKey, ulong> items = new CheckBoxItemList<ChannelFilterKey, ulong>();
 			Dictionary<ulong, DHT.Server.Data.Server> servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
 			
-			await foreach (Channel channel in state.Db.Channels.Get()) {
+			foreach (ChannelFilterKey channelFilterKey in servers.Values.Select(ChannelFilterKey.For).Order()) {
-				ulong channelId = channel.Id;
+				items.AddParent(channelFilterKey, channelFilterKey.Title);
-				string channelName = channel.Name;
-				
-				string title;
-				if (servers.TryGetValue(channel.Server, out var server)) {
-					var titleBuilder = new StringBuilder();
-					ServerType? serverType = server.Type;
-					
-					titleBuilder.Append('[')
-					            .Append(ServerTypes.ToString(serverType))
-					            .Append("] ");
-					
-					if (serverType == ServerType.DirectMessage) {
-						titleBuilder.Append(channelName);
-					}
-					else {
-						titleBuilder.Append(server.Name)
-						            .Append(" - ")
-						            .Append(channelName);
 			}
 			
-					title = titleBuilder.ToString();
+			await foreach (Channel channel in state.Db.Channels.Get().OrderBy(static channel => channel.Position ?? int.MinValue).ThenBy(static channel => channel.Name)) {
-				}
+				ChannelFilterKey key = servers.TryGetValue(channel.Server, out var server)
-				else {
+					                       ? ChannelFilterKey.For(server)
-					title = channelName;
+					                       : ChannelFilterKey.Unknown;
+				
+				items.Add(key, channel.Id, channel.Name, isChecked: IncludedChannels == null || IncludedChannels.Contains(channel.Id));
 			}
 			
-				items.Add(new CheckBoxItem<ulong>(channelId) {
+			return items.ToCheckBoxItems();
-					Title = title,
-					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId),
-				});
-			}
-			
-			return items;
 		}
 		
 		const string Title = "Included Channels";
 		
-		List<CheckBoxItem<ulong>> items;
+		ImmutableArray<ICheckBoxItem> items;
 		try {
 			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading channels...", PrepareChannelItems);
 		} catch (Exception e) {
@@ -244,22 +258,27 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 	}
 	
 	public async Task OpenUserFilterDialog() {
-		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
+		async Task<ImmutableArray<ICheckBoxItem>> PrepareUserItems(ProgressDialog dialog) {
-			var checkBoxItems = new List<CheckBoxItem<ulong>>();
+			CheckBoxItemList<ulong, ulong> items = new CheckBoxItemList<ulong, ulong>();
 			
-			await foreach (User user in state.Db.Users.Get()) {
+			static string GetDisplayName(User user) {
-				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
+				return user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})";
-					Title = user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})",
-					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id),
-				});
 			}
 			
-			return checkBoxItems;
+			await foreach ((ulong id, string name) in state.Db.Users.Get().Select(static user => (user.Id, GetDisplayName(user))).OrderBy(static pair => pair.Item2)) {
+				items.Add(
+					value: id,
+					title: name,
+					isChecked: IncludedUsers == null || IncludedUsers.Contains(id)
+				);
+			}
+			
+			return items.ToCheckBoxItems();
 		}
 		
 		const string Title = "Included Users";
 		
-		List<CheckBoxItem<ulong>> items;
+		ImmutableArray<ICheckBoxItem> items;
 		try {
 			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);
 		} catch (Exception e) {
@@ -273,9 +292,7 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		}
 	}
 	
-	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, List<CheckBoxItem<ulong>> items) {
+	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, ImmutableArray<ICheckBoxItem> items) {
-		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
-		
 		var model = new CheckBoxDialogModel<ulong>(items) {
 			Title = title,
 		};
@@ -283,7 +300,7 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		var dialog = new CheckBoxDialog { DataContext = model };
 		var result = await dialog.ShowDialog<DialogResult.OkCancel>(window);
 		
-		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
+		return result == DialogResult.OkCancel.Ok ? model.SelectedValues.ToHashSet() : null;
 	}
 	
 	public MessageFilter CreateFilter() {

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

@@ -22,16 +22,15 @@
         </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Orientation" Value="Vertical" />
-            <Setter Property="Margin" Value="0 0 10 10" />
         </Style>
     </UserControl.Styles>
 
-    <StackPanel>
+    <StackPanel Spacing="10">
         <Button Command="{Binding OnClickToggleServerButton}" Content="{Binding ToggleServerButtonText}" IsEnabled="{Binding IsToggleServerButtonEnabled}" />
-        <TextBlock TextWrapping="Wrap" Margin="0 15">
+        <TextBlock TextWrapping="Wrap" Margin="0 5">
             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>
+        <WrapPanel ItemSpacing="10" LineSpacing="10">
             <StackPanel>
                 <Label Target="Port">Port</Label>
                 <TextBox x:Name="Port" Width="70" Text="{Binding InputPort}" />

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

@@ -62,7 +62,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 		try {
 			await server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not start internal server.", e);
 			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
 		}
 		
@@ -76,7 +76,7 @@ sealed partial class ServerConfigurationPanelModel : IDisposable {
 		try {
 			await server.Stop();
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not stop internal server.", e);
 			await Dialog.ShowOk(window, "Internal Server Error", e.Message);
 		}
 		

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml

@@ -48,7 +48,7 @@
             </CheckBox>
         </StackPanel>
         <Panel Classes="buttons">
-            <WrapPanel Classes="right">
+            <WrapPanel HorizontalAlignment="Right">
                 <Button Click="ClickOk">OK</Button>
             </WrapPanel>
         </Panel>

app/Desktop/Main/MainWindowModel.cs

@@ -89,14 +89,21 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 		try {
 			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
 		} catch (Exception ex) {
-			Log.Error(ex);
+			Log.Error("Could not start internal server.", ex);
 			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
 		}
 		
+		try {
 			mainContentScreenModel = new MainContentScreenModel(window, state);
 			mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-		
 			await mainContentScreenModel.Initialize();
+		} catch (Exception ex) {
+			Log.Error("Could not initialize content screen.", ex);
+			await Dialog.ShowOk(window, "Initialization Error", ex.Message);
+			await DisposeContent();
+			await DisposeState();
+			return;
+		}
 		
 		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
 		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -11,23 +11,17 @@
         <pages:DatabasePageModel />
     </Design.DataContext>
 
-    <UserControl.Styles>
-        <Style Selector="WrapPanel > Button">
-            <Setter Property="Margin" Value="0 0 10 10" />
-        </Style>
-    </UserControl.Styles>
-
     <StackPanel Spacing="10">
         <DockPanel>
             <Button Command="{Binding CloseDatabase}" DockPanel.Dock="Right">Close Database</Button>
             <TextBox Text="{Binding Db.Path}" Width="NaN" Margin="0 0 10 0" IsReadOnly="True" />
         </DockPanel>
-        <WrapPanel>
+        <WrapPanel ItemSpacing="10" LineSpacing="10">
             <Button Command="{Binding OpenDatabaseFolder}">Open Database Folder</Button>
             <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
             <Button Command="{Binding ImportLegacyArchive}">Import Legacy Archive(s)...</Button>
         </WrapPanel>
-        <Expander Header="Advanced Tools" Margin="0 15 0 0">
+        <Expander Header="Advanced Tools" Margin="0 25 0 0">
             <StackPanel Orientation="Vertical" Spacing="10">
                 <TextBlock TextWrapping="Wrap">Recreate the database to free up space after deleting data.</TextBlock>
                 <Button Command="{Binding VacuumDatabase}">Vacuum Database</Button>

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -84,7 +84,7 @@ sealed class DatabasePageModel {
 		try {
 			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await MergeWithDatabaseFromPaths(Db, paths, dialog, callback));
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not merge databases.", e);
 			await Dialog.ShowOk(window, Title, "Could not merge databases: " + e.Message);
 			return;
 		}
@@ -160,7 +160,7 @@ sealed class DatabasePageModel {
 		try {
 			result = await ProgressDialog.Show(window, Title, async (dialog, callback) => await ImportLegacyArchiveFromPaths(Db, paths, dialog, callback));
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not import legacy archives.", e);
 			await Dialog.ShowOk(window, Title, "Could not import legacy archives: " + e.Message);
 			return;
 		}
@@ -236,7 +236,7 @@ sealed class DatabasePageModel {
 					++successful;
 				}
 			} catch (Exception ex) {
-				Log.Error(ex);
+				Log.Error("Could not import file: " + path, ex);
 				await Dialog.ShowOk(dialog, dialogTitle, "File '" + Path.GetFileName(path) + "' could not be imported: " + ex.Message);
 			}
 		}
@@ -302,7 +302,7 @@ sealed class DatabasePageModel {
 		try {
 			await ProgressDialog.ShowIndeterminate(window, Title, "Vacuuming database...", _ => Db.Vacuum());
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not vacuum database.", e);
 			await Dialog.ShowOk(window, Title, "Could not vacuum database: " + e.Message);
 			return;
 		}

app/Desktop/Main/Pages/DebugPage.axaml

@@ -17,27 +17,26 @@
             <Setter Property="FontSize" Value="15" />
         </Style>
         <Style Selector="Label">
-            <Setter Property="Margin" Value="0 5" />
+            <Setter Property="Margin" Value="0" />
             <Setter Property="Padding" Value="0" />
         </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Orientation" Value="Vertical" />
-            <Setter Property="Margin" Value="0 0 10 10" />
         </Style>
     </UserControl.Styles>
 
     <StackPanel Orientation="Vertical" Spacing="10">
         <Expander Header="Generate Random Data" IsExpanded="True">
-            <WrapPanel>
+            <WrapPanel ItemSpacing="10" LineSpacing="10">
-                <StackPanel>
+                <StackPanel Spacing="8">
                     <Label Target="Channels">Channels</Label>
                     <TextBox x:Name="Channels" Width="100" Text="{Binding GenerateChannels}" />
                 </StackPanel>
-                <StackPanel>
+                <StackPanel Spacing="8">
                     <Label Target="Users">Users</Label>
                     <TextBox x:Name="Users" Width="100" Text="{Binding GenerateUsers}" />
                 </StackPanel>
-                <StackPanel>
+                <StackPanel Spacing="8">
                     <Label Target="Messages">Messages</Label>
                     <TextBox x:Name="Messages" Width="100" Text="{Binding GenerateMessages}" />
                 </StackPanel>
@@ -46,5 +45,8 @@
                 </StackPanel>
             </WrapPanel>
         </Expander>
+        <Expander Header="About" IsExpanded="True">
+            <TextBlock Text="{Binding SqliteVersion, StringFormat=Sqlite Version: {0}}" />
+        </Expander>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/DebugPageModel.cs

@@ -9,14 +9,18 @@ using DHT.Desktop.Dialogs.Progress;
 using DHT.Server;
 using DHT.Server.Data;
 using DHT.Server.Service;
+using PropertyChanged.SourceGenerator;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed class DebugPageModel {
+sealed partial class DebugPageModel {
 	public string GenerateChannels { get; set; } = "0";
 	public string GenerateUsers { get; set; } = "0";
 	public string GenerateMessages { get; set; } = "0";
 	
+	[Notify(Setter.Private)]
+	private string? sqliteVersion = string.Empty;
+	
 	private readonly Window window;
 	private readonly State state;
 	
@@ -28,6 +32,10 @@ sealed class DebugPageModel {
 		this.state = state;
 	}
 	
+	public async Task Initialize() {
+		SqliteVersion = await state.Db.GetVersion() ?? "<unknown>";
+	}
+	
 	public async void OnClickAddRandomDataToDatabase() {
 		if (!int.TryParse(GenerateChannels, out int channels) || channels < 1) {
 			await Dialog.ShowOk(window, "Generate Random Data", "Amount of channels must be at least 1!");
@@ -169,6 +177,8 @@ sealed class DebugPageModel {
 	public string GenerateUsers { get; set; } = "0";
 	public string GenerateMessages { get; set; } = "0";
 
+	public string SqliteVersion => string.Empty;
+	
 	public void OnClickAddRandomDataToDatabase() {}
 }
 #endif

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -13,9 +13,6 @@
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="WrapPanel > Button">
-            <Setter Property="Margin" Value="0 0 10 10" />
-        </Style>
         <Style Selector="DataGridColumnHeader">
             <Setter Property="FontWeight" Value="Medium" />
         </Style>
@@ -30,14 +27,13 @@
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Orientation="Vertical">
+    <StackPanel Orientation="Vertical" Spacing="20">
-        <WrapPanel Orientation="Horizontal">
+        <WrapPanel Orientation="Horizontal" ItemSpacing="10" LineSpacing="10">
             <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
             <Button Command="{Binding OnClickRetryFailed}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed</Button>
             <Button Command="{Binding OnClickDeleteOrphaned}">Delete Orphaned</Button>
             <Button Command="{Binding OnClickExportAll}" IsEnabled="{Binding HasSuccessfulDownloads}">Export All...</Button>
         </WrapPanel>
-        <StackPanel Orientation="Vertical" Spacing="20" Margin="0 10 0 0">
         <controls:DownloadItemFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !$parent[UserControl].((pages:DownloadsPageModel)DataContext).IsDownloading}" />
         <TextBlock TextWrapping="Wrap">
             Downloading state and filter settings are remembered per-database.
@@ -52,5 +48,4 @@
             </DataGrid>
         </Expander>
     </StackPanel>
-    </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -92,7 +92,12 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 		await FilterModel.Initialize();
 		
 		if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, defaultValue: false)) {
+			try {
 				await StartDownload();
+			} catch (Exception e) {
+				Log.Error("Could not automatically start downloads.", e);
+				await Dialog.ShowOk(window, "Database Error", "Could not automatically start downloads: " + e.Message);
+			}
 		}
 	}
 	
@@ -111,23 +116,43 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 	
 	public async Task OnClickToggleDownload() {
 		IsToggleDownloadButtonEnabled = false;
-		
+		try {
 			if (IsDownloading) {
 				await StopDownload();
 			}
 			else {
+				try {
 					await StartDownload();
+				} catch (Exception e) {
+					Log.Error("Could not start downloads.", e);
+					await Dialog.ShowOk(window, "Database Error", "Could not start downloads: " + e.Message);
+					return;
+				}
 			}
 			
+			try {
 				await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
+			} catch (Exception e) {
+				Log.Error("Could not update auto-start setting in database.", e);
+			}
+		} finally {
 			IsToggleDownloadButtonEnabled = true;
 		}
+	}
 	
 	private async Task StartDownload() {
 		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
 		
-		IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
+		try {
+			currentDownloadFilter = FilterModel.CreateFilter();
+			IObservable<DownloadItem> finishedItems = await state.Downloader.Start(currentDownloadFilter);
 			finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
+		} catch (Exception) {
+			finishedItemsSubscription?.Dispose();
+			finishedItemsSubscription = null;
+			currentDownloadFilter = null;
+			throw;
+		}
 		
 		OnDownloadStateChanged();
 	}
@@ -138,8 +163,8 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 		
 		finishedItemsSubscription?.Dispose();
 		finishedItemsSubscription = null;
-		
 		currentDownloadFilter = null;
+		
 		OnDownloadStateChanged();
 	}
 	
@@ -155,12 +180,12 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 	
 	public async Task OnClickRetryFailed() {
 		IsRetryingFailedDownloads = true;
-		
 		try {
 			await state.Db.Downloads.RetryFailed();
 			RecomputeDownloadStatistics();
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not retry failed downloads.", e);
+			await Dialog.ShowOk(window, "Retry Failed", "Could not retry failed downloads: " + e.Message);
 		} finally {
 			IsRetryingFailedDownloads = false;
 		}
@@ -212,7 +237,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 				await state.Db.Vacuum();
 			});
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not delete orphaned downloads.", e);
 			await Dialog.ShowOk(window, Title, "Could not delete orphaned downloads: " + e.Message);
 		}
 	}
@@ -239,7 +264,7 @@ sealed partial class DownloadsPageModel : IAsyncDisposable {
 				return await exporter.Export(new ExportProgressReporter(callback));
 			});
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not export downloaded files.", e);
 			await Dialog.ShowOk(window, Title, "Could not export downloaded files: " + e.Message);
 			return;
 		}

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -15,9 +15,6 @@
         <Style Selector="TextBlock">
             <Setter Property="TextWrapping" Value="Wrap" />
         </Style>
-        <Style Selector="WrapPanel > Button">
-            <Setter Property="Margin" Value="0 0 10 10" />
-        </Style>
     </UserControl.Styles>
 
     <StackPanel Spacing="20">
@@ -37,7 +34,7 @@
                 <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">
+        <Expander Header="Method 2: Userscript" IsExpanded="True">
             <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.
@@ -46,7 +43,7 @@
                 <TextBlock>
                     Copy the Connection Code, click the DHT icon, and paste the code into the prompt.
                 </TextBlock>
-                <WrapPanel>
+                <WrapPanel ItemSpacing="10" LineSpacing="10">
                     <Button Command="{Binding OnClickInstallOrUpdateUserscript}">Install or Update Userscript</Button>
                     <Button x:Name="CopyConnectionCode" Click="CopyConnectionScriptButton_OnClick">Copy Connection Code</Button>
                 </WrapPanel>

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -146,7 +146,7 @@ sealed partial class TrackingPageModel {
 			await clipboard.SetTextAsync(script);
 			return true;
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not copy to clipboard.", e);
 			await Dialog.ShowOk(window, errorDialogTitle, "An error occurred while copying to clipboard.");
 			return false;
 		}

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -75,7 +75,7 @@ sealed partial class ViewerPageModel : IDisposable {
 				}
 			}
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not apply filters.", e);
 			await Dialog.ShowOk(window, "Apply Filters", "Could not apply filters: " + e.Message);
 		}
 	}

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -70,6 +70,10 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 	
 	public async Task Initialize() {
 		await DownloadsPageModel.Initialize();
+		
+		#if DEBUG
+		await DebugPageModel.Initialize();
+		#endif
 	}
 	
 	public async ValueTask DisposeAsync() {

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -131,7 +131,7 @@ sealed partial class WelcomeScreenModel {
 			await Dialog.ShowOk(window, "Check Updates", "Request timed out.");
 			return;
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not check for updates.", e);
 			await Dialog.ShowOk(window, "Check Updates", "Error checking for updates: " + e.Message);
 			return;
 		}

app/Desktop/Program.cs

@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Reflection;
 using Avalonia;
+using DHT.Desktop.Common;
 using DHT.Utils.Logging;
 using DHT.Utils.Resources;
 
@@ -57,6 +58,8 @@ static class Program {
 	}
 	
 	private static AppBuilder BuildAvaloniaApp() {
+		AvaloniaReflection.Check();
+		
 		return AppBuilder.Configure<App>()
 		                 .UsePlatformDetect()
 		                 .WithInterFont()

app/Resources/Tracker/scripts/discord.js

@@ -67,7 +67,7 @@ class DISCORD {
 	/**
 	 * @type {function(String): MessageData}
 	 */
-	static #getMessages = WEBPACK.findFunction("getMessages");
+	static #getMessages = WEBPACK.findFunction("getMessages", [ "isLoadingMessages" ]);
 	
 	/**
 	 * @type {function(String): void}

app/Resources/Tracker/scripts/webpack.js

@@ -1,8 +1,8 @@
 /**
  * Parts copied from Better Discord, licensed under Apache License 2.0.
  *
- * https://github.com/BetterDiscord/BetterDiscord/blob/78edeb77c60542a57884686c4ba98f997c886fad/renderer/src/modules/webpackmodules.js
+ * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/renderer/src/modules/webpackmodules.js
- * https://github.com/BetterDiscord/BetterDiscord/blob/78edeb77c60542a57884686c4ba98f997c886fad/LICENSE
+ * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/LICENSE
  */
 class WEBPACK {
 	static get require() {
@@ -17,13 +17,15 @@ class WEBPACK {
 		 */
 		let hookedRequire;
 		
-		const id = "dht-webpackmodules-" + new Date().getTime();
+		const id = Symbol("dht-webpackmodules-" + new Date().getTime());
 		if (typeof (window["webpackChunkdiscord_app"]) !== "undefined") {
-			window["webpackChunkdiscord_app"].push([ [ id ], {}, internalRequire => hookedRequire = internalRequire ]);
+			window["webpackChunkdiscord_app"].push([ [ id ], {}, internalRequire => {
+				if ("b" in internalRequire) {
+					hookedRequire = internalRequire;
+				}
+			}]);
 		}
 		
-		delete hookedRequire.m[id];
-		delete hookedRequire.c[id];
 		return this._require = hookedRequire;
 	}
 	
@@ -86,7 +88,7 @@ class WEBPACK {
 			return modules[0];
 		}
 		
-		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length);
+		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length, modules);
 		return null;
 	}
 	

app/Resources/Viewer/index.html

@@ -10,6 +10,7 @@
     
     <link rel="stylesheet" href="styles/main.css">
     <link rel="stylesheet" href="styles/menu.css">
+    <link rel="stylesheet" href="styles/servers.css">
     <link rel="stylesheet" href="styles/channels.css">
     <link rel="stylesheet" href="styles/messages.css">
     <link rel="stylesheet" href="styles/modal.css">
@@ -75,6 +76,7 @@
     </div>
     
     <div id="app">
+      <div id="servers"></div>
       <div id="channels">
         <div class="loading"></div>
       </div>

app/Resources/Viewer/scripts/bootstrap.mjs

@@ -2,6 +2,7 @@ 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;
 
@@ -25,10 +26,12 @@ 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,16 +113,17 @@ export default (function() {
 	return {
 		setup() {
 			templateChannelServer = new template([
-				"<div class='channel' data-channel='{id}'>",
+				"<div class='channel ServerChannel' data-channel='{id}' server-id='{serverId}' server-name='{server.name}' server-type='{server.type}'>",
 				"<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' data-channel='{id}'>",
+				"<div class='channel UserChannel' data-channel='{id}' server-id='0' server-name='{server.name}' server-type='{server.type}'>",
+				"<div class='avatar'>{icon}</div>",
 				"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
-				"<span class='server'>({server.type})</span>",
+				"<!--<span class='server'>{server.name} ({server.type})</span>-->",
 				"</div>"
 			].join(""));
 			
@@ -166,7 +167,7 @@ export default (function() {
 			
 			// noinspection HtmlUnknownTarget
 			templateEmbedImageWithSize = new template([
-				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
+				"<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>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget

app/Resources/Viewer/scripts/servers.mjs

@@ -0,0 +1,109 @@
+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

@@ -9,6 +9,18 @@ export default (function() {
 	 * @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;
 
@@ -31,6 +43,26 @@ export default (function() {
 		return loadedFileMeta.servers[id] || { "name": "<unknown>", "type": "unknown" };
 	};
 
+	const getUserIDByName = function (name) {
+		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>}
@@ -144,13 +176,18 @@ export default (function() {
 		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+".webp")}'>`
 		})).sort((ac, bc) => {
 			return channelOrder[ac.id] - channelOrder[bc.id];
 		});

app/Resources/Viewer/scripts/template.mjs

@@ -8,15 +8,21 @@ export default class {
 	};
 	
 	apply(obj, processor) {
+
+		//Keys to not escape
+		const allowHTMLKeys = new Set(["icon"]); //Example with more: Set(["icon", "description", "content"]);
+	
 		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" ? dom.escapeHTML(value) : updated;
+				return typeof updated === "undefined" ? (allowHTMLKeys.has(match) ? value : dom.escapeHTML(value)) : updated;
 			}
 
-			return dom.escapeHTML(value);
+	
+			return allowHTMLKeys.has(match) ? value : dom.escapeHTML(value);
 		});
 	}
+	
 }

app/Resources/Viewer/styles/channels.css

@@ -4,8 +4,9 @@
   max-width: 300px;
   overflow-y: auto;
   color: #eee;
-  background-color: #1c1e22;
+  background-color: #2B2D31;
   font-size: 15px;
+  padding: 2px;
 }
 
 #channels > div.loading {
@@ -14,27 +15,93 @@
   height: 150px;
 }
 
-#channels > div.channel {
+#channels > div.loading {
-  cursor: pointer;
+  background-color: rgba(0, 0, 0, 0) !important;
-  padding: 10px 12px;
-  border-bottom: 1px solid #333333;
 }
 
-#channels > div.channel:hover, #channels > div.channel.active {
+
-  background-color: #282b30;
+#channels > div.channel.visible {
+  display: flex !important;
 }
 
+#channels > div.channel {
+  display: none !important;
+
+  cursor: pointer;
+  padding: 5px 8px;
+
+  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;
+}
+
+
+.ServerChannel {
+  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;
-  height: 16px;
+  width: 100%;
-  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;
-  overflow: hidden;
+  color: oklab(0.686636 -0.00407365 -0.0149199);
+  font-weight: 500;
+  font-size: 16px;
+  /* max-width: 200px; */
+}
+
+.ServerChannel .name {
+  height: 18px;
 }
 
 #channels .tag {
@@ -46,3 +113,25 @@
   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

@@ -17,6 +17,10 @@ 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: #17181c;
+  background-color: #313338;
-  border-bottom: 1px dotted #5d626b;
+  border-bottom: 2px solid #27292D;
 }
 
 #menu .splitter {
@@ -23,7 +23,9 @@
   cursor: default;
 }
 
-#menu button, #menu select, #menu input[type="text"] {
+#menu button,
+#menu select,
+#menu input[type="text"] {
   height: 31px;
   padding: 0 10px;
   background-color: #7289da;
@@ -64,11 +66,13 @@
   padding: 0 8px;
 }
 
-#menu .nav > button, #menu .nav > p {
+#menu .nav > button,
+#menu .nav > p {
   margin: 0 1px;
 }
 
-#opt-filter-list > select, #opt-filter-list > input {
+#opt-filter-list > select,
+#opt-filter-list > input {
   display: none;
 }
 

app/Resources/Viewer/styles/messages.css

@@ -5,9 +5,14 @@
 }
 
 #messages > div {
-  margin: 0 24px;
+  padding: 0 4px 0 24px;
-  padding: 4px 0 12px;
+
-  border-bottom: 1px solid rgba(255, 255, 255, 0.04);
+  margin-bottom: 17px;
+}
+
+
+#messages > div:hover {
+  background-color: oklab(0.0846607 0.00000385568 0.00000169128 / 0.06);
 }
 
 #messages h2 {
@@ -23,6 +28,8 @@
   align-content: flex-start;
 }
 
+
+
 #messages .avatar-wrapper > div {
   flex: 1 1 auto;
 }
@@ -50,14 +57,9 @@
   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;
@@ -66,20 +68,22 @@
 }
 
 .message {
-  margin-top: 6px;
+  margin-top: 2px;
-  color: rgba(255, 255, 255, 0.7);
+  color: oklab(0.89908 -0.00192907 -0.0048306);
-  font-size: 15px;
+  font-size: 16px;
   line-height: 1.1em;
   white-space: pre-wrap;
   word-wrap: break-word;
 }
 
-.message .link, .reply-message .link {
+.message .link,
+.reply-message .link {
   color: #7289da;
   background-color: rgba(115, 139, 215, 0.1);
 }
 
-.message a, .reply-message a {
+.message a,
+.reply-message a {
   color: #0096cf;
   text-decoration: none;
 }
@@ -126,7 +130,8 @@
   border-radius: 3px;
 }
 
-.message .embed:first-child, .message .download + .download {
+.message .embed:first-child,
+.message .download+.download {
   margin-top: 0;
 }
 

app/Resources/Viewer/styles/servers.css

@@ -0,0 +1,81 @@
+#servers {
+    width: 76px;
+    background-color: #1e1f22;
+    padding: 0px;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+
+.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;
+    overflow: hidden;
+}
+
+.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;
+    word-break: break-all;
+    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/Database/DummyDatabaseFile.cs

@@ -19,6 +19,10 @@ sealed class DummyDatabaseFile : IDatabaseFile {
 	
 	private DummyDatabaseFile() {}
 	
+	public Task<string?> GetVersion() {
+		return Task.FromResult<string?>(null);
+	}
+	
 	public Task Vacuum() {
 		return Task.CompletedTask;
 	}

app/Server/Database/IDatabaseFile.cs

@@ -14,5 +14,6 @@ public interface IDatabaseFile : IAsyncDisposable {
 	IMessageRepository Messages { get; }
 	IDownloadRepository Downloads { get; }
 	
+	Task<string?> GetVersion();
 	Task Vacuum();
 }

app/Server/Database/Import/LegacyArchiveImport.cs

@@ -10,12 +10,15 @@ 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);
@@ -186,7 +189,7 @@ public static class LegacyArchiveImport {
 		return attachmentsArray.Select(attachmentObj => {
 			string url = attachmentObj.RequireString("url", path);
 			string name = url[(url.LastIndexOf('/') + 1)..];
-			string? type = MimeTypes.TryGetByFileExtension(name, out var mimeType) ? mimeType : null;
+			string? type = ContentTypeProvider.TryGetContentType(name, out string? contentType) ? contentType : null;
 			
 			return new Attachment {
 				Id = fakeSnowflake.Next(),

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -80,6 +80,11 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 		await pool.DisposeAsync();
 	}
 	
+	public async Task<string?> GetVersion() {
+		await using var conn = await pool.Take();
+		return await conn.ExecuteReaderAsync("SELECT sqlite_version()", static reader => reader?.GetString(0));
+	}
+	
 	public async Task Vacuum() {
 		await using var conn = await pool.Take();
 		

app/Server/Download/DownloadExporter.cs

@@ -95,7 +95,7 @@ public sealed partial class DownloadExporter(IDatabaseFile db, string folderPath
 				} catch (FileAlreadyExistsException) {
 					success = false;
 				} catch (Exception e) {
-					Log.Error(e);
+					Log.Error("Could not export downloaded file: " + download.NormalizedUrl, e);
 					success = false;
 				}
 				

app/Server/Download/DownloaderTask.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Reactive.Subjects;
 using System.Threading;
@@ -94,12 +95,10 @@ sealed class DownloaderTask : IAsyncDisposable {
 			} catch (TaskCanceledException e) when (e.InnerException is TimeoutException) {
 				await db.Downloads.AddDownload(item.ToFailure(), stream: null);
 				log.Error("Download timed out: " + item.DownloadUrl);
-			} catch (HttpRequestException e) {
-				await db.Downloads.AddDownload(item.ToFailure(e.StatusCode), stream: null);
-				log.Error(e);
 			} catch (Exception e) {
-				await db.Downloads.AddDownload(item.ToFailure(), stream: null);
+				HttpStatusCode? statusCode = e is HttpRequestException hre ? hre.StatusCode : null;
-				log.Error(e);
+				await db.Downloads.AddDownload(item.ToFailure(statusCode), stream: null);
+				log.Error("Could not download file: " + item.DownloadUrl, e);
 			} finally {
 				try {
 					finishedItemPublisher.OnNext(item);

app/Server/Endpoints/BaseEndpoint.cs

@@ -1,58 +1,65 @@
 using System;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Utils.Http;
 using DHT.Utils.Logging;
-using Sisk.Core.Entity;
+using Microsoft.AspNetCore.Http;
-using Sisk.Core.Http;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.Primitives;
 
 namespace DHT.Server.Endpoints;
 
 abstract class BaseEndpoint {
 	private static readonly Log Log = Log.ForType<BaseEndpoint>();
+	private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
+	
+	public async Task Handle(HttpContext ctx) {
+		HttpResponse response = ctx.Response;
 		
-	public async Task<HttpResponse> Handle(HttpRequest request) {
 		try {
-			return await Respond(request);
+			response.StatusCode = (int) HttpStatusCode.OK;
+			await Respond(ctx.Request, response, ctx.RequestAborted);
 		} catch (OperationCanceledException) {
 			throw;
 		} catch (HttpException e) {
 			Log.Error(e);
-			return new HttpResponse(e.StatusCode).WithContent(e.Message);
+			response.StatusCode = (int) e.StatusCode;
+			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);
+			Log.Error("Could not handle request.", e);
-			return new HttpResponse(HttpStatusCode.InternalServerError);
+			response.StatusCode = (int) HttpStatusCode.InternalServerError;
 		}
 	}
 	
-	protected abstract Task<HttpResponse> Respond(HttpRequest request);
+	protected abstract Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken);
 	
 	protected static async Task<JsonElement> ReadJson(HttpRequest request) {
 		try {
-			return await request.GetJsonContentAsync(JsonElementContext.Default.JsonElement);
+			return await request.ReadFromJsonAsync(JsonElementContext.Default.JsonElement);
 		} catch (JsonException) {
 			throw new HttpException(HttpStatusCode.UnsupportedMediaType, "This endpoint only accepts JSON.");
 		}
 	}
 	
-	protected static Task<HttpResponse> WriteFileIfFound(string relativeFilePath, byte[]? bytes) {
+	protected static async Task WriteFileIfFound(HttpResponse response, string relativeFilePath, byte[]? bytes, CancellationToken cancellationToken) {
 		if (bytes == null) {
 			throw new HttpException(HttpStatusCode.NotFound, "File not found: " + relativeFilePath);
 		}
-		
+		else {
-		HttpResponse response = new HttpResponse(new ByteArrayContent(bytes));
+			string? contentType = ContentTypeProvider.TryGetContentType(relativeFilePath, out string? type) ? type : null;
-		
+			await response.WriteFileAsync(contentType, bytes, cancellationToken);
-		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 StringValue sessionIdValue) && !sessionIdValue.IsNull && Guid.TryParse(sessionIdValue, out Guid sessionId)) {
+		if (request.Query.TryGetValue("session", out StringValues sessionIdValue) && sessionIdValue.Count == 1 && Guid.TryParse(sessionIdValue[0], out Guid sessionId)) {
 			return sessionId;
 		}
 		else {

app/Server/Endpoints/GetDownloadedFileEndpoint.cs

@@ -5,39 +5,22 @@ using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
 using DHT.Server.Download;
-using Sisk.Core.Http;
+using DHT.Utils.Http;
-using Sisk.Core.Http.Streams;
+using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
 sealed class GetDownloadedFileEndpoint(IDatabaseFile db) : BaseEndpoint {
-	protected override async Task<HttpResponse> Respond(HttpRequest request) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
-		string url = WebUtility.UrlDecode(request.RouteParameters.GetItem("url"));
+		string url = WebUtility.UrlDecode((string) request.RouteValues["url"]!);
 		string normalizedUrl = DiscordCdn.NormalizeUrl(url);
 		
-		HttpResponseStreamManager response = request.GetResponseStream();
+		if (!await db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, WriteDataTo(response), cancellationToken)) {
-		
+			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) {
-	}
+		return (download, stream, cancellationToken) => response.WriteStreamAsync(download.Type, download.Size, stream, cancellationToken);
-	
-	private static Func<Data.Download, Stream, CancellationToken, Task> WriteDataTo(HttpResponseStreamManager response) {
-		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,15 +1,16 @@
 using System.Net.Mime;
-using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using DHT.Server.Service;
+using DHT.Utils.Http;
 using DHT.Utils.Resources;
-using Sisk.Core.Http;
+using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
 sealed class GetTrackingScriptEndpoint(ServerParameters parameters, ResourceLoader resources) : BaseEndpoint {
-	protected override async Task<HttpResponse> Respond(HttpRequest request) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
 		string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + parameters.Port + ";")
 		                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(parameters.Token))
@@ -18,8 +19,7 @@ sealed class GetTrackingScriptEndpoint(ServerParameters parameters, ResourceLoad
 		                         .Replace("/*[CSS-SETTINGS]*/", await resources.ReadTextAsync("Tracker/styles/settings.css"))
 		                         .Replace("/*[DEBUGGER]*/", request.Query.ContainsKey("debug") ? "debugger;" : "");
 		
-		return new HttpResponse()
+		response.Headers.Append("X-DHT", "1");
-		       .WithHeader("X-DHT", "1")
+		await response.WriteTextAsync(MediaTypeNames.Text.JavaScript, script, cancellationToken);
-		       .WithContent(script, Encoding.UTF8, MediaTypeNames.Text.JavaScript);
 	}
 }

app/Server/Endpoints/GetUserscriptEndpoint.cs

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

app/Server/Endpoints/GetViewerMessagesEndpoint.cs

@@ -1,27 +1,19 @@
 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 Sisk.Core.Http;
+using Microsoft.AspNetCore.Http;
-using Sisk.Core.Http.Streams;
 
 namespace DHT.Server.Endpoints;
 
 sealed class GetViewerMessagesEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint {
-	protected override async Task<HttpResponse> Respond(HttpRequest request) {
+	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		Guid sessionId = GetSessionId(request);
 		ViewerSession session = viewerSessions.Get(sessionId);
 		
-		HttpResponseStreamManager response = request.GetResponseStream();
+		response.ContentType = "application/x-ndjson";
-		response.SendChunked = true;
+		return ViewerJsonExport.GetMessages(response.Body, db, session.MessageFilter, cancellationToken);
-		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,28 +1,20 @@
 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 Sisk.Core.Http;
+using Microsoft.AspNetCore.Http;
-using Sisk.Core.Http.Streams;
 
 namespace DHT.Server.Endpoints;
 
 sealed class GetViewerMetadataEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint {
-	protected override async Task<HttpResponse> Respond(HttpRequest request) {
+	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		Guid sessionId = GetSessionId(request);
 		ViewerSession session = viewerSessions.Get(sessionId);
 		
-		HttpResponseStreamManager response = request.GetResponseStream();
+		response.ContentType = MediaTypeNames.Application.Json;
-		response.SendChunked = true;
+		return ViewerJsonExport.GetMetadata(response.Body, db, session.MessageFilter, cancellationToken);
-		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,23 +1,22 @@
 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 Sisk.Core.Http;
+using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
 sealed class TrackChannelEndpoint(IDatabaseFile db) : BaseEndpoint {
-	protected override async Task<HttpResponse> Respond(HttpRequest request) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		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.Channels.Add([channel]);
-		
-		return new HttpResponse();
 	}
 	
 	private static Data.Server ReadServer(JsonElement json, string path) {

app/Server/Endpoints/TrackMessagesEndpoint.cs

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

app/Server/Endpoints/TrackUsersEndpoint.cs

@@ -1,15 +1,16 @@
 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 Sisk.Core.Http;
+using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
 sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint {
-	protected override async Task<HttpResponse> Respond(HttpRequest request) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		JsonElement root = await ReadJson(request);
 		
 		if (root.ValueKind != JsonValueKind.Array) {
@@ -24,8 +25,6 @@ sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint {
 		}
 		
 		await db.Users.Add(users);
-		
-		return new HttpResponse();
 	}
 	
 	private static User ReadUser(JsonElement json, string path) {

app/Server/Endpoints/ViewerEndpoint.cs

@@ -1,23 +1,24 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using DHT.Server.Service.Middlewares;
 using DHT.Utils.Resources;
-using Sisk.Core.Http;
+using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
-// [ServerAuthorizationMiddleware.NoAuthorization]
+[ServerAuthorizationMiddleware.NoAuthorization]
 sealed class ViewerEndpoint(ResourceLoader resources) : BaseEndpoint {
 	private readonly Dictionary<string, byte[]?> cache = new ();
 	private readonly SemaphoreSlim cacheSemaphore = new (1);
 	
-	protected override async Task<HttpResponse> Respond(HttpRequest request) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
-		string path = request.RouteParameters.GetValue("path") ?? "index.html";
+		string path = (string?) request.RouteValues["path"] ?? "index.html";
 		string resourcePath = "Viewer/" + path;
 		
 		byte[]? resourceBytes;
 		
-		await cacheSemaphore.WaitAsync();
+		await cacheSemaphore.WaitAsync(cancellationToken);
 		try {
 			if (!cache.TryGetValue(resourcePath, out resourceBytes)) {
 				cache[resourcePath] = resourceBytes = await resources.ReadBytesAsyncIfExists(resourcePath);
@@ -26,6 +27,6 @@ sealed class ViewerEndpoint(ResourceLoader resources) : BaseEndpoint {
 			cacheSemaphore.Release();
 		}
 		
-		return await WriteFileIfFound(path, resourceBytes);
+		await WriteFileIfFound(response, path, resourceBytes, cancellationToken);
 	}
 }

app/Server/Server.csproj

@@ -7,8 +7,11 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.7" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Sisk.HttpServer" Version="1.4.2" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.6" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
   

app/Server/Service/Middlewares/ServerAuthorizationMiddleware.cs

@@ -1,45 +1,45 @@
-// using System;
+using System;
-// using System.Net;
+using System.Net;
-// using System.Reflection;
+using System.Reflection;
-// 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.Extensions.Primitives;
+using Microsoft.Extensions.Primitives;
-//
+
-// namespace DHT.Server.Service.Middlewares;
+namespace DHT.Server.Service.Middlewares;
-//
+
-// sealed class ServerAuthorizationMiddleware(RequestDelegate next, ServerParameters serverParameters) {
+sealed class ServerAuthorizationMiddleware(RequestDelegate next, ServerParameters serverParameters) {
-// 	private static readonly Log Log = Log.ForType<ServerAuthorizationMiddleware>();
+	private static readonly Log Log = Log.ForType<ServerAuthorizationMiddleware>();
-// 	
+	
-// 	public async Task InvokeAsync(HttpContext context) {
+	public async Task InvokeAsync(HttpContext context) {
-// 		if (SkipAuthorization(context) || CheckToken(context.Request)) {
+		if (SkipAuthorization(context) || CheckToken(context.Request)) {
-// 			await next(context);
+			await next(context);
-// 		}
+		}
-// 		else {
+		else {
-// 			context.Response.StatusCode = (int) HttpStatusCode.Forbidden;
+			context.Response.StatusCode = (int) HttpStatusCode.Forbidden;
-// 		}
+		}
-// 	}
+	}
-// 	
+	
-// 	private static bool SkipAuthorization(HttpContext context) {
+	private static bool SkipAuthorization(HttpContext context) {
-// 		return context.GetEndpoint()?.RequestDelegate?.Target?.GetType().GetCustomAttribute<NoAuthorization>() != null;
+		return context.GetEndpoint()?.RequestDelegate?.Target?.GetType().GetCustomAttribute<NoAuthorization>() != null;
-// 	}
+	}
-// 	
+	
-// 	private bool CheckToken(HttpRequest request) {
+	private bool CheckToken(HttpRequest request) {
-// 		return HttpMethods.IsGet(request.Method)
+		return HttpMethods.IsGet(request.Method)
-// 			       ? CheckToken(request.Query["token"])
+			       ? CheckToken(request.Query["token"])
-// 			       : CheckToken(request.Headers["X-DHT-Token"]);
+			       : CheckToken(request.Headers["X-DHT-Token"]);
-// 	}
+	}
-// 	
+	
-// 	private bool CheckToken(StringValues token) {
+	private bool CheckToken(StringValues token) {
-// 		if (token.Count == 1 && token[0] == serverParameters.Token) {
+		if (token.Count == 1 && token[0] == serverParameters.Token) {
-// 			return true;
+			return true;
-// 		}
+		}
-// 		else {
+		else {
-// 			Log.Error("Invalid token: " + (token.Count == 1 ? token[0] : "<missing>"));
+			Log.Error("Invalid token: " + (token.Count == 1 ? token[0] : "<missing>"));
-// 			return false;
+			return false;
-// 		}
+		}
-// 	}
+	}
-// 	
+	
-// 	[AttributeUsage(AttributeTargets.Class)]
+	[AttributeUsage(AttributeTargets.Class)]
-// 	public sealed class NoAuthorization : Attribute;
+	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,24 +1,21 @@
 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 Sisk.Core.Entity;
+using Microsoft.AspNetCore.Hosting;
-using Sisk.Core.Http;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Sisk.Core.Http.Hosting;
+using Microsoft.Extensions.DependencyInjection;
-using Router = Sisk.Core.Routing.Router;
 
 namespace DHT.Server.Service;
 
 public sealed class ServerManager {
 	private static readonly Log Log = Log.ForType(typeof(ServerManager));
 	
-	private HttpServerHostContext? server;
+	private IWebHost? server;
 	public bool IsRunning => server != null;
 	
 	public event EventHandler<Status>? StatusChanged;
@@ -51,58 +48,34 @@ public sealed class ServerManager {
 	public async Task Stop() {
 		await semaphore.WaitAsync();
 		try {
-			StopInternal();
+			await StopInternal();
 		} finally {
 			semaphore.Release();
 		}
 	}
 	
 	private async Task StartInternal(ushort port, string token) {
-		StopInternal();
+		await StopInternal();
 		
 		StatusChanged?.Invoke(this, Status.Starting);
 		
-		ServerParameters parameters = new ServerParameters(port, token);
+		void AddServices(IServiceCollection services) {
-		ResourceLoader resources = new ResourceLoader(Assembly.GetExecutingAssembly());
+			services.AddSingleton(typeof(IDatabaseFile), db);
-		
+			services.AddSingleton(typeof(ServerParameters), new ServerParameters(port, token));
-		static void ConfigureServer(HttpServerConfiguration config) {
+			services.AddSingleton(typeof(ResourceLoader), new ResourceLoader(Assembly.GetExecutingAssembly()));
-			config.AsyncRequestProcessing = true;
+			services.AddSingleton(typeof(ViewerSessions), viewerSessions);
-			config.IncludeRequestIdHeader = false;
-			config.MaximumContentLength = 0;
-			config.SendSiskHeader = false;
-			config.ThrowExceptions = false;
 		}
 		
-		void ConfigureRoutes(Router router) {
+		void SetKestrelOptions(KestrelServerOptions options) {
-			router.CallbackErrorHandler = static (exception, _) => {
+			options.Limits.MaxRequestBodySize = null;
-				Log.Error(exception);
+			options.Limits.MinResponseDataRate = null;
-				return new HttpResponse(HttpStatusCode.InternalServerError).WithContent("An error occurred.");
+			options.ListenLocalhost(port, static listenOptions => listenOptions.Protocols = HttpProtocols.Http1);
-			};
-			
-			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);
 		}
 		
-		string[] allowedOrigins = [
+		IWebHost newServer = new WebHostBuilder()
-			"https://discord.com",
+		                     .ConfigureServices(AddServices)
-			"https://ptb.discord.com",
+		                     .UseKestrel(SetKestrelOptions)
-			"https://canary.discord.com",
+		                     .UseStartup<Startup>()
-			"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 + "...");
@@ -115,14 +88,14 @@ public sealed class ServerManager {
 			throw;
 		}
 		
-		Log.Info("Server started");
+		Log.Info("Server started.");
 		
 		server = newServer;
 		
 		StatusChanged?.Invoke(this, Status.Started);
 	}
 	
-	private void StopInternal() {
+	private async Task StopInternal() {
 		if (server == null) {
 			return;
 		}
@@ -130,8 +103,8 @@ public sealed class ServerManager {
 		StatusChanged?.Invoke(this, Status.Stopping);
 		
 		Log.Info("Stopping server...");
-		server.Dispose();
+		await server.StopAsync();
-		Log.Info("Server stopped");
+		Log.Info("Server stopped.");
 		
 		server.Dispose();
 		server = null;

app/Server/Service/ServerStartup.cs

@@ -0,0 +1,56 @@
+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.UseRouting();
+		app.UseMiddleware<ServerAuthorizationMiddleware>();
+		app.UseEndpoints(endpoints => {
+			endpoints.MapGet("/get-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
+			endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(parameters, resources).Handle);
+			endpoints.MapGet("/get-userscript/{**ignored}", new GetUserscriptEndpoint(resources).Handle);
+			endpoints.MapGet("/get-viewer-messages", new GetViewerMessagesEndpoint(db, viewerSessions).Handle);
+			endpoints.MapGet("/get-viewer-metadata", new GetViewerMetadataEndpoint(db, viewerSessions).Handle);
+			endpoints.MapGet("/viewer/{**path}", new ViewerEndpoint(resources).Handle);
+			
+			endpoints.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
+			endpoints.MapPost("/track-messages", new TrackMessagesEndpoint(db).Handle);
+			endpoints.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
+		});
+	}
+}

app/Utils/Http/HttpExtensions.cs

@@ -0,0 +1,34 @@
+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

@@ -1,399 +0,0 @@
-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/Logging/Log.cs

@@ -88,6 +88,11 @@ public sealed class Log {
 		LogLevel(ConsoleColor.Red, "ERROR", e.ToString());
 	}
 	
+	public void Error(string message, Exception e) {
+		Error(message);
+		Error(e);
+	}
+	
 	public Perf Start(string? context = null, [CallerMemberName] string callerMemberName = "") {
 		return Perf.Start(this, context, callerMemberName);
 	}

app/Utils/Utils.csproj

@@ -10,6 +10,10 @@
     <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" />

app/Version.cs

@@ -8,5 +8,5 @@ using DHT.Utils;
 namespace DHT.Utils;
 
 static class Version {
-	public const string Tag = "46.0.0.0";
+	public const string Tag = "47.1.0.0";
 }