Release v47.1

Closes #292

app/Desktop/App.axaml

@@ -58,18 +58,12 @@
         <Style Selector="Panel.buttons">
             <Setter Property="Margin" Value="0 20 0 0" />
         </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right">
+        <Style Selector="Panel.buttons > WrapPanel">
-            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="ItemSpacing" Value="8" />
         </Style>
         <Style Selector="Panel.buttons Button">
             <Setter Property="MinWidth" Value="80" />
         </Style>
-        <Style Selector="Panel.buttons > WrapPanel.left Button">
-            <Setter Property="Margin" Value="0 0 8 0" />
-        </Style>
-        <Style Selector="Panel.buttons > WrapPanel.right Button">
-            <Setter Property="Margin" Value="8 0 0 0" />
-        </Style>
 
     </Application.Styles>
 

app/Desktop/Arguments.cs

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

app/Desktop/Common/DatabaseGui.cs

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

app/Desktop/Desktop.csproj

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

app/Desktop/Dialogs/CheckBox/CheckBoxDialog.axaml

@@ -30,11 +30,11 @@
             </ItemsRepeater>
         </ScrollViewer>
         <Panel Classes="buttons">
-            <WrapPanel Classes="left">
+            <WrapPanel>
                 <Button Command="{Binding SelectAll}" IsEnabled="{Binding !AreAllSelected}">Select All</Button>
                 <Button Command="{Binding SelectNone}" IsEnabled="{Binding !AreNoneSelected}">Select None</Button>
             </WrapPanel>
-            <WrapPanel Classes="right">
+            <WrapPanel HorizontalAlignment="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 Classes="right">
+            <WrapPanel HorizontalAlignment="Right">
                 <Button Click="ClickOk" IsVisible="{Binding IsOkVisible}">OK</Button>
                 <Button Click="ClickYes" IsVisible="{Binding IsYesVisible}">Yes</Button>
                 <Button Click="ClickNo" IsVisible="{Binding IsNoVisible}">No</Button>

app/Desktop/Dialogs/Progress/DelayedProgressDialog.cs

@@ -0,0 +1,24 @@
+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,13 +2,12 @@ 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 Log Log = Log.ForType<ProgressDialog>();
+	private static readonly TimeSpan MinimumShowDuration = TimeSpan.FromMilliseconds(500);
 	
 	internal static async Task Show(Window owner, string title, Func<ProgressDialog, IProgressCallback, Task> action) {
 		var dialog = new ProgressDialog();
@@ -43,6 +42,7 @@ public sealed partial class ProgressDialog : Window {
 	}
 	
 	private bool isFinished = false;
+	private DateTime startTime = DateTime.Now;
 	private Task progressTask = Task.CompletedTask;
 	
 	public ProgressDialog() {
@@ -50,6 +50,8 @@ 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());
@@ -60,8 +62,14 @@ public sealed partial class ProgressDialog : Window {
 		e.Cancel = !isFinished;
 	}
 	
-	private void OnFinished(Task task) {
+	private async Task 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 Classes="right">
+            <WrapPanel HorizontalAlignment="Right">
                 <Button Click="ClickOk" IsEnabled="{Binding !HasErrors}">OK</Button>
                 <Button Click="ClickCancel">Cancel</Button>
             </WrapPanel>

app/Desktop/Discord/DiscordAppSettings.cs

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

app/Desktop/Main/AboutWindow.axaml

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

app/Desktop/Main/AboutWindowModel.cs

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

app/Desktop/Main/Controls/DownloadItemFilterPanel.axaml

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

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

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

app/Desktop/Main/Controls/MessageFilterPanel.axaml

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

app/Desktop/Main/Controls/ServerConfigurationPanel.axaml

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

app/Desktop/Main/Controls/ServerConfigurationPanelModel.cs

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

app/Desktop/Main/Dialogs/NewDatabaseSettingsDialog.axaml

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

app/Desktop/Main/MainWindowModel.cs

@@ -4,6 +4,7 @@ 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;
@@ -88,14 +89,21 @@ sealed partial class MainWindowModel : IAsyncDisposable {
 		try {
 			await state.Server.Start(ServerConfiguration.Port, ServerConfiguration.Token);
 		} catch (Exception ex) {
-			Log.Error(ex);
+			Log.Error("Could not start internal server.", ex);
 			await Dialog.ShowOk(window, "Internal Server Error", ex.Message);
 		}
 		
+		try {
 			mainContentScreenModel = new MainContentScreenModel(window, state);
 			mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
-		
 			await mainContentScreenModel.Initialize();
+		} catch (Exception ex) {
+			Log.Error("Could not initialize content screen.", ex);
+			await Dialog.ShowOk(window, "Initialization Error", ex.Message);
+			await DisposeContent();
+			await DisposeState();
+			return;
+		}
 		
 		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
 		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
@@ -104,32 +112,33 @@ 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 state.DisposeAsync();
+			await DelayedProgressDialog.Await(() => state.DisposeAsync().AsTask(), TimeSpan.FromMilliseconds(200), window, "Close Database", "Please wait for the database to close...");
 			state = null;
 		}
 	}
 	
 	public async ValueTask DisposeAsync() {
-		if (mainContentScreenModel != null) {
+		await DisposeContent();
-			await mainContentScreenModel.DisposeAsync();
-		}
-		
 		await DisposeState();
 	}
 }

app/Desktop/Main/Pages/DatabasePage.axaml

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

app/Desktop/Main/Pages/DatabasePageModel.cs

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

app/Desktop/Main/Pages/DebugPage.axaml

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

app/Desktop/Main/Pages/DebugPageModel.cs

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

app/Desktop/Main/Pages/DownloadsPage.axaml

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

app/Desktop/Main/Pages/DownloadsPageModel.cs

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

app/Desktop/Main/Pages/TrackingPage.axaml

@@ -15,9 +15,6 @@
         <Style Selector="TextBlock">
             <Setter Property="TextWrapping" Value="Wrap" />
         </Style>
-        <Style Selector="WrapPanel > Button">
-            <Setter Property="Margin" Value="0 0 10 10" />
-        </Style>
     </UserControl.Styles>
 
     <StackPanel Spacing="20">
@@ -37,7 +34,7 @@
                 <Button Command="{Binding OnClickToggleAppDevTools}" Content="{Binding ToggleAppDevToolsButtonText}" IsEnabled="{Binding IsToggleAppDevToolsButtonEnabled}" />
             </StackPanel>
         </Expander>
-        <Expander Header="Method 2: Userscript" IsExpanded="True" Padding="12 12 12 2.5">
+        <Expander Header="Method 2: Userscript" IsExpanded="True">
             <StackPanel Orientation="Vertical" Spacing="10">
                 <TextBlock>
                     Requires a userscript manager in your browser. The userscript adds a DHT icon next to the Help icon on Discord.
@@ -46,7 +43,7 @@
                 <TextBlock>
                     Copy the Connection Code, click the DHT icon, and paste the code into the prompt.
                 </TextBlock>
-                <WrapPanel>
+                <WrapPanel ItemSpacing="10" LineSpacing="10">
                     <Button Command="{Binding OnClickInstallOrUpdateUserscript}">Install or Update Userscript</Button>
                     <Button x:Name="CopyConnectionCode" Click="CopyConnectionScriptButton_OnClick">Copy Connection Code</Button>
                 </WrapPanel>

app/Desktop/Main/Pages/TrackingPageModel.cs

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

app/Desktop/Main/Pages/ViewerPageModel.cs

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

app/Desktop/Main/Screens/MainContentScreenModel.cs

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

app/Desktop/Main/Screens/WelcomeScreenModel.cs

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

app/Resources/Tracker/scripts/discord.js

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

app/Resources/Tracker/scripts/state.js

@@ -142,11 +142,19 @@ 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,6 +2,7 @@
  * @name DiscordGuild
  * @property {String} id
  * @property {String} name
+ * @property {String|null|undefined} [icon]
  */
 
 /**
@@ -14,6 +15,7 @@
  * @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/78edeb77c60542a57884686c4ba98f997c886fad/renderer/src/modules/webpackmodules.js
+ * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/renderer/src/modules/webpackmodules.js
- * https://github.com/BetterDiscord/BetterDiscord/blob/78edeb77c60542a57884686c4ba98f997c886fad/LICENSE
+ * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/LICENSE
  */
 class WEBPACK {
 	static get require() {
@@ -17,13 +17,15 @@ class WEBPACK {
 		 */
 		let hookedRequire;
 		
-		const id = "dht-webpackmodules-" + new Date().getTime();
+		const id = Symbol("dht-webpackmodules-" + new Date().getTime());
 		if (typeof (window["webpackChunkdiscord_app"]) !== "undefined") {
-			window["webpackChunkdiscord_app"].push([ [ id ], {}, internalRequire => hookedRequire = internalRequire ]);
+			window["webpackChunkdiscord_app"].push([ [ id ], {}, internalRequire => {
+				if ("b" in internalRequire) {
+					hookedRequire = internalRequire;
+				}
+			}]);
 		}
 		
-		delete hookedRequire.m[id];
-		delete hookedRequire.c[id];
 		return this._require = hookedRequire;
 	}
 	
@@ -86,7 +88,7 @@ class WEBPACK {
 			return modules[0];
 		}
 		
-		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length);
+		console.error("[DHT] Cannot find module " + name + ", results found:", modules.length, modules);
 		return null;
 	}
 	

app/Server/Data/FileUrl.cs

@@ -0,0 +1,9 @@
+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,7 +1,12 @@
+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,9 +1,13 @@
+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? AvatarUrl { get; init; }
+	public string? AvatarHash { get; init; }
 	public string? Discriminator { get; init; }
+	
+	internal FileUrl? AvatarUrl => AvatarHash == null ? null : DownloadLinkExtractor.UserAvatar(Id, AvatarHash);
 }

app/Server/Database/DummyDatabaseFile.cs

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

app/Server/Database/Export/ViewerJson.cs

@@ -23,6 +23,9 @@ 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.AvatarUrl,
+				Avatar = user.AvatarHash,
 			};
 		}
 		
@@ -108,6 +108,7 @@ static class ViewerJsonExport {
 			servers[server.Id] = new ViewerJson.JsonServer {
 				Name = server.Name,
 				Type = ServerTypes.ToJsonViewerString(server.Type),
+				IconUrl = server.IconUrl?.DownloadUrl,
 			};
 		}
 		

app/Server/Database/IDatabaseFile.cs

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

app/Server/Database/Import/LegacyArchiveImport.cs

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

app/Server/Database/Repositories/IDownloadRepository.cs

@@ -5,6 +5,7 @@ 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;
@@ -34,7 +35,7 @@ public interface IDownloadRepository {
 	
 	Task Remove(ICollection<string> normalizedUrls);
 	
-	IAsyncEnumerable<Data.Download> FindAllDownloadableUrls(CancellationToken cancellationToken = default);
+	IAsyncEnumerable<FileUrl> FindReachableFiles(CancellationToken cancellationToken = default);
 	
 	internal sealed class Dummy : IDownloadRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
@@ -79,8 +80,8 @@ public interface IDownloadRepository {
 			return Task.CompletedTask;
 		}
 		
-		public IAsyncEnumerable<Data.Download> FindAllDownloadableUrls(CancellationToken cancellationToken) {
+		public IAsyncEnumerable<FileUrl> FindReachableFiles(CancellationToken cancellationToken) {
-			return AsyncEnumerable.Empty<Data.Download>();
+			return AsyncEnumerable.Empty<FileUrl>();
 		}
 	}
 }

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

@@ -62,6 +62,15 @@ 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();
@@ -361,14 +370,17 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		UpdateTotalCount();
 	}
 	
-	public async IAsyncEnumerable<Data.Download> FindAllDownloadableUrls([EnumeratorCancellation] CancellationToken cancellationToken = default) {
+	public async IAsyncEnumerable<FileUrl> FindReachableFiles([EnumeratorCancellation] CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();
 		
-		await using (var cmd = conn.Command("SELECT normalized_url, download_url, type, size FROM attachments")) {
+		await using (var cmd = conn.Command("SELECT type, normalized_url, download_url FROM attachments")) {
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 			
 			while (await reader.ReadAsync(cancellationToken)) {
-				yield return DownloadLinkExtractor.FromAttachment(reader.GetString(0), reader.GetString(1), reader.IsDBNull(2) ? null : reader.GetString(2), reader.GetUint64(3));
+				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);
 			}
 		}
 		
@@ -376,8 +388,31 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 			
 			while (await reader.ReadAsync(cancellationToken)) {
-				var result = await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0));
+				if (await DownloadLinkExtractor.TryFromEmbedJson(reader.GetStream(0)) is {} result) {
-				if (result is not null) {
+					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) {
 					yield return result;
 				}
 			}
@@ -387,15 +422,9 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 			
 			while (await reader.ReadAsync(cancellationToken)) {
-				yield return DownloadLinkExtractor.FromUserAvatar(reader.GetUint64(0), reader.GetString(1));
+				ulong id = reader.GetUint64(0);
-			}
+				string avatarHash = reader.GetString(1);
-		}
+				yield return DownloadLinkExtractor.UserAvatar(id, avatarHash);
-		
-		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,6 +10,7 @@ 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;
@@ -17,15 +18,16 @@ 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();
@@ -137,7 +139,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 						messageAttachmentCmd.Set(":attachment_id", attachmentId);
 						await messageAttachmentCmd.ExecuteNonQueryAsync();
 						
-						await downloadCollector.Add(DownloadLinkExtractor.FromAttachment(attachment));
+						await downloadCollector.Add(new Data.Download(attachment.NormalizedUrl, attachment.DownloadUrl, DownloadStatus.Pending, attachment.Type, attachment.Size));
 					}
 				}
 				
@@ -148,7 +150,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 						await messageEmbedCmd.ExecuteNonQueryAsync();
 						
 						if (DownloadLinkExtractor.TryFromEmbedJson(embed.Json) is {} download) {
-							await downloadCollector.Add(download);
+							await downloadCollector.Add(download.ToPendingDownload());
 						}
 					}
 				}
@@ -163,7 +165,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 						await messageReactionCmd.ExecuteNonQueryAsync();
 						
 						if (reaction.EmojiId is {} emojiId) {
-							await downloadCollector.Add(DownloadLinkExtractor.FromEmoji(emojiId, reaction.EmojiFlags));
+							await downloadCollector.Add(DownloadLinkExtractor.Emoji(emojiId, reaction.EmojiFlags).ToPendingDownload());
 						}
 					}
 				}

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

@@ -10,15 +10,9 @@ using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
+sealed class SqliteServerRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : BaseSqliteRepository(Log), 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();
@@ -27,13 +21,18 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 				("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();
@@ -50,7 +49,7 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 	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 FROM servers");
+		await using var cmd = conn.Command("SELECT id, name, type, icon_hash FROM servers");
 		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);
 		
 		while (await reader.ReadAsync(cancellationToken)) {
@@ -58,6 +57,7 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 				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,23 +5,14 @@ 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 : BaseSqliteRepository, IUserRepository {
+sealed class SqliteUserRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : BaseSqliteRepository(Log), 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();
@@ -40,13 +31,10 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 				cmd.Set(":id", user.Id);
 				cmd.Set(":name", user.Name);
 				cmd.Set(":display_name", user.DisplayName);
-				cmd.Set(":avatar_url", user.AvatarUrl);
+				cmd.Set(":avatar_url", user.AvatarHash);
 				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();
@@ -72,7 +60,7 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 				Id = reader.GetUint64(0),
 				Name = reader.GetString(1),
 				DisplayName = reader.IsDBNull(2) ? null : reader.GetString(2),
-				AvatarUrl = reader.IsDBNull(3) ? null : reader.GetString(3),
+				AvatarHash = reader.IsDBNull(3) ? null : reader.GetString(3),
 				Discriminator = reader.IsDBNull(4) ? null : reader.GetString(4),
 			};
 		}

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

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

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -66,20 +66,25 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 		downloads = new SqliteDownloadRepository(pool);
 		settings = new SqliteSettingsRepository(pool);
 		users = new SqliteUserRepository(pool, downloads);
-		servers = new SqliteServerRepository(pool);
+		servers = new SqliteServerRepository(pool, downloads);
 		channels = new SqliteChannelRepository(pool);
 		messages = new SqliteMessageRepository(pool, downloads);
 	}
 	
 	public async ValueTask DisposeAsync() {
-		users.Dispose();
-		servers.Dispose();
-		channels.Dispose();
 		messages.Dispose();
+		channels.Dispose();
+		servers.Dispose();
+		users.Dispose();
 		downloads.Dispose();
 		await pool.DisposeAsync();
 	}
 	
+	public async Task<string?> GetVersion() {
+		await using var conn = await pool.Take();
+		return await conn.ExecuteReaderAsync("SELECT sqlite_version()", static reader => reader?.GetString(0));
+	}
+	
 	public async Task Vacuum() {
 		await using var conn = await pool.Take();
 		

app/Server/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 = 10;
+	internal const int Version = 11;
 	
 	private static readonly Log Log = Log.ForType<SqliteSchema>();
 	
@@ -94,7 +94,8 @@ sealed class SqliteSchema(CustomSqliteConnection conn) {
 		                        CREATE TABLE servers (
 		                        	id        INTEGER PRIMARY KEY NOT NULL,
 		                        	name      TEXT NOT NULL,
-		                        	type TEXT NOT NULL
+		                        	type      TEXT NOT NULL,
+		                        	icon_hash TEXT
 		                        )
 		                        """);
 		
@@ -222,6 +223,7 @@ 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, string tableName, (string Name, SqliteType Type)[] columns) {
+	public static SqliteCommand Insert(this ISqliteConnection conn, [LanguageInjection("sql", Prefix = "SELECT * FROM ")] 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, string tableName, (string Name, SqliteType Type)[] columns) {
+	public static SqliteCommand Upsert(this ISqliteConnection conn, [LanguageInjection("sql", Prefix = "SELECT * FROM ")] 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, string tableName, (string Name, SqliteType Type) column) {
+	public static SqliteCommand Delete(this ISqliteConnection conn, [LanguageInjection("sql", Prefix = "SELECT * FROM ")] 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/DownloadExporter.cs

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

app/Server/Download/DownloadLinkExtractor.cs

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

app/Server/Download/DownloaderTask.cs

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

app/Server/Endpoints/BaseEndpoint.cs

@@ -33,7 +33,7 @@ abstract class BaseEndpoint {
 				await response.WriteAsync(e.Message);
 			}
 		} catch (Exception e) {
-			Log.Error(e);
+			Log.Error("Could not handle request.", e);
 			response.StatusCode = (int) HttpStatusCode.InternalServerError;
 		}
 	}

app/Server/Endpoints/TrackChannelEndpoint.cs

@@ -24,6 +24,7 @@ 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/TrackUsersEndpoint.cs

@@ -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,
-			AvatarUrl = json.HasKey("avatar") ? json.RequireString("avatar", path) : null,
+			AvatarHash = json.HasKey("avatar") ? json.RequireString("avatar", path) : null,
 			Discriminator = json.HasKey("discriminator") ? json.RequireString("discriminator", path) : null,
 		};
 	}

app/Server/Server.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.7" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.6" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
   

app/Server/Service/Middlewares/ServerLoggingMiddleware.cs

@@ -30,11 +30,11 @@ sealed class ServerLoggingMiddleware(RequestDelegate next) {
 		long elapsedMs = stopwatch.ElapsedMilliseconds;
 		
 		if (context.RequestAborted.IsCancellationRequested) {
-			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms");
+			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms.");
 		}
 		else {
 			int responseStatus = context.Response.StatusCode;
-			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
+			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms.");
 		}
 	}
 }

app/Server/Service/ServerManager.cs

@@ -88,7 +88,7 @@ public sealed class ServerManager {
 			throw;
 		}
 		
-		Log.Info("Server started");
+		Log.Info("Server started.");
 		
 		server = newServer;
 		
@@ -104,7 +104,7 @@ public sealed class ServerManager {
 		
 		Log.Info("Stopping server...");
 		await server.StopAsync();
-		Log.Info("Server stopped");
+		Log.Info("Server stopped.");
 		
 		server.Dispose();
 		server = null;

app/Utils/Logging/Log.cs

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

app/Version.cs

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