Merge 6c0e0ff697 into 08dec7deb3

app/Desktop/App.axaml

@@ -55,42 +55,6 @@
             <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>

app/Desktop/Common/AvaloniaReflection.cs

@@ -1,25 +0,0 @@
-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/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -8,22 +8,28 @@
         x:DataType="namespace:CheckBoxDialogModel"
         Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        MinWidth="425" MinHeight="200"
+        Width="500" SizeToContent="Height" CanResize="False"
-        Width="500" Height="395" CanResize="True"
         WindowStartupLocation="CenterOwner">
 
     <Window.DataContext>
         <namespace:CheckBoxDialogModel />
     </Window.DataContext>
 
-    <Window.Styles>
+    <StackPanel Margin="20">
-        <Style Selector="TreeViewItem">
+        <ScrollViewer MaxHeight="400">
-            <Setter Property="IsExpanded" Value="True" />
+            <ItemsRepeater ItemsSource="{Binding Items}">
-        </Style>
+                <ItemsRepeater.ItemTemplate>
-    </Window.Styles>
+                    <DataTemplate>
-
+                        <CheckBox IsChecked="{Binding IsChecked}">
-    <DockPanel Margin="20 17 20 20">
+                            <Label>
-        <Panel Classes="buttons" DockPanel.Dock="Bottom">
+                                <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
+                            </Label>
+                        </CheckBox>
+                    </DataTemplate>
+                </ItemsRepeater.ItemTemplate>
+            </ItemsRepeater>
+        </ScrollViewer>
+        <Panel Classes="buttons">
             <WrapPanel>
                 <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
                 <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
@@ -33,19 +39,6 @@
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>
         </Panel>
-        <ScrollViewer DockPanel.Dock="Top">
+    </StackPanel>
-            <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>
-                    </TreeDataTemplate>
-                </TreeView.ItemTemplate>
-            </TreeView>
-        </ScrollViewer>
-    </DockPanel>
 
 </Window>

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

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

@@ -1,46 +0,0 @@
-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/Main/Controls/MessageFilterPanelModel.cs

@@ -1,10 +1,9 @@
 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;
@@ -186,64 +185,51 @@ 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<ImmutableArray<ICheckBoxItem>> PrepareChannelItems(ProgressDialog dialog) {
+		async Task<List<CheckBoxItem<ulong>>> PrepareChannelItems(ProgressDialog dialog) {
-			CheckBoxItemList<ChannelFilterKey, ulong> items = new CheckBoxItemList<ChannelFilterKey, ulong>();
+			var items = new List<CheckBoxItem<ulong>>();
 			Dictionary<ulong, DHT.Server.Data.Server> servers = await state.Db.Servers.Get().ToDictionaryAsync(static server => server.Id);
 			
-			foreach (ChannelFilterKey channelFilterKey in servers.Values.Select(ChannelFilterKey.For).Order()) {
+			await foreach (Channel channel in state.Db.Channels.Get()) {
-				items.AddParent(channelFilterKey, channelFilterKey.Title);
+				ulong channelId = channel.Id;
+				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);
 					}
 					
-			await foreach (Channel channel in state.Db.Channels.Get().OrderBy(static channel => channel.Position ?? int.MinValue).ThenBy(static channel => channel.Name)) {
+					title = titleBuilder.ToString();
-				ChannelFilterKey key = servers.TryGetValue(channel.Server, out var server)
+				}
-					                       ? ChannelFilterKey.For(server)
+				else {
-					                       : ChannelFilterKey.Unknown;
+					title = channelName;
-				
-				items.Add(key, channel.Id, channel.Name, isChecked: IncludedChannels == null || IncludedChannels.Contains(channel.Id));
 				}
 				
-			return items.ToCheckBoxItems();
+				items.Add(new CheckBoxItem<ulong>(channelId) {
+					Title = title,
+					IsChecked = IncludedChannels == null || IncludedChannels.Contains(channelId),
+				});
+			}
+			
+			return items;
 		}
 		
 		const string Title = "Included Channels";
 		
-		ImmutableArray<ICheckBoxItem> items;
+		List<CheckBoxItem<ulong>> items;
 		try {
 			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading channels...", PrepareChannelItems);
 		} catch (Exception e) {
@@ -258,27 +244,22 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 	}
 	
 	public async Task OpenUserFilterDialog() {
-		async Task<ImmutableArray<ICheckBoxItem>> PrepareUserItems(ProgressDialog dialog) {
+		async Task<List<CheckBoxItem<ulong>>> PrepareUserItems(ProgressDialog dialog) {
-			CheckBoxItemList<ulong, ulong> items = new CheckBoxItemList<ulong, ulong>();
+			var checkBoxItems = new List<CheckBoxItem<ulong>>();
 			
-			static string GetDisplayName(User user) {
+			await foreach (User user in state.Db.Users.Get()) {
-				return user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})";
+				checkBoxItems.Add(new CheckBoxItem<ulong>(user.Id) {
+					Title = user.DisplayName == null ? user.Name : $"{user.DisplayName} ({user.Name})",
+					IsChecked = IncludedUsers == null || IncludedUsers.Contains(user.Id),
+				});
 			}
 			
-			await foreach ((ulong id, string name) in state.Db.Users.Get().Select(static user => (user.Id, GetDisplayName(user))).OrderBy(static pair => pair.Item2)) {
+			return checkBoxItems;
-				items.Add(
-					value: id,
-					title: name,
-					isChecked: IncludedUsers == null || IncludedUsers.Contains(id)
-				);
-			}
-			
-			return items.ToCheckBoxItems();
 		}
 		
 		const string Title = "Included Users";
 		
-		ImmutableArray<ICheckBoxItem> items;
+		List<CheckBoxItem<ulong>> items;
 		try {
 			items = await ProgressDialog.ShowIndeterminate(window, Title, "Loading users...", PrepareUserItems);
 		} catch (Exception e) {
@@ -292,7 +273,9 @@ sealed partial class MessageFilterPanelModel : IDisposable {
 		}
 	}
 	
-	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, ImmutableArray<ICheckBoxItem> items) {
+	private async Task<HashSet<ulong>?> OpenIdFilterDialog(string title, List<CheckBoxItem<ulong>> items) {
+		items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
+		
 		var model = new CheckBoxDialogModel<ulong>(items) {
 			Title = title,
 		};
@@ -300,7 +283,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.SelectedValues.ToHashSet() : null;
+		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
 	}
 	
 	public MessageFilter CreateFilter() {

app/Desktop/Program.cs

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

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;
+}

web/index.php

@@ -22,6 +22,7 @@ define('LATEST_VERSION', $version === false ? '_' : $version);
       <h1>Discord History Tracker&nbsp;<span class="bar">|</span>&nbsp;<span class="notes"><a href="https://github.com/chylex/Discord-History-Tracker/releases">Release&nbsp;Notes</a></span></h1>
       <p>Discord History Tracker lets you save chat history in your servers, groups, and private conversations, and view it offline.</p>
       <img src="img/tracker.png" width="851" class="dht bordered">
+      <p>This page explains how to use the desktop app. If you are looking for the older version of Discord History Tracker which only needs a browser or the Discord app, visit the page for the <a href="https://dht.chylex.com/browser-only">browser-only version</a>, however keep in mind that this version has <strong>significant limitations and fewer features</strong>.</p>
       
       <h2>How to Use</h2>
       <p>Download the latest version of the desktop app here, or visit <a href="https://github.com/chylex/Discord-History-Tracker/releases">All Releases</a> for older versions and release notes.</p>
@@ -70,9 +71,9 @@ define('LATEST_VERSION', $version === false ? '_' : $version);
       
       <h2>External Links</h2>
       <p class="links">
-        <a href="https://github.com/chylex/Discord-History-Tracker/issues">Issues&nbsp;&amp;&nbsp;Suggestions</a>&nbsp;&nbsp;&bullet;&nbsp;
+        <a href="https://github.com/chylex/Discord-History-Tracker/issues">Issues&nbsp;&amp;&nbsp;Suggestions</a>&nbsp;&nbsp;&mdash;&nbsp;
-        <a href="https://github.com/chylex/Discord-History-Tracker">Source&nbsp;Code</a>&nbsp;&nbsp;&bullet;&nbsp;
+        <a href="https://github.com/chylex/Discord-History-Tracker">Source&nbsp;Code</a>&nbsp;&nbsp;&mdash;&nbsp;
-        <a href="https://chylex.com">Developer's&nbsp;Website</a>&nbsp;&nbsp;&bullet;&nbsp;
+        <a href="https://twitter.com/chylexmc">Follow&nbsp;Dev&nbsp;on&nbsp;Twitter</a>&nbsp;&nbsp;&mdash;&nbsp;
         <a href="https://ko-fi.com/chylex">Support&nbsp;via&nbsp;Ko-fi</a>
       </p>
       

web/style.css

@@ -165,7 +165,7 @@ code {
 
 .downloads svg {
   margin: 1px 4px;
-  vertical-align: -30%;
+  vertical-align: -25%;
 }
 
 .downloads svg.icon-large {