Release v39.0

Fix viewer converting underscores to italics even when not at the end of a word
Fix not storing channel topic and position if the channel is in a category
2025-08-18 13:31:42 +02:00 · 2023-12-21 05:18:01 +01:00 · 2023-12-21 05:09:55 +01:00 · 2023-12-21 04:49:19 +01:00 · 2023-12-21 04:27:24 +01:00 · 2023-12-21 04:27:24 +01:00
188 changed files with 5315 additions and 46878 deletions
--- a/README.md
+++ b/README.md
@@ -16,10 +16,9 @@ Fork the repository and clone it to your computer (if you've never used git, you

 Folder organization:
 * `app/` contains a Visual Studio solution for the desktop app
-* `lib/` contains utilities required to build the project
 * `web/` contains source code of the [official website](https://dht.chylex.com), which can be used as a template when making your own website

-To start editing source code for the desktop app, install the [.NET 5 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/5.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).
+To start editing source code for the desktop app, install the [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0), and then open `app/DiscordHistoryTracker.sln` in [Visual Studio](https://visualstudio.microsoft.com/downloads/) or [Rider](https://www.jetbrains.com/rider/).

 ### Building

@@ -29,27 +28,18 @@ To build a `Release` version of the desktop app, follow the instructions for you

 #### Release – Windows (64-bit)

-1. Install [Python 3](https://www.python.org/downloads), and ensure the `python` executable is in your `PATH`
-2. Install [Powershell 5](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) or newer (on Windows 10, the included version of Powershell should be enough)
-
-The `lib/` folder contains an installation of [Node](https://nodejs.org/en) and [uglify-js](https://www.npmjs.com/package/uglify-js), which are used to minify the tracking script. This installation will only work on 64-bit Windows; building on 32-bit Windows is not supported, but you can try.
+1. Install [Powershell 5](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows) or newer (on Windows 10, the included version of Powershell should be enough)

 Run the `app/build.bat` script, and read the [Distribution](#distribution) section below.

 #### Release – Other Operating Systems

-1. Install [Python 3](https://www.python.org/downloads), and ensure the `python` executable exists and launches Python 3
-   - On Debian and derivatives, you can install `python-is-python3`
-   - On other distributions, you can create a link manually, for ex. `ln -s /usr/bin/python3 /usr/bin/python`
-   - If you don't want `python` to mean Python 3, then edit `Desktop.csproj` and change `python` to `python3`
-2. Install [Node + npm](https://nodejs.org/en)
-3. Install [uglify-js](https://www.npmjs.com/package/uglify-js) globally (`npm install -g uglify-js`)
-4. Install the `zip` package from your repository
+1. Install the `zip` package from your repository

 Run the `app/build.sh` script, and read the [Distribution](#distribution) section below.

 #### Distribution

-The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires .NET 5 to be installed.
+The mentioned build scripts will prepare `Release` builds ready for distribution. Once the script finishes, the `app/bin` folder will contain self-contained executables for each major operating system, and a portable version that works on all other systems but requires .NET 8 to be installed.

-Note that when building on Windows, the generated `.zip` files for Linux and Mac will not have correct file permissions, so it will not be possible to run them by double-clicking `DiscordHistoryTracker`. I tried using Python to re-create the archives with correct file permissions, but found that Linux `zip` tools could not see them. The only working solution is building the Windows + portable version on Windows, and Linux + Mac version on Linux.
+Note that when building on Windows, the generated `.zip` files for Linux and Mac will not have correct file permissions, so it will not be possible to run them by double-clicking the executable. Since .NET 8 fixed several issues with publishing Windows executables on Linux, I recommend using Linux to build the app for all operating systems.
--- a/app/.idea/.idea.DiscordHistoryTracker/.idea/codeStyles/Project.xml
+++ b/app/.idea/.idea.DiscordHistoryTracker/.idea/codeStyles/Project.xml
@@ -29,9 +29,6 @@
    <H2CodeStyleSettings version="6">
      <option name="USE_GENERIC_STYLE" value="true" />
    </H2CodeStyleSettings>
-    <H2CodeStyleSettings version="6">
-      <option name="USE_GENERIC_STYLE" value="true" />
-    </H2CodeStyleSettings>
    <HSQLCodeStyleSettings version="6">
      <option name="USE_GENERIC_STYLE" value="true" />
    </HSQLCodeStyleSettings>
--- a/app/.idea/.idea.DiscordHistoryTracker/.idea/runConfigurations/Desktop.xml
+++ b/app/.idea/.idea.DiscordHistoryTracker/.idea/runConfigurations/Desktop.xml
@@ -1,8 +1,8 @@
 <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/DiscordHistoryTracker.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/.artifacts/bin/Desktop/debug/DiscordHistoryTracker.exe" />
    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Desktop/bin/Debug/net5.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.artifacts/bin/Desktop/debug" />
    <option name="PASS_PARENT_ENVS" value="1" />
    <option name="USE_EXTERNAL_CONSOLE" value="0" />
    <option name="USE_MONO" value="0" />
@@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net5.0" />
+    <option name="PROJECT_TFM" value="net8.0" />
    <method v="2">
      <option name="Build" />
    </method>
--- a/app/.idea/.idea.DiscordHistoryTracker/.idea/runConfigurations/Minify.xml
+++ b/app/.idea/.idea.DiscordHistoryTracker/.idea/runConfigurations/Minify.xml
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Minify" type="PythonConfigurationType" factoryName="Python">
-    <module name="rider.module" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
-    <option name="ADD_CONTENT_ROOTS" value="false" />
-    <option name="ADD_SOURCE_ROOTS" value="false" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/minify.py" />
-    <option name="PARAMETERS" value="" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="false" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
--- a/app/Desktop/App.axaml
+++ b/app/Desktop/App.axaml
@@ -2,12 +2,13 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:common="clr-namespace:DHT.Desktop.Common"
             xmlns:system="clr-namespace:System;assembly=System.Runtime"
-             x:Class="DHT.Desktop.App">
+             x:Class="DHT.Desktop.App"
+             RequestedThemeVariant="Light">

    <Application.Styles>

-        <FluentTheme Mode="Light" />
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml" />
+        <FluentTheme />
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml" />

        <Style Selector="Button, CheckBox, RadioButton, Expander /template/ ToggleButton#ExpanderHeader">
            <Setter Property="Cursor" Value="Hand" />
@@ -48,68 +49,9 @@
            <Setter Property="Template" Value="{StaticResource InlineDataValidationContentTemplate}" />
        </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>
-        <Style Selector="Expander:expanded /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-            <Style.Animations>
-                <Animation FillMode="Both" Duration="0:0:0.0625">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="180" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="180" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
-        </Style>
-        <Style Selector="Expander:not(:expanded) /template/ ToggleButton#ExpanderHeader /template/ Border#ExpandCollapseChevronBorder">
-            <Style.Animations>
-                <Animation FillMode="Both" Duration="0:0:0.0625">
-                    <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="0" />
-                    </KeyFrame>
-                    <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="0" />
-                    </KeyFrame>
-                </Animation>
-            </Style.Animations>
+        <Style Selector="Expander">
+            <Setter Property="MinHeight" Value="40" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
        </Style>
        
    </Application.Styles>
@@ -168,12 +110,26 @@
        
        <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
        <Thickness x:Key="ExpanderContentPadding">12</Thickness>
-        <SolidColorBrush x:Key="ExpanderBorderBrush" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderBackground" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderForeground" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPressed" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBorderBrushDisabled" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="#536794" />
+        <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed" Color="#47587F" />
+        <SolidColorBrush x:Key="ExpanderHeaderBackgroundDisabled" Color="#697DAB" />
+        <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderForegroundPointerOver" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderForegroundPressed" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderHeaderForegroundDisabled" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent" />
+        <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="#536794" />
+        <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="#47587F" />
+        <SolidColorBrush x:Key="ExpanderChevronBackgroundDisabled" Color="Transparent" />
        <SolidColorBrush x:Key="ExpanderChevronForeground" Color="#FFFFFF" />
-        <SolidColorBrush x:Key="ExpanderDropDownBorderBrush" Color="#697DAB" />
-        <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronForegroundPointerOver" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronForegroundPressed" Color="#FFFFFF" />
+        <SolidColorBrush x:Key="ExpanderChevronForegroundDisabled" Color="#FFFFFF" />

    </Application.Resources>

--- a/app/Desktop/App.axaml.cs
+++ b/app/Desktop/App.axaml.cs
@@ -1,9 +1,11 @@
+using System;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main;

-namespace DHT.Desktop {
+namespace DHT.Desktop;
+
 sealed class App : Application {
 	public override void Initialize() {
 		AvaloniaXamlLoader.Load(this);
@@ -11,10 +13,9 @@ namespace DHT.Desktop {

 	public override void OnFrameworkInitializationCompleted() {
 		if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) {
-				desktop.MainWindow = new MainWindow(new Arguments(desktop.Args));
+			desktop.MainWindow = new MainWindow(new Arguments(desktop.Args ?? Array.Empty<string>()));
 		}

 		base.OnFrameworkInitializationCompleted();
 	}
 }
-}
--- a/app/Desktop/Arguments.cs
+++ b/app/Desktop/Arguments.cs
@@ -1,7 +1,8 @@
 using System;
 using DHT.Utils.Logging;

-namespace DHT.Desktop {
+namespace DHT.Desktop;
+
 sealed class Arguments {
 	private static readonly Log Log = Log.ForType<Arguments>();

@@ -62,4 +63,3 @@ namespace DHT.Desktop {
 		}
 	}
 }
-}
--- a/app/Desktop/Common/BytesValueConverter.cs
+++ b/app/Desktop/Common/BytesValueConverter.cs
@@ -2,7 +2,8 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;

-namespace DHT.Desktop.Common {
+namespace DHT.Desktop.Common;
+
 sealed class BytesValueConverter : IValueConverter {
 	private sealed class Unit {
 		private readonly string label;
@@ -50,4 +51,3 @@ namespace DHT.Desktop.Common {
 		throw new NotSupportedException();
 	}
 }
-}
--- a/app/Desktop/Common/DatabaseGui.cs
+++ b/app/Desktop/Common/DatabaseGui.cs
@@ -3,39 +3,42 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Server.Database.Exceptions;
 using DHT.Server.Database.Sqlite;
 using DHT.Utils.Logging;

-namespace DHT.Desktop.Common {
+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" }
-			}
+	private static readonly IReadOnlyList<FilePickerFileType> DatabaseFileDialogFilter = new List<FilePickerFileType> {
+		FileDialogs.CreateFilter("Discord History Tracker Database", new [] { "dht" })
 	};

-		public static OpenFileDialog NewOpenDatabaseFileDialog() {
-			return new OpenFileDialog {
+	public static async Task<string[]> NewOpenDatabaseFilesDialog(Window window, string? suggestedDirectory) {
+		return await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Database File",
-				InitialFileName = DatabaseFileInitialName,
-				Filters = DatabaseFileDialogFilter
-			};
+			FileTypeFilter = DatabaseFileDialogFilter,
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
+			AllowMultiple = true
+		});
 	}

-		public static SaveFileDialog NewOpenOrCreateDatabaseFileDialog() {
-			return new SaveFileDialog {
+	public static async Task<string?> NewOpenOrCreateDatabaseFileDialog(Window window, string? suggestedDirectory) {
+		return await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
 			Title = "Open or Create Database File",
-				InitialFileName = DatabaseFileInitialName,
-				Filters = DatabaseFileDialogFilter
-			};
+			FileTypeChoices = DatabaseFileDialogFilter,
+			SuggestedFileName = DatabaseFileInitialName,
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, suggestedDirectory),
+			ShowOverwritePrompt = false
+		});
 	}

 	public static async Task<IDatabaseFile?> TryOpenOrCreateDatabaseFromPath(string path, Window window, Func<Task<bool>> checkCanUpgradeDatabase) {
@@ -63,4 +66,3 @@ namespace DHT.Desktop.Common {
 		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.\n\nPlease ensure you have a backup of the databases. Do you want to proceed with the upgrade?");
 	}
 }
-}
--- a/app/Desktop/Common/NumberValueConverter.cs
+++ b/app/Desktop/Common/NumberValueConverter.cs
@@ -2,7 +2,8 @@ using System;
 using System.Globalization;
 using Avalonia.Data.Converters;

-namespace DHT.Desktop.Common {
+namespace DHT.Desktop.Common;
+
 sealed class NumberValueConverter : IValueConverter {
 	public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
 		return value == null ? "-" : string.Format(Program.Culture, "{0:n0}", value);
@@ -12,4 +13,3 @@ namespace DHT.Desktop.Common {
 		throw new NotSupportedException();
 	}
 }
-}
--- a/app/Desktop/Common/TextFormat.cs
+++ b/app/Desktop/Common/TextFormat.cs
@@ -1,4 +1,5 @@
-namespace DHT.Desktop.Common {
+namespace DHT.Desktop.Common;
+
 static class TextFormat {
 	public static string Format(this int number) {
 		return number.ToString("N0", Program.Culture);
@@ -16,4 +17,3 @@ namespace DHT.Desktop.Common {
 		return number.Format() + "\u00A0" + (number == 1 ? singular : singular + "s");
 	}
 }
-}
--- a/app/Desktop/Desktop.csproj
+++ b/app/Desktop/Desktop.csproj
@@ -1,34 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <RootNamespace>DHT.Desktop</RootNamespace>
+    <AssemblyName>DiscordHistoryTracker</AssemblyName>
+    <PackageId>DiscordHistoryTracker</PackageId>
+  </PropertyGroup>
+  
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <AssemblyName>DiscordHistoryTracker</AssemblyName>
-    <RootNamespace>DHT.Desktop</RootNamespace>
-    <PackageId>DiscordHistoryTracker</PackageId>
-    <Authors>chylex</Authors>
-    <Company>DiscordHistoryTracker</Company>
-    <Product>DiscordHistoryTracker</Product>
    <ApplicationIcon>./Resources/icon.ico</ApplicationIcon>
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
    <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-    <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.16" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.16" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.16" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
  </ItemGroup>
+  
  <ItemGroup>
    <ProjectReference Include="..\Server\Server.csproj" />
  </ItemGroup>
+  
  <ItemGroup>
    <Compile Include="..\Version.cs" Link="Version.cs" />
    <Compile Update="Dialogs\TextBox\TextBoxDialog.axaml.cs">
@@ -36,22 +34,11 @@
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
+  
  <ItemGroup>
    <AvaloniaResource Include="Resources/icon.ico" />
-    <EmbeddedResource Include="../Resources/Tracker/bootstrap.js">
-      <LogicalName>Tracker\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Tracker/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../Resources/Tracker/scripts/**" Condition=" '$(Configuration)' == 'Debug' ">
-      <LogicalName>Tracker\scripts\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Tracker/scripts/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
-    <EmbeddedResource Include="../Resources/Tracker/styles/**">
-      <LogicalName>Tracker\styles\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Tracker/styles/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
+    <EmbeddedResource Include="Resources/tracker-loader.js">
+      <LogicalName>tracker-loader.js</LogicalName>
    </EmbeddedResource>
    <EmbeddedResource Include="../Resources/Viewer/**">
      <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
@@ -59,19 +46,5 @@
      <Visible>false</Visible>
    </EmbeddedResource>
  </ItemGroup>
-  <Target Name="MinifyResources" BeforeTargets="PrepareForBuild" Condition=" '$(Configuration)' == 'Release' ">
-    <PropertyGroup>
-      <MinifiedResourceDir>$(ProjectDir)bin/.res/scripts</MinifiedResourceDir>
-    </PropertyGroup>
-    <ItemGroup>
-      <UpToDateCheckInput Include="$(ProjectDir)../Resources/Tracker/scripts/**" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/discord.js" LogicalName="Tracker\scripts\discord.js" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/dom.js" LogicalName="Tracker\scripts\dom.js" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/gui.js" LogicalName="Tracker\scripts\gui.js" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/settings.js" LogicalName="Tracker\scripts\settings.js" Visible="false" />
-      <EmbeddedResource Include="$(MinifiedResourceDir)/state.js" LogicalName="Tracker\scripts\state.js" Visible="false" />
-    </ItemGroup>
-    <RemoveDir Directories="$(ProjectDir)bin/.res/scripts" />
-    <Exec Command="python $(ProjectDir)../Resources/minify.py" WorkingDirectory="$(ProjectDir)../Resources" IgnoreExitCode="false" />
-  </Target>
+  
 </Project>
--- a/app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml
+++ b/app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml
@@ -34,7 +34,7 @@

    <StackPanel Margin="20">
        <ScrollViewer MaxHeight="400">
-            <ItemsRepeater Items="{Binding Items}">
+            <ItemsRepeater ItemsSource="{Binding Items}">
                <ItemsRepeater.ItemTemplate>
                    <DataTemplate>
                        <CheckBox IsChecked="{Binding Checked}">
--- a/app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml.cs
+++ b/app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml.cs
@@ -1,22 +1,14 @@
 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 {
+namespace DHT.Desktop.Dialogs.CheckBox;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class CheckBoxDialog : Window {
+public sealed partial class CheckBoxDialog : Window {
 	public CheckBoxDialog() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
 	}

 	public void ClickOk(object? sender, RoutedEventArgs e) {
@@ -27,5 +19,3 @@ namespace DHT.Desktop.Dialogs.CheckBox {
 		Close(DialogResult.OkCancel.Cancel);
 	}
 }
-}
-
--- a/app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs
+++ b/app/Desktop/Dialogs/CheckBox/CheckBoxDialogModel.cs
@@ -4,7 +4,8 @@ using System.ComponentModel;
 using System.Linq;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Dialogs.CheckBox {
+namespace DHT.Desktop.Dialogs.CheckBox;
+
 class CheckBoxDialogModel : BaseModel {
 	public string Title { get; init; } = "";

@@ -67,4 +68,3 @@ namespace DHT.Desktop.Dialogs.CheckBox {
 		base.Items = this.Items;
 	}
 }
-}
--- a/app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs
+++ b/app/Desktop/Dialogs/CheckBox/CheckBoxItem.cs
@@ -1,6 +1,7 @@
 using DHT.Utils.Models;

-namespace DHT.Desktop.Dialogs.CheckBox {
+namespace DHT.Desktop.Dialogs.CheckBox;
+
 class CheckBoxItem : BaseModel {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
@@ -21,4 +22,3 @@ namespace DHT.Desktop.Dialogs.CheckBox {
 		base.Item = item;
 	}
 }
-}
--- a/app/Desktop/Dialogs/File/FileDialogs.cs
+++ b/app/Desktop/Dialogs/File/FileDialogs.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+
+namespace DHT.Desktop.Dialogs.File;
+
+static class FileDialogs {
+	public static async Task<string[]> OpenFiles(this IStorageProvider storageProvider, FilePickerOpenOptions options) {
+		return (await storageProvider.OpenFilePickerAsync(options)).ToLocalPaths();
+	}
+
+	public static async Task<string?> SaveFile(this IStorageProvider storageProvider, FilePickerSaveOptions options) {
+		return (await storageProvider.SaveFilePickerAsync(options))?.ToLocalPath();
+	}
+
+	public static FilePickerFileType CreateFilter(string name, string[] extensions) {
+		return new FilePickerFileType(name) {
+			Patterns = extensions.Select(static ext => "*." + ext).ToArray()
+		};
+	}
+
+	public static Task<IStorageFolder?> GetSuggestedStartLocation(Window window, string? suggestedDirectory) {
+		return suggestedDirectory == null ? Task.FromResult<IStorageFolder?>(null) : window.StorageProvider.TryGetFolderFromPathAsync(suggestedDirectory);
+	}
+
+	private static string ToLocalPath(this IStorageFile file) {
+		return file.TryGetLocalPath() ?? throw new NotSupportedException("Local filesystem is not supported.");
+	}
+
+	private static string[] ToLocalPaths(this IReadOnlyList<IStorageFile> files) {
+		return files.Select(ToLocalPath).ToArray();
+	}
+}
--- a/app/Desktop/Dialogs/Message/Dialog.cs
+++ b/app/Desktop/Dialogs/Message/Dialog.cs
@@ -2,7 +2,8 @@ using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Threading;

-namespace DHT.Desktop.Dialogs.Message {
+namespace DHT.Desktop.Dialogs.Message;
+
 static class Dialog {
 	public static async Task ShowOk(Window owner, string title, string message) {
 		if (!Dispatcher.UIThread.CheckAccess()) {
@@ -71,4 +72,3 @@ namespace DHT.Desktop.Dialogs.Message {
 		return result.ToYesNoCancel();
 	}
 }
-}
--- a/app/Desktop/Dialogs/Message/DialogResult.cs
+++ b/app/Desktop/Dialogs/Message/DialogResult.cs
@@ -1,6 +1,7 @@
 using System;

-namespace DHT.Desktop.Dialogs.Message {
+namespace DHT.Desktop.Dialogs.Message;
+
 static class DialogResult {
 	public enum All {
 		Ok,
@@ -56,4 +57,3 @@ namespace DHT.Desktop.Dialogs.Message {
 		};
 	}
 }
-}
--- a/app/Desktop/Dialogs/Message/MessageDialog.axaml.cs
+++ b/app/Desktop/Dialogs/Message/MessageDialog.axaml.cs
@@ -1,21 +1,13 @@
 using System.Diagnostics.CodeAnalysis;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Dialogs.Message {
+namespace DHT.Desktop.Dialogs.Message;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class MessageDialog : Window {
+public sealed partial class MessageDialog : Window {
 	public MessageDialog() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
 	}

 	public void ClickOk(object? sender, RoutedEventArgs e) {
@@ -34,4 +26,3 @@ namespace DHT.Desktop.Dialogs.Message {
 		Close(DialogResult.All.Cancel);
 	}
 }
-}
--- a/app/Desktop/Dialogs/Message/MessageDialogModel.cs
+++ b/app/Desktop/Dialogs/Message/MessageDialogModel.cs
@@ -1,4 +1,5 @@
-namespace DHT.Desktop.Dialogs.Message {
+namespace DHT.Desktop.Dialogs.Message;
+
 sealed class MessageDialogModel {
 	public string Title { get; init; } = "";
 	public string Message { get; init; } = "";
@@ -8,4 +9,3 @@ namespace DHT.Desktop.Dialogs.Message {
 	public bool IsNoVisible { get; init; } = false;
 	public bool IsCancelVisible { get; init; } = false;
 }
-}
--- a/app/Desktop/Dialogs/Progress/IProgressCallback.cs
+++ b/app/Desktop/Dialogs/Progress/IProgressCallback.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;

-namespace DHT.Desktop.Dialogs.Progress {
+namespace DHT.Desktop.Dialogs.Progress;
+
 interface IProgressCallback {
 	Task Update(string message, int finishedItems, int totalItems);
 }
-}
--- a/app/Desktop/Dialogs/Progress/ProgressDialog.axaml
+++ b/app/Desktop/Dialogs/Progress/ProgressDialog.axaml
@@ -7,7 +7,7 @@
        x:Class="DHT.Desktop.Dialogs.Progress.ProgressDialog"
        Title="{Binding Title}"
        Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Opened="Loaded"
+        Opened="OnOpened"
        Closing="OnClosing"
        Width="500" SizeToContent="Height" CanResize="False"
        WindowStartupLocation="CenterOwner">
--- a/app/Desktop/Dialogs/Progress/ProgressDialog.axaml.cs
+++ b/app/Desktop/Dialogs/Progress/ProgressDialog.axaml.cs
@@ -1,40 +1,30 @@
 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 {
+namespace DHT.Desktop.Dialogs.Progress;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class ProgressDialog : Window {
+public sealed partial 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) {
+	public void OnOpened(object? sender, EventArgs e) {
 		if (DataContext is ProgressDialogModel model) {
 			Task.Run(model.StartTask).ContinueWith(OnFinished, TaskScheduler.FromCurrentSynchronizationContext());
 		}
 	}

+	public void OnClosing(object? sender, WindowClosingEventArgs e) {
+		e.Cancel = !isFinished;
+	}
+
 	private void OnFinished(Task task) {
 		isFinished = true;
 		Close();
 	}
 }
-}
--- a/app/Desktop/Dialogs/Progress/ProgressDialogModel.cs
+++ b/app/Desktop/Dialogs/Progress/ProgressDialogModel.cs
@@ -4,7 +4,8 @@ using Avalonia.Threading;
 using DHT.Desktop.Common;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Dialogs.Progress {
+namespace DHT.Desktop.Dialogs.Progress;
+
 sealed class ProgressDialogModel : BaseModel {
 	public string Title { get; init; } = "";

@@ -62,4 +63,3 @@ namespace DHT.Desktop.Dialogs.Progress {
 		}
 	}
 }
-}
--- a/app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml
+++ b/app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml
@@ -31,7 +31,7 @@
        <ScrollViewer MaxHeight="400">
            <StackPanel Spacing="10">
                <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
-                <ItemsRepeater Items="{Binding Items}">
+                <ItemsRepeater ItemsSource="{Binding Items}">
                    <ItemsRepeater.ItemTemplate>
                        <DataTemplate>
                            <DockPanel Margin="0 5 25 0">
--- a/app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml.cs
+++ b/app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml.cs
@@ -1,22 +1,14 @@
 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.TextBox {
+namespace DHT.Desktop.Dialogs.TextBox; 
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class TextBoxDialog : Window {
+public sealed partial class TextBoxDialog : Window {
 	public TextBoxDialog() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
 	}

 	public void ClickOk(object? sender, RoutedEventArgs e) {
@@ -27,5 +19,3 @@ namespace DHT.Desktop.Dialogs.TextBox {
 		Close(DialogResult.OkCancel.Cancel);
 	}
 }
-}
-
--- a/app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs
+++ b/app/Desktop/Dialogs/TextBox/TextBoxDialogModel.cs
@@ -4,7 +4,8 @@ using System.ComponentModel;
 using System.Linq;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Dialogs.TextBox {
+namespace DHT.Desktop.Dialogs.TextBox; 
+
 class TextBoxDialogModel : BaseModel {
 	public string Title { get; init; } = "";
 	public string Description { get; init; } = "";
@@ -44,4 +45,3 @@ namespace DHT.Desktop.Dialogs.TextBox {
 		base.Items = this.Items;
 	}
 }
-}
--- a/app/Desktop/Dialogs/TextBox/TextBoxItem.cs
+++ b/app/Desktop/Dialogs/TextBox/TextBoxItem.cs
@@ -3,7 +3,8 @@ using System.Collections;
 using System.ComponentModel;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Dialogs.TextBox {
+namespace DHT.Desktop.Dialogs.TextBox; 
+
 class TextBoxItem : BaseModel, INotifyDataErrorInfo {
 	public string Title { get; init; } = "";
 	public object? Item { get; init; } = null;
@@ -39,4 +40,3 @@ namespace DHT.Desktop.Dialogs.TextBox {
 		base.Item = item;
 	}
 }
-}
--- a/app/Desktop/Discord/DiscordAppSettings.cs
+++ b/app/Desktop/Discord/DiscordAppSettings.cs
@@ -9,7 +9,8 @@ using DHT.Utils.Logging;
 using static System.Environment.SpecialFolder;
 using static System.Environment.SpecialFolderOption;

-namespace DHT.Desktop.Discord {
+namespace DHT.Desktop.Discord;
+
 static class DiscordAppSettings {
 	private static readonly Log Log = Log.ForType(typeof(DiscordAppSettings));

@@ -39,7 +40,9 @@ namespace DHT.Desktop.Discord {
 	public static async Task<bool?> AreDevToolsEnabled() {
 		try {
 			return AreDevToolsEnabled(await ReadSettingsJson());
-			} catch (Exception) {
+		} catch (Exception e) {
+			Log.Error("Cannot read settings file.");
+			Log.Error(e);
 			return null;
 		}
 	}
@@ -116,4 +119,3 @@ namespace DHT.Desktop.Discord {
 		await JsonSerializer.SerializeAsync(stream, json, new JsonSerializerOptions { WriteIndented = true });
 	}
 }
-}
--- a/app/Desktop/Discord/SettingsJsonResult.cs
+++ b/app/Desktop/Discord/SettingsJsonResult.cs
@@ -1,4 +1,5 @@
-namespace DHT.Desktop.Discord {
+namespace DHT.Desktop.Discord;
+
 enum SettingsJsonResult {
 	Success,
 	AlreadySet,
@@ -7,4 +8,3 @@ namespace DHT.Desktop.Discord {
 	InvalidJson,
 	WriteError
 }
-}
--- a/app/Desktop/Main/AboutWindow.axaml
+++ b/app/Desktop/Main/AboutWindow.axaml
@@ -46,7 +46,7 @@
            <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold">License</TextBlock>
            <TextBlock Grid.Row="0" Grid.Column="2" FontWeight="Bold">Link</TextBlock>

-            <TextBlock Grid.Row="2" Grid.Column="0">.NET 5</TextBlock>
+            <TextBlock Grid.Row="2" Grid.Column="0">.NET 8</TextBlock>
            <TextBlock Grid.Row="2" Grid.Column="1">MIT</TextBlock>
            <Button Grid.Row="2" Grid.Column="2" Command="{Binding ShowLibraryNetCore}">GitHub</Button>

--- a/app/Desktop/Main/AboutWindow.axaml.cs
+++ b/app/Desktop/Main/AboutWindow.axaml.cs
@@ -1,20 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class AboutWindow : Window {
+public sealed partial class AboutWindow : Window {
 	public AboutWindow() {
 		InitializeComponent();
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
 	}
 }
--- a/app/Desktop/Main/AboutWindowModel.cs
+++ b/app/Desktop/Main/AboutWindowModel.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics;

-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main;
+
 sealed class AboutWindowModel {
 	public void ShowOfficialWebsite() {
 		OpenUrl("https://dht.chylex.com");
@@ -30,4 +31,3 @@ namespace DHT.Desktop.Main {
 		Process.Start(new ProcessStartInfo { FileName = url, UseShellExecute = true });
 	}
 }
-}
--- a/app/Desktop/Main/Controls/AttachmentFilterPanel.axaml
+++ b/app/Desktop/Main/Controls/AttachmentFilterPanel.axaml
@@ -36,7 +36,7 @@
                <CheckBox IsChecked="{Binding LimitSize}">Limit Size</CheckBox>
                <StackPanel Orientation="Horizontal">
                    <TextBox Text="{Binding MaximumSize}" IsEnabled="{Binding LimitSize}" HorizontalContentAlignment="Right" />
-                    <ComboBox IsEnabled="{Binding LimitSize}" Items="{Binding Units}" SelectedItem="{Binding MaximumSizeUnit}">
+                    <ComboBox IsEnabled="{Binding LimitSize}" ItemsSource="{Binding Units}" SelectedItem="{Binding MaximumSizeUnit}">
                        <ComboBox.ItemTemplate>
                            <DataTemplate>
                                <TextBlock Text="{Binding Name}" />
--- a/app/Desktop/Main/Controls/AttachmentFilterPanel.axaml.cs
+++ b/app/Desktop/Main/Controls/AttachmentFilterPanel.axaml.cs
@@ -1,17 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class AttachmentFilterPanel : UserControl {
+public sealed partial class AttachmentFilterPanel : UserControl {
 	public AttachmentFilterPanel() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
 }
-	}
-}
-
--- a/app/Desktop/Main/Controls/AttachmentFilterPanelModel.cs
+++ b/app/Desktop/Main/Controls/AttachmentFilterPanelModel.cs
@@ -7,7 +7,8 @@ using DHT.Server.Database;
 using DHT.Utils.Models;
 using DHT.Utils.Tasks;

-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 sealed class AttachmentFilterPanelModel : BaseModel, IDisposable {
 	public sealed record Unit(string Name, uint Scale);

@@ -126,4 +127,3 @@ namespace DHT.Desktop.Main.Controls {
 		return filter;
 	}
 }
-}
--- a/app/Desktop/Main/Controls/MessageFilterPanel.axaml.cs
+++ b/app/Desktop/Main/Controls/MessageFilterPanel.axaml.cs
@@ -1,19 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class MessageFilterPanel : UserControl {
-		private CalendarDatePicker StartDatePicker => this.FindControl<CalendarDatePicker>("StartDatePicker");
-		private CalendarDatePicker EndDatePicker => this.FindControl<CalendarDatePicker>("EndDatePicker");
-
+public sealed partial class MessageFilterPanel : UserControl {
 	public MessageFilterPanel() {
 		InitializeComponent();
-		}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);

 		var culture = Program.Culture;
 		foreach (var picker in new CalendarDatePicker[] { StartDatePicker, EndDatePicker }) {
@@ -31,4 +24,3 @@ namespace DHT.Desktop.Main.Controls {
 		}
 	}
 }
-}
--- a/app/Desktop/Main/Controls/MessageFilterPanelModel.cs
+++ b/app/Desktop/Main/Controls/MessageFilterPanelModel.cs
@@ -14,7 +14,8 @@ using DHT.Server.Database;
 using DHT.Utils.Models;
 using DHT.Utils.Tasks;

-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 sealed class MessageFilterPanelModel : BaseModel, IDisposable {
 	private static readonly HashSet<string> FilterProperties = new () {
 		nameof(FilterByDate),
@@ -282,4 +283,3 @@ namespace DHT.Desktop.Main.Controls {
 		return result == DialogResult.OkCancel.Ok ? model.SelectedItems.Select(static item => item.Item).ToHashSet() : null;
 	}
 }
-}
--- a/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml.cs
+++ b/app/Desktop/Main/Controls/ServerConfigurationPanel.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class ServerConfigurationPanel : UserControl {
+public sealed partial class ServerConfigurationPanel : UserControl {
 	public ServerConfigurationPanel() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs
+++ b/app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs
@@ -6,7 +6,8 @@ using DHT.Server.Database;
 using DHT.Server.Service;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 sealed class ServerConfigurationPanelModel : BaseModel, IDisposable {
 	private string inputPort;

@@ -113,4 +114,3 @@ namespace DHT.Desktop.Main.Controls {
 		InputToken = ServerManager.Token;
 	}
 }
-}
--- a/app/Desktop/Main/Controls/StatusBar.axaml.cs
+++ b/app/Desktop/Main/Controls/StatusBar.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class StatusBar : UserControl {
+public sealed partial class StatusBar : UserControl {
 	public StatusBar() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Controls/StatusBarModel.cs
+++ b/app/Desktop/Main/Controls/StatusBarModel.cs
@@ -2,7 +2,8 @@ using System;
 using DHT.Server.Database;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Main.Controls {
+namespace DHT.Desktop.Main.Controls;
+
 sealed class StatusBarModel : BaseModel {
 	public DatabaseStatistics DatabaseStatistics { get; }

@@ -42,4 +43,3 @@ namespace DHT.Desktop.Main.Controls {
 		Stopped
 	}
 }
-}
--- a/app/Desktop/Main/MainWindow.axaml.cs
+++ b/app/Desktop/Main/MainWindow.axaml.cs
@@ -1,31 +1,23 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 using DHT.Desktop.Main.Pages;
 using JetBrains.Annotations;

-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class MainWindow : Window {
+public sealed partial class MainWindow : Window {
 	[UsedImplicitly]
 	public MainWindow() {
-			InitializeComponent(Arguments.Empty);
+		InitializeComponent();
+		DataContext = new MainWindowModel(this, Arguments.Empty);
 	}

 	internal MainWindow(Arguments args) {
-			InitializeComponent(args);
-		}
-
-		private void InitializeComponent(Arguments args) {
-			AvaloniaXamlLoader.Load(this);
+		InitializeComponent();
 		DataContext = new MainWindowModel(this, args);
-
-			#if DEBUG
-			this.AttachDevTools();
-			#endif
 	}

 	public void OnClosed(object? sender, EventArgs e) {
@@ -42,4 +34,3 @@ namespace DHT.Desktop.Main {
 		}
 	}
 }
-}
--- a/app/Desktop/Main/MainWindowModel.cs
+++ b/app/Desktop/Main/MainWindowModel.cs
@@ -10,7 +10,8 @@ using DHT.Desktop.Server;
 using DHT.Server.Database;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Main {
+namespace DHT.Desktop.Main;
+
 sealed class MainWindowModel : BaseModel, IDisposable {
 	private const string DefaultTitle = "Discord History Tracker";

@@ -113,4 +114,3 @@ namespace DHT.Desktop.Main {
 		db = null;
 	}
 }
-}
--- a/app/Desktop/Main/Pages/AdvancedPage.axaml.cs
+++ b/app/Desktop/Main/Pages/AdvancedPage.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class AdvancedPage : UserControl {
+public sealed partial class AdvancedPage : UserControl {
 	public AdvancedPage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Pages/AdvancedPageModel.cs
+++ b/app/Desktop/Main/Pages/AdvancedPageModel.cs
@@ -6,7 +6,8 @@ using DHT.Desktop.Server;
 using DHT.Server.Database;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 sealed class AdvancedPageModel : BaseModel, IDisposable {
 	public ServerConfigurationPanelModel ServerConfigurationModel { get; }

@@ -36,4 +37,3 @@ namespace DHT.Desktop.Main.Pages {
 		await Dialog.ShowOk(window, "Vacuum Database", "Done.");
 	}
 }
-}
--- a/app/Desktop/Main/Pages/AttachmentsPage.axaml
+++ b/app/Desktop/Main/Pages/AttachmentsPage.axaml
@@ -38,7 +38,7 @@
        <controls:AttachmentFilterPanel DataContext="{Binding FilterModel}" IsEnabled="{Binding !DataContext.IsDownloading, RelativeSource={RelativeSource AncestorType=UserControl}}" />
        <StackPanel Orientation="Vertical" Spacing="12">
            <Expander Header="Download Status" IsExpanded="True">
-                <DataGrid Items="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
+                <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
                    <DataGrid.Columns>
                        <DataGridTextColumn Header="State" Binding="{Binding State}" Width="*" />
                        <DataGridTextColumn Header="Attachments" Binding="{Binding Items, Converter={StaticResource NumberValueConverter}}" Width="*" CellStyleClasses="right" />
--- a/app/Desktop/Main/Pages/AttachmentsPage.axaml.cs
+++ b/app/Desktop/Main/Pages/AttachmentsPage.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class AttachmentsPage : UserControl {
+public sealed partial class AttachmentsPage : UserControl {
 	public AttachmentsPage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Pages/AttachmentsPageModel.cs
+++ b/app/Desktop/Main/Pages/AttachmentsPageModel.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Threading;
+using Avalonia.Threading;
 using DHT.Desktop.Common;
 using DHT.Desktop.Main.Controls;
 using DHT.Server.Data;
@@ -11,7 +13,8 @@ using DHT.Server.Download;
 using DHT.Utils.Models;
 using DHT.Utils.Tasks;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 sealed class AttachmentsPageModel : BaseModel, IDisposable {
 	private static readonly DownloadItemFilter EnqueuedItemFilter = new() {
 		IncludeStatuses = new HashSet<DownloadStatus> {
@@ -133,9 +136,9 @@ namespace DHT.Desktop.Main.Pages {
 	}

 	private void DownloadThreadOnOnItemFinished(object? sender, DownloadItem e) {
-			++doneItemsCount;
+		Interlocked.Increment(ref doneItemsCount);

-			UpdateDownloadMessage();
+		Dispatcher.UIThread.Invoke(UpdateDownloadMessage);
 		downloadStatisticsComputer.Recompute();
 	}

@@ -200,4 +203,3 @@ namespace DHT.Desktop.Main.Pages {
 		}
 	}
 }
-}
--- a/app/Desktop/Main/Pages/DatabasePage.axaml.cs
+++ b/app/Desktop/Main/Pages/DatabasePage.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class DatabasePage : UserControl {
+public sealed partial class DatabasePage : UserControl {
 	public DatabasePage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Pages/DatabasePageModel.cs
+++ b/app/Desktop/Main/Pages/DatabasePageModel.cs
@@ -7,8 +7,10 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Dialogs.TextBox;
@@ -18,7 +20,8 @@ using DHT.Server.Database.Import;
 using DHT.Utils.Logging;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages; 
+
 sealed class DatabasePageModel : BaseModel {
 	private static readonly Log Log = Log.ForType<DatabasePageModel>();

@@ -68,12 +71,8 @@ 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) {
+		var paths = await DatabaseGui.NewOpenDatabaseFilesDialog(window, Path.GetDirectoryName(Db.Path));
+		if (paths.Length == 0) {
 			return;
 		}

@@ -118,14 +117,13 @@ namespace DHT.Desktop.Main.Pages {
 	}

 	public async void ImportLegacyArchive() {
-			var fileDialog = new OpenFileDialog {
+		var paths = await window.StorageProvider.OpenFiles(new FilePickerOpenOptions {
 			Title = "Open Legacy DHT Archive",
-				Directory = Path.GetDirectoryName(Db.Path),
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(Db.Path)),
 			AllowMultiple = true
-			};
+		});
 			
-			string[]? paths = await fileDialog.ShowAsync(window);
-			if (paths == null || paths.Length == 0) {
+		if (paths.Length == 0) {
 			return;
 		}

@@ -245,4 +243,3 @@ namespace DHT.Desktop.Main.Pages {
 		return message.ToString();
 	}
 }
-}
--- a/app/Desktop/Main/Pages/DebugPage.axaml.cs
+++ b/app/Desktop/Main/Pages/DebugPage.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class DebugPage : UserControl {
+public sealed partial class DebugPage : UserControl {
 	public DebugPage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Pages/DebugPageModel.cs
+++ b/app/Desktop/Main/Pages/DebugPageModel.cs
@@ -63,7 +63,7 @@ namespace DHT.Desktop.Main.Pages {
 			var server = new DHT.Server.Data.Server {
 				Id = RandomId(rand),
 				Name = RandomName("s"),
-				Type = ServerType.Server
+				Type = ServerType.Server,
 			};

 			var channels = Enumerable.Range(0, channelCount).Select(i => new Channel {
@@ -73,14 +73,14 @@ namespace DHT.Desktop.Main.Pages {
 				ParentId = null,
 				Position = i,
 				Topic = RandomText(rand, 10),
-				Nsfw = rand.Next(4) == 0
+				Nsfw = rand.Next(4) == 0,
 			}).ToArray();

 			var users = Enumerable.Range(0, userCount).Select(_ => new User {
 				Id = RandomId(rand),
 				Name = RandomName("u"),
 				AvatarUrl = null,
-				Discriminator = rand.Next(0, 9999).ToString()
+				Discriminator = rand.Next(0, 9999).ToString(),
 			}).ToArray();

 			db.AddServer(server);
@@ -97,7 +97,7 @@ namespace DHT.Desktop.Main.Pages {
 				int hourOffset = batchIndex;

 				var messages = Enumerable.Range(0, Math.Min(messageCount, BatchSize)).Select(i => {
-					DateTimeOffset time = now.AddHours(hourOffset).AddMinutes((i * 60.0) / BatchSize);
+					DateTimeOffset time = now.AddHours(hourOffset).AddMinutes(i * 60.0 / BatchSize);
 					DateTimeOffset? edit = rand.Next(100) == 0 ? time.AddSeconds(rand.Next(1, 60)) : null;

 					var timeMillis = time.ToUnixTimeMilliseconds();
@@ -113,7 +113,7 @@ namespace DHT.Desktop.Main.Pages {
 						RepliedToId = null,
 						Attachments = ImmutableArray<Attachment>.Empty,
 						Embeds = ImmutableArray<Embed>.Empty,
-						Reactions = ImmutableArray<Reaction>.Empty
+						Reactions = ImmutableArray<Reaction>.Empty,
 					};
 				}).ToArray();

@@ -161,7 +161,7 @@ namespace DHT.Desktop.Main.Pages {
 			"vanilla",
 			"watercress", "watermelon",
 			"yam",
-			"zucchini"
+			"zucchini",
 		};

 		private static string RandomText(Random rand, int maxWords) {
--- a/app/Desktop/Main/Pages/TrackingPage.axaml.cs
+++ b/app/Desktop/Main/Pages/TrackingPage.axaml.cs
@@ -3,36 +3,30 @@ using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class TrackingPage : UserControl {
+public sealed partial class TrackingPage : UserControl {
 	private bool isCopyingScript;

 	public TrackingPage() {
 		InitializeComponent();
 	}

-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-
 	public async void CopyTrackingScriptButton_OnClick(object? sender, RoutedEventArgs e) {
 		if (DataContext is TrackingPageModel model) {
-				var button = this.FindControl<Button>("CopyTrackingScript");
-				var originalText = button.Content;
-				button.MinWidth = button.Bounds.Width;
+			var originalText = CopyTrackingScript.Content;
+			CopyTrackingScript.MinWidth = CopyTrackingScript.Bounds.Width;

 			if (await model.OnClickCopyTrackingScript() && !isCopyingScript) {
 				isCopyingScript = true;
-					button.Content = "Script Copied!";
+				CopyTrackingScript.Content = "Script Copied!";

 				await Task.Delay(TimeSpan.FromSeconds(2));
-					button.Content = originalText;
+				CopyTrackingScript.Content = originalText;
 				isCopyingScript = false;
 			}
 		}
 	}
 }
-}
--- a/app/Desktop/Main/Pages/TrackingPageModel.cs
+++ b/app/Desktop/Main/Pages/TrackingPageModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using System.Web;
-using Avalonia;
 using Avalonia.Controls;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Discord;
@@ -9,7 +8,8 @@ using DHT.Desktop.Server;
 using DHT.Utils.Models;
 using static DHT.Desktop.Program;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 sealed class TrackingPageModel : BaseModel {
 	private bool areDevToolsEnabled;

@@ -54,14 +54,10 @@ namespace DHT.Desktop.Main.Pages {
 	}
 	
 	public async Task<bool> OnClickCopyTrackingScript() {
-			string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
-			string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + ServerManager.Port + ";")
-			                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(ServerManager.Token))
-			                         .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"));
+		string url = $"http://127.0.0.1:{ServerManager.Port}/get-tracking-script?token={HttpUtility.UrlEncode(ServerManager.Token)}";
+		string script = (await Resources.ReadTextAsync("tracker-loader.js")).Trim().Replace("{url}", url);

-			var clipboard = Application.Current?.Clipboard;
+		var clipboard = window.Clipboard;
 		if (clipboard == null) {
 			await Dialog.ShowOk(window, "Copy Tracking Script", "Clipboard is not available on this system.");
 			return false;
@@ -114,4 +110,3 @@ namespace DHT.Desktop.Main.Pages {
 		}
 	}
 }
-}
--- a/app/Desktop/Main/Pages/ViewerPage.axaml.cs
+++ b/app/Desktop/Main/Pages/ViewerPage.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class ViewerPage : UserControl {
+public sealed partial class ViewerPage : UserControl {
 	public ViewerPage() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Pages/ViewerPageModel.cs
+++ b/app/Desktop/Main/Pages/ViewerPageModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
@@ -8,7 +7,9 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using DHT.Desktop.Common;
+using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Server;
@@ -19,7 +20,8 @@ using DHT.Server.Database.Export.Strategy;
 using DHT.Utils.Models;
 using static DHT.Desktop.Program;

-namespace DHT.Desktop.Main.Pages {
+namespace DHT.Desktop.Main.Pages;
+
 sealed class ViewerPageModel : BaseModel, IDisposable {
 	public static readonly ConcurrentBag<string> TemporaryFiles = new ();

@@ -113,21 +115,19 @@ namespace DHT.Desktop.Main.Pages {
 		Process.Start(new ProcessStartInfo(fullPath) { UseShellExecute = true });
 	}

-		public async void OnClickSaveViewer() {
-			var dialog = new SaveFileDialog {
-				Title = "Save Viewer",
-				InitialFileName = Path.GetFileNameWithoutExtension(db.Path) + ".html",
-				Directory = Path.GetDirectoryName(db.Path),
-				Filters = new List<FileDialogFilter> {
-					new() {
-						Name = "Discord History Viewer",
-						Extensions = { "html" }
-					}
-				}
-			}.ShowAsync(window);
+	private static readonly FilePickerFileType[] ViewerFileTypes = {
+		FileDialogs.CreateFilter("Discord History Viewer", new string[] { "html" }),
+	};
 	
-			string? path = await dialog;
-			if (!string.IsNullOrEmpty(path)) {
+	public async void OnClickSaveViewer() {
+		string? path = await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
+			Title = "Save Viewer",
+			FileTypeChoices = ViewerFileTypes,
+			SuggestedFileName = Path.GetFileNameWithoutExtension(db.Path) + ".html",
+			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(db.Path)),
+		});
+
+		if (path != null) {
 			await WriteViewerFile(path, StandaloneViewerExportStrategy.Instance);
 		}
 	}
@@ -147,4 +147,3 @@ namespace DHT.Desktop.Main.Pages {
 		}
 	}
 }
-}
--- a/app/Desktop/Main/Screens/MainContentScreen.axaml.cs
+++ b/app/Desktop/Main/Screens/MainContentScreen.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Screens {
+namespace DHT.Desktop.Main.Screens;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class MainContentScreen : UserControl {
+public sealed partial class MainContentScreen : UserControl {
 	public MainContentScreen() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Screens/MainContentScreenModel.cs
+++ b/app/Desktop/Main/Screens/MainContentScreenModel.cs
@@ -9,7 +9,8 @@ using DHT.Server.Database;
 using DHT.Server.Service;
 using DHT.Utils.Logging;

-namespace DHT.Desktop.Main.Screens {
+namespace DHT.Desktop.Main.Screens;
+
 sealed class MainContentScreenModel : IDisposable {
 	private static readonly Log Log = Log.ForType<MainContentScreenModel>();

@@ -116,4 +117,3 @@ namespace DHT.Desktop.Main.Screens {
 		await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
 	}
 }
-}
--- a/app/Desktop/Main/Screens/WelcomeScreen.axaml.cs
+++ b/app/Desktop/Main/Screens/WelcomeScreen.axaml.cs
@@ -1,16 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;

-namespace DHT.Desktop.Main.Screens {
+namespace DHT.Desktop.Main.Screens;
+
 [SuppressMessage("ReSharper", "MemberCanBeInternal")]
-	public sealed class WelcomeScreen : UserControl {
+public sealed partial class WelcomeScreen : UserControl {
 	public WelcomeScreen() {
 		InitializeComponent();
 	}
-
-		private void InitializeComponent() {
-			AvaloniaXamlLoader.Load(this);
-		}
-	}
 }
--- a/app/Desktop/Main/Screens/WelcomeScreenModel.cs
+++ b/app/Desktop/Main/Screens/WelcomeScreenModel.cs
@@ -7,7 +7,8 @@ using DHT.Desktop.Dialogs.Message;
 using DHT.Server.Database;
 using DHT.Utils.Models;

-namespace DHT.Desktop.Main.Screens {
+namespace DHT.Desktop.Main.Screens;
+
 sealed class WelcomeScreenModel : BaseModel, IDisposable {
 	public string Version => Program.Version;

@@ -26,11 +27,8 @@ namespace DHT.Desktop.Main.Screens {
 	}

 	public async void OpenOrCreateDatabase() {
-			var dialog = DatabaseGui.NewOpenOrCreateDatabaseFileDialog();
-			dialog.Directory = Path.GetDirectoryName(dbFilePath);
-
-			string? path = await dialog.ShowAsync(window);
-			if (!string.IsNullOrWhiteSpace(path)) {
+		var path = await DatabaseGui.NewOpenOrCreateDatabaseFileDialog(window, Path.GetDirectoryName(dbFilePath));
+		if (path != null) {
 			await OpenOrCreateDatabaseFromPath(path);
 		}
 	}
@@ -70,4 +68,3 @@ namespace DHT.Desktop.Main.Screens {
 		Db = null;
 	}
 }
-}
--- a/app/Desktop/Program.cs
+++ b/app/Desktop/Program.cs
@@ -3,7 +3,8 @@ using System.Reflection;
 using Avalonia;
 using DHT.Utils.Resources;

-namespace DHT.Desktop {
+namespace DHT.Desktop;
+
 static class Program {
 	public static string Version { get; }
 	public static CultureInfo Culture { get; }
@@ -33,7 +34,7 @@ namespace DHT.Desktop {
 	private static AppBuilder BuildAvaloniaApp() {
 		return AppBuilder.Configure<App>()
 		                 .UsePlatformDetect()
+		                 .WithInterFont()
 		                 .LogToTrace();
 	}
 }
-}
--- a/app/Desktop/Resources/tracker-loader.js
+++ b/app/Desktop/Resources/tracker-loader.js
@@ -0,0 +1 @@
+fetch("{url}").then(r => r.ok ? (r.headers.get("X-DHT") === "1" ? r.text() : Promise.reject("Invalid response")) : Promise.reject(r.status + " " + r.statusText)).then(s => eval(s)).catch(e => alert("Could not load tracking script:\n" + e));
--- a/app/Desktop/Server/ServerManager.cs
+++ b/app/Desktop/Server/ServerManager.cs
@@ -2,7 +2,8 @@ using System;
 using DHT.Server.Database;
 using DHT.Server.Service;

-namespace DHT.Desktop.Server {
+namespace DHT.Desktop.Server;
+
 sealed class ServerManager : IDisposable {
 	public static ushort Port { get; set; } = ServerUtils.FindAvailablePort(50000, 60000);
 	public static string Token { get; set; } = ServerUtils.GenerateRandomToken(20);
@@ -47,4 +48,3 @@ namespace DHT.Desktop.Server {
 		}
 	}
 }
-}
--- a/app/Directory.Build.props
+++ b/app/Directory.Build.props
@@ -0,0 +1,37 @@
+<Project>
+  
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>11</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <Authors>chylex</Authors>
+    <Company>DiscordHistoryTracker</Company>
+    <Product>DiscordHistoryTracker</Product>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>partial</TrimMode>
+    <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
+    <ArtifactsPath>$(MSBuildThisFileDirectory).artifacts</ArtifactsPath>
+  </PropertyGroup>
+  
+</Project>
--- a/app/Resources/Tracker/bootstrap.js
+++ b/app/Resources/Tracker/bootstrap.js
@@ -64,9 +64,11 @@
 			let action = null;
 			
 			if (!DISCORD.hasMoreMessages()) {
+				console.debug("[DHT] Reached first message.");
 				action = SETTINGS.afterFirstMsg;
 			}
 			if (isNoAction(action) && !anyNewMessages) {
+				console.debug("[DHT] No new messages.");
 				action = SETTINGS.afterSavedMsg;
 			}
 			
@@ -121,7 +123,7 @@
 				onTrackingContinued(false);
 			}
 			else {
-				const anyNewMessages = await STATE.addDiscordMessages(info.id, messages);
+				const anyNewMessages = await STATE.addDiscordMessages(messages);
 				onTrackingContinued(anyNewMessages);
 			}
 		} catch (e) {
@@ -156,3 +158,4 @@
 		GUI.showSettings();
 	}
 })();
+/*[DEBUGGER]*/
--- a/app/Resources/Tracker/scripts/discord.js
+++ b/app/Resources/Tracker/scripts/discord.js
@@ -1,5 +1,23 @@
 // noinspection JSUnresolvedVariable
+// noinspection LocalVariableNamingConventionJS
 class DISCORD {
+	
+	// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
+	static CHANNEL_TYPE = {
+		DM: 1,
+		GROUP_DM: 3,
+		ANNOUNCEMENT_THREAD: 10,
+		PUBLIC_THREAD: 11,
+		PRIVATE_THREAD: 12
+	};
+	
+	// https://discord.com/developers/docs/resources/channel#message-object-message-types
+	static MESSAGE_TYPE = {
+		DEFAULT: 0,
+		REPLY: 19,
+		THREAD_STARTER: 21
+	};
+	
 	static getMessageOuterElement() {
 		return DOM.queryReactClass("messagesWrapper");
 	}
@@ -9,7 +27,7 @@ class DISCORD {
 	}
 	
 	static getMessageElements() {
-		return this.getMessageOuterElement().querySelectorAll("[class*='message-']");
+		return this.getMessageOuterElement().querySelectorAll("[class*='message_']");
 	}
 	
 	static hasMoreMessages() {
@@ -28,46 +46,11 @@ class DISCORD {
 	 * Calls the provided function with a list of messages whenever the currently loaded messages change.
 	 */
 	static setupMessageCallback(callback) {
-		let skipsLeft = 0;
-		let waitForCleanup = false;
 		const previousMessages = new Set();
 		
-		const timer = window.setInterval(() => {
-			if (skipsLeft > 0) {
-				--skipsLeft;
-				return;
-			}
-			
-			const view = this.getMessageOuterElement();
-			
-			if (!view) {
-				skipsLeft = 2;
-				return;
-			}
-			
-			const anyMessage = DOM.queryReactClass("message", this.getMessageOuterElement());
-			const messageCount = anyMessage ? anyMessage.parentElement.children.length : 0;
-			
-			if (messageCount > 300) {
-				if (waitForCleanup) {
-					return;
-				}
-				
-				skipsLeft = 3;
-				waitForCleanup = true;
-				
-				window.setTimeout(() => {
-					const view = this.getMessageScrollerElement();
-					// noinspection JSUnusedGlobalSymbols
-					view.scrollTop = view.scrollHeight / 2;
-				}, 1);
-			}
-			else {
-				waitForCleanup = false;
-			}
-			
-			const messages = this.getMessages();
-			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !this.hasMoreMessages();
+		const onMessageElementsChanged = function() {
+			const messages = DISCORD.getMessages();
+			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !DISCORD.hasMoreMessages();
 			
 			if (!hasChanged) {
 				return;
@@ -79,24 +62,74 @@ class DISCORD {
 			}
 			
 			callback(messages);
-		}, 200);
+		};
 		
-		window.DHT_ON_UNLOAD.push(() => window.clearInterval(timer));
+		let debounceTimer;
+		
+		/**
+		 * Do not trigger the callback too often due to autoscrolling.
+		 */
+		const onMessageElementsChangedLater = function() {
+			window.clearTimeout(debounceTimer);
+			debounceTimer = window.setTimeout(onMessageElementsChanged, 100);
+		};
+		
+		const observer = new MutationObserver(function () {
+			onMessageElementsChangedLater();
+		});
+		
+		let skipsLeft = 0;
+		let observedElement = null;
+		
+		const observerTimer = window.setInterval(() => {
+			if (skipsLeft > 0) {
+				--skipsLeft;
+				return;
+			}
+			
+			const view = this.getMessageOuterElement();
+			
+			if (!view) {
+				skipsLeft = 1;
+				return;
+			}
+			
+			if (observedElement !== null && observedElement.isConnected) {
+				return;
+			}
+			
+			observedElement = view.querySelector("[data-list-id='chat-messages']");
+			
+			if (observedElement) {
+				console.debug("[DHT] Observed message container.");
+				observer.observe(observedElement, { childList: true });
+				onMessageElementsChangedLater();
+			}
+		}, 400);
+		
+		window.DHT_ON_UNLOAD.push(() => {
+			observer.disconnect();
+			observedElement = null;
+			window.clearInterval(observerTimer);
+		});
 	}
 	
 	/**
-	 * Returns the property object of a message element.
-	 * @returns { null | { message: DiscordMessage, channel: Object } }
+	 * Returns the message from a message element.
+	 * @returns { null | DiscordMessage } }
 	 */
-	static getMessageElementProps(ele) {
+	static getMessageFromElement(ele) {
 		const props = DOM.getReactProps(ele);
 		
-		if (props.children && props.children.length) {
-			for (let i = 3; i < props.children.length; i++) {
-				const childProps = props.children[i].props;
+		if (props && Array.isArray(props.children)) {
+			for (const child of props.children) {
+				if (!(child instanceof Object)) {
+					continue;
+				}
 				
-				if (childProps && "message" in childProps && "channel" in childProps) {
-					return childProps;
+				const childProps = child.props;
+				if (childProps instanceof Object && "message" in childProps) {
+					return childProps.message;
 				}
 			}
 		}
@@ -113,10 +146,10 @@ class DISCORD {
 			
 			for (const ele of this.getMessageElements()) {
 				try {
-					const props = this.getMessageElementProps(ele);
+					const message = this.getMessageFromElement(ele);
 					
-					if (props != null) {
-						messages.push(props.message);
+					if (message != null) {
+						messages.push(message);
 					}
 				} catch (e) {
 					console.error("[DHT] Error extracing message data, skipping it.", e, ele, DOM.tryGetReactProps(ele));
@@ -137,7 +170,7 @@ class DISCORD {
 	 */
 	static getSelectedChannel() {
 		try {
-			let obj;
+			let obj = null;
 			
 			try {
 				for (const child of DOM.getReactProps(DOM.queryReactClass("chatContent")).children) {
@@ -148,15 +181,6 @@ class DISCORD {
 				}
 			} catch (e) {
 				console.error("[DHT] Error retrieving selected channel from 'chatContent' element.", e);
-				
-				for (const ele of this.getMessageElements()) {
-					const props = this.getMessageElementProps(ele);
-					
-					if (props != null) {
-						obj = props.channel;
-						break;
-					}
-				}
 			}
 			
 			if (!obj || typeof obj.id !== "string") {
@@ -168,7 +192,7 @@ class DISCORD {
 			if (dms) {
 				let name;
 				
-				for (const ele of dms.querySelectorAll("[class*='channel-'] [class*='selected-'] [class^='name-'] *, [class*='channel-'][class*='selected-'] [class^='name-'] *")) {
+				for (const ele of dms.querySelectorAll("[class*='channel_'] [class*='selected_'] [class^='name_'] *")) {
 					const node = Array.prototype.find.call(ele.childNodes, node => node.nodeType === Node.TEXT_NODE);
 					
 					if (node) {
@@ -185,8 +209,8 @@ class DISCORD {
 				
 				// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 				switch (obj.type) {
-					case 1: type = "DM"; break;
-					case 3: type = "GROUP"; break;
+					case DISCORD.CHANNEL_TYPE.DM: type = "DM"; break;
+					case DISCORD.CHANNEL_TYPE.GROUP_DM: type = "GROUP"; break;
 					default: return null;
 				}
 				
@@ -197,9 +221,22 @@ class DISCORD {
 				return { server, channel };
 			}
 			else if (obj.guild_id) {
+				let guild;
+				
+				for (const child of DOM.getReactProps(document.querySelector("nav header [class*='headerContent_']")).children) {
+					if (child && child.props && child.props.guild) {
+						guild = child.props.guild;
+						break;
+					}
+				}
+				
+				if (!guild || typeof guild.name !== "string" || obj.guild_id !== guild.id) {
+					return null;
+				}
+				
 				const server = {
-					"id": obj.guild_id,
-					"name": document.querySelector("nav header h1[class*='name-']").innerText,
+					"id": guild.id,
+					"name": guild.name,
 					"type": "SERVER"
 				};
 				
@@ -211,7 +248,7 @@ class DISCORD {
 					}
 				};
 				
-				if (obj.parent_id) {
+				if (obj.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
 					channel["extra"]["parent"] = obj.parent_id;
 				}
 				else {
@@ -238,10 +275,10 @@ class DISCORD {
 		
 		if (dms) {
 			const currentChannel = DOM.queryReactClass("selected", dms);
-			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel-']");
+			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel_']");
 			const nextChannel = currentChannelContainer && currentChannelContainer.nextElementSibling;
 			
-			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel-")) {
+			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel_")) {
 				return false;
 			}
 			
@@ -268,7 +305,7 @@ class DISCORD {
 			let nextChannel = null;
 			
 			for (let index = 0; index < allTextChannels.length - 1; index++) {
-				if (allTextChannels[index].className.includes("selected-")) {
+				if (allTextChannels[index].className.includes("selected_")) {
 					nextChannel = allTextChannels[index + 1];
 					break;
 				}
--- a/app/Resources/Tracker/scripts/dom.js
+++ b/app/Resources/Tracker/scripts/dom.js
@@ -11,7 +11,7 @@ class DOM {
 	 * Returns the first child element containing the specified obfuscated class. Parent defaults to the entire document.
 	 */
 	static queryReactClass(cls, parent) {
-		return (parent || document).querySelector(`[class*="${cls}-"]`);
+		return (parent || document).querySelector(`[class*="${cls}_"]`);
 	}
 	
 	/**
--- a/app/Resources/Tracker/scripts/gui.js
+++ b/app/Resources/Tracker/scripts/gui.js
@@ -86,12 +86,12 @@ const GUI = (function() {
 <label><input id='dht-cfg-autoscroll' type='checkbox'> Autoscroll</label><br>
 <br>
 <label>After reaching the first message in channel...</label><br>
-${radio("afm", "nothing", "Do Nothing")}
+${radio("afm", "nothing", "Continue Tracking")}
 ${radio("afm", "pause", "Pause Tracking")}
 ${radio("afm", "switch", "Switch to Next Channel")}
 <br>
 <label>After reaching a previously saved message...</label><br>
-${radio("asm", "nothing", "Do Nothing")}
+${radio("asm", "nothing", "Continue Tracking")}
 ${radio("asm", "pause", "Pause Tracking")}
 ${radio("asm", "switch", "Switch to Next Channel")}
 <p id='dht-cfg-note'>It is recommended to disable link and image previews to avoid putting unnecessary strain on your browser.</p>`;
--- a/app/Resources/Tracker/scripts/state.js
+++ b/app/Resources/Tracker/scripts/state.js
@@ -174,12 +174,10 @@ const STATE = (function() {
 		},
 		
 		/**
-		 * @param {String} channelId
 		 * @param {DiscordMessage[]} discordMessageArray
 		 */
-		async addDiscordMessages(channelId, discordMessageArray) {
-			// https://discord.com/developers/docs/resources/channel#message-object-message-types
-			discordMessageArray = discordMessageArray.filter(msg => (msg.type === 0 || msg.type === 19 || msg.type === 21) && msg.state === "SENT");
+		async addDiscordMessages(discordMessageArray) {
+			discordMessageArray = discordMessageArray.filter(msg => (msg.type === DISCORD.MESSAGE_TYPE.DEFAULT || msg.type === DISCORD.MESSAGE_TYPE.REPLY || msg.type === DISCORD.MESSAGE_TYPE.THREAD_STARTER) && msg.state === "SENT");
 			
 			if (discordMessageArray.length === 0) {
 				return false;
--- a/app/Resources/Viewer/scripts/discord.js
+++ b/app/Resources/Viewer/scripts/discord.js
@@ -1,7 +1,8 @@
 const DISCORD = (function() {
 	const regex = {
 		formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
-		formatItalic: /(.)?([_*])([\s\S]+?)\2(?!\2)/g,
+		formatItalic1: /\*([\s\S]+?)\*(?!\*)/g,
+		formatItalic2: /_([\s\S]+?)_(?!_)\b/g,
 		formatUnderline: /__([\s\S]+?)__(?!_)/g,
 		formatStrike: /~~([\s\S]+?)~~(?!~)/g,
 		formatCodeInline: /(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/g,
@@ -48,7 +49,8 @@ const DISCORD = (function() {
 				.replace(regex.specialEscapedDouble, full => full.replace(/\\/g, "").replace(/(.)/g, escapeHtmlMatch))
 				.replace(regex.formatBold, "<b>$1</b>")
 				.replace(regex.formatUnderline, "<u>$1</u>")
-				.replace(regex.formatItalic, (full, pre, char, match) => pre === "\\" ? full : (pre || "") + "<i>" + match + "</i>")
+				.replace(regex.formatItalic1, "<i>$1</i>")
+				.replace(regex.formatItalic2, "<i>$1</i>")
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		
--- a/app/Resources/minify.py
+++ b/app/Resources/minify.py
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-
-import glob
-import os
-import shutil
-import sys
-
-if os.name == "nt":
-    uglifyjs = os.path.abspath("../../lib/uglifyjs.cmd")
-else:
-    uglifyjs = "uglifyjs"
-
-if shutil.which(uglifyjs) is None:
-    print("Cannot find executable: {0}".format(uglifyjs))
-    sys.exit(1)
-
-input_dir = os.path.abspath("./Tracker/scripts")
-output_dir = os.path.abspath("../Desktop/bin/.res/scripts")
-
-os.makedirs(output_dir, exist_ok=True)
-
-for file in glob.glob(input_dir + "/*.js"):
-    name = os.path.basename(file)
-    print("Minifying {0}...".format(name))
-    os.system("{0} {1} -o {2}/{3}".format(uglifyjs, file, output_dir, name))
-
-print("Done!")
--- a/app/Server/Data/Aggregations/DownloadStatusStatistics.cs
+++ b/app/Server/Data/Aggregations/DownloadStatusStatistics.cs
@@ -1,4 +1,5 @@
-namespace DHT.Server.Data.Aggregations {
+namespace DHT.Server.Data.Aggregations;
+
 public sealed class DownloadStatusStatistics {
 	public int EnqueuedCount { get; internal set; }
 	public ulong EnqueuedSize { get; internal set; }
@@ -12,4 +13,3 @@ namespace DHT.Server.Data.Aggregations {
 	public int SkippedCount { get; internal set; }
 	public ulong SkippedSize { get; internal set; }
 }
-}
--- a/app/Server/Data/Attachment.cs
+++ b/app/Server/Data/Attachment.cs
@@ -1,11 +1,12 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct Attachment {
 	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 string NormalizedUrl { get; internal init; }
+	public string DownloadUrl { get; internal init; }
 	public ulong Size { get; internal init; }
 	public int? Width { get; internal init; }
 	public int? Height { get; internal init; }
 }
-}
--- a/app/Server/Data/Channel.cs
+++ b/app/Server/Data/Channel.cs
@@ -1,4 +1,5 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct Channel {
 	public ulong Id { get; init; }
 	public ulong Server { get; init; }
@@ -8,4 +9,3 @@ namespace DHT.Server.Data {
 	public string? Topic { get; init; }
 	public bool? Nsfw { get; init; }
 }
-}
--- a/app/Server/Data/Download.cs
+++ b/app/Server/Data/Download.cs
@@ -1,30 +1,33 @@
 using System;
 using System.Net;
+using DHT.Server.Download;
+
+namespace DHT.Server.Data;

-namespace DHT.Server.Data {
 public readonly struct Download {
-		internal static Download NewSuccess(string url, byte[] data) {
-			return new Download(url, DownloadStatus.Success, (ulong) Math.Max(data.LongLength, 0), data);
+	internal static Download NewSuccess(DownloadItem item, byte[] data) {
+		return new Download(item.NormalizedUrl, item.DownloadUrl, DownloadStatus.Success, (ulong) Math.Max(data.LongLength, 0), data);
 	}

-		internal static Download NewFailure(string url, HttpStatusCode? statusCode, ulong size) {
-			return new Download(url, statusCode.HasValue ? (DownloadStatus) (int) statusCode : DownloadStatus.GenericError, size);
+	internal static Download NewFailure(DownloadItem item, HttpStatusCode? statusCode, ulong size) {
+		return new Download(item.NormalizedUrl, item.DownloadUrl, statusCode.HasValue ? (DownloadStatus) (int) statusCode : DownloadStatus.GenericError, size);
 	}

-		public string Url { get; }
+	public string NormalizedUrl { get; }
+	public string DownloadUrl { get; }
 	public DownloadStatus Status { get; }
 	public ulong Size { get; }
 	public byte[]? Data { get; }

-		internal Download(string url, DownloadStatus status, ulong size, byte[]? data = null) {
-			Url = url;
+	internal Download(string normalizedUrl, string downloadUrl, DownloadStatus status, ulong size, byte[]? data = null) {
+		NormalizedUrl = normalizedUrl;
+		DownloadUrl = downloadUrl;
 		Status = status;
 		Size = size;
 		Data = data;
 	}

 	internal Download WithData(byte[] data) {
-			return new Download(Url, Status, Size, data);
-		}
+		return new Download(NormalizedUrl, DownloadUrl, Status, Size, data);
 	}
 }
--- a/app/Server/Data/DownloadStatus.cs
+++ b/app/Server/Data/DownloadStatus.cs
@@ -1,6 +1,7 @@
 using System.Net;

-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 /// <summary>
 /// Extends <see cref="HttpStatusCode"/> with custom status codes in the range 0-99.
 /// </summary>
@@ -9,4 +10,3 @@ namespace DHT.Server.Data {
 	GenericError = 1,
 	Success = HttpStatusCode.OK
 }
-}
--- a/app/Server/Data/DownloadedAttachment.cs
+++ b/app/Server/Data/DownloadedAttachment.cs
@@ -1,6 +1,6 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct DownloadedAttachment {
 	public string? Type { get; internal init; }
 	public byte[] Data { get; internal init; }
 }
-}
--- a/app/Server/Data/Embed.cs
+++ b/app/Server/Data/Embed.cs
@@ -1,5 +1,5 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct Embed {
 	public string Json { get; internal init; }
 }
-}
--- a/app/Server/Data/EmojiFlags.cs
+++ b/app/Server/Data/EmojiFlags.cs
@@ -1,9 +1,9 @@
 using System;

-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 [Flags]
 public enum EmojiFlags : ushort {
 	None = 0,
 	Animated = 0b1
 }
-}
--- a/app/Server/Data/Filters/AttachmentFilter.cs
+++ b/app/Server/Data/Filters/AttachmentFilter.cs
@@ -1,4 +1,5 @@
-namespace DHT.Server.Data.Filters {
+namespace DHT.Server.Data.Filters;
+
 public sealed class AttachmentFilter {
 	public ulong? MaxBytes { get; set; } = null;

@@ -12,4 +13,3 @@ namespace DHT.Server.Data.Filters {
 		OnlyPresent
 	}
 }
-}
--- a/app/Server/Data/Filters/DownloadItemFilter.cs
+++ b/app/Server/Data/Filters/DownloadItemFilter.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;

-namespace DHT.Server.Data.Filters {
+namespace DHT.Server.Data.Filters;
+
 public sealed class DownloadItemFilter {
-		public HashSet<DownloadStatus>? IncludeStatuses { get; set; } = null;
-		public HashSet<DownloadStatus>? ExcludeStatuses { get; set; } = null;
+	public HashSet<DownloadStatus>? IncludeStatuses { get; init; } = null;
+	public HashSet<DownloadStatus>? ExcludeStatuses { get; init; } = null;

 	public bool IsEmpty => IncludeStatuses == null && ExcludeStatuses == null;
 }
-}
--- a/app/Server/Data/Filters/FilterRemovalMode.cs
+++ b/app/Server/Data/Filters/FilterRemovalMode.cs
@@ -1,6 +1,6 @@
-namespace DHT.Server.Data.Filters {
+namespace DHT.Server.Data.Filters;
+
 public enum FilterRemovalMode {
 	KeepMatching,
 	RemoveMatching
 }
-}
--- a/app/Server/Data/Filters/MessageFilter.cs
+++ b/app/Server/Data/Filters/MessageFilter.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;

-namespace DHT.Server.Data.Filters {
+namespace DHT.Server.Data.Filters;
+
 public sealed class MessageFilter {
 	public DateTime? StartDate { get; set; } = null;
 	public DateTime? EndDate { get; set; } = null;
@@ -16,4 +17,3 @@ namespace DHT.Server.Data.Filters {
 	                       UserIds == null &&
 	                       MessageIds == null;
 }
-}
--- a/app/Server/Data/Message.cs
+++ b/app/Server/Data/Message.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;

-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct Message {
 	public ulong Id { get; init; }
 	public ulong Sender { get; init; }
@@ -13,4 +14,3 @@ namespace DHT.Server.Data {
 	public ImmutableArray<Embed> Embeds { get; init; }
 	public ImmutableArray<Reaction> Reactions { get; init; }
 }
-}
--- a/app/Server/Data/Reaction.cs
+++ b/app/Server/Data/Reaction.cs
@@ -1,8 +1,8 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct Reaction {
 	public ulong? EmojiId { get; internal init; }
 	public string? EmojiName { get; internal init; }
 	public EmojiFlags EmojiFlags { get; internal init; }
 	public int Count { get; internal init; }
 }
-}
--- a/app/Server/Data/Server.cs
+++ b/app/Server/Data/Server.cs
@@ -1,7 +1,7 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public readonly struct Server {
 	public ulong Id { get; init; }
 	public string Name { get; init; }
 	public ServerType? Type { get; init; }
 }
-}
--- a/app/Server/Data/ServerType.cs
+++ b/app/Server/Data/ServerType.cs
@@ -1,4 +1,5 @@
-namespace DHT.Server.Data {
+namespace DHT.Server.Data;
+
 public enum ServerType {
 	Server,
 	Group,
@@ -42,4 +43,3 @@ namespace DHT.Server.Data {
 		};
 	}
 }
-}
--- a/app/Server/Data/User.cs
+++ b/app/Server/Data/User.cs
@@ -1,8 +1,8 @@
-namespace DHT.Server.Data {
+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; }
 }
-}
--- a/app/Server/Database/DatabaseExtensions.cs
+++ b/app/Server/Database/DatabaseExtensions.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using DHT.Server.Data;

-namespace DHT.Server.Database {
+namespace DHT.Server.Database;
+
 public static class DatabaseExtensions {
 	public static void AddFrom(this IDatabaseFile target, IDatabaseFile source) {
 		target.AddServers(source.GetAllServers());
@@ -26,4 +27,3 @@ namespace DHT.Server.Database {
 		}
 	}
 }
-}
--- a/app/Server/Database/DatabaseStatistics.cs
+++ b/app/Server/Database/DatabaseStatistics.cs
@@ -1,6 +1,7 @@
 using DHT.Utils.Models;

-namespace DHT.Server.Database {
+namespace DHT.Server.Database;
+
 /// <summary>
 /// A live view of database statistics.
 /// Some of the totals are computed asynchronously and may not reflect the most recent version of the database, or may not be available at all until computed for the first time.
@@ -43,4 +44,3 @@ namespace DHT.Server.Database {
 		internal set => Change(ref totalDownloads, value);
 	}
 }
-}
--- a/app/Server/Database/DatabaseStatisticsSnapshot.cs
+++ b/app/Server/Database/DatabaseStatisticsSnapshot.cs
@@ -1,4 +1,5 @@
-namespace DHT.Server.Database {
+namespace DHT.Server.Database;
+
 /// <summary>
 /// A complete snapshot of database statistics at a particular point in time.
 /// </summary>
@@ -8,4 +9,3 @@ namespace DHT.Server.Database {
 	public long TotalUsers { get; internal init; }
 	public long TotalMessages { get; internal init; }
 }
-}
--- a/app/Server/Database/DummyDatabaseFile.cs
+++ b/app/Server/Database/DummyDatabaseFile.cs
@@ -1,10 +1,13 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using DHT.Server.Data;
 using DHT.Server.Data.Aggregations;
 using DHT.Server.Data.Filters;
 using DHT.Server.Download;

-namespace DHT.Server.Database {
+namespace DHT.Server.Database;
+
+[SuppressMessage("ReSharper", "ArrangeObjectCreationWhenTypeNotEvident")]
 public sealed class DummyDatabaseFile : IDatabaseFile {
 	public static DummyDatabaseFile Instance { get; } = new();

@@ -85,4 +88,3 @@ namespace DHT.Server.Database {

 	public void Dispose() {}
 }
-}
--- a/app/Server/Database/Exceptions/DatabaseTooNewException.cs
+++ b/app/Server/Database/Exceptions/DatabaseTooNewException.cs
@@ -1,7 +1,8 @@
 using System;
 using DHT.Server.Database.Sqlite;

-namespace DHT.Server.Database.Exceptions {
+namespace DHT.Server.Database.Exceptions;
+
 public sealed class DatabaseTooNewException : Exception {
 	public int DatabaseVersion { get; }
 	public int CurrentVersion => Schema.Version;
@@ -10,4 +11,3 @@ namespace DHT.Server.Database.Exceptions {
 		this.DatabaseVersion = databaseVersion;
 	}
 }
-}
--- a/app/Server/Database/Exceptions/InvalidDatabaseVersionException.cs
+++ b/app/Server/Database/Exceptions/InvalidDatabaseVersionException.cs
@@ -1,6 +1,7 @@
 using System;

-namespace DHT.Server.Database.Exceptions {
+namespace DHT.Server.Database.Exceptions;
+
 public sealed class InvalidDatabaseVersionException : Exception {
 	public string Version { get; }

@@ -8,4 +9,3 @@ namespace DHT.Server.Database.Exceptions {
 		this.Version = version;
 	}
 }
-}
--- a/app/Server/Database/Export/Strategy/IViewerExportStrategy.cs
+++ b/app/Server/Database/Export/Strategy/IViewerExportStrategy.cs
@@ -1,7 +1,7 @@
 using DHT.Server.Data;

-namespace DHT.Server.Database.Export.Strategy {
+namespace DHT.Server.Database.Export.Strategy;
+
 public interface IViewerExportStrategy {
 	string GetAttachmentUrl(Attachment attachment);
 }
-}
--- a/app/Server/Database/Export/Strategy/LiveViewerExportStrategy.cs
+++ b/app/Server/Database/Export/Strategy/LiveViewerExportStrategy.cs
@@ -1,7 +1,8 @@
 using System.Net;
 using DHT.Server.Data;

-namespace DHT.Server.Database.Export.Strategy {
+namespace DHT.Server.Database.Export.Strategy;
+
 public sealed class LiveViewerExportStrategy : IViewerExportStrategy {
 	private readonly string safePort;
 	private readonly string safeToken;
@@ -12,7 +13,6 @@ namespace DHT.Server.Database.Export.Strategy {
 	}

 	public string GetAttachmentUrl(Attachment attachment) {
-			return "http://127.0.0.1:" + safePort + "/get-attachment/" + WebUtility.UrlEncode(attachment.Url) + "?token=" + safeToken;
-		}
+		return "http://127.0.0.1:" + safePort + "/get-attachment/" + WebUtility.UrlEncode(attachment.NormalizedUrl) + "?token=" + safeToken;
 	}
 }
--- a/app/Server/Database/Export/Strategy/StandaloneViewerExportStrategy.cs
+++ b/app/Server/Database/Export/Strategy/StandaloneViewerExportStrategy.cs
@@ -1,13 +1,18 @@
 using DHT.Server.Data;

-namespace DHT.Server.Database.Export.Strategy {
+namespace DHT.Server.Database.Export.Strategy;
+
 public sealed class StandaloneViewerExportStrategy : IViewerExportStrategy {
 	public static StandaloneViewerExportStrategy Instance { get; } = new ();

 	private StandaloneViewerExportStrategy() {}

 	public string GetAttachmentUrl(Attachment attachment) {
-			return attachment.Url;
-		}
+		// The normalized URL will not load files from Discord CDN once the time limit is enforced.
+		
+		// The downloaded URL would work, but only for a limited time, so it is better for the links to not work
+		// rather than give users a false sense of security.
+		
+		return attachment.NormalizedUrl;
 	}
 }
--- a/app/Server/Database/Export/ViewerJsonExport.cs
+++ b/app/Server/Database/Export/ViewerJsonExport.cs
@@ -9,7 +9,8 @@ using DHT.Server.Data.Filters;
 using DHT.Server.Database.Export.Strategy;
 using DHT.Utils.Logging;

-namespace DHT.Server.Database.Export {
+namespace DHT.Server.Database.Export;
+
 public static class ViewerJsonExport {
 	private static readonly Log Log = Log.ForType(typeof(ViewerJsonExport));

@@ -43,7 +44,7 @@ namespace DHT.Server.Database.Export {

 		var value = new {
 			meta = new { users, userindex, servers, channels },
-				data = GenerateMessageList(includedMessages, userIndices, strategy)
+			data = GenerateMessageList(includedMessages, userIndices, strategy),
 		};

 		perf.Step("Generate value object");
@@ -57,7 +58,7 @@ namespace DHT.Server.Database.Export {
 		perf.End();
 	}

-		private static object GenerateUserList(IDatabaseFile db, HashSet<ulong> userIds, out List<string> userindex, out Dictionary<ulong, object> userIndices) {
+	private static Dictionary<string, object> GenerateUserList(IDatabaseFile db, HashSet<ulong> userIds, out List<string> userindex, out Dictionary<ulong, object> userIndices) {
 		var users = new Dictionary<string, object>();
 		userindex = new List<string>();
 		userIndices = new Dictionary<ulong, object>();
@@ -89,7 +90,7 @@ namespace DHT.Server.Database.Export {
 		return users;
 	}

-		private static object GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, out Dictionary<ulong, object> serverIndices) {
+	private static List<object> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, out Dictionary<ulong, object> serverIndices) {
 		var servers = new List<object>();
 		serverIndices = new Dictionary<ulong, object>();

@@ -102,20 +103,20 @@ namespace DHT.Server.Database.Export {
 			serverIndices[id] = servers.Count;
 			servers.Add(new Dictionary<string, object> {
 				["name"] = server.Name,
-					["type"] = ServerTypes.ToJsonViewerString(server.Type)
+				["type"] = ServerTypes.ToJsonViewerString(server.Type),
 			});
 		}

 		return servers;
 	}

-		private static object GenerateChannelList(List<Channel> includedChannels, Dictionary<ulong, object> serverIndices) {
+	private static Dictionary<string, object> GenerateChannelList(List<Channel> includedChannels, Dictionary<ulong, object> serverIndices) {
 		var channels = new Dictionary<string, object>();

 		foreach (var channel in includedChannels) {
 			var obj = new Dictionary<string, object> {
 				["server"] = serverIndices[channel.Server],
-					["name"] = channel.Name
+				["name"] = channel.Name,
 			};

 			if (channel.ParentId != null) {
@@ -140,7 +141,7 @@ namespace DHT.Server.Database.Export {
 		return channels;
 	}

-		private static object GenerateMessageList( List<Message> includedMessages, Dictionary<ulong, object> userIndices, IViewerExportStrategy strategy) {
+	private static Dictionary<string, Dictionary<string, object>> GenerateMessageList( List<Message> includedMessages, Dictionary<ulong, object> userIndices, IViewerExportStrategy strategy) {
 		var data = new Dictionary<string, Dictionary<string, object>>();

 		foreach (var grouping in includedMessages.GroupBy(static message => message.Channel)) {
@@ -150,7 +151,7 @@ namespace DHT.Server.Database.Export {
 			foreach (var message in grouping) {
 				var obj = new Dictionary<string, object> {
 					["u"] = userIndices[message.Sender],
-						["t"] = message.Timestamp
+					["t"] = message.Timestamp,
 				};

 				if (!string.IsNullOrEmpty(message.Text)) {
@@ -169,10 +170,10 @@ namespace DHT.Server.Database.Export {
 					obj["a"] = message.Attachments.Select(attachment => {
 						var a = new Dictionary<string, object> {
 							{ "url", strategy.GetAttachmentUrl(attachment) },
-								{ "name", Uri.TryCreate(attachment.Url, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.Url }
+							{ "name", Uri.TryCreate(attachment.NormalizedUrl, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.LocalPath) : attachment.NormalizedUrl },
 						};

-							if (attachment.Width != null && attachment.Height != null) {
+						if (attachment is { Width: not null, Height: not null }) {
 							a["width"] = attachment.Width;
 							a["height"] = attachment.Height;
 						}
@@ -212,4 +213,3 @@ namespace DHT.Server.Database.Export {
 		return data;
 	}
 }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chylex	8aeb590bb3	Release v39.0	2023-12-21 05:18:01 +01:00
chylex	8dc1adc9f0	Fix viewer converting underscores to italics even when not at the end of a word	2023-12-21 05:09:55 +01:00
chylex	ddf70b02e7	Fix not storing channel topic and position if the channel is in a category Closes #232	2023-12-21 04:49:19 +01:00
chylex	ef59fd992e	Reword "Do Nothing" option in autoscroll settings to improve clarity	2023-12-21 04:27:24 +01:00
chylex	d044627fac	Reduce delay in tracker for responding to new messages	2023-12-21 04:27:24 +01:00
chylex	a624745602	Force light theme in Avalonia	2023-12-21 04:24:12 +01:00
chylex	6da3c185e5	Update Avalonia to 11.0.6	2023-12-21 04:24:01 +01:00
chylex	d4d14cab97	Update Rider project configuration files	2023-12-21 00:55:19 +01:00
chylex	095c9a061a	Update attachment downloads for time-limited Discord CDN URLs Closes #223	2023-12-21 00:27:08 +01:00
chylex	d01f9ed218	Rewrite detection of newly loaded messages	2023-12-20 13:19:11 +01:00
chylex	dd6f121059	Fix not seeing messages after a Discord update Closes #240	2023-12-20 10:51:14 +01:00
chylex	8bba33d815	Update SQLite provider to 8.0.0 (SQLite version 3.41.2)	2023-12-20 10:42:17 +01:00
chylex	9eab8ac92a	Update README section on distribution	2023-11-24 13:47:53 +01:00
chylex	fe588686fc	Clean up project configuration and build scripts & fix CI builds	2023-11-23 21:45:54 +01:00
chylex	7392987165	Remove unused argument in tracker script Closes #235	2023-11-23 05:22:33 +01:00
chylex	492dddb35d	Load full tracking script from the integrated server to remove need for minification	2023-11-21 07:08:26 +01:00
chylex	d35280a6a6	Release v38.0	2023-10-29 06:42:45 +01:00
chylex	ae8a34f938	Log error when reading Discord settings fails	2023-10-29 06:42:45 +01:00
chylex	18f5823f2a	Fix not seeing messages after a Discord update Closes #226	2023-10-29 06:42:45 +01:00
chylex	37640c97b0	Update to Avalonia 11.0.5	2023-10-29 06:38:26 +01:00
chylex	3cc5c75c48	Fix JSON serialization not working in release builds	2023-10-29 06:38:26 +01:00
chylex	2424a8ac8d	Fix UI freezing due to attachment download statistics being updated on the wrong thread	2023-07-18 18:56:34 +02:00
chylex	e7705587c2	Fix .NET 8 warnings and update C# conventions	2023-07-18 18:51:23 +02:00
chylex	bd7904b88e	Convert namespace declarations to top-level	2023-07-18 16:12:02 +02:00
chylex	3db599e901	Update to .NET 8	2023-07-18 15:56:15 +02:00
chylex	69a68b463c	Update JetBrains.Annotations to 2023.2.0	2023-07-18 15:54:13 +02:00
chylex	b2389dd521	Update SQLite provider to 7.0.9	2023-07-18 15:54:13 +02:00
chylex	610516de1f	Update file dialogs and hide overwrite prompt when opening database files Closes #198	2023-07-17 23:11:41 +02:00
chylex	3a6b83e0ba	Update to Avalonia 11	2023-07-17 23:11:41 +02:00
chylex	22958536e7	Update Avalonia to 0.10.18 & SQLite provider to 6.0.10	2022-10-22 00:17:48 +02:00
chylex	4db8c302d8	Release v37.2	2022-10-07 14:40:37 +02:00
chylex	7e7d140957	Fix server name detection after a Discord update Closes #204	2022-10-07 14:35:30 +02:00
				`@@ -0,0 +1 @@`
				`fetch("{url}").then(r => r.ok ? (r.headers.get("X-DHT") === "1" ? r.text() : Promise.reject("Invalid response")) : Promise.reject(r.status + " " + r.statusText)).then(s => eval(s)).catch(e => alert("Could not load tracking script:\n" + e));`