WIP

app/Desktop/App.axaml

@@ -51,19 +51,24 @@
 
         <Style Selector="Expander">
             <Setter Property="MinHeight" Value="40" />
-            <Setter Property="Padding" Value="12" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
 
         <Style Selector="Panel.buttons">
             <Setter Property="Margin" Value="0 20 0 0" />
         </Style>
-        <Style Selector="Panel.buttons > WrapPanel">
-            <Setter Property="ItemSpacing" Value="8" />
+        <Style Selector="Panel.buttons > WrapPanel.right">
+            <Setter Property="HorizontalAlignment" Value="Right" />
         </Style>
         <Style Selector="Panel.buttons Button">
             <Setter Property="MinWidth" Value="80" />
         </Style>
+        <Style Selector="Panel.buttons > WrapPanel.left Button">
+            <Setter Property="Margin" Value="0 0 8 0" />
+        </Style>
+        <Style Selector="Panel.buttons > WrapPanel.right Button">
+            <Setter Property="Margin" Value="8 0 0 0" />
+        </Style>
 
     </Application.Styles>
 

app/Desktop/Desktop.csproj

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

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -30,11 +30,11 @@
             </ItemsRepeater>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel>
+            <WrapPanel Classes="left">
                 <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
                 <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
             </WrapPanel>
-            <WrapPanel HorizontalAlignment="Right">
+            <WrapPanel Classes="right">
                 <Button Click="ClickOk">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

app/Desktop/Dialogs/Message/MessageDialog.axaml

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

app/Desktop/Dialogs/Progress/DelayedProgressDialog.cs

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

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

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

app/Desktop/Dialogs/TextBox/TextBoxDialog.axaml

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

app/Desktop/Main/AboutWindow.axaml

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

app/Desktop/Main/AboutWindowModel.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

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

app/Desktop/Main/Controls/MessageFilterPanel.axaml

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

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

@@ -22,15 +22,16 @@
         </Style>
         <Style Selector="WrapPanel > StackPanel">
             <Setter Property="Orientation" Value="Vertical" />
+            <Setter Property="Margin" Value="0 0 10 10" />
         </Style>
     </UserControl.Styles>
 
-    <StackPanel Spacing="10">
+    <StackPanel>
         <Button Command="{Binding OnClickToggleServerButton}" Content="{Binding ToggleServerButtonText}" IsEnabled="{Binding IsToggleServerButtonEnabled}" />
-        <TextBlock TextWrapping="Wrap" Margin="0 5">
-            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script or connection code again.
+        <TextBlock TextWrapping="Wrap" Margin="0 15">
+            The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy/paste the tracking script again.
         </TextBlock>
-        <WrapPanel ItemSpacing="10" LineSpacing="10">
+        <WrapPanel>
             <StackPanel>
                 <Label Target="Port">Port</Label>
                 <TextBox x:Name="Port" Width="70" Text="{Binding InputPort}" />

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml

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

app/Desktop/Main/MainWindowModel.cs

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

app/Desktop/Main/Pages/DatabasePage.axaml

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

app/Desktop/Main/Pages/DebugPage.axaml

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

app/Desktop/Main/Pages/DebugPageModel.cs

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

app/Desktop/Main/Pages/DownloadsPage.axaml

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

app/Desktop/Main/Pages/DownloadsPageModel.cs

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

app/Desktop/Main/Pages/TrackingPage.axaml

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

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

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

app/Desktop/Main/Pages/TrackingPageModel.cs

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

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -51,9 +51,10 @@ sealed partial class ViewerPageModel : IDisposable {
 	
 	public async void OnClickOpenViewer() {
 		try {
+			string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
 			string serverToken = ServerConfiguration.Token;
 			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
-			SystemUtils.OpenUrl(ServerConfiguration.HttpHost + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
+			SystemUtils.OpenUrl(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId));
 		} catch (Exception e) {
 			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
 		}

app/Desktop/Server/ServerConfiguration.cs

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

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

@@ -11,21 +11,12 @@
 // ==/UserScript==
 
 function startMutationObserver(callback) {
-	let hasDebounceStarted = false;
+	let debounceTimeout = null;
 	
-	function handleMutations(mutations, observer) {
-		if (hasDebounceStarted) {
-			return;
-		}
-		
-		hasDebounceStarted = true;
-		window.setTimeout(() => {
-			hasDebounceStarted = false;
-			callback(observer);
-		}, 20);
-	}
-	
-	new MutationObserver(handleMutations).observe(document.body, { childList: true, subtree: true });
+	new MutationObserver((_, observer) => {
+		window.clearTimeout(debounceTimeout);
+		debounceTimeout = window.setTimeout(() => callback(observer), 20);
+	}).observe(document.body, { childList: true, subtree: true });
 }
 
 startMutationObserver(observer => {
@@ -72,11 +63,6 @@ function getHelpIcon() {
 }
 
 function showConnectDialog() {
-	if (window.DHT_LOADED) {
-		alert("Discord History Tracker is already loaded.");
-		return;
-	}
-	
 	const dialogElement = document.createElement("dialog");
 	dialogElement.id = "dht-connector-dialog";
 	dialogElement.innerHTML = `
@@ -113,10 +99,9 @@ function showConnectDialog() {
   }
   
   #dht-connector-dialog-input-error {
-    margin: 11px 1px;
-    color: #ff484c;
+    margin: 10px 1px;
+    color: #f23f43;
     font-size: 15px;
-    font-weight: 500;
   }
   
   #dht-connector-dialog input[type="text"] {
@@ -174,13 +159,11 @@ function showConnectDialog() {
 		dialogElement.close();
 	});
 	
-	codeInputElement.addEventListener("paste", function() {
-		setTimeout(async function() {
+	codeInputElement.addEventListener("paste", async function() {
 		const code = parseConnectionCode(codeInputElement.value);
 		if (code !== null) {
 			await onSubmit(code);
 		}
-		}, 0);
 	});
 	
 	formElement.addEventListener("submit", async function(e) {
@@ -205,30 +188,17 @@ function showConnectDialog() {
 		isSubmitting = true;
 		connectButtonElement.setAttribute("disabled", "");
 		try {
-			await loadTrackingScript(code);
+			await loadTrackingScript(code.port, code.token);
+			dialogElement.close();
 		} catch (e) {
-			onError("Could not load tracking script.", e);
+			console.error("Could not load tracking script", e);
+			codeErrorElement.innerText = "Could not load tracking script";
 		} finally {
 			isSubmitting = false;
 			connectButtonElement.removeAttribute("disabled");
 		}
 	}
 	
-	async function loadTrackingScript(code) {
-		const trackingScript = await getTrackingScript(code.port, code.token);
-		
-		if (dialogElement.isConnected) {
-			// noinspection DynamicallyGeneratedCodeJS
-			eval(trackingScript);
-			dialogElement.close();
-		}
-	}
-	
-	function onError(message, e) {
-		console.error(message, e);
-		codeErrorElement.innerText = message;
-	}
-	
 	dialogElement.showModal();
 }
 
@@ -237,37 +207,34 @@ function showConnectDialog() {
  * @return {?{port: number, token: string}}
  */
 function parseConnectionCode(code) {
-	if (code.length > 5 + 1 + 100) {
+	if (code.length > 1000) {
 		return null;
 	}
 	
-	const match = code.match(/^(\d{1,5}):([a-zA-Z0-9]{1,100})$/);
+	const match = code.match(/^(\d{1,5}):([a-z0-9]{1,100})$/);
 	if (!match) {
 		return null;
 	}
 	
 	const port = Number(match[1]);
-	if (port < 0 || port > 65535) {
+	if (port < 0 || port > 65536) {
 		return null;
 	}
 	
 	return { port, token: match[2] };
 }
 
-async function getTrackingScript(port, token) {
-	const url = "http://127.0.0.1:" + port + "/get-tracking-script?token=" + encodeURIComponent(token);
-	const response = await fetch(url, {
-		credentials: "omit",
-		signal: AbortSignal.timeout(2000),
-	});
+async function loadTrackingScript(port, token) {
+	const response = await fetch("http://127.0.0.1:" + port + "/get-tracking-script?token=" + encodeURIComponent(token));
 	
 	if (!response.ok) {
-		throw response.status + " " + response.statusText;
-	}
-	
-	if (response.headers.get("X-DHT") !== "1") {
 		throw "Invalid response";
 	}
 	
-	return await response.text();
+	if (response.headers.get("X-DHT") !== "1") {
+		throw response.status + " " + response.statusText;
+	}
+	
+	// noinspection DynamicallyGeneratedCodeJS
+	eval(await response.text());
 }

app/Resources/Tracker/scripts/state.js

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

app/Resources/Tracker/scripts/types.js

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

app/Resources/Tracker/scripts/webpack.js

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

app/Server/Data/FileUrl.cs

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

app/Server/Data/Server.cs

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

app/Server/Data/User.cs

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

app/Server/Database/Export/ViewerJson.cs

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

app/Server/Database/Export/ViewerJsonExport.cs

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

app/Server/Database/Import/LegacyArchiveImport.cs

@@ -106,7 +106,7 @@ public static class LegacyArchiveImport {
 			users[userindex[userId]] = new User {
 				Id = userId,
 				Name = userObj.RequireString("name", path),
-				AvatarHash = userObj.HasKey("avatar") ? userObj.RequireString("avatar", path) : null,
+				AvatarUrl = userObj.HasKey("avatar") ? userObj.RequireString("avatar", path) : null,
 				Discriminator = userObj.HasKey("tag") ? userObj.RequireString("tag", path) : null,
 			};
 		}

app/Server/Database/Repositories/IDownloadRepository.cs

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

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

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

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

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

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

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

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

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

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

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

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

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

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

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

app/Server/Database/Sqlite/SqliteSchema.cs

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

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

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

app/Server/Download/DownloadLinkExtractor.cs

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

app/Server/Endpoints/BaseEndpoint.cs

@@ -3,17 +3,18 @@ using System.Net;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using DHT.Server.Database;
 using DHT.Utils.Http;
 using DHT.Utils.Logging;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Primitives;
 
 namespace DHT.Server.Endpoints;
 
-abstract class BaseEndpoint {
+abstract class BaseEndpoint(IDatabaseFile db) {
 	private static readonly Log Log = Log.ForType<BaseEndpoint>();
-	private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
+	
+	protected IDatabaseFile Db { get; } = db;
 	
 	public async Task Handle(HttpContext ctx) {
 		HttpResponse response = ctx.Response;
@@ -48,16 +49,6 @@ abstract class BaseEndpoint {
 		}
 	}
 	
-	protected static async Task WriteFileIfFound(HttpResponse response, string relativeFilePath, byte[]? bytes, CancellationToken cancellationToken) {
-		if (bytes == null) {
-			throw new HttpException(HttpStatusCode.NotFound, "File not found: " + relativeFilePath);
-		}
-		else {
-			string? contentType = ContentTypeProvider.TryGetContentType(relativeFilePath, out string? type) ? type : null;
-			await response.WriteFileAsync(contentType, bytes, cancellationToken);
-		}
-	}
-	
 	protected static Guid GetSessionId(HttpRequest request) {
 		if (request.Query.TryGetValue("session", out StringValues sessionIdValue) && sessionIdValue.Count == 1 && Guid.TryParse(sessionIdValue[0], out Guid sessionId)) {
 			return sessionId;

app/Server/Endpoints/GetDownloadedFileEndpoint.cs

@@ -10,12 +10,12 @@ using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class GetDownloadedFileEndpoint(IDatabaseFile db) : BaseEndpoint {
+sealed class GetDownloadedFileEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		string url = WebUtility.UrlDecode((string) request.RouteValues["url"]!);
 		string normalizedUrl = DiscordCdn.NormalizeUrl(url);
 		
-		if (!await db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, WriteDataTo(response), cancellationToken)) {
+		if (!await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, WriteDataTo(response), cancellationToken)) {
 			response.Redirect(url, permanent: false);
 		}
 	}

app/Server/Endpoints/GetTrackingScriptEndpoint.cs

@@ -2,6 +2,7 @@ using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
+using DHT.Server.Database;
 using DHT.Server.Service;
 using DHT.Utils.Http;
 using DHT.Utils.Resources;
@@ -9,7 +10,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class GetTrackingScriptEndpoint(ServerParameters parameters, ResourceLoader resources) : BaseEndpoint {
+sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters, ResourceLoader resources) : BaseEndpoint(db) {
 	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
 		string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + parameters.Port + ";")

app/Server/Endpoints/GetUserscriptEndpoint.cs

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

app/Server/Endpoints/GetViewerMessagesEndpoint.cs

@@ -8,12 +8,12 @@ using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class GetViewerMessagesEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint {
+sealed class GetViewerMessagesEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
 	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		Guid sessionId = GetSessionId(request);
 		ViewerSession session = viewerSessions.Get(sessionId);
 		
 		response.ContentType = "application/x-ndjson";
-		return ViewerJsonExport.GetMessages(response.Body, db, session.MessageFilter, cancellationToken);
+		return ViewerJsonExport.GetMessages(response.Body, Db, session.MessageFilter, cancellationToken);
 	}
 }

app/Server/Endpoints/GetViewerMetadataEndpoint.cs

@@ -9,12 +9,12 @@ using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class GetViewerMetadataEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint {
+sealed class GetViewerMetadataEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
 	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		Guid sessionId = GetSessionId(request);
 		ViewerSession session = viewerSessions.Get(sessionId);
 		
 		response.ContentType = MediaTypeNames.Application.Json;
-		return ViewerJsonExport.GetMetadata(response.Body, db, session.MessageFilter, cancellationToken);
+		return ViewerJsonExport.GetMetadata(response.Body, Db, session.MessageFilter, cancellationToken);
 	}
 }

app/Server/Endpoints/TrackChannelEndpoint.cs

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

app/Server/Endpoints/TrackMessagesEndpoint.cs

@@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint {
+sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 	private const string HasNewMessages = "1";
 	private const string NoNewMessages = "0";
 	
@@ -38,9 +38,9 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint {
 		}
 		
 		var addedMessageFilter = new MessageFilter { MessageIds = addedMessageIds };
-		bool anyNewMessages = await db.Messages.Count(addedMessageFilter, CancellationToken.None) < addedMessageIds.Count;
+		bool anyNewMessages = await Db.Messages.Count(addedMessageFilter, CancellationToken.None) < addedMessageIds.Count;
 		
-		await db.Messages.Add(messages);
+		await Db.Messages.Add(messages);
 		
 		await response.WriteTextAsync(anyNewMessages ? HasNewMessages : NoNewMessages, cancellationToken);
 	}

app/Server/Endpoints/TrackUsersEndpoint.cs

@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Http;
 
 namespace DHT.Server.Endpoints;
 
-sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint {
+sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		JsonElement root = await ReadJson(request);
 		
@@ -24,7 +24,7 @@ sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint {
 			users[i++] = ReadUser(user, "user");
 		}
 		
-		await db.Users.Add(users);
+		await Db.Users.Add(users);
 	}
 	
 	private static User ReadUser(JsonElement json, string path) {
@@ -32,7 +32,7 @@ sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint {
 			Id = json.RequireSnowflake("id", path),
 			Name = json.RequireString("name", path),
 			DisplayName = json.HasKey("displayName") ? json.RequireString("displayName", path) : null,
-			AvatarHash = json.HasKey("avatar") ? json.RequireString("avatar", path) : null,
+			AvatarUrl = json.HasKey("avatar") ? json.RequireString("avatar", path) : null,
 			Discriminator = json.HasKey("discriminator") ? json.RequireString("discriminator", path) : null,
 		};
 	}

app/Server/Endpoints/ViewerEndpoint.cs

@@ -1,14 +1,18 @@
 using System.Collections.Generic;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using DHT.Server.Service.Middlewares;
+using DHT.Server.Database;
+using DHT.Utils.Http;
 using DHT.Utils.Resources;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
 
 namespace DHT.Server.Endpoints;
 
-[ServerAuthorizationMiddleware.NoAuthorization]
-sealed class ViewerEndpoint(ResourceLoader resources) : BaseEndpoint {
+sealed class ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : BaseEndpoint(db) {
+	private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
+	
 	private readonly Dictionary<string, byte[]?> cache = new ();
 	private readonly SemaphoreSlim cacheSemaphore = new (1);
 	
@@ -27,6 +31,12 @@ sealed class ViewerEndpoint(ResourceLoader resources) : BaseEndpoint {
 			cacheSemaphore.Release();
 		}
 		
-		await WriteFileIfFound(response, path, resourceBytes, cancellationToken);
+		if (resourceBytes == null) {
+			throw new HttpException(HttpStatusCode.NotFound, "File not found: " + path);
+		}
+		else {
+			string? contentType = ContentTypeProvider.TryGetContentType(path, out string? type) ? type : null;
+			await response.WriteFileAsync(contentType, resourceBytes, cancellationToken);
+		}
 	}
 }

app/Server/Server.csproj

@@ -29,11 +29,6 @@
       <Link>Resources/Tracker/%(RecursiveDir)%(Filename)%(Extension)</Link>
       <Visible>false</Visible>
     </EmbeddedResource>
-    <EmbeddedResource Include="../Resources/Tracker/loader/**">
-      <LogicalName>Tracker\loader\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Tracker/loader/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
     <EmbeddedResource Include="../Resources/Tracker/scripts/**">
       <LogicalName>Tracker\scripts\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
       <Link>Resources/Tracker/scripts/%(RecursiveDir)%(Filename)%(Extension)</Link>

app/Server/Service/Middlewares/ServerAuthorizationMiddleware.cs

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

app/Server/Service/ServerStartup.cs

@@ -38,19 +38,25 @@ sealed class Startup {
 	public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime, IDatabaseFile db, ServerParameters parameters, ResourceLoader resources, ViewerSessions viewerSessions) {
 		app.UseMiddleware<ServerLoggingMiddleware>();
 		app.UseCors();
-		app.UseRouting();
-		app.UseMiddleware<ServerAuthorizationMiddleware>();
-		app.UseEndpoints(endpoints => {
-			endpoints.MapGet("/get-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
-			endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(parameters, resources).Handle);
-			endpoints.MapGet("/get-userscript/{**ignored}", new GetUserscriptEndpoint(resources).Handle);
-			endpoints.MapGet("/get-viewer-messages", new GetViewerMessagesEndpoint(db, viewerSessions).Handle);
-			endpoints.MapGet("/get-viewer-metadata", new GetViewerMetadataEndpoint(db, viewerSessions).Handle);
-			endpoints.MapGet("/viewer/{**path}", new ViewerEndpoint(resources).Handle);
 		
+		app.Map("/viewer", node => {
+			node.UseRouting();
+			node.UseEndpoints(endpoints => {
+				endpoints.MapGet("/{**path}", new ViewerEndpoint(db, resources).Handle);
+			});
+		});
+		
+		app.UseMiddleware<ServerAuthorizationMiddleware>();
+		
+		app.UseRouting();
+		app.UseEndpoints(endpoints => {
+			endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(db, parameters, resources).Handle);
+			endpoints.MapGet("/get-viewer-metadata", new GetViewerMetadataEndpoint(db, viewerSessions).Handle);
+			endpoints.MapGet("/get-viewer-messages", new GetViewerMessagesEndpoint(db, viewerSessions).Handle);
+			endpoints.MapGet("/get-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
 			endpoints.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
-			endpoints.MapPost("/track-messages", new TrackMessagesEndpoint(db).Handle);
 			endpoints.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
+			endpoints.MapPost("/track-messages", new TrackMessagesEndpoint(db).Handle);
 		});
 	}
 }

app/Version.cs

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