Release v33.2 (app)

References #165

app/.idea/.idea.DiscordHistoryTracker/.idea/.gitignore

@@ -2,7 +2,6 @@
 /contentModel.xml
 /dataSources
 /dataSources.local.xml
-/dataSources.xml
 /dictionaries
 /httpRequests/
 /misc.xml

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

@@ -4,8 +4,11 @@
     <option name="projectPerEditor">
       <map>
         <entry key="Desktop/App.axaml" value="Desktop/Desktop.csproj" />
-        <entry key="Desktop/Dialogs/MessageDialog.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Dialogs/Message/MessageDialog.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Dialogs/Progress/ProgressDialog.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/AboutWindow.axaml" value="Desktop/Desktop.csproj" />
+        <entry key="Desktop/Main/Controls/FilterPanel.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/Controls/StatusBar.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainContentScreen.axaml" value="Desktop/Desktop.csproj" />
         <entry key="Desktop/Main/MainWindow.axaml" value="Desktop/Desktop.csproj" />

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

@@ -13,10 +13,10 @@
     <CssCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </CssCodeStyleSettings>
-    <DB2CodeStyleSettings version="5">
+    <DB2CodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </DB2CodeStyleSettings>
-    <DerbyCodeStyleSettings version="5">
+    <DerbyCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </DerbyCodeStyleSettings>
     <GoCodeStyleSettings>
@@ -26,10 +26,13 @@
       <option name="WRAP_FUNC_PARAMS" value="5" />
       <option name="WRAP_FUNC_RESULT" value="5" />
     </GoCodeStyleSettings>
-    <H2CodeStyleSettings version="5">
+    <H2CodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </H2CodeStyleSettings>
-    <HSQLCodeStyleSettings version="5">
+    <H2CodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </H2CodeStyleSettings>
+    <HSQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </HSQLCodeStyleSettings>
     <HTMLCodeStyleSettings>
@@ -85,10 +88,10 @@
     <LessCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </LessCodeStyleSettings>
-    <MSSQLCodeStyleSettings version="5">
+    <MSSQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </MSSQLCodeStyleSettings>
-    <MySQLCodeStyleSettings version="5">
+    <MySQLCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </MySQLCodeStyleSettings>
     <Objective-C>
@@ -98,7 +101,7 @@
       <option name="SPACE_BEFORE_INIT_LIST" value="true" />
       <option name="SPACE_AFTER_DICTIONARY_LITERAL_COLON" value="false" />
     </Objective-C>
-    <OracleCodeStyleSettings version="5">
+    <OracleCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </OracleCodeStyleSettings>
     <PHPCodeStyleSettings>
@@ -116,7 +119,7 @@
       <option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
       <option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
     </PHPCodeStyleSettings>
-    <PostgresCodeStyleSettings version="5">
+    <PostgresCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </PostgresCodeStyleSettings>
     <Properties>
@@ -143,13 +146,13 @@
       <option name="INDENT_WHEN_CASES" value="true" />
       <option name="CHAIN_CALLS_ALIGNMENT" value="2" />
     </Ruby>
-    <SQLiteCodeStyleSettings version="5">
+    <SQLiteCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </SQLiteCodeStyleSettings>
     <ScssCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </ScssCodeStyleSettings>
-    <SqlCodeStyleSettings version="5">
+    <SqlCodeStyleSettings version="6">
       <option name="KEYWORD_CASE" value="2" />
       <option name="TYPE_CASE" value="2" />
       <option name="CUSTOM_TYPE_CASE" value="2" />
@@ -175,7 +178,7 @@
       <option name="VIEW_INDENT_QUERY" value="true" />
       <option name="EXPR_CASE_WHEN_WRAP" value="false" />
     </SqlCodeStyleSettings>
-    <SybaseCodeStyleSettings version="5">
+    <SybaseCodeStyleSettings version="6">
       <option name="USE_GENERIC_STYLE" value="true" />
     </SybaseCodeStyleSettings>
     <TypeScriptCodeStyleSettings version="0">

app/.idea/.idea.DiscordHistoryTracker/.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="empty.dht" read-only="true" uuid="e01b8deb-489e-470a-9011-f6548927191e">
+      <driver-ref>sqlite.xerial</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/empty.dht</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

app/.idea/.idea.DiscordHistoryTracker/.idea/runConfigurations/Desktop.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Desktop" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/Desktop/bin/Debug/net5.0/Desktop.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/Desktop/bin/Debug/net5.0/DiscordHistoryTracker.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Desktop/bin/Debug/net5.0" />
     <option name="PASS_PARENT_ENVS" value="1" />

app/Desktop/App.axaml

@@ -1,5 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:common="clr-namespace:DHT.Desktop.Common"
              x:Class="DHT.Desktop.App">
 
     <Application.Styles>
@@ -8,20 +9,20 @@
 
         <Style Selector="Button">
             <Setter Property="Padding" Value="10 7 10 6" />
-            <Setter Property="Background" Value="#D2D2D2" />
+            <Setter Property="Background" Value="#DDDDDD" />
             <Setter Property="BorderBrush" Value="#999999" />
             <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="0" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
         <Style Selector="Button /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="TextBlock.Foreground" Value="#070707" />
-            <Setter Property="Background" Value="#D2D2D2" />
+            <Setter Property="TextBlock.Foreground" Value="#060606" />
+            <Setter Property="Background" Value="#DDDDDD" />
             <Setter Property="BorderBrush" Value="#999999" />
-            <Setter Property="CornerRadius" Value="0" />
         </Style>
         <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="#DEDEDE" />
+            <Setter Property="Background" Value="#E7E7E7" />
             <Setter Property="BorderBrush" Value="#A2A2A2" />
             <Setter Property="CornerRadius" Value="0" />
         </Style>
@@ -29,28 +30,25 @@
             <Setter Property="RenderTransform" Value="none" />
         </Style>
         <Style Selector="Button:pressed /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="#E5E5E5" />
+            <Setter Property="Background" Value="#EBEBEB" />
             <Setter Property="BorderBrush" Value="#A5A5A5" />
             <Setter Property="CornerRadius" Value="0" />
         </Style>
         <Style Selector="Button:disabled /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="TextBlock.Foreground" Value="#909090" />
+            <Setter Property="TextBlock.Foreground" Value="#7A7A7A" />
             <Setter Property="Background" Value="#E9E9E9" />
             <Setter Property="BorderBrush" Value="#BFBFBF" />
-            <Setter Property="CornerRadius" Value="0" />
         </Style>
 
         <Style Selector="TextBox">
             <Setter Property="BorderBrush" Value="#999999" />
             <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="0" />
             <Setter Property="SelectionBrush" Value="#72C0FF" />
             <Setter Property="Background" Value="#F4F4F4" />
             <Setter Property="Padding" Value="6 0" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
-        <Style Selector="TextBox /template/ Border#PART_BorderElement">
-            <Setter Property="CornerRadius" Value="0" />
-        </Style>
         <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
             <Setter Property="BorderBrush" Value="#999999" />
             <Setter Property="Background" Value="#F8F8F8" />
@@ -68,6 +66,59 @@
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
 
+        <Style Selector="Expander">
+            <Setter Property="CornerRadius" Value="0" />
+        </Style>
+        <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Border x:Name="ToggleButtonBackground">
+                        <Grid ColumnDefinitions="Auto,*" RowDefinitions="35">
+                            <Border x:Name="ExpandCollapseChevronBorder"
+                                    Grid.Column="0"
+                                    Width="35"
+                                    Height="35"
+                                    Margin="2,0"
+                                    RenderTransformOrigin="50%,50%">
+                                <Path x:Name="ExpandCollapseChevron"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      RenderTransformOrigin="50%,50%"
+                                      Stretch="None"
+                                      Stroke="{DynamicResource ExpanderChevronForeground}"
+                                      StrokeThickness="1" />
+                                <Border.RenderTransform>
+                                    <RotateTransform />
+                                </Border.RenderTransform>
+                            </Border>
+                            <ContentPresenter x:Name="PART_ContentPresenter"
+                                              Grid.Column="1"
+                                              Margin="0"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="Center"
+                                              Background="Transparent"
+                                              BorderBrush="Transparent"
+                                              BorderThickness="0"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              TextBlock.Foreground="{DynamicResource ExpanderForeground}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+
     </Application.Styles>
 
+    <Application.Resources>
+
+        <common:NumberValueConverter x:Key="NumberValueConverter" />
+
+        <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
+        <Thickness x:Key="ExpanderContentPadding">15</Thickness>
+        <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="#FCFCFC" />
+
+    </Application.Resources>
+
 </Application>

app/Desktop/App.axaml.cs

@@ -4,7 +4,7 @@ using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main;
 
 namespace DHT.Desktop {
-	public class App : Application {
+	sealed class App : Application {
 		public override void Initialize() {
 			AvaloniaXamlLoader.Load(this);
 		}

app/Desktop/Arguments.cs

@@ -1,8 +1,10 @@
 using System;
-using DHT.Server.Logging;
+using DHT.Utils.Logging;
 
 namespace DHT.Desktop {
-	public class Arguments {
+	sealed class Arguments {
+		private static readonly Log Log = Log.ForType<Arguments>();
+
 		public static Arguments Empty => new(Array.Empty<string>());
 
 		public string? DatabaseFile { get; }

app/Desktop/Common/DatabaseGui.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Server.Database;
+using DHT.Server.Database.Exceptions;
+using DHT.Server.Database.Sqlite;
+using DHT.Utils.Logging;
+
+namespace DHT.Desktop.Common {
+	static class DatabaseGui {
+		private static readonly Log Log = Log.ForType(typeof(DatabaseGui));
+
+		private const string DatabaseFileInitialName = "archive.dht";
+
+		private static readonly List<FileDialogFilter> DatabaseFileDialogFilter = new() {
+			new FileDialogFilter {
+				Name = "Discord History Tracker Database",
+				Extensions = { "dht" }
+			}
+		};
+
+		public static OpenFileDialog NewOpenDatabaseFileDialog() {
+			return new OpenFileDialog {
+				Title = "Open Database File",
+				InitialFileName = DatabaseFileInitialName,
+				Filters = DatabaseFileDialogFilter
+			};
+		}
+
+		public static SaveFileDialog NewOpenOrCreateDatabaseFileDialog() {
+			return new SaveFileDialog {
+				Title = "Open or Create Database File",
+				InitialFileName = DatabaseFileInitialName,
+				Filters = DatabaseFileDialogFilter
+			};
+		}
+
+		public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, Func<Task<bool>> checkCanUpgradeDatabase) {
+			IDatabaseFile? file = null;
+
+			try {
+				file = await SqliteDatabaseFile.OpenOrCreate(path, checkCanUpgradeDatabase);
+			} catch (InvalidDatabaseVersionException ex) {
+				await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' appears to be corrupted (invalid version: " + ex.Version + ").");
+			} 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);
+				await Dialog.ShowOk(window, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be opened:" + ex.Message);
+			}
+
+			return file;
+		}
+
+		public static async Task<DialogResult.YesNo> ShowCanUpgradeDatabaseDialog(Window window) {
+			return await Dialog.ShowYesNo(window, "Database Upgrade", "This database was created with an older version of DHT. If you proceed, the database will be upgraded and will no longer open in previous versions of DHT. Do you want to proceed with the upgrade?");
+		}
+
+		public static async Task<DialogResult.YesNo> ShowCanUpgradeMultipleDatabaseDialog(Window window) {
+			return await Dialog.ShowYesNo(window, "Database Upgrade", "One or more databases were created with an older version of DHT. If you proceed, these databases will be upgraded and will no longer open in previous versions of DHT. Otherwise, these databases will be skipped. Do you want to proceed with the upgrade?");
+		}
+	}
+}

app/Desktop/Common/NumberValueConverter.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Globalization;
+using Avalonia.Data.Converters;
+
+namespace DHT.Desktop.Common {
+	sealed class NumberValueConverter : IValueConverter {
+		public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
+			return string.Format(Program.Culture, "{0:n0}", value);
+		}
+
+		public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {
+			throw new NotSupportedException();
+		}
+	}
+}

app/Desktop/Common/TextFormat.cs

@@ -0,0 +1,19 @@
+namespace DHT.Desktop.Common {
+	static class TextFormat {
+		public static string Format(this int number) {
+			return number.ToString("N0", Program.Culture);
+		}
+
+		public static string Format(this long number) {
+			return number.ToString("N0", Program.Culture);
+		}
+
+		public static string Pluralize(this int number, string singular) {
+			return number.Format() + "\u00A0" + (number == 1 ? singular : singular + "s");
+		}
+
+		public static string Pluralize(this long number, string singular) {
+			return number.Format() + "\u00A0" + (number == 1 ? singular : singular + "s");
+		}
+	}
+}

app/Desktop/Desktop.csproj

@@ -12,29 +12,39 @@
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
     <AssemblyName>DiscordHistoryTracker</AssemblyName>
-    <Version>32.0.0.0</Version>
-    <AssemblyVersion>$(Version)</AssemblyVersion>
-    <FileVersion>$(Version)</FileVersion>
-    <PackageVersion>$(Version)</PackageVersion>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>none</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.3" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.3" />
+    <PackageReference Include="Avalonia" Version="0.10.12" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
     <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.3" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Windows\MainWindow.axaml.cs">
       <DependentUpon>MainWindow.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Dialogs\MessageDialog.axaml.cs">
+    <Compile Update="Dialogs\CheckBox\CheckBoxDialog.axaml.cs">
+      <DependentUpon>CheckBoxDialog.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Dialogs\Progress\ProgressDialog.axaml.cs">
+      <DependentUpon>ProgressDialog.axaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Dialogs\Message\MessageDialog.axaml.cs">
       <DependentUpon>MessageDialog.axaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -0,0 +1,61 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.CheckBox"
+        mc:Ignorable="d" d:DesignWidth="500"
+        x:Class="DHT.Desktop.Dialogs.CheckBox.CheckBoxDialog"
+        Title="{Binding Title}"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Width="500" SizeToContent="Height" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Window.DataContext>
+        <namespace:CheckBoxDialogModel />
+    </Window.DataContext>
+
+    <Window.Styles>
+        <Style Selector="Panel.buttons">
+            <Setter Property="Margin" Value="0 20 0 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right">
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </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>
+    </Window.Styles>
+
+    <StackPanel Margin="20">
+        <ScrollViewer MaxHeight="400">
+            <ItemsControl Items="{Binding Items}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <CheckBox IsChecked="{Binding Checked}">
+                            <Label>
+                                <TextBlock Text="{Binding Title}" TextWrapping="Wrap" />
+                            </Label>
+                        </CheckBox>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+        <Panel Classes="buttons">
+            <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

@@ -0,0 +1,31 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using DHT.Desktop.Dialogs.Message;
+
+namespace DHT.Desktop.Dialogs.CheckBox {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class CheckBoxDialog : Window {
+		public CheckBoxDialog() {
+			InitializeComponent();
+			#if DEBUG
+			this.AttachDevTools();
+			#endif
+		}
+
+		private void InitializeComponent() {
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public void ClickOk(object? sender, RoutedEventArgs e) {
+			Close(DialogResult.OkCancel.Ok);
+		}
+
+		public void ClickCancel(object? sender, RoutedEventArgs e) {
+			Close(DialogResult.OkCancel.Cancel);
+		}
+	}
+}
+

app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.Dialogs.CheckBox {
+	class CheckBoxDialogModel : BaseModel {
+		public string Title { get; init; } = "";
+
+		private IReadOnlyList<CheckBoxItem> items = Array.Empty<CheckBoxItem>();
+
+		public IReadOnlyList<CheckBoxItem> Items {
+			get => items;
+
+			protected set {
+				foreach (var item in items) {
+					item.PropertyChanged -= OnItemPropertyChanged;
+				}
+
+				items = value;
+
+				foreach (var item in items) {
+					item.PropertyChanged += OnItemPropertyChanged;
+				}
+			}
+		}
+
+		private bool pauseCheckEvents = false;
+
+		public bool AreAllSelected => Items.All(static item => item.Checked);
+		public bool AreNoneSelected => Items.All(static item => !item.Checked);
+
+		public void SelectAll() => SetAllChecked(true);
+		public void SelectNone() => SetAllChecked(false);
+
+		private void SetAllChecked(bool isChecked) {
+			pauseCheckEvents = true;
+
+			foreach (var item in Items) {
+				item.Checked = isChecked;
+			}
+
+			pauseCheckEvents = false;
+			UpdateBulkButtons();
+		}
+
+		private void UpdateBulkButtons() {
+			OnPropertyChanged(nameof(AreAllSelected));
+			OnPropertyChanged(nameof(AreNoneSelected));
+		}
+
+		private void OnItemPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+			if (!pauseCheckEvents && e.PropertyName == nameof(CheckBoxItem.Checked)) {
+				UpdateBulkButtons();
+			}
+		}
+	}
+
+	sealed class CheckBoxDialogModel<T> : CheckBoxDialogModel {
+		public new IReadOnlyList<CheckBoxItem<T>> Items { get; }
+
+		public IEnumerable<CheckBoxItem<T>> SelectedItems => Items.Where(static item => item.Checked);
+
+		public CheckBoxDialogModel(IEnumerable<CheckBoxItem<T>> items) {
+			this.Items = new List<CheckBoxItem<T>>(items);
+			base.Items = this.Items;
+		}
+	}
+}

app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs

@@ -0,0 +1,24 @@
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.Dialogs.CheckBox {
+	class CheckBoxItem : BaseModel {
+		public string Title { get; init; } = "";
+		public object? Item { get; init; } = null;
+
+		private bool isChecked = false;
+
+		public bool Checked {
+			get => isChecked;
+			set => Change(ref isChecked, value);
+		}
+	}
+
+	sealed class CheckBoxItem<T> : CheckBoxItem {
+		public new T Item { get; }
+
+		public CheckBoxItem(T item) {
+			this.Item = item;
+			base.Item = item;
+		}
+	}
+}

app/Desktop/Dialogs/Message/Dialog.cs

@@ -1,9 +1,15 @@
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Threading;
 
-namespace DHT.Desktop.Dialogs {
-	public static class Dialog {
+namespace DHT.Desktop.Dialogs.Message {
+	static class Dialog {
 		public static async Task ShowOk(Window owner, string title, string message) {
+			if (!Dispatcher.UIThread.CheckAccess()) {
+				await Dispatcher.UIThread.InvokeAsync(() => ShowOk(owner, title, message));
+				return;
+			}
+
 			await new MessageDialog {
 				DataContext = new MessageDialogModel {
 					Title = title,
@@ -14,6 +20,10 @@ namespace DHT.Desktop.Dialogs {
 		}
 
 		public static async Task<DialogResult.OkCancel> ShowOkCancel(Window owner, string title, string message) {
+			if (!Dispatcher.UIThread.CheckAccess()) {
+				return await Dispatcher.UIThread.InvokeAsync(() => ShowOkCancel(owner, title, message));
+			}
+
 			var result = await new MessageDialog {
 				DataContext = new MessageDialogModel {
 					Title = title,
@@ -27,6 +37,10 @@ namespace DHT.Desktop.Dialogs {
 		}
 
 		public static async Task<DialogResult.YesNo> ShowYesNo(Window owner, string title, string message) {
+			if (!Dispatcher.UIThread.CheckAccess()) {
+				return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNo(owner, title, message));
+			}
+
 			var result = await new MessageDialog {
 				DataContext = new MessageDialogModel {
 					Title = title,
@@ -40,6 +54,10 @@ namespace DHT.Desktop.Dialogs {
 		}
 
 		public static async Task<DialogResult.YesNoCancel> ShowYesNoCancel(Window owner, string title, string message) {
+			if (!Dispatcher.UIThread.CheckAccess()) {
+				return await Dispatcher.UIThread.InvokeAsync(() => ShowYesNoCancel(owner, title, message));
+			}
+
 			var result = await new MessageDialog {
 				DataContext = new MessageDialogModel {
 					Title = title,

app/Desktop/Dialogs/Message/DialogResult.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace DHT.Desktop.Dialogs {
-	public static class DialogResult {
+namespace DHT.Desktop.Dialogs.Message {
+	static class DialogResult {
 		public enum All {
 			Ok,
 			Yes,

app/Desktop/Dialogs/Message/MessageDialog.axaml

@@ -2,15 +2,16 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:dialogs="clr-namespace:DHT.Desktop.Dialogs"
+        xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.Message"
         mc:Ignorable="d" d:DesignWidth="500"
-        x:Class="DHT.Desktop.Dialogs.MessageDialog"
+        x:Class="DHT.Desktop.Dialogs.Message.MessageDialog"
         Title="{Binding Title}"
-        Width="500" SizeToContent="Height"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Width="500" SizeToContent="Height" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Window.DataContext>
-        <dialogs:MessageDialogModel />
+        <namespace:MessageDialogModel />
     </Window.DataContext>
 
     <Window.Styles>

app/Desktop/Dialogs/Message/MessageDialog.axaml.cs

@@ -1,10 +1,12 @@
+using System.Diagnostics.CodeAnalysis;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 
-namespace DHT.Desktop.Dialogs {
-	public class MessageDialog : Window {
+namespace DHT.Desktop.Dialogs.Message {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class MessageDialog : Window {
 		public MessageDialog() {
 			InitializeComponent();
 			#if DEBUG

app/Desktop/Dialogs/Message/MessageDialogModel.cs

@@ -1,5 +1,5 @@
-namespace DHT.Desktop.Dialogs {
-	public class MessageDialogModel {
+namespace DHT.Desktop.Dialogs.Message {
+	sealed class MessageDialogModel {
 		public string Title { get; init; } = "";
 		public string Message { get; init; } = "";
 

app/Desktop/Dialogs/Progress/IProgressCallback.cs

@@ -0,0 +1,7 @@
+using System.Threading.Tasks;
+
+namespace DHT.Desktop.Dialogs.Progress {
+	interface IProgressCallback {
+		Task Update(string message, int finishedItems, int totalItems);
+	}
+}

app/Desktop/Dialogs/Progress/ProgressDialog.axaml

@@ -0,0 +1,42 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:namespace="clr-namespace:DHT.Desktop.Dialogs.Progress"
+        mc:Ignorable="d" d:DesignWidth="500"
+        x:Class="DHT.Desktop.Dialogs.Progress.ProgressDialog"
+        Title="{Binding Title}"
+        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
+        Opened="Loaded"
+        Closing="OnClosing"
+        Width="500" SizeToContent="Height" CanResize="False"
+        WindowStartupLocation="CenterOwner">
+
+    <Window.DataContext>
+        <namespace:ProgressDialogModel />
+    </Window.DataContext>
+
+    <Window.Styles>
+        <Style Selector="TextBlock">
+            <Setter Property="FontSize" Value="15" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+        </Style>
+        <Style Selector="TextBlock.items">
+            <Setter Property="Margin" Value="10 0 0 0" />
+            <Setter Property="TextAlignment" Value="Right" />
+            <Setter Property="TextWrapping" Value="NoWrap" />
+        </Style>
+        <Style Selector="ProgressBar">
+            <Setter Property="Margin" Value="0 15 0 0" />
+        </Style>
+    </Window.Styles>
+
+    <StackPanel Margin="20">
+        <DockPanel>
+            <TextBlock DockPanel.Dock="Right" Text="{Binding Items}" Classes="items" />
+            <TextBlock DockPanel.Dock="Left" Text="{Binding Message}" />
+        </DockPanel>
+        <ProgressBar Value="{Binding Progress}" />
+    </StackPanel>
+
+</Window>

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

@@ -0,0 +1,40 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace DHT.Desktop.Dialogs.Progress {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class ProgressDialog : Window {
+		private bool isFinished = false;
+
+		public ProgressDialog() {
+			InitializeComponent();
+			#if DEBUG
+			this.AttachDevTools();
+			#endif
+		}
+
+		private void InitializeComponent() {
+			AvaloniaXamlLoader.Load(this);
+		}
+
+		public void OnClosing(object? sender, CancelEventArgs e) {
+			e.Cancel = !isFinished;
+		}
+
+		public void Loaded(object? sender, EventArgs e) {
+			if (DataContext is ProgressDialogModel model) {
+				Task.Run(model.StartTask).ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
+			}
+		}
+
+		private void OnFinished(Task task) {
+			isFinished = true;
+			Close();
+		}
+	}
+}

app/Desktop/Dialogs/Progress/ProgressDialogModel.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Threading;
+using DHT.Desktop.Common;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.Dialogs.Progress {
+	sealed class ProgressDialogModel : BaseModel {
+		public string Title { get; init; } = "";
+
+		private string message = "";
+
+		public string Message {
+			get => message;
+			private set => Change(ref message, value);
+		}
+
+		private string items = "";
+
+		public string Items {
+			get => items;
+			private set => Change(ref items, value);
+		}
+
+		private int progress = 0;
+
+		public int Progress {
+			get => progress;
+			private set => Change(ref progress, value);
+		}
+
+		private readonly TaskRunner? task;
+
+		[Obsolete("Designer")]
+		public ProgressDialogModel() {}
+
+		public ProgressDialogModel(TaskRunner task) {
+			this.task = task;
+		}
+
+		internal async Task StartTask() {
+			if (task != null) {
+				await task(new Callback(this));
+			}
+		}
+
+		public delegate Task TaskRunner(IProgressCallback callback);
+
+		private sealed class Callback : IProgressCallback {
+			private readonly ProgressDialogModel model;
+
+			public Callback(ProgressDialogModel model) {
+				this.model = model;
+			}
+
+			async Task IProgressCallback.Update(string message, int finishedItems, int totalItems) {
+				await Dispatcher.UIThread.InvokeAsync(() => {
+					model.Message = message;
+					model.Items = finishedItems.Format() + " / " + totalItems.Format();
+					model.Progress = 100 * finishedItems / totalItems;
+				});
+			}
+		}
+	}
+}

app/Desktop/Discord/DiscordAppSettings.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text.Json;
+using System.Threading.Tasks;
+using DHT.Utils.Logging;
+using static System.Environment.SpecialFolder;
+using static System.Environment.SpecialFolderOption;
+
+namespace DHT.Desktop.Discord {
+	static class DiscordAppSettings {
+		private static readonly Log Log = Log.ForType(typeof(DiscordAppSettings));
+
+		private const string JsonKeyDevTools = "DANGEROUS_ENABLE_DEVTOOLS_ONLY_ENABLE_IF_YOU_KNOW_WHAT_YOURE_DOING";
+
+		public static string JsonFilePath { get; }
+		private static string JsonBackupFilePath { get; }
+
+		[SuppressMessage("ReSharper", "ConvertIfStatementToConditionalTernaryExpression")]
+		static DiscordAppSettings() {
+			string rootFolder;
+
+			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+				rootFolder = Path.Combine(Environment.GetFolderPath(ApplicationData, DoNotVerify), "Discord");
+			}
+			else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
+				rootFolder = Path.Combine(Environment.GetFolderPath(UserProfile, DoNotVerify), "Library", "Application Support", "Discord");
+			}
+			else {
+				rootFolder = Path.Combine(Environment.GetFolderPath(ApplicationData, DoNotVerify), "discord");
+			}
+
+			JsonFilePath = Path.Combine(rootFolder, "settings.json");
+			JsonBackupFilePath = JsonFilePath + ".bak";
+		}
+
+		public static async Task<bool?> AreDevToolsEnabled() {
+			try {
+				return AreDevToolsEnabled(await ReadSettingsJson());
+			} catch (Exception) {
+				return null;
+			}
+		}
+
+		private static bool AreDevToolsEnabled(Dictionary<string, object?> json) {
+			return json.TryGetValue(JsonKeyDevTools, out var value) && value is JsonElement { ValueKind: JsonValueKind.True };
+		}
+
+		public static async Task<SettingsJsonResult> ConfigureDevTools(bool enable) {
+			Dictionary<string, object?> json;
+
+			try {
+				json = await ReadSettingsJson();
+			} catch (FileNotFoundException) {
+				return SettingsJsonResult.FileNotFound;
+			} catch (JsonException) {
+				return SettingsJsonResult.InvalidJson;
+			} catch (Exception e) {
+				Log.Error(e);
+				return SettingsJsonResult.ReadError;
+			}
+
+			if (enable == AreDevToolsEnabled(json)) {
+				return SettingsJsonResult.AlreadySet;
+			}
+
+			if (enable) {
+				json[JsonKeyDevTools] = true;
+			}
+			else {
+				json.Remove(JsonKeyDevTools);
+			}
+
+			try {
+				if (!File.Exists(JsonBackupFilePath)) {
+					File.Copy(JsonFilePath, JsonBackupFilePath);
+				}
+
+				await WriteSettingsJson(json);
+			} catch (Exception e) {
+				Log.Error("An error occurred when writing settings file.");
+				Log.Error(e);
+
+				if (File.Exists(JsonBackupFilePath)) {
+					try {
+						File.Move(JsonBackupFilePath, JsonFilePath, true);
+						Log.Info("Restored settings file from backup.");
+					} catch (Exception e2) {
+						Log.Error("Cannot restore settings file from backup.");
+						Log.Error(e2);
+					}
+				}
+
+				return SettingsJsonResult.WriteError;
+			}
+
+			try {
+				File.Delete(JsonBackupFilePath);
+			} catch (Exception e) {
+				Log.Error("Cannot delete backup file.");
+				Log.Error(e);
+			}
+
+			return SettingsJsonResult.Success;
+		}
+
+		private static async Task<Dictionary<string, object?>> ReadSettingsJson() {
+			await using var stream = new FileStream(JsonFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+			return await JsonSerializer.DeserializeAsync<Dictionary<string, object?>?>(stream) ?? throw new JsonException();
+		}
+
+		private static async Task WriteSettingsJson(Dictionary<string, object?> json) {
+			await using var stream = new FileStream(JsonFilePath, FileMode.Truncate, FileAccess.Write, FileShare.None);
+			await JsonSerializer.SerializeAsync(stream, json, new JsonSerializerOptions { WriteIndented = true });
+		}
+	}
+}

app/Desktop/Discord/SettingsJsonResult.cs

@@ -0,0 +1,10 @@
+namespace DHT.Desktop.Discord {
+	enum SettingsJsonResult {
+		Success,
+		AlreadySet,
+		FileNotFound,
+		ReadError,
+		InvalidJson,
+		WriteError
+	}
+}

app/Desktop/Main/AboutWindow.axaml.cs

@@ -1,9 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace DHT.Desktop.Main {
-	public class AboutWindow : Window {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class AboutWindow : Window {
 		public AboutWindow() {
 			InitializeComponent();
 			#if DEBUG

app/Desktop/Main/AboutWindowModel.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics;
 
 namespace DHT.Desktop.Main {
-	public class AboutWindowModel {
+	sealed class AboutWindowModel {
 		public void ShowOfficialWebsite() {
 			OpenUrl("https://dht.chylex.com");
 		}

app/Desktop/Main/Controls/FilterPanel.axaml

@@ -0,0 +1,57 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
+             mc:Ignorable="d"
+             x:Class="DHT.Desktop.Main.Controls.FilterPanel">
+
+    <Design.DataContext>
+        <controls:FilterPanelModel />
+    </Design.DataContext>
+
+    <UserControl.Styles>
+        <Style Selector="WrapPanel > StackPanel">
+            <Setter Property="Margin" Value="0 20 40 0" />
+            <Setter Property="Spacing" Value="4" />
+        </Style>
+        <Style Selector="Grid > Label">
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style Selector="Grid > CalendarDatePicker">
+            <Setter Property="CornerRadius" Value="0" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="IsTodayHighlighted" Value="True" />
+            <Setter Property="SelectedDateFormat" Value="Short" />
+        </Style>
+        <Style Selector="Button">
+            <Setter Property="Margin" Value="0 0 0 8" />
+        </Style>
+    </UserControl.Styles>
+
+    <WrapPanel>
+        <StackPanel>
+            <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
+            <Grid ColumnDefinitions="Auto, 4, 125" RowDefinitions="Auto, 4, Auto" Margin="4 0">
+                <Label Grid.Row="0" Grid.Column="0">From:</Label>
+                <CalendarDatePicker Grid.Row="0" Grid.Column="2" x:Name="StartDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
+                <Label Grid.Row="2" Grid.Column="0">To:</Label>
+                <CalendarDatePicker Grid.Row="2" Grid.Column="2" x:Name="EndDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
+            </Grid>
+        </StackPanel>
+        <StackPanel>
+            <CheckBox IsChecked="{Binding FilterByChannel}">Filter by Channel</CheckBox>
+            <Button Command="{Binding OpenChannelFilterDialog}" IsEnabled="{Binding FilterByChannel}">Select Channels...</Button>
+            <TextBlock Text="{Binding ChannelFilterLabel}" />
+        </StackPanel>
+        <StackPanel>
+            <CheckBox IsChecked="{Binding FilterByUser}">Filter by User</CheckBox>
+            <Button Command="{Binding OpenUserFilterDialog}" IsEnabled="{Binding FilterByUser}">Select Users...</Button>
+            <TextBlock Text="{Binding UserFilterLabel}" />
+        </StackPanel>
+    </WrapPanel>
+
+</UserControl>

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

@@ -0,0 +1,34 @@
+using System.Diagnostics.CodeAnalysis;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace DHT.Desktop.Main.Controls {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class FilterPanel : UserControl {
+		private CalendarDatePicker StartDatePicker => this.FindControl<CalendarDatePicker>("StartDatePicker");
+		private CalendarDatePicker EndDatePicker => this.FindControl<CalendarDatePicker>("EndDatePicker");
+
+		public FilterPanel() {
+			InitializeComponent();
+		}
+
+		private void InitializeComponent() {
+			AvaloniaXamlLoader.Load(this);
+
+			var culture = Program.Culture;
+			foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
+				picker.FirstDayOfWeek = culture.DateTimeFormat.FirstDayOfWeek;
+				picker.SelectedDateFormat = CalendarDatePickerFormat.Custom;
+				picker.CustomDateFormatString = culture.DateTimeFormat.ShortDatePattern;
+				picker.Watermark = culture.DateTimeFormat.ShortDatePattern;
+			}
+		}
+
+		public void CalendarDatePicker_OnSelectedDateChanged(object? sender, SelectionChangedEventArgs e) {
+			if (DataContext is FilterPanelModel model) {
+				model.StartDate = StartDatePicker.SelectedDate;
+				model.EndDate = EndDatePicker.SelectedDate;
+			}
+		}
+	}
+}

app/Desktop/Main/Controls/FilterPanelModel.cs

@@ -0,0 +1,237 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.CheckBox;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Server.Data;
+using DHT.Server.Data.Filters;
+using DHT.Server.Database;
+using DHT.Utils.Models;
+
+namespace DHT.Desktop.Main.Controls {
+	sealed class FilterPanelModel : BaseModel {
+		private static readonly HashSet<string> FilterProperties = new () {
+			nameof(FilterByDate),
+			nameof(StartDate),
+			nameof(EndDate),
+			nameof(FilterByChannel),
+			nameof(IncludedChannels),
+			nameof(FilterByUser),
+			nameof(IncludedUsers)
+		};
+
+		public event PropertyChangedEventHandler? FilterPropertyChanged;
+
+		public bool HasAnyFilters => FilterByDate || FilterByChannel || FilterByUser;
+
+		private bool filterByDate = false;
+		private DateTime? startDate = null;
+		private DateTime? endDate = null;
+		private bool filterByChannel = false;
+		private HashSet<ulong>? includedChannels = null;
+		private bool filterByUser = false;
+		private HashSet<ulong>? includedUsers = null;
+
+		public bool FilterByDate {
+			get => filterByDate;
+			set => Change(ref filterByDate, value);
+		}
+
+		public DateTime? StartDate {
+			get => startDate;
+			set => Change(ref startDate, value);
+		}
+
+		public DateTime? EndDate {
+			get => endDate;
+			set => Change(ref endDate, value);
+		}
+
+		public bool FilterByChannel {
+			get => filterByChannel;
+			set => Change(ref filterByChannel, value);
+		}
+
+		public HashSet<ulong> IncludedChannels {
+			get => includedChannels ?? db.GetAllChannels().Select(static channel => channel.Id).ToHashSet();
+			set => Change(ref includedChannels, value);
+		}
+
+		public bool FilterByUser {
+			get => filterByUser;
+			set => Change(ref filterByUser, value);
+		}
+
+		public HashSet<ulong> IncludedUsers {
+			get => includedUsers ?? db.GetAllUsers().Select(static user => user.Id).ToHashSet();
+			set => Change(ref includedUsers, value);
+		}
+
+		private string channelFilterLabel = "";
+
+		public string ChannelFilterLabel {
+			get => channelFilterLabel;
+			set => Change(ref channelFilterLabel, value);
+		}
+
+		private string userFilterLabel = "";
+
+		public string UserFilterLabel {
+			get => userFilterLabel;
+			set => Change(ref userFilterLabel, value);
+		}
+
+		private readonly Window window;
+		private readonly IDatabaseFile db;
+
+		[Obsolete("Designer")]
+		public FilterPanelModel() : this(null!, DummyDatabaseFile.Instance) {}
+
+		public FilterPanelModel(Window window, IDatabaseFile db) {
+			this.window = window;
+			this.db = db;
+
+			UpdateChannelFilterLabel();
+			UpdateUserFilterLabel();
+
+			PropertyChanged += OnPropertyChanged;
+			db.Statistics.PropertyChanged += OnDbStatisticsChanged;
+		}
+
+		private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+			if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
+				FilterPropertyChanged?.Invoke(sender, e);
+			}
+
+			if (e.PropertyName is nameof(FilterByChannel) or nameof(IncludedChannels)) {
+				UpdateChannelFilterLabel();
+			}
+			else if (e.PropertyName is nameof(FilterByUser) or nameof(IncludedUsers)) {
+				UpdateUserFilterLabel();
+			}
+		}
+
+		private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
+			if (e.PropertyName == nameof(DatabaseStatistics.TotalChannels)) {
+				UpdateChannelFilterLabel();
+			}
+			else if (e.PropertyName == nameof(DatabaseStatistics.TotalUsers)) {
+				UpdateUserFilterLabel();
+			}
+		}
+
+		public async void OpenChannelFilterDialog() {
+			var servers = db.GetAllServers().ToDictionary(static server => server.Id);
+			var items = new List<CheckBoxItem<ulong>>();
+			var included = IncludedChannels;
+
+			foreach (var channel in db.GetAllChannels()) {
+				var channelId = channel.Id;
+				var channelName = channel.Name;
+
+				string title;
+				if (servers.TryGetValue(channel.Server, out var server)) {
+					var titleBuilder = new StringBuilder();
+					var 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();
+				}
+				else {
+					title = channelName;
+				}
+
+				items.Add(new CheckBoxItem<ulong>(channelId) {
+					Title = title,
+					Checked = included.Contains(channelId)
+				});
+			}
+
+			var result = await OpenIdFilterDialog(window, "Included Channels", items);
+			if (result != null) {
+				IncludedChannels = result;
+			}
+		}
+
+		public async void OpenUserFilterDialog() {
+			var items = new List<CheckBoxItem<ulong>>();
+			var included = IncludedUsers;
+
+			foreach (var user in db.GetAllUsers()) {
+				var name = user.Name;
+				var discriminator = user.Discriminator;
+
+				items.Add(new CheckBoxItem<ulong>(user.Id) {
+					Title = discriminator == null ? name : name + " #" + discriminator,
+					Checked = included.Contains(user.Id)
+				});
+			}
+
+			var result = await OpenIdFilterDialog(window, "Included Users", items);
+			if (result != null) {
+				IncludedUsers = result;
+			}
+		}
+
+		private void UpdateChannelFilterLabel() {
+			long total = db.Statistics.TotalChannels;
+			long included = FilterByChannel ? IncludedChannels.Count : total;
+			ChannelFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("channel") + ".";
+		}
+
+		private void UpdateUserFilterLabel() {
+			long total = db.Statistics.TotalUsers;
+			long included = FilterByUser ? IncludedUsers.Count : total;
+			UserFilterLabel = "Selected " + included.Format() + " / " + total.Pluralize("user") + ".";
+		}
+
+		public MessageFilter CreateFilter() {
+			MessageFilter filter = new();
+
+			if (FilterByDate) {
+				filter.StartDate = StartDate;
+				filter.EndDate = EndDate;
+			}
+
+			if (FilterByChannel) {
+				filter.ChannelIds = new HashSet<ulong>(IncludedChannels);
+			}
+
+			if (FilterByUser) {
+				filter.UserIds = new HashSet<ulong>(IncludedUsers);
+			}
+
+			return filter;
+		}
+
+		private static async Task<HashSet<ulong>?> OpenIdFilterDialog(Window window, string title, List<CheckBoxItem<ulong>> items) {
+			items.Sort(static (item1, item2) => item1.Title.CompareTo(item2.Title));
+
+			var model = new CheckBoxDialogModel<ulong>(items) {
+				Title = title
+			};
+
+			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;
+		}
+	}
+}

app/Desktop/Main/Controls/StatusBar.axaml

@@ -41,17 +41,17 @@
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Servers</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalServers, StringFormat={}{0:n0}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalServers, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Channels</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalChannels, StringFormat={}{0:n0}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalChannels, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
         <Rectangle />
         <StackPanel Orientation="Vertical">
             <TextBlock Classes="label">Messages</TextBlock>
-            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalMessages, StringFormat={}{0:n0}}" />
+            <TextBlock Classes="value" Text="{Binding DatabaseStatistics.TotalMessages, Converter={StaticResource NumberValueConverter}}" />
         </StackPanel>
     </StackPanel>
 

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

@@ -1,8 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace DHT.Desktop.Main.Controls {
-	public class StatusBar : UserControl {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class StatusBar : UserControl {
 		public StatusBar() {
 			InitializeComponent();
 		}

app/Desktop/Main/Controls/StatusBarModel.cs

@@ -1,9 +1,9 @@
 using System;
-using DHT.Desktop.Models;
 using DHT.Server.Database;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Controls {
-	public class StatusBarModel : BaseModel {
+	sealed class StatusBarModel : BaseModel {
 		public DatabaseStatistics DatabaseStatistics { get; }
 
 		private Status status = Status.Stopped;

app/Desktop/Main/MainContentScreen.axaml

@@ -12,7 +12,7 @@
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="TabControl WrapPanel">
+        <Style Selector="TabControl ItemsPresenter > WrapPanel">
             <Setter Property="Background" Value="#546A9F" />
         </Style>
         <Style Selector="TabItem">

app/Desktop/Main/MainContentScreen.axaml.cs

@@ -1,8 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace DHT.Desktop.Main {
-	public class MainContentScreen : UserControl {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class MainContentScreen : UserControl {
 		public MainContentScreen() {
 			InitializeComponent();
 		}

app/Desktop/Main/MainContentScreenModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Main.Pages;
@@ -6,7 +7,7 @@ using DHT.Server.Database;
 using DHT.Server.Service;
 
 namespace DHT.Desktop.Main {
-	public class MainContentScreenModel : IDisposable {
+	sealed class MainContentScreenModel : IDisposable {
 		public DatabasePage DatabasePage { get; }
 		private DatabasePageModel DatabasePageModel { get; }
 
@@ -19,8 +20,12 @@ namespace DHT.Desktop.Main {
 		public StatusBarModel StatusBarModel { get; }
 
 		public event EventHandler? DatabaseClosed {
-			add { DatabasePageModel.DatabaseClosed += value; }
-			remove { DatabasePageModel.DatabaseClosed -= value; }
+			add {
+				DatabasePageModel.DatabaseClosed += value;
+			}
+			remove {
+				DatabasePageModel.DatabaseClosed -= value;
+			}
 		}
 
 		[Obsolete("Designer")]
@@ -41,8 +46,8 @@ namespace DHT.Desktop.Main {
 			StatusBarModel.CurrentStatus = ServerLauncher.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped;
 		}
 
-		public void Initialize() {
-			TrackingPageModel.Initialize();
+		public async Task Initialize() {
+			await TrackingPageModel.Initialize();
 		}
 
 		private void TrackingPageModelOnServerStatusChanged(object? sender, StatusBarModel.Status e) {
@@ -51,7 +56,6 @@ namespace DHT.Desktop.Main {
 
 		public void Dispose() {
 			TrackingPageModel.Dispose();
-			GC.SuppressFinalize(this);
 		}
 	}
 }

app/Desktop/Main/MainWindow.axaml

@@ -5,9 +5,9 @@
         xmlns:main="clr-namespace:DHT.Desktop.Main"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="DHT.Desktop.Main.MainWindow"
-        Title="Discord History Tracker"
+        Title="{Binding Title}"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="800" Height="450"
+        Width="800" Height="500"
         MinWidth="480" MinHeight="240"
         WindowStartupLocation="CenterScreen">
 

app/Desktop/Main/MainWindow.axaml.cs

@@ -1,16 +1,18 @@
+using System.Diagnostics.CodeAnalysis;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using JetBrains.Annotations;
 
 namespace DHT.Desktop.Main {
-	public class MainWindow : Window {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class MainWindow : Window {
 		[UsedImplicitly]
 		public MainWindow() {
 			InitializeComponent(Arguments.Empty);
 		}
 
-		public MainWindow(Arguments args) {
+		internal MainWindow(Arguments args) {
 			InitializeComponent(args);
 		}
 

app/Desktop/Main/MainWindowModel.cs

@@ -4,13 +4,17 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Desktop.Dialogs;
+using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Pages;
-using DHT.Desktop.Models;
 using DHT.Server.Database;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main {
-	public class MainWindowModel : BaseModel {
+	sealed class MainWindowModel : BaseModel {
+		private const string DefaultTitle = "Discord History Tracker";
+
+		public string Title { get; private set; } = DefaultTitle;
+
 		public WelcomeScreen WelcomeScreen { get; }
 		private WelcomeScreenModel WelcomeScreenModel { get; }
 
@@ -65,7 +69,7 @@ namespace DHT.Desktop.Main {
 			}
 		}
 
-		private void WelcomeScreenModelOnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+		private async void WelcomeScreenModelOnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
 			if (e.PropertyName == nameof(WelcomeScreenModel.Db)) {
 				if (MainContentScreenModel != null) {
 					MainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
@@ -76,12 +80,14 @@ namespace DHT.Desktop.Main {
 				db = WelcomeScreenModel.Db;
 
 				if (db == null) {
+					Title = DefaultTitle;
 					MainContentScreenModel = null;
 					MainContentScreen = null;
 				}
 				else {
+					Title = Path.GetFileName(db.Path) + " - " + DefaultTitle;
 					MainContentScreenModel = new MainContentScreenModel(window, db);
-					MainContentScreenModel.Initialize();
+					await MainContentScreenModel.Initialize();
 					MainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
 					MainContentScreen = new MainContentScreen { DataContext = MainContentScreenModel };
 					OnPropertyChanged(nameof(MainContentScreen));
@@ -89,6 +95,7 @@ namespace DHT.Desktop.Main {
 
 				OnPropertyChanged(nameof(ShowWelcomeScreen));
 				OnPropertyChanged(nameof(ShowMainContentScreen));
+				OnPropertyChanged(nameof(Title));
 
 				window.Focus();
 			}

app/Desktop/Main/Pages/DatabasePage.axaml

@@ -10,12 +10,21 @@
         <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" IsEnabled="True" />
+            <TextBox Text="{Binding Db.Path}" Width="NaN" Margin="0 0 10 0" IsReadOnly="True" />
         </DockPanel>
-        <Button Command="{Binding OpenDatabaseFolder}">Open Database Folder</Button>
+        <WrapPanel>
+            <Button Command="{Binding OpenDatabaseFolder}">Open Database Folder</Button>
+            <Button Command="{Binding MergeWithDatabase}">Merge with Database(s)...</Button>
+        </WrapPanel>
     </StackPanel>
 
 </UserControl>

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

@@ -1,8 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace DHT.Desktop.Main.Pages {
-	public class DatabasePage : UserControl {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class DatabasePage : UserControl {
 		public DatabasePage() {
 			InitializeComponent();
 		}

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -1,14 +1,21 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Text;
+using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Desktop.Dialogs;
-using DHT.Desktop.Models;
+using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Dialogs.Progress;
 using DHT.Server.Database;
 using DHT.Server.Service;
+using DHT.Utils.Logging;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main.Pages {
-	public class DatabasePageModel : BaseModel {
+	sealed class DatabasePageModel : BaseModel {
+		private static readonly Log Log = Log.ForType<DatabasePageModel>();
+
 		public IDatabaseFile Db { get; }
 
 		public event EventHandler? DatabaseClosed;
@@ -50,9 +57,101 @@ namespace DHT.Desktop.Main.Pages {
 			}
 		}
 
+		public async void MergeWithDatabase() {
+			var fileDialog = DatabaseGui.NewOpenDatabaseFileDialog();
+			fileDialog.Directory = Path.GetDirectoryName(Db.Path);
+			fileDialog.AllowMultiple = true;
+
+			string[]? paths = await fileDialog.ShowAsync(window);
+			if (paths == null || paths.Length == 0) {
+				return;
+			}
+
+			ProgressDialog progressDialog = new ProgressDialog();
+			progressDialog.DataContext = new ProgressDialogModel(async callback => await MergeWithDatabaseFromPaths(Db, paths, progressDialog, callback)) {
+				Title = "Database Merge"
+			};
+
+			await progressDialog.ShowDialog(window);
+		}
+
 		public void CloseDatabase() {
 			ServerLauncher.Stop();
 			DatabaseClosed?.Invoke(this, EventArgs.Empty);
 		}
+
+		private static async Task MergeWithDatabaseFromPaths(IDatabaseFile target, string[] paths, ProgressDialog dialog, IProgressCallback callback) {
+			int total = paths.Length;
+
+			DialogResult.YesNo? upgradeResult = null;
+
+			async Task<bool> CheckCanUpgradeDatabase() {
+				upgradeResult ??= total > 1
+					                  ? await DatabaseGui.ShowCanUpgradeMultipleDatabaseDialog(dialog)
+					                  : await DatabaseGui.ShowCanUpgradeDatabaseDialog(dialog);
+
+				return DialogResult.YesNo.Yes == upgradeResult;
+			}
+
+			var oldStatistics = target.Statistics.Clone();
+			int successful = 0;
+			int finished = 0;
+
+			foreach (string path in paths) {
+				await callback.Update(Path.GetFileName(path), finished, total);
+				++finished;
+
+				if (!File.Exists(path)) {
+					await Dialog.ShowOk(dialog, "Database Error", "Database '" + Path.GetFileName(path) + "' no longer exists.");
+					continue;
+				}
+
+				IDatabaseFile? db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, dialog, CheckCanUpgradeDatabase);
+				if (db == null) {
+					continue;
+				}
+
+				try {
+					target.AddFrom(db);
+				} catch (Exception ex) {
+					Log.Error(ex);
+					await Dialog.ShowOk(dialog, "Database Error", "Database '" + Path.GetFileName(path) + "' could not be merged: " + ex.Message);
+					continue;
+				} finally {
+					db.Dispose();
+				}
+
+				++successful;
+			}
+
+			await callback.Update("Done", finished, total);
+
+			if (successful == 0) {
+				await Dialog.ShowOk(dialog, "Database Merge", "Nothing was merged.");
+				return;
+			}
+
+			var newStatistics = target.Statistics;
+			long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
+			long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
+			long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
+
+			StringBuilder message = new StringBuilder();
+			message.Append("Processed ");
+
+			if (successful == total) {
+				message.Append(successful.Pluralize("database file"));
+			}
+			else {
+				message.Append(successful.Format()).Append(" out of ").Append(total.Pluralize("database file"));
+			}
+
+			message.Append(" and added:\n\n  \u2022 ");
+			message.Append(newServers.Pluralize("server")).Append("\n  \u2022 ");
+			message.Append(newChannels.Pluralize("channel")).Append("\n  \u2022 ");
+			message.Append(newMessages.Pluralize("message"));
+
+			await Dialog.ShowOk(dialog, "Database Merge", message.ToString());
+		}
 	}
 }

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -15,40 +15,50 @@
             <Setter Property="FontFamily" Value="Consolas,Courier" />
             <Setter Property="FontSize" Value="15" />
         </Style>
+        <Style Selector="WrapPanel > StackPanel">
+            <Setter Property="Orientation" Value="Vertical" />
+            <Setter Property="Margin" Value="0 0 10 10" />
+        </Style>
     </UserControl.Styles>
 
     <StackPanel Spacing="10">
         <TextBlock TextWrapping="Wrap">
-            To start tracking messages, copy the tracking script and paste it into the console of either the Discord app (Ctrl+Shift+I), or your browser with Discord open.
+            To start tracking messages, copy the tracking script and paste it into the console of either the Discord app, or your browser. The console is usually opened by pressing Ctrl+Shift+I.
         </TextBlock>
-        <StackPanel Orientation="Horizontal" Spacing="10">
+        <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" Spacing="10">
             <Button x:Name="CopyTrackingScript" Click="CopyTrackingScriptButton_OnClick">Copy Tracking Script</Button>
-            <Button Command="{Binding OnClickToggleButton}" Content="{Binding ToggleButtonText}" IsEnabled="{Binding IsToggleButtonEnabled}" />
+            <Button Command="{Binding OnClickToggleTrackingButton}" Content="{Binding ToggleTrackingButtonText}" IsEnabled="{Binding IsToggleButtonEnabled}" />
         </StackPanel>
-        <Expander Header="Advanced Settings">
-            <StackPanel Spacing="10" Margin="0 10 0 0">
+        <Expander Header="Advanced Tracking Settings">
+            <StackPanel Spacing="10">
                 <TextBlock TextWrapping="Wrap">
                     The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy and apply the tracking script again.
                 </TextBlock>
-                <StackPanel Orientation="Horizontal" Spacing="10">
-                    <StackPanel Orientation="Vertical">
+                <WrapPanel>
+                    <StackPanel>
                         <Label Target="Port">Port</Label>
                         <TextBox x:Name="Port" Width="70" Text="{Binding InputPort}" />
                     </StackPanel>
-                    <StackPanel Orientation="Vertical">
+                    <StackPanel>
                         <Label Target="Token">Token</Label>
                         <StackPanel Orientation="Horizontal">
                             <TextBox x:Name="Token" Width="200" Text="{Binding InputToken}" />
                         </StackPanel>
                     </StackPanel>
-                    <Button Command="{Binding OnClickRandomizeToken}" VerticalAlignment="Bottom">Randomize Token</Button>
-                </StackPanel>
+                    <StackPanel VerticalAlignment="Bottom">
+                        <Button Command="{Binding OnClickRandomizeToken}">Randomize Token</Button>
+                    </StackPanel>
+                </WrapPanel>
                 <StackPanel Orientation="Horizontal" Spacing="10">
                     <Button IsEnabled="{Binding HasMadeChanges}" Command="{Binding OnClickApplyChanges}">Apply &amp; Restart</Button>
                     <Button IsEnabled="{Binding HasMadeChanges}" Command="{Binding OnClickCancelChanges}">Cancel</Button>
                 </StackPanel>
             </StackPanel>
         </Expander>
+        <TextBlock TextWrapping="Wrap" Margin="0 15 0 0">
+            By default, the Discord app does not allow opening the console. The button below will change a hidden setting in the Discord app that controls whether the Ctrl+Shift+I shortcut is enabled.
+        </TextBlock>
+        <Button DockPanel.Dock="Right" Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
     </StackPanel>
 
 </UserControl>

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

@@ -1,11 +1,13 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 
 namespace DHT.Desktop.Main.Pages {
-	public class TrackingPage : UserControl {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class TrackingPage : UserControl {
 		private bool isCopyingScript;
 
 		public TrackingPage() {
@@ -22,9 +24,7 @@ namespace DHT.Desktop.Main.Pages {
 				var originalText = button.Content;
 				button.MinWidth = button.Bounds.Width;
 
-				await model.OnClickCopyTrackingScript();
-
-				if (!isCopyingScript) {
+				if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
 					isCopyingScript = true;
 					button.Content = "Script Copied!";
 

app/Desktop/Main/Pages/TrackingPageModel.cs

@@ -3,17 +3,19 @@ using System.Threading.Tasks;
 using System.Web;
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Threading;
-using DHT.Desktop.Dialogs;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Discord;
 using DHT.Desktop.Main.Controls;
-using DHT.Desktop.Models;
-using DHT.Desktop.Resources;
 using DHT.Server.Database;
-using DHT.Server.Logging;
 using DHT.Server.Service;
+using DHT.Utils.Logging;
+using DHT.Utils.Models;
+using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages {
-	public class TrackingPageModel : BaseModel, IDisposable {
+	sealed class TrackingPageModel : BaseModel, IDisposable {
+		private static readonly Log Log = Log.ForType<TrackingPageModel>();
+
 		internal static string ServerPort { get; set; } = ServerUtils.FindAvailablePort(50000, 60000).ToString();
 		internal static string ServerToken { get; set; } = ServerUtils.GenerateRandomToken(20);
 
@@ -39,14 +41,36 @@ namespace DHT.Desktop.Main.Pages {
 
 		public bool HasMadeChanges => ServerPort != InputPort || ServerToken != InputToken;
 
-		private bool isToggleButtonEnabled = true;
+		private bool isToggleTrackingButtonEnabled = true;
 
 		public bool IsToggleButtonEnabled {
-			get => isToggleButtonEnabled;
-			set => Change(ref isToggleButtonEnabled, value);
+			get => isToggleTrackingButtonEnabled;
+			set => Change(ref isToggleTrackingButtonEnabled, value);
 		}
 
-		public string ToggleButtonText => ServerLauncher.IsRunning ? "Pause Tracking" : "Resume Tracking";
+		public string ToggleTrackingButtonText => ServerLauncher.IsRunning ? "Pause Tracking" : "Resume Tracking";
+
+		private bool areDevToolsEnabled;
+
+		private bool AreDevToolsEnabled {
+			get => areDevToolsEnabled;
+			set {
+				Change(ref areDevToolsEnabled, value);
+				OnPropertyChanged(nameof(ToggleAppDevToolsButtonText));
+			}
+		}
+
+		public bool IsToggleAppDevToolsButtonEnabled { get; private set; } = true;
+
+		public string ToggleAppDevToolsButtonText {
+			get {
+				if (!IsToggleAppDevToolsButtonEnabled) {
+					return "Unavailable";
+				}
+
+				return AreDevToolsEnabled ? "Disable Ctrl+Shift+I" : "Enable Ctrl+Shift+I";
+			}
+		}
 
 		public event EventHandler<StatusBarModel.Status>? ServerStatusChanged;
 
@@ -61,7 +85,7 @@ namespace DHT.Desktop.Main.Pages {
 			this.db = db;
 		}
 
-		public void Initialize() {
+		public async Task Initialize() {
 			ServerLauncher.ServerStatusChanged += ServerLauncherOnServerStatusChanged;
 			ServerLauncher.ServerManagementExceptionCaught += ServerLauncherOnServerManagementExceptionCaught;
 
@@ -69,13 +93,32 @@ namespace DHT.Desktop.Main.Pages {
 				string token = ServerToken;
 				ServerLauncher.Relaunch(port, token, db);
 			}
+
+			bool? devToolsEnabled = await DiscordAppSettings.AreDevToolsEnabled();
+			if (devToolsEnabled.HasValue) {
+				AreDevToolsEnabled = devToolsEnabled.Value;
+			}
+			else {
+				IsToggleAppDevToolsButtonEnabled = false;
+				OnPropertyChanged(nameof(IsToggleAppDevToolsButtonEnabled));
+			}
 		}
 
 		public void Dispose() {
 			ServerLauncher.ServerManagementExceptionCaught -= ServerLauncherOnServerManagementExceptionCaught;
 			ServerLauncher.ServerStatusChanged -= ServerLauncherOnServerStatusChanged;
 			ServerLauncher.Stop();
-			GC.SuppressFinalize(this);
+		}
+
+		private void ServerLauncherOnServerStatusChanged(object? sender, EventArgs e) {
+			ServerStatusChanged?.Invoke(this, ServerLauncher.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped);
+			OnPropertyChanged(nameof(ToggleTrackingButtonText));
+			IsToggleButtonEnabled = true;
+		}
+
+		private async void ServerLauncherOnServerManagementExceptionCaught(object? sender, Exception ex) {
+			Log.Error(ex);
+			await Dialog.ShowOk(window, "Server Error", ex.Message);
 		}
 
 		private async Task<bool> StartServer() {
@@ -96,7 +139,7 @@ namespace DHT.Desktop.Main.Pages {
 			ServerLauncher.Stop();
 		}
 
-		public async Task<bool> OnClickToggleButton() {
+		public async Task<bool> OnClickToggleTrackingButton() {
 			if (ServerLauncher.IsRunning) {
 				StopServer();
 				return true;
@@ -106,15 +149,27 @@ namespace DHT.Desktop.Main.Pages {
 			}
 		}
 
-		public async Task OnClickCopyTrackingScript() {
-			string bootstrap = await ResourceLoader.ReadTextAsync("Tracker/bootstrap.js");
+		public async Task<bool> OnClickCopyTrackingScript() {
+			string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
 			string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerPort + ";")
 			                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(ServerToken))
-			                         .Replace("/*[IMPORTS]*/", await ResourceLoader.ReadJoinedAsync("Tracker/scripts/", '\n'))
-			                         .Replace("/*[CSS-CONTROLLER]*/", await ResourceLoader.ReadTextAsync("Tracker/styles/controller.css"))
-			                         .Replace("/*[CSS-SETTINGS]*/", await ResourceLoader.ReadTextAsync("Tracker/styles/settings.css"));
+			                         .Replace("/*[IMPORTS]*/", await Resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
+			                         .Replace("/*[CSS-CONTROLLER]*/", await Resources.ReadTextAsync("Tracker/styles/controller.css"))
+			                         .Replace("/*[CSS-SETTINGS]*/", await Resources.ReadTextAsync("Tracker/styles/settings.css"));
 
-			await Application.Current.Clipboard.SetTextAsync(script);
+			var clipboard = Application.Current?.Clipboard;
+			if (clipboard == null) {
+				await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
+				return false;
+			}
+
+			try {
+				await clipboard.SetTextAsync(script);
+				return true;
+			} catch {
+				await Dialog.ShowOk(window, "Copy Tracking Script", "An error occurred while copying to clipboard.");
+				return false;
+			}
 		}
 
 		public void OnClickRandomizeToken() {
@@ -134,17 +189,42 @@ namespace DHT.Desktop.Main.Pages {
 			InputToken = ServerToken;
 		}
 
-		private void ServerLauncherOnServerStatusChanged(object? sender, EventArgs e) {
-			ServerStatusChanged?.Invoke(this, ServerLauncher.IsRunning ? StatusBarModel.Status.Ready : StatusBarModel.Status.Stopped);
-			OnPropertyChanged(nameof(ToggleButtonText));
-			IsToggleButtonEnabled = true;
-		}
+		public async void OnClickToggleAppDevTools() {
+			const string DialogTitle = "Discord App Settings File";
 
-		private void ServerLauncherOnServerManagementExceptionCaught(object? sender, Exception ex) {
-			Log.Error(ex);
+			bool oldState = AreDevToolsEnabled;
+			bool newState = !oldState;
 
-			string message = ex.Message;
-			Dispatcher.UIThread.Post(async () => { await Dialog.ShowOk(window, "Server Error", message); });
+			switch (await DiscordAppSettings.ConfigureDevTools(newState)) {
+				case SettingsJsonResult.Success:
+					AreDevToolsEnabled = newState;
+					await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I was " + (newState ? "enabled." : "disabled.") + " Restart the Discord app for the change to take effect.");
+					break;
+
+				case SettingsJsonResult.AlreadySet:
+					await Dialog.ShowOk(window, DialogTitle, "Ctrl+Shift+I is already " + (newState ? "enabled." : "disabled."));
+					AreDevToolsEnabled = newState;
+					break;
+
+				case SettingsJsonResult.FileNotFound:
+					await Dialog.ShowOk(window, DialogTitle, "Cannot find the settings file:\n" + DiscordAppSettings.JsonFilePath);
+					break;
+
+				case SettingsJsonResult.ReadError:
+					await Dialog.ShowOk(window, DialogTitle, "Cannot read the settings file:\n" + DiscordAppSettings.JsonFilePath);
+					break;
+
+				case SettingsJsonResult.InvalidJson:
+					await Dialog.ShowOk(window, DialogTitle, "Unknown format of the settings file:\n" + DiscordAppSettings.JsonFilePath);
+					break;
+
+				case SettingsJsonResult.WriteError:
+					await Dialog.ShowOk(window, DialogTitle, "Cannot save the settings file:\n" + DiscordAppSettings.JsonFilePath);
+					break;
+
+				default:
+					throw new ArgumentOutOfRangeException();
+			}
 		}
 	}
 }

app/Desktop/Main/Pages/ViewerPage.axaml

@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:pages="clr-namespace:DHT.Desktop.Main.Pages"
+             xmlns:controls="clr-namespace:DHT.Desktop.Main.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="DHT.Desktop.Main.Pages.ViewerPage">
 
@@ -11,34 +12,27 @@
     </Design.DataContext>
 
     <UserControl.Styles>
-        <Style Selector="Grid > Label">
-            <Setter Property="VerticalAlignment" Value="Center" />
-        </Style>
-        <Style Selector="Grid > CalendarDatePicker">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="HorizontalContentAlignment" Value="Center" />
-            <Setter Property="VerticalAlignment" Value="Center" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="IsTodayHighlighted" Value="True" />
-            <Setter Property="SelectedDateFormat" Value="Short" />
+        <Style Selector="Expander">
+            <Setter Property="Margin" Value="0 25 0 0" />
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Orientation="Vertical" Spacing="20">
+    <StackPanel Orientation="Vertical">
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
             <Button Command="{Binding OnClickOpenViewer}" Margin="0 0 5 0">Open Viewer</Button>
             <Button Command="{Binding OnClickSaveViewer}" Margin="5 0 0 0">Save Viewer</Button>
         </StackPanel>
-        <TextBlock Text="{Binding ExportedMessageText}" />
-        <StackPanel>
-            <CheckBox IsChecked="{Binding FilterByDate}">Filter by Date</CheckBox>
-            <Grid ColumnDefinitions="Auto, 4, 140" RowDefinitions="Auto, 4, Auto" Margin="4">
-                <Label Grid.Row="0" Grid.Column="0">From:</Label>
-                <CalendarDatePicker Grid.Row="0" Grid.Column="2" x:Name="StartDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
-                <Label Grid.Row="2" Grid.Column="0">To:</Label>
-                <CalendarDatePicker Grid.Row="2" Grid.Column="2" x:Name="EndDatePicker" IsEnabled="{Binding FilterByDate}" SelectedDateChanged="CalendarDatePicker_OnSelectedDateChanged" />
-            </Grid>
-        </StackPanel>
+        <TextBlock Text="{Binding ExportedMessageText}" Margin="0 20 0 0" />
+        <controls:FilterPanel DataContext="{Binding FilterModel}" />
+        <Expander Header="Database Tools">
+            <StackPanel Orientation="Vertical" Spacing="10">
+                <StackPanel Orientation="Vertical" Spacing="4">
+                    <RadioButton GroupName="DatabaseToolFilterMode" IsEnabled="{Binding HasFilters}" IsChecked="{Binding DatabaseToolFilterModeKeep}">Keep Only Messages Matching Filters</RadioButton>
+                    <RadioButton GroupName="DatabaseToolFilterMode" IsEnabled="{Binding HasFilters}" IsChecked="{Binding DatabaseToolFilterModeRemove}">Remove Messages Matching Filters</RadioButton>
+                </StackPanel>
+                <Button IsEnabled="{Binding HasFilters}" Command="{Binding OnClickApplyFiltersToDatabase}">Apply Filters to Database</Button>
+            </StackPanel>
+        </Expander>
     </StackPanel>
 
 </UserControl>

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

@@ -1,8 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace DHT.Desktop.Main.Pages {
-	public class ViewerPage : UserControl {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class ViewerPage : UserControl {
 		public ViewerPage() {
 			InitializeComponent();
 		}
@@ -10,12 +12,5 @@ namespace DHT.Desktop.Main.Pages {
 		private void InitializeComponent() {
 			AvaloniaXamlLoader.Load(this);
 		}
-
-		public void CalendarDatePicker_OnSelectedDateChanged(object? sender, SelectionChangedEventArgs e) {
-			if (DataContext is ViewerPageModel model) {
-				model.StartDate = this.FindControl<CalendarDatePicker>("StartDatePicker").SelectedDate;
-				model.EndDate = this.FindControl<CalendarDatePicker>("EndDatePicker").SelectedDate;
-			}
-		}
 	}
 }

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -6,36 +6,30 @@ using System.IO;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-using DHT.Desktop.Models;
-using DHT.Desktop.Resources;
+using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.Message;
+using DHT.Desktop.Main.Controls;
 using DHT.Server.Data.Filters;
 using DHT.Server.Database;
 using DHT.Server.Database.Export;
+using DHT.Utils.Models;
+using static DHT.Desktop.Program;
 
 namespace DHT.Desktop.Main.Pages {
-	public class ViewerPageModel : BaseModel {
+	sealed class ViewerPageModel : BaseModel {
 		public string ExportedMessageText { get; private set; } = "";
 
-		private bool filterByDate = false;
+		public bool DatabaseToolFilterModeKeep { get; set; } = true;
+		public bool DatabaseToolFilterModeRemove { get; set; } = false;
 
-		public bool FilterByDate {
-			get => filterByDate;
-			set => Change(ref filterByDate, value);
+		private bool hasFilters = false;
+
+		public bool HasFilters {
+			get => hasFilters;
+			set => Change(ref hasFilters, value);
 		}
 
-		private DateTime? startDate = null;
-
-		public DateTime? StartDate {
-			get => startDate;
-			set => Change(ref startDate, value);
-		}
-
-		private DateTime? endDate = null;
-
-		public DateTime? EndDate {
-			get => endDate;
-			set => Change(ref endDate, value);
-		}
+		private FilterPanelModel FilterModel { get; }
 
 		private readonly Window window;
 		private readonly IDatabaseFile db;
@@ -47,15 +41,15 @@ namespace DHT.Desktop.Main.Pages {
 			this.window = window;
 			this.db = db;
 
-			this.PropertyChanged += OnPropertyChanged;
+			this.FilterModel = new FilterPanelModel(window, db);
+			this.FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
 			this.db.Statistics.PropertyChanged += OnDbStatisticsChanged;
 			UpdateStatistics();
 		}
 
-		private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
-			if (e.PropertyName is nameof(FilterByDate) or nameof(StartDate) or nameof(EndDate)) {
-				UpdateStatistics();
-			}
+		private void OnFilterPropertyChanged(object? sender, PropertyChangedEventArgs e) {
+			UpdateStatistics();
+			HasFilters = FilterModel.HasAnyFilters;
 		}
 
 		private void OnDbStatisticsChanged(object? sender, PropertyChangedEventArgs e) {
@@ -64,28 +58,17 @@ namespace DHT.Desktop.Main.Pages {
 			}
 		}
 
-		private MessageFilter CreateFilter() {
-			MessageFilter filter = new();
-
-			if (FilterByDate) {
-				filter.StartDate = StartDate;
-				filter.EndDate = EndDate;
-			}
-
-			return filter;
-		}
-
 		private void UpdateStatistics() {
-			ExportedMessageText = "Will export " + db.CountMessages(CreateFilter()) + " out of " + db.Statistics.TotalMessages + " message(s).";
+			ExportedMessageText = "Will export " + db.CountMessages(FilterModel.CreateFilter()).Format() + " out of " + db.Statistics.TotalMessages.Format() + " message(s).";
 			OnPropertyChanged(nameof(ExportedMessageText));
 		}
 
 		private async Task<string> GenerateViewerContents() {
-			string json = ViewerJsonExport.Generate(db, CreateFilter());
-
-			string index = await ResourceLoader.ReadTextAsync("Viewer/index.html");
-			string viewer = index.Replace("/*[JS]*/", await ResourceLoader.ReadJoinedAsync("Viewer/scripts/", '\n'))
-			                     .Replace("/*[CSS]*/", await ResourceLoader.ReadJoinedAsync("Viewer/styles/", '\n'))
+			string json = ViewerJsonExport.Generate(db, FilterModel.CreateFilter());
+			
+			string index = await Resources.ReadTextAsync("Viewer/index.html");
+			string viewer = index.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
+			                     .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'))
 			                     .Replace("/*[ARCHIVE]*/", HttpUtility.JavaScriptStringEncode(json));
 			return viewer;
 		}
@@ -97,7 +80,8 @@ namespace DHT.Desktop.Main.Pages {
 			int counter = 0;
 
 			while (File.Exists(fullPath)) {
-				fullPath = Path.Combine(rootPath, filenameBase + "-" + (++counter) + ".html");
+				++counter;
+				fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
 			}
 
 			Directory.CreateDirectory(rootPath);
@@ -119,10 +103,25 @@ namespace DHT.Desktop.Main.Pages {
 				}
 			}.ShowAsync(window);
 
-			string path = await dialog;
+			string? path = await dialog;
 			if (!string.IsNullOrEmpty(path)) {
 				await File.WriteAllTextAsync(path, await GenerateViewerContents());
 			}
 		}
+
+		public async void OnClickApplyFiltersToDatabase() {
+			var filter = FilterModel.CreateFilter();
+
+			if (DatabaseToolFilterModeKeep) {
+				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Keep Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be kept, and the rest will be removed from this database. This action cannot be undone. Proceed?")) {
+					db.RemoveMessages(filter, MessageFilterRemovalMode.KeepMatching);
+				}
+			}
+			else if (DatabaseToolFilterModeRemove) {
+				if (DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Remove Matching Messages in This Database", db.CountMessages(filter).Pluralize("message") + " will be removed from this database. This action cannot be undone. Proceed?")) {
+					db.RemoveMessages(filter, MessageFilterRemovalMode.RemoveMatching);
+				}
+			}
+		}
 	}
 }

app/Desktop/Main/WelcomeScreen.axaml

@@ -28,7 +28,7 @@
 
     <Panel Name="RootPanel">
         <StackPanel Margin="42">
-            <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v.{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
+            <TextBlock Text="{Binding Version, StringFormat=Discord History Tracker v{0}}" FontSize="25" Margin="0 0 0 30" HorizontalAlignment="Center" />
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                 <Button Command="{Binding OpenOrCreateDatabase}">Open or Create Database</Button>

app/Desktop/Main/WelcomeScreen.axaml.cs

@@ -1,8 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
 namespace DHT.Desktop.Main {
-	public class WelcomeScreen : UserControl {
+	[SuppressMessage("ReSharper", "MemberCanBeInternal")]
+	public sealed class WelcomeScreen : UserControl {
 		public WelcomeScreen() {
 			InitializeComponent();
 		}

app/Desktop/Main/WelcomeScreenModel.cs

@@ -1,17 +1,14 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Desktop.Dialogs;
-using DHT.Desktop.Models;
+using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
-using DHT.Server.Database.Exceptions;
-using DHT.Server.Database.Sqlite;
-using DHT.Server.Logging;
+using DHT.Utils.Models;
 
 namespace DHT.Desktop.Main {
-	public class WelcomeScreenModel : BaseModel {
+	sealed class WelcomeScreenModel : BaseModel {
 		public string Version => Program.Version;
 
 		public IDatabaseFile? Db { get; private set; }
@@ -29,19 +26,10 @@ namespace DHT.Desktop.Main {
 		}
 
 		public async void OpenOrCreateDatabase() {
-			var dialog = new SaveFileDialog {
-				Title = "Open or Create Database File",
-				InitialFileName = "archive.dht",
-				Directory = Path.GetDirectoryName(dbFilePath),
-				Filters = new List<FileDialogFilter> {
-					new() {
-						Name = "Discord History Tracker Database",
-						Extensions = { "dht" }
-					}
-				}
-			}.ShowAsync(window);
+			var dialog = DatabaseGui.NewOpenOrCreateDatabaseFileDialog();
+			dialog.Directory = Path.GetDirectoryName(dbFilePath);
 
-			string path = await dialog;
+			string? path = await dialog.ShowAsync(window);
 			if (!string.IsNullOrWhiteSpace(path)) {
 				await OpenOrCreateDatabaseFromPath(path);
 			}
@@ -53,24 +41,14 @@ namespace DHT.Desktop.Main {
 			}
 
 			dbFilePath = path;
-
-			try {
-				Db = await SqliteDatabaseFile.OpenOrCreate(path, CheckCanUpgradeDatabase);
-			} catch (InvalidDatabaseVersionException ex) {
-				await Dialog.ShowOk(window, "Database Error", "This database appears to be corrupted (invalid version: " + ex.Version + ").");
-			} catch (DatabaseTooNewException ex) {
-				await Dialog.ShowOk(window, "Database Error", "This database was opened in a newer version of DHT (database version " + ex.DatabaseVersion + ", app version " + ex.CurrentVersion + ").");
-			} catch (Exception ex) {
-				Log.Error(ex);
-				await Dialog.ShowOk(window, "Database Error", ex.Message);
-			}
+			Db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, CheckCanUpgradeDatabase);
 
 			OnPropertyChanged(nameof(Db));
 			OnPropertyChanged(nameof(HasDatabase));
 		}
 
 		private async Task<bool> CheckCanUpgradeDatabase() {
-			return DialogResult.YesNo.Yes == await Dialog.ShowYesNo(window, "Database Upgrade", "This database was created with an older version of DHT. If you proceed, the database will be upgraded and will no longer open in previous versions of DHT. Do you want to proceed?");
+			return DialogResult.YesNo.Yes == await DatabaseGui.ShowCanUpgradeDatabaseDialog(window);
 		}
 
 		public void CloseDatabase() {
@@ -81,7 +59,7 @@ namespace DHT.Desktop.Main {
 		}
 
 		public async void ShowAboutDialog() {
-			await new AboutWindow() { DataContext = new AboutWindowModel() }.ShowDialog(this.window);
+			await new AboutWindow { DataContext = new AboutWindowModel() }.ShowDialog(this.window);
 		}
 
 		public void Exit() {

app/Desktop/Program.cs

@@ -1,21 +1,29 @@
 using System.Globalization;
 using System.Reflection;
 using Avalonia;
+using DHT.Utils.Resources;
 
 namespace DHT.Desktop {
-	internal static class Program {
+	static class Program {
 		public static string Version { get; }
+		public static CultureInfo Culture { get; }
+		public static ResourceLoader Resources { get; }
 
 		static Program() {
-			Version = Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "";
+			var assembly = Assembly.GetExecutingAssembly();
+			
+			Version = assembly.GetName().Version?.ToString() ?? "";
 			while (Version.EndsWith(".0")) {
 				Version = Version[..^2];
 			}
 
+			Culture = CultureInfo.CurrentCulture;
 			CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
 			CultureInfo.CurrentUICulture = CultureInfo.InvariantCulture;
 			CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
 			CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture;
+			
+			Resources = new ResourceLoader(assembly);
 		}
 
 		public static void Main(string[] args) {

app/DiscordHistoryTracker.sln

@@ -4,6 +4,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Desktop", "Desktop\Desktop.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{7F94B470-B06F-43C0-9655-6592A9AE2D92}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "Utils\Utils.csproj", "{7EEC1C05-1D21-4B39-B1D6-CF51F3795629}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -18,5 +20,9 @@ Global
 		{7F94B470-B06F-43C0-9655-6592A9AE2D92}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F94B470-B06F-43C0-9655-6592A9AE2D92}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F94B470-B06F-43C0-9655-6592A9AE2D92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EEC1C05-1D21-4B39-B1D6-CF51F3795629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EEC1C05-1D21-4B39-B1D6-CF51F3795629}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EEC1C05-1D21-4B39-B1D6-CF51F3795629}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EEC1C05-1D21-4B39-B1D6-CF51F3795629}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

app/Resources/Tracker/bootstrap.js

@@ -125,8 +125,7 @@
 		}
 	};
 	
-	const callbackTimer = DISCORD.setupMessageCallback(onMessagesUpdated);
-	window.DHT_ON_UNLOAD.push(() => window.clearTimeout(callbackTimer));
+	DISCORD.setupMessageCallback(onMessagesUpdated);
 	
 	STATE.onTrackingStateChanged(enabled => {
 		if (enabled) {

app/Resources/Tracker/scripts/discord.js

@@ -26,14 +26,13 @@ class DISCORD {
 	
 	/**
 	 * Calls the provided function with a list of messages whenever the currently loaded messages change.
-	 * Returns a setInterval handle.
 	 */
 	static setupMessageCallback(callback) {
 		let skipsLeft = 0;
 		let waitForCleanup = false;
 		const previousMessages = new Set();
 		
-		return window.setInterval(() => {
+		const timer = window.setInterval(() => {
 			if (skipsLeft > 0) {
 				--skipsLeft;
 				return;
@@ -88,6 +87,8 @@ class DISCORD {
 			
 			callback(messages);
 		}, 200);
+		
+		window.DHT_ON_UNLOAD.push(() => window.clearInterval(timer));
 	}
 	
 	/**
@@ -157,7 +158,7 @@ class DISCORD {
 			if (dms) {
 				let name;
 				
-				for (const ele of dms.querySelectorAll("[class*='channel-'][class*='selected-'] [class^='name-'] *")) {
+				for (const ele of dms.querySelectorAll("[class*='channel-'] [class*='selected-'] [class^='name-'] *, [class*='channel-'][class*='selected-'] [class^='name-'] *")) {
 					const node = Array.prototype.find.call(ele.childNodes, node => node.nodeType === Node.TEXT_NODE);
 					
 					if (node) {

app/Resources/Tracker/scripts/gui.js

@@ -55,7 +55,8 @@ const GUI = (function() {
 			controller.ui.btnClose.addEventListener("click", () => {
 				this.hideController();
 				window.DHT_ON_UNLOAD.forEach(f => f());
-				window.DHT_LOADED = false;
+				delete window.DHT_ON_UNLOAD;
+				delete window.DHT_LOADED;
 			});
 			
 			STATE.onTrackingStateChanged(isTracking => {

app/Server/Data/Attachment.cs

@@ -1,9 +1,9 @@
 namespace DHT.Server.Data {
 	public readonly struct Attachment {
-		public ulong Id { get; init; }
-		public string Name { get; init; }
-		public string? Type { get; init; }
-		public string Url { get; init; }
-		public ulong Size { get; init; }
+		public ulong Id { get; internal init; }
+		public string Name { get; internal init; }
+		public string? Type { get; internal init; }
+		public string Url { get; internal init; }
+		public ulong Size { get; internal init; }
 	}
 }

app/Server/Data/Channel.cs

@@ -1,11 +1,11 @@
 namespace DHT.Server.Data {
 	public readonly struct Channel {
-		public ulong Id { get; init; }
-		public ulong Server { get; init; }
-		public string Name { get; init; }
-		public ulong? ParentId { get; init; }
-		public int? Position { get; init; }
-		public string? Topic { get; init; }
-		public bool? Nsfw { get; init; }
+		public ulong Id { get; internal init; }
+		public ulong Server { get; internal init; }
+		public string Name { get; internal init; }
+		public ulong? ParentId { get; internal init; }
+		public int? Position { get; internal init; }
+		public string? Topic { get; internal init; }
+		public bool? Nsfw { get; internal init; }
 	}
 }

app/Server/Data/Embed.cs

@@ -1,5 +1,5 @@
 namespace DHT.Server.Data {
 	public readonly struct Embed {
-		public string Json { get; init; }
+		public string Json { get; internal init; }
 	}
 }

app/Server/Data/Filters/MessageFilter.cs

@@ -2,10 +2,12 @@ using System;
 using System.Collections.Generic;
 
 namespace DHT.Server.Data.Filters {
-	public class MessageFilter {
+	public sealed class MessageFilter {
 		public DateTime? StartDate { get; set; }
 		public DateTime? EndDate { get; set; }
 
-		public HashSet<ulong> MessageIds { get; } = new();
+		public HashSet<ulong>? ChannelIds { get; set; } = null;
+		public HashSet<ulong>? UserIds { get; set; } = null;
+		public HashSet<ulong>? MessageIds { get; set; } = null;
 	}
 }

app/Server/Data/Filters/MessageFilterRemovalMode.cs

@@ -0,0 +1,6 @@
+namespace DHT.Server.Data.Filters {
+	public enum MessageFilterRemovalMode {
+		KeepMatching,
+		RemoveMatching
+	}
+}

app/Server/Data/Message.cs

@@ -2,15 +2,15 @@ using System.Collections.Immutable;
 
 namespace DHT.Server.Data {
 	public readonly struct Message {
-		public ulong Id { get; init; }
-		public ulong Sender { get; init; }
-		public ulong Channel { get; init; }
-		public string Text { get; init; }
-		public long Timestamp { get; init; }
-		public long? EditTimestamp { get; init; }
-		public ulong? RepliedToId { get; init; }
-		public ImmutableArray<Attachment> Attachments { get; init; }
-		public ImmutableArray<Embed> Embeds { get; init; }
-		public ImmutableArray<Reaction> Reactions { get; init; }
+		public ulong Id { get; internal init; }
+		public ulong Sender { get; internal init; }
+		public ulong Channel { get; internal init; }
+		public string Text { get; internal init; }
+		public long Timestamp { get; internal init; }
+		public long? EditTimestamp { get; internal init; }
+		public ulong? RepliedToId { get; internal init; }
+		public ImmutableArray<Attachment> Attachments { get; internal init; }
+		public ImmutableArray<Embed> Embeds { get; internal init; }
+		public ImmutableArray<Reaction> Reactions { get; internal init; }
 	}
 }

app/Server/Data/Reaction.cs

@@ -1,8 +1,8 @@
 namespace DHT.Server.Data {
 	public readonly struct Reaction {
-		public ulong? EmojiId { get; init; }
-		public string? EmojiName { get; init; }
-		public EmojiFlags EmojiFlags { get; init; }
-		public int Count { get; init; }
+		public ulong? EmojiId { get; internal init; }
+		public string? EmojiName { get; internal init; }
+		public EmojiFlags EmojiFlags { get; internal init; }
+		public int Count { get; internal init; }
 	}
 }

app/Server/Data/Server.cs

@@ -1,7 +1,7 @@
 namespace DHT.Server.Data {
 	public readonly struct Server {
-		public ulong Id { get; init; }
-		public string Name { get; init; }
-		public ServerType? Type { get; init; }
+		public ulong Id { get; internal init; }
+		public string Name { get; internal init; }
+		public ServerType? Type { get; internal init; }
 	}
 }

app/Server/Data/ServerType.cs

@@ -24,7 +24,7 @@ namespace DHT.Server.Data {
 			};
 		}
 
-		public static string ToJsonViewerString(ServerType? type) {
+		internal static string ToJsonViewerString(ServerType? type) {
 			return type switch {
 				ServerType.Server        => "server",
 				ServerType.Group         => "group",

app/Server/Data/User.cs

@@ -1,8 +1,8 @@
 namespace DHT.Server.Data {
 	public readonly struct User {
-		public ulong Id { get; init; }
-		public string Name { get; init; }
-		public string? AvatarUrl { get; init; }
-		public string? Discriminator { get; init; }
+		public ulong Id { get; internal init; }
+		public string Name { get; internal init; }
+		public string? AvatarUrl { get; internal init; }
+		public string? Discriminator { get; internal init; }
 	}
 }

app/Server/Database/DatabaseExtensions.cs

@@ -0,0 +1,16 @@
+namespace DHT.Server.Database {
+	public static class DatabaseExtensions {
+		public static void AddFrom(this IDatabaseFile target, IDatabaseFile source) {
+			foreach (var server in source.GetAllServers()) {
+				target.AddServer(server);
+			}
+
+			foreach (var channel in source.GetAllChannels()) {
+				target.AddChannel(channel);
+			}
+
+			target.AddUsers(source.GetAllUsers().ToArray());
+			target.AddMessages(source.GetMessages().ToArray());
+		}
+	}
+}

app/Server/Database/DatabaseStatistics.cs

@@ -2,9 +2,10 @@ using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
 namespace DHT.Server.Database {
-	public class DatabaseStatistics : INotifyPropertyChanged {
+	public sealed class DatabaseStatistics : INotifyPropertyChanged {
 		private long totalServers;
 		private long totalChannels;
+		private long totalUsers;
 		private long totalMessages;
 
 		public long TotalServers {
@@ -17,6 +18,11 @@ namespace DHT.Server.Database {
 			internal set => Change(out totalChannels, value);
 		}
 
+		public long TotalUsers {
+			get => totalUsers;
+			internal set => Change(out totalUsers, value);
+		}
+
 		public long TotalMessages {
 			get => totalMessages;
 			internal set => Change(out totalMessages, value);
@@ -28,5 +34,14 @@ namespace DHT.Server.Database {
 			field = value;
 			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 		}
+
+		public DatabaseStatistics Clone() {
+			return new DatabaseStatistics {
+				totalServers = totalServers,
+				totalChannels = totalChannels,
+				totalUsers = TotalUsers,
+				totalMessages = totalMessages
+			};
+		}
 	}
 }

app/Server/Database/DummyDatabaseFile.cs

@@ -1,10 +1,9 @@
-using System;
 using System.Collections.Generic;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
 
 namespace DHT.Server.Database {
-	public class DummyDatabaseFile : IDatabaseFile {
+	public sealed class DummyDatabaseFile : IDatabaseFile {
 		public static DummyDatabaseFile Instance { get; } = new();
 
 		public string Path => "";
@@ -40,8 +39,8 @@ namespace DHT.Server.Database {
 			return new();
 		}
 
-		public void Dispose() {
-			GC.SuppressFinalize(this);
-		}
+		public void RemoveMessages(MessageFilter filter, MessageFilterRemovalMode mode) {}
+
+		public void Dispose() {}
 	}
 }

app/Server/Database/Exceptions/DatabaseTooNewException.cs

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

app/Server/Database/Exceptions/InvalidDatabaseVersionException.cs

@@ -1,10 +1,10 @@
 using System;
 
 namespace DHT.Server.Database.Exceptions {
-	public class InvalidDatabaseVersionException : Exception {
+	public sealed class InvalidDatabaseVersionException : Exception {
 		public string Version { get; }
 
-		public InvalidDatabaseVersionException(string version) : base("Invalid database version: " + version) {
+		internal InvalidDatabaseVersionException(string version) : base("Invalid database version: " + version) {
 			this.Version = version;
 		}
 	}

app/Server/Database/Export/ViewerJsonExport.cs

@@ -8,26 +8,48 @@ using DHT.Server.Data.Filters;
 namespace DHT.Server.Database.Export {
 	public static class ViewerJsonExport {
 		public static string Generate(IDatabaseFile db, MessageFilter? filter = null) {
-			JsonSerializerOptions opts = new();
+			var includedUserIds = new HashSet<ulong>();
+			var includedChannelIds = new HashSet<ulong>();
+			var includedServerIds = new HashSet<ulong>();
+
+			var includedMessages = db.GetMessages(filter);
+			var includedChannels = new List<Channel>();
+
+			foreach (var message in includedMessages) {
+				includedUserIds.Add(message.Sender);
+				includedChannelIds.Add(message.Channel);
+			}
+
+			foreach (var channel in db.GetAllChannels()) {
+				if (includedChannelIds.Contains(channel.Id)) {
+					includedChannels.Add(channel);
+					includedServerIds.Add(channel.Server);
+				}
+			}
+
+			var opts = new JsonSerializerOptions();
 			opts.Converters.Add(new ViewerJsonSnowflakeSerializer());
 
-			var users = GenerateUserList(db, out var userindex, out var userIndices);
-			var servers = GenerateServerList(db, out var serverindex);
-			var channels = GenerateChannelList(db, serverindex);
+			var users = GenerateUserList(db, includedUserIds, out var userindex, out var userIndices);
+			var servers = GenerateServerList(db, includedServerIds, out var serverindex);
+			var channels = GenerateChannelList(includedChannels, serverindex);
 
 			return JsonSerializer.Serialize(new {
 				meta = new { users, userindex, servers, channels },
-				data = GenerateMessageList(db, filter, userIndices)
+				data = GenerateMessageList(includedMessages, userIndices)
 			}, opts);
 		}
 
-		private static dynamic GenerateUserList(IDatabaseFile db, out List<string> userindex, out Dictionary<ulong, int> userIndices) {
+		private static dynamic GenerateUserList(IDatabaseFile db, HashSet<ulong> userIds, out List<string> userindex, out Dictionary<ulong, int> userIndices) {
 			var users = new Dictionary<string, dynamic>();
 			userindex = new List<string>();
 			userIndices = new Dictionary<ulong, int>();
 
 			foreach (var user in db.GetAllUsers()) {
-				var id = user.Id.ToString();
+				var id = user.Id;
+				if (!userIds.Contains(id)) {
+					continue;
+				}
 
 				dynamic obj = new ExpandoObject();
 				obj.name = user.Name;
@@ -40,20 +62,26 @@ namespace DHT.Server.Database.Export {
 					obj.tag = user.Discriminator;
 				}
 
-				userIndices[user.Id] = users.Count;
-				userindex.Add(id);
-				users[id] = obj;
+				var idStr = id.ToString();
+				userIndices[id] = users.Count;
+				userindex.Add(idStr);
+				users[idStr] = obj;
 			}
 
 			return users;
 		}
 
-		private static dynamic GenerateServerList(IDatabaseFile db, out Dictionary<ulong, int> serverIndices) {
+		private static dynamic GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, out Dictionary<ulong, int> serverIndices) {
 			var servers = new List<dynamic>();
 			serverIndices = new Dictionary<ulong, int>();
 
 			foreach (var server in db.GetAllServers()) {
-				serverIndices[server.Id] = servers.Count;
+				var id = server.Id;
+				if (!serverIds.Contains(id)) {
+					continue;
+				}
+
+				serverIndices[id] = servers.Count;
 				servers.Add(new {
 					name = server.Name,
 					type = ServerTypes.ToJsonViewerString(server.Type)
@@ -63,10 +91,10 @@ namespace DHT.Server.Database.Export {
 			return servers;
 		}
 
-		private static dynamic GenerateChannelList(IDatabaseFile db, Dictionary<ulong, int> serverIndices) {
+		private static dynamic GenerateChannelList(List<Channel> includedChannels, Dictionary<ulong, int> serverIndices) {
 			var channels = new Dictionary<string, dynamic>();
 
-			foreach (var channel in db.GetAllChannels()) {
+			foreach (var channel in includedChannels) {
 				dynamic obj = new ExpandoObject();
 				obj.server = serverIndices[channel.Server];
 				obj.name = channel.Name;
@@ -93,10 +121,10 @@ namespace DHT.Server.Database.Export {
 			return channels;
 		}
 
-		private static dynamic GenerateMessageList(IDatabaseFile db, MessageFilter? filter, Dictionary<ulong, int> userIndices) {
+		private static dynamic GenerateMessageList(List<Message> includedMessages, Dictionary<ulong, int> userIndices) {
 			var data = new Dictionary<string, Dictionary<string, dynamic>>();
 
-			foreach (var grouping in db.GetMessages(filter).GroupBy(message => message.Channel)) {
+			foreach (var grouping in includedMessages.GroupBy(static message => message.Channel)) {
 				var channel = grouping.Key.ToString();
 				var channelData = new Dictionary<string, dynamic>();
 
@@ -118,17 +146,17 @@ namespace DHT.Server.Database.Export {
 					}
 
 					if (!message.Attachments.IsEmpty) {
-						obj.a = message.Attachments.Select(attachment => new {
+						obj.a = message.Attachments.Select(static attachment => new {
 							url = attachment.Url
 						}).ToArray();
 					}
 
 					if (!message.Embeds.IsEmpty) {
-						obj.e = message.Embeds.Select(embed => embed.Json).ToArray();
+						obj.e = message.Embeds.Select(static embed => embed.Json).ToArray();
 					}
 
 					if (!message.Reactions.IsEmpty) {
-						obj.re = message.Reactions.Select(reaction => {
+						obj.re = message.Reactions.Select(static reaction => {
 							dynamic r = new ExpandoObject();
 
 							if (reaction.EmojiId != null) {

app/Server/Database/Export/ViewerJsonSnowflakeSerializer.cs

@@ -3,7 +3,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace DHT.Server.Database.Export {
-	public class ViewerJsonSnowflakeSerializer : JsonConverter<ulong> {
+	sealed class ViewerJsonSnowflakeSerializer : JsonConverter<ulong> {
 		public override ulong Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
 			return ulong.Parse(reader.GetString()!);
 		}

app/Server/Database/IDatabaseFile.cs

@@ -20,5 +20,6 @@ namespace DHT.Server.Database {
 		void AddMessages(Message[] messages);
 		int CountMessages(MessageFilter? filter = null);
 		List<Message> GetMessages(MessageFilter? filter = null);
+		void RemoveMessages(MessageFilter filter, MessageFilterRemovalMode mode);
 	}
 }

app/Server/Database/Sqlite/Schema.cs

@@ -4,7 +4,7 @@ using DHT.Server.Database.Exceptions;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite {
-	internal class Schema {
+	sealed class Schema {
 		internal const int Version = 2;
 
 		private readonly SqliteConnection conn;
@@ -80,7 +80,7 @@ namespace DHT.Server.Database.Sqlite {
 
 			Execute(@"CREATE TABLE attachments (
 			        message_id INTEGER NOT NULL,
-                    attachment_id INTEGER NOT NULL PRIMARY KEY NOT NULL,
+			        attachment_id INTEGER NOT NULL PRIMARY KEY NOT NULL,
 			        name TEXT NOT NULL,
 			        type TEXT,
 			        url TEXT NOT NULL,

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -1,14 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Text;
 using System.Threading.Tasks;
-using DHT.Server.Collections;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
+using DHT.Utils.Collections;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite {
-	public class SqliteDatabaseFile : IDatabaseFile {
+	public sealed class SqliteDatabaseFile : IDatabaseFile {
 		public static async Task<SqliteDatabaseFile?> OpenOrCreate(string path, Func<Task<bool>> checkCanUpgradeSchemas) {
 			string connectionString = new SqliteConnectionStringBuilder {
 				DataSource = path,
@@ -32,12 +33,12 @@ namespace DHT.Server.Database.Sqlite {
 			this.Statistics = new DatabaseStatistics();
 			UpdateServerStatistics();
 			UpdateChannelStatistics();
+			UpdateUserStatistics();
 			UpdateMessageStatistics();
 		}
 
 		public void Dispose() {
 			conn.Dispose();
-			GC.SuppressFinalize(this);
 		}
 
 		public void AddServer(Data.Server server) {
@@ -129,6 +130,7 @@ namespace DHT.Server.Database.Sqlite {
 			}
 
 			tx.Commit();
+			UpdateUserStatistics();
 		}
 
 		public List<User> GetAllUsers() {
@@ -301,6 +303,24 @@ namespace DHT.Server.Database.Sqlite {
 			return list;
 		}
 
+		public void RemoveMessages(MessageFilter filter, MessageFilterRemovalMode mode) {
+			var whereClause = filter.GenerateWhereClause(invert: mode == MessageFilterRemovalMode.KeepMatching);
+			if (string.IsNullOrEmpty(whereClause)) {
+				return;
+			}
+
+			// Rider is being stupid...
+			StringBuilder build = new StringBuilder()
+			                      .Append("DELETE ")
+			                      .Append("FROM messages")
+			                      .Append(whereClause);
+
+			using var cmd = conn.Command(build.ToString());
+			cmd.ExecuteNonQuery();
+
+			UpdateMessageStatistics();
+		}
+
 		private MultiDictionary<ulong, Attachment> GetAllAttachments() {
 			var dict = new MultiDictionary<ulong, Attachment>();
 
@@ -369,6 +389,11 @@ namespace DHT.Server.Database.Sqlite {
 			Statistics.TotalChannels = cmd.ExecuteScalar() as long? ?? 0;
 		}
 
+		private void UpdateUserStatistics() {
+			using var cmd = conn.Command("SELECT COUNT(*) FROM users");
+			Statistics.TotalUsers = cmd.ExecuteScalar() as long? ?? 0;
+		}
+
 		private void UpdateMessageStatistics() {
 			using var cmd = conn.Command("SELECT COUNT(*) FROM messages");
 			Statistics.TotalMessages = cmd.ExecuteScalar() as long? ?? 0L;

app/Server/Database/Sqlite/SqliteMessageFilter.cs

@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using DHT.Server.Data.Filters;
 
 namespace DHT.Server.Database.Sqlite {
-	public static class SqliteMessageFilter {
-		public static string GenerateWhereClause(this MessageFilter? filter) {
+	static class SqliteMessageFilter {
+		public static string GenerateWhereClause(this MessageFilter? filter, bool invert = false) {
 			if (filter == null) {
 				return "";
 			}
@@ -15,15 +14,33 @@ namespace DHT.Server.Database.Sqlite {
 			if (filter.StartDate != null) {
 				conditions.Add("timestamp >= " + new DateTimeOffset(filter.StartDate.Value).ToUnixTimeMilliseconds());
 			}
+
 			if (filter.EndDate != null) {
 				conditions.Add("timestamp <= " + new DateTimeOffset(filter.EndDate.Value).ToUnixTimeMilliseconds());
 			}
 
-			if (filter.MessageIds.Count > 0) {
-				conditions.Add("(" + string.Join(" OR ", filter.MessageIds.Select(id => "message_id = " + id)) + ")");
+			if (filter.ChannelIds != null) {
+				conditions.Add("channel_id IN (" + string.Join(",", filter.ChannelIds) + ")");
 			}
 
-			return conditions.Count == 0 ? "" : " WHERE " + string.Join(" AND ", conditions);
+			if (filter.UserIds != null) {
+				conditions.Add("sender_id IN (" + string.Join(",", filter.UserIds) + ")");
+			}
+
+			if (filter.MessageIds != null) {
+				conditions.Add("message_id IN (" + string.Join(",", filter.MessageIds) + ")");
+			}
+
+			if (conditions.Count == 0) {
+				return "";
+			}
+
+			if (invert) {
+				return " WHERE NOT (" + string.Join(" AND ", conditions) + ")";
+			}
+			else {
+				return " WHERE " + string.Join(" AND ", conditions);
+			}
 		}
 	}
 }

app/Server/Database/Sqlite/SqliteUtils.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite {
-	public static class SqliteUtils {
+	static class SqliteUtils {
 		public static SqliteCommand Command(this SqliteConnection conn, string sql) {
 			var cmd = conn.CreateCommand();
 			cmd.CommandText = sql;
@@ -12,7 +12,7 @@ namespace DHT.Server.Database.Sqlite {
 
 		public static SqliteCommand Insert(this SqliteConnection conn, string tableName, string[] columns) {
 			string columnNames = string.Join(',', columns);
-			string columnParams = string.Join(',', columns.Select(c => ':' + c));
+			string columnParams = string.Join(',', columns.Select(static c => ':' + c));
 
 			return conn.Command("INSERT INTO " + tableName + " (" + columnNames + ")" +
 			                    "VALUES (" + columnParams + ")");
@@ -20,8 +20,8 @@ namespace DHT.Server.Database.Sqlite {
 
 		public static SqliteCommand Upsert(this SqliteConnection conn, string tableName, string[] columns) {
 			string columnNames = string.Join(',', columns);
-			string columnParams = string.Join(',', columns.Select(c => ':' + c));
-			string columnUpdates = string.Join(',', columns.Skip(1).Select(c => c + " = excluded." + c));
+			string columnParams = string.Join(',', columns.Select(static c => ':' + c));
+			string columnUpdates = string.Join(',', columns.Skip(1).Select(static c => c + " = excluded." + c));
 
 			return conn.Command("INSERT INTO " + tableName + " (" + columnNames + ")" +
 			                    "VALUES (" + columnParams + ")" +

app/Server/Endpoints/BaseEndpoint.cs

@@ -3,13 +3,16 @@ using System.Net;
 using System.Text.Json;
 using System.Threading.Tasks;
 using DHT.Server.Database;
-using DHT.Server.Logging;
 using DHT.Server.Service;
+using DHT.Utils.Http;
+using DHT.Utils.Logging;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 
 namespace DHT.Server.Endpoints {
-	public abstract class BaseEndpoint {
+	abstract class BaseEndpoint {
+		private static readonly Log Log = Log.ForType<BaseEndpoint>();
+
 		protected IDatabaseFile Db { get; }
 		private readonly ServerParameters parameters;
 

app/Server/Endpoints/TrackChannelEndpoint.cs

@@ -3,12 +3,12 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database;
-using DHT.Server.Json;
 using DHT.Server.Service;
+using DHT.Utils.Http;
 using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints {
-	public class TrackChannelEndpoint : BaseEndpoint {
+	sealed class TrackChannelEndpoint : BaseEndpoint {
 		public TrackChannelEndpoint(IDatabaseFile db, ServerParameters parameters) : base(db, parameters) {}
 
 		protected override async Task<(HttpStatusCode, object?)> Respond(HttpContext ctx) {

app/Server/Endpoints/TrackMessagesEndpoint.cs

@@ -7,12 +7,12 @@ using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
 using DHT.Server.Database;
-using DHT.Server.Json;
 using DHT.Server.Service;
+using DHT.Utils.Http;
 using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints {
-	public class TrackMessagesEndpoint : BaseEndpoint {
+	sealed class TrackMessagesEndpoint : BaseEndpoint {
 		public TrackMessagesEndpoint(IDatabaseFile db, ServerParameters parameters) : base(db, parameters) {}
 
 		protected override async Task<(HttpStatusCode, object?)> Respond(HttpContext ctx) {
@@ -22,17 +22,19 @@ namespace DHT.Server.Endpoints {
 				throw new HttpException(HttpStatusCode.BadRequest, "Expected root element to be an array.");
 			}
 
-			MessageFilter addedMessageIdFilter = new();
-			Message[] messages = new Message[root.GetArrayLength()];
+			var addedMessageIds = new HashSet<ulong>();
+			var messages = new Message[root.GetArrayLength()];
 
 			int i = 0;
 			foreach (JsonElement ele in root.EnumerateArray()) {
 				var message = ReadMessage(ele, "message");
 				messages[i++] = message;
-				addedMessageIdFilter.MessageIds.Add(message.Id);
+				addedMessageIds.Add(message.Id);
 			}
 
-			bool anyNewMessages = Db.CountMessages(addedMessageIdFilter) < messages.Length;
+			var addedMessageFilter = new MessageFilter { MessageIds = addedMessageIds };
+			bool anyNewMessages = Db.CountMessages(addedMessageFilter) < messages.Length;
+
 			Db.AddMessages(messages);
 
 			return (HttpStatusCode.OK, anyNewMessages ? 1 : 0);

app/Server/Endpoints/TrackUsersEndpoint.cs

@@ -3,12 +3,12 @@ using System.Text.Json;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database;
-using DHT.Server.Json;
 using DHT.Server.Service;
+using DHT.Utils.Http;
 using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints {
-	public class TrackUsersEndpoint : BaseEndpoint {
+	sealed class TrackUsersEndpoint : BaseEndpoint {
 		public TrackUsersEndpoint(IDatabaseFile db, ServerParameters parameters) : base(db, parameters) {}
 
 		protected override async Task<(HttpStatusCode, object?)> Respond(HttpContext ctx) {
@@ -18,7 +18,7 @@ namespace DHT.Server.Endpoints {
 				throw new HttpException(HttpStatusCode.BadRequest, "Expected root element to be an array.");
 			}
 
-			User[] users = new User[root.GetArrayLength()];
+			var users = new User[root.GetArrayLength()];
 			int i = 0;
 
 			foreach (JsonElement user in root.EnumerateArray()) {

app/Server/Logging/Log.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Diagnostics;
-
-namespace DHT.Server.Logging {
-	public static class Log {
-		private static void LogLevel(ConsoleColor color, string level, string text) {
-			Console.ForegroundColor = color;
-			foreach (string line in text.Replace("\r", "").Split('\n')) {
-				string formatted = $"[{level}] {line}";
-				Console.WriteLine(formatted);
-				Trace.WriteLine(formatted);
-			}
-		}
-
-		public static void Info(string message) {
-			LogLevel(ConsoleColor.Blue, "INFO", message);
-		}
-
-		public static void Warn(string message) {
-			LogLevel(ConsoleColor.Yellow, "WARN", message);
-		}
-
-		public static void Error(string message) {
-			LogLevel(ConsoleColor.Red, "ERROR", message);
-		}
-
-		public static void Error(Exception e) {
-			LogLevel(ConsoleColor.Red, "ERROR", e.ToString());
-		}
-	}
-}

app/Server/Server.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>DHT.Server</RootNamespace>
@@ -8,12 +7,10 @@
     <Authors>chylex</Authors>
     <Company>DiscordHistoryTracker</Company>
     <Product>DiscordHistoryTrackerServer</Product>
-    <Version>32.0.0.0</Version>
-    <AssemblyVersion>$(Version)</AssemblyVersion>
-    <FileVersion>$(Version)</FileVersion>
-    <PackageVersion>$(Version)</PackageVersion>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
   </PropertyGroup>
-  
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>none</DebugType>
@@ -24,4 +21,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.Sqlite" Version="5.0.5" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Utils\Utils.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
+  </ItemGroup>
 </Project>

app/Server/Service/ServerLauncher.cs

@@ -3,7 +3,7 @@ using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using DHT.Server.Database;
-using DHT.Server.Logging;
+using DHT.Utils.Logging;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
@@ -11,6 +11,8 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace DHT.Server.Service {
 	public static class ServerLauncher {
+		private static readonly Log Log = Log.ForType(typeof(ServerLauncher));
+		
 		private static IWebHost? Server { get; set; } = null;
 
 		public static bool IsRunning { get; private set; }
@@ -70,7 +72,7 @@ namespace DHT.Server.Service {
 			void SetKestrelOptions(KestrelServerOptions options) {
 				options.Limits.MaxRequestBodySize = null;
 				options.Limits.MinResponseDataRate = null;
-				options.ListenLocalhost(port, listenOptions => listenOptions.Protocols = HttpProtocols.Http1);
+				options.ListenLocalhost(port, static listenOptions => listenOptions.Protocols = HttpProtocols.Http1);
 			}
 
 			Server = WebHost.CreateDefaultBuilder()

app/Server/Service/ServerParameters.cs

@@ -1,5 +1,5 @@
 namespace DHT.Server.Service {
-	public struct ServerParameters {
+	readonly struct ServerParameters {
 		public string Token { get; init; }
 	}
 }

app/Server/Service/ServerStartup.cs

@@ -8,15 +8,15 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace DHT.Server.Service {
-	public class Startup {
+	sealed class Startup {
 		public void ConfigureServices(IServiceCollection services) {
-			services.Configure<JsonOptions>(options => {
+			services.Configure<JsonOptions>(static options => {
 				options.SerializerOptions.NumberHandling = JsonNumberHandling.Strict;
 			});
 
-			services.AddCors(cors => {
-				cors.AddDefaultPolicy(builder => {
-					builder.WithOrigins("https://discord.com").AllowCredentials().AllowAnyMethod().AllowAnyHeader();
+			services.AddCors(static cors => {
+				cors.AddDefaultPolicy(static builder => {
+					builder.WithOrigins("https://discord.com", "https://discordapp.com").AllowCredentials().AllowAnyMethod().AllowAnyHeader();
 				});
 			});
 		}

app/Server/Service/ServerUtils.cs

@@ -10,8 +10,8 @@ namespace DHT.Server.Service {
 		public static int FindAvailablePort(int min, int max) {
 			var properties = IPGlobalProperties.GetIPGlobalProperties();
 			var occupied = new HashSet<int>();
-			occupied.UnionWith(properties.GetActiveTcpListeners().Select(tcp => tcp.Port));
-			occupied.UnionWith(properties.GetActiveTcpConnections().Select(tcp => tcp.LocalEndPoint.Port));
+			occupied.UnionWith(properties.GetActiveTcpListeners().Select(static tcp => tcp.Port));
+			occupied.UnionWith(properties.GetActiveTcpConnections().Select(static tcp => tcp.LocalEndPoint.Port));
 
 			for (int port = min; port < max; port++) {
 				if (!occupied.Contains(port)) {

app/Utils/Collections/MultiDictionary.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
-namespace DHT.Server.Collections {
-	public class MultiDictionary<TKey, TValue> where TKey : notnull {
+namespace DHT.Utils.Collections {
+	public sealed class MultiDictionary<TKey, TValue> where TKey : notnull {
 		private readonly Dictionary<TKey, List<TValue>> dict = new();
 
 		public void Add(TKey key, TValue value) {

app/Utils/Http/HttpException.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Net;
 
-namespace DHT.Server.Service {
-	public class HttpException : Exception {
+namespace DHT.Utils.Http {
+	public sealed class HttpException : Exception {
 		public HttpStatusCode StatusCode { get; }
 
 		public HttpException(HttpStatusCode statusCode, string message) : base(message) {

app/Utils/Http/JsonExtensions.cs

@@ -1,8 +1,7 @@
 using System.Net;
 using System.Text.Json;
-using DHT.Server.Service;
 
-namespace DHT.Server.Json {
+namespace DHT.Utils.Http {
 	public static class JsonExtensions {
 		public static bool HasKey(this JsonElement json, string key) {
 			return json.TryGetProperty(key, out _);

app/Utils/Logging/Log.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Diagnostics;
+
+namespace DHT.Utils.Logging {
+	public sealed class Log {
+		public static Log ForType<T>() {
+			return ForType(typeof(T));
+		}
+
+		public static Log ForType(Type type) {
+			return new Log(type.Name);
+		}
+
+		private readonly string tag;
+
+		private Log(string tag) {
+			this.tag = tag;
+		}
+
+		private void LogLevel(ConsoleColor color, string level, string text) {
+			Console.ForegroundColor = color;
+			foreach (string line in text.Replace("\r", "").Split('\n')) {
+				string formatted = $"[{level}] [{tag}] {line}";
+				Console.WriteLine(formatted);
+				Trace.WriteLine(formatted);
+			}
+		}
+
+		public void Info(string message) {
+			LogLevel(ConsoleColor.Blue, "INFO", message);
+		}
+
+		public void Warn(string message) {
+			LogLevel(ConsoleColor.Yellow, "WARN", message);
+		}
+
+		public void Error(string message) {
+			LogLevel(ConsoleColor.Red, "ERROR", message);
+		}
+
+		public void Error(Exception e) {
+			LogLevel(ConsoleColor.Red, "ERROR", e.ToString());
+		}
+	}
+}

app/Utils/Models/BaseModel.cs

@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
 
-namespace DHT.Desktop.Models {
+namespace DHT.Utils.Models {
 	public abstract class BaseModel : INotifyPropertyChanged {
 		public event PropertyChangedEventHandler? PropertyChanged;
 

app/Utils/Resources/ResourceLoader.cs

@@ -4,11 +4,16 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DHT.Desktop.Resources {
-	public static class ResourceLoader {
-		private static Stream GetEmbeddedStream(string filename) {
+namespace DHT.Utils.Resources {
+	public sealed class ResourceLoader {
+		private readonly Assembly assembly;
+		
+		public ResourceLoader(Assembly assembly) {
+			this.assembly = assembly;
+		}
+
+		private Stream GetEmbeddedStream(string filename) {
 			Stream? stream = null;
-			Assembly assembly = Assembly.GetExecutingAssembly();
 			foreach (var embeddedName in assembly.GetManifestResourceNames()) {
 				if (embeddedName.Replace('\\', '/') == filename) {
 					stream = assembly.GetManifestResourceStream(embeddedName);
@@ -19,19 +24,18 @@ namespace DHT.Desktop.Resources {
 			return stream ?? throw new ArgumentException("Missing embedded resource: " + filename);
 		}
 
-		private static async Task<string> ReadTextAsync(Stream stream) {
+		private async Task<string> ReadTextAsync(Stream stream) {
 			using var reader = new StreamReader(stream, Encoding.UTF8);
 			return await reader.ReadToEndAsync();
 		}
 
-		public static async Task<string> ReadTextAsync(string filename) {
+		public async Task<string> ReadTextAsync(string filename) {
 			return await ReadTextAsync(GetEmbeddedStream(filename));
 		}
 
-		public static async Task<string> ReadJoinedAsync(string path, char separator) {
+		public async Task<string> ReadJoinedAsync(string path, char separator) {
 			StringBuilder joined = new();
 
-			Assembly assembly = Assembly.GetExecutingAssembly();
 			foreach (var embeddedName in assembly.GetManifestResourceNames()) {
 				if (embeddedName.Replace('\\', '/').StartsWith(path)) {
 					joined.Append(await ReadTextAsync(assembly.GetManifestResourceStream(embeddedName)!)).Append(separator);

app/Utils/Utils.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <RootNamespace>DHT.Utils</RootNamespace>
+    <Nullable>enable</Nullable>
+    <PackageId>DiscordHistoryTrackerUtils</PackageId>
+    <Authors>chylex</Authors>
+    <Company>DiscordHistoryTracker</Company>
+    <Product>DiscordHistoryTrackerUtils</Product>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="10.3.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Version.cs" Link="Version.cs" />
+  </ItemGroup>
+</Project>

app/Version.cs

@@ -0,0 +1,12 @@
+using System.Reflection;
+using DHT.Utils;
+
+[assembly: AssemblyVersion(Version.Tag)]
+[assembly: AssemblyFileVersion(Version.Tag)]
+[assembly: AssemblyInformationalVersion(Version.Tag)]
+
+namespace DHT.Utils {
+	static class Version {
+		public const string Tag = "32.2.0.0";
+	}
+}

app/build.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+if [ ! -f "DiscordHistoryTracker.sln" ]; then
+	echo "Missing DiscordHistoryTracker.sln in working directory!"
+	exit 1
+fi
+
+makezip() {
+	pushd "./bin/$1"
+	zip -9 -r "../$1.zip" .
+	popd
+}
+
+rm -rf "./bin"
+
+configurations=(win-x64 linux-x64 osx-x64)
+
+for cfg in ${configurations[@]}; do
+	dotnet publish Desktop -c Release -r "$cfg" -o "./bin/$cfg" -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishReadyToRun=false -p:PublishTrimmed=true --self-contained true
+	makezip "$cfg"
+done
+
+dotnet publish Desktop -c Release -o "./bin/portable" --self-contained false
+makezip "portable"