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">
-            <Setter Property="HorizontalAlignment" Value="Right" />
+        <Style Selector="Panel.buttons > WrapPanel">
+            <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.Controls.DataGrid" Version="11.2.3" />
+    <PackageReference Include="Avalonia" Version="11.3.0" />
+    <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.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="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="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/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(e);
+			Log.Error("Could not read settings file.", 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(e);
+			Log.Error("Could not write settings file.", 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(e2);
+					Log.Error("Could not restore settings file from backup.", e2);
 				}
 			}
 			
@@ -103,8 +100,7 @@ static class DiscordAppSettings {
 		try {
 			File.Delete(JsonBackupFilePath);
 		} catch (Exception e) {
-			Log.Error("Cannot delete backup file.");
-			Log.Error(e);
+			Log.Error("Could not delete backup file.", 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 ShowIssueTracker}">Issue Tracker</Button>
-            <Button Command="{Binding ShowSourceCode}">Source Code</Button>
+            <Button Command="{Binding OpenOfficialWebsite}">Official Website</Button>
+            <Button Command="{Binding OpenIssueTracker}">Issue Tracker</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(e);
+			Log.Error("Could not save download filter settings.", 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

@@ -89,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 };

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>
-                <StackPanel>
+            <WrapPanel ItemSpacing="10" LineSpacing="10">
+                <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!");
@@ -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">
-        <WrapPanel Orientation="Horizontal">
+    <StackPanel Orientation="Vertical" Spacing="20">
+        <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;
 		}
@@ -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/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/78edeb77c60542a57884686c4ba98f997c886fad/LICENSE
+ * https://github.com/BetterDiscord/BetterDiscord/blob/2752daf64f98625fc67c569361bd56021307d058/renderer/src/modules/webpackmodules.js
+ * 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/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/IDatabaseFile.cs

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

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -80,6 +80,11 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 		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/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/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);
-				log.Error(e);
+				HttpStatusCode? statusCode = e is HttpRequestException hre ? hre.StatusCode : null;
+				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/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";
 }