Rewrite tracker to use Discord client functions instead of React properties

app/Desktop/Desktop.csproj

@@ -15,14 +15,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.11" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.11" />
-    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.11" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.11" Condition=" '$(Configuration)' == 'Debug' " />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.11" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.11" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
+    <PackageReference Include="Avalonia" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Controls.ItemsRepeater" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.6" Condition=" '$(Configuration)' == 'Debug' " />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="999.0.0-build.0.g0d941a6a62" />
   </ItemGroup>
   

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="480" d:DesignHeight="360"
+        mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="295"
         x:Class="DHT.Desktop.Main.AboutWindow"
         x:DataType="main:AboutWindowModel"
         Title="About Discord History Tracker"
         Icon="avares://DiscordHistoryTracker/Resources/icon.ico"
-        Width="480" Height="360" CanResize="False"
+        Width="480" Height="295" CanResize="False"
         WindowStartupLocation="CenterOwner">
 
     <Design.DataContext>
@@ -39,11 +39,10 @@
 
         <StackPanel>
             <Button Command="{Binding ShowOfficialWebsite}">Official Website</Button>
-            <Button Command="{Binding ShowIssueTracker}">Issue Tracker</Button>
             <Button Command="{Binding ShowSourceCode}">Source Code</Button>
         </StackPanel>
 
-        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" Margin="0 10 0 0">
+        <Grid RowDefinitions="Auto,5,Auto,Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="175,125,*" 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>
@@ -56,21 +55,13 @@
             <TextBlock Grid.Row="3" Grid.Column="1">MIT</TextBlock>
             <Button Grid.Row="3" Grid.Column="2" Command="{Binding ShowLibraryAvalonia}">NuGet</Button>
 
-            <TextBlock Grid.Row="4" Grid.Column="0">MVVM Toolkit</TextBlock>
-            <TextBlock Grid.Row="4" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibraryCommunityToolkit}">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}">Official Website</Button>
+            <TextBlock Grid.Row="4" Grid.Column="0">SQLite</TextBlock>
+            <TextBlock Grid.Row="4" Grid.Column="1">Public Domain</TextBlock>
+            <Button Grid.Row="4" Grid.Column="2" Command="{Binding ShowLibrarySqlite}">Official 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>
-            
-            <TextBlock Grid.Row="7" Grid.Column="0">Rx.NET</TextBlock>
-            <TextBlock Grid.Row="7" Grid.Column="1">MIT</TextBlock>
-            <Button Grid.Row="7" Grid.Column="2" Command="{Binding ShowLibraryRxNet}">GitHub</Button>
+            <TextBlock Grid.Row="5" Grid.Column="0">Microsoft.Data.Sqlite</TextBlock>
+            <TextBlock Grid.Row="5" Grid.Column="1">Apache-2.0</TextBlock>
+            <Button Grid.Row="5" Grid.Column="2" Command="{Binding ShowLibrarySqliteAdoNet}">NuGet</Button>
         </Grid>
 
     </StackPanel>

app/Desktop/Main/AboutWindowModel.cs

@@ -7,26 +7,14 @@ sealed class AboutWindowModel {
 		OpenUrl("https://dht.chylex.com");
 	}
 
-	public void ShowIssueTracker() {
-		OpenUrl("https://github.com/chylex/Discord-History-Tracker/issues");
-	}
-	
 	public void ShowSourceCode() {
 		OpenUrl("https://github.com/chylex/Discord-History-Tracker");
 	}
 
-	public void ShowLibraryNetCore() {
-		OpenUrl("https://github.com/dotnet/core");
-	}
-
 	public void ShowLibraryAvalonia() {
 		OpenUrl("https://www.nuget.org/packages/Avalonia");
 	}
 
-	public void ShowLibraryCommunityToolkit() {
-		OpenUrl("https://github.com/CommunityToolkit/dotnet");
-	}
-
 	public void ShowLibrarySqlite() {
 		OpenUrl("https://www.sqlite.org");
 	}
@@ -35,8 +23,8 @@ sealed class AboutWindowModel {
 		OpenUrl("https://www.nuget.org/packages/Microsoft.Data.Sqlite");
 	}
 
-	public void ShowLibraryRxNet() {
-		OpenUrl("https://github.com/dotnet/reactive");
+	public void ShowLibraryNetCore() {
+		OpenUrl("https://github.com/dotnet/core");
 	}
 
 	private static void OpenUrl(string url) {

app/Desktop/Main/Controls/DownloadItemFilterPanelModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.ReactiveUI;
@@ -9,17 +8,13 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Server;
 using DHT.Server.Data.Filters;
-using DHT.Server.Data.Settings;
-using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
 
 namespace DHT.Desktop.Main.Controls;
 
-sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisposable {
-	private static readonly Log Log = Log.ForType<DownloadItemFilterPanelModel>();
-	
+sealed partial class DownloadItemFilterPanelModel : ObservableObject, IDisposable {
 	public sealed record Unit(string Name, uint Scale);
-	
+
 	private static readonly Unit[] AllUnits = [
 		new Unit("B", 1),
 		new Unit("kB", 1024),
@@ -38,7 +33,7 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 	private bool limitSize = false;
 	
 	[ObservableProperty]
-	private ulong maximumSize = 0UL;
+	private ulong maximumSize = 0L;
 	
 	[ObservableProperty]
 	private Unit maximumSizeUnit = AllUnits[0];
@@ -48,9 +43,6 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 	private readonly State state;
 	private readonly string verb;
 
-	private readonly DelayedThrottledTask<FilterSettings> saveFilterSettingsTask;
-	private bool isLoadingFilterSettings;
-
 	private readonly RestartableTask<long> downloadItemCountTask;
 	private long? matchingItemCount;
 	
@@ -64,8 +56,6 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 		this.state = state;
 		this.verb = verb;
 
-		this.saveFilterSettingsTask = new DelayedThrottledTask<FilterSettings>(Log, TimeSpan.FromSeconds(5), SaveFilterSettings);
-
 		this.downloadItemCountTask = new RestartableTask<long>(SetMatchingCount, TaskScheduler.FromCurrentSynchronizationContext());
 		this.downloadItemCountSubscription = state.Db.Downloads.TotalCount.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnDownloadItemCountChanged);
 
@@ -74,51 +64,13 @@ sealed partial class DownloadItemFilterPanelModel : ObservableObject, IAsyncDisp
 		PropertyChanged += OnPropertyChanged;
 	}
 
-	public async Task Initialize() {
-		isLoadingFilterSettings = true;
-		
-		LimitSize = await state.Db.Settings.Get(SettingsKey.DownloadsLimitSize, LimitSize);
-		MaximumSize = await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSize, MaximumSize);
-
-		if (await state.Db.Settings.Get(SettingsKey.DownloadsMaximumSizeUnit, null) is {} unitName && AllUnits.FirstOrDefault(unit => unit.Name == unitName) is {} unitValue) {
-			MaximumSizeUnit = unitValue;
-		}
-		
-		isLoadingFilterSettings = false;
-	}
-
-	public async ValueTask DisposeAsync() {
-		saveFilterSettingsTask.Dispose();
-		
+	public void Dispose() {
 		downloadItemCountTask.Cancel();
 		downloadItemCountSubscription.Dispose();
-		
-		await SaveFilterSettings(new FilterSettings(this));
-	}
-	
-	private sealed record FilterSettings(bool LimitSize, ulong MaximumSize, Unit MaximumSizeUnit) {
-		public FilterSettings(DownloadItemFilterPanelModel model) : this(model.LimitSize, model.MaximumSize, model.MaximumSizeUnit) {}
-	}
-	
-	private async Task SaveFilterSettings(FilterSettings settings) {
-		try {
-			await state.Db.Settings.Set(async setter => {
-				await setter.Set(SettingsKey.DownloadsLimitSize, settings.LimitSize);
-				await setter.Set(SettingsKey.DownloadsMaximumSize, settings.MaximumSize);
-				await setter.Set(SettingsKey.DownloadsMaximumSizeUnit, settings.MaximumSizeUnit.Name);
-			});
-		} catch (Exception e) {
-			Log.Error("Could not save download filter settings");
-			Log.Error(e);
-		}
 	}
 
 	private void OnPropertyChanged(object? sender, PropertyChangedEventArgs e) {
 		if (e.PropertyName != null && FilterProperties.Contains(e.PropertyName)) {
-			if (!isLoadingFilterSettings) {
-				saveFilterSettingsTask.Post(new FilterSettings(this));
-			}
-			
 			UpdateFilterStatistics();
 		}
 	}

app/Desktop/Main/MainWindowModel.cs

@@ -95,8 +95,6 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 		mainContentScreenModel = new MainContentScreenModel(window, state);
 		mainContentScreenModel.DatabaseClosed += MainContentScreenModelOnDatabaseClosed;
 		
-		await mainContentScreenModel.Initialize();
-		
 		Title = Path.GetFileName(state.Db.Path) + " - " + DefaultTitle;
 		CurrentScreen = new MainContentScreen { DataContext = mainContentScreenModel };
 
@@ -106,7 +104,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	private async void MainContentScreenModelOnDatabaseClosed(object? sender, EventArgs e) {
 		if (mainContentScreenModel != null) {
 			mainContentScreenModel.DatabaseClosed -= MainContentScreenModelOnDatabaseClosed;
-			await mainContentScreenModel.DisposeAsync();
+			mainContentScreenModel.Dispose();
 			mainContentScreenModel = null;
 		}
 
@@ -126,10 +124,7 @@ sealed partial class MainWindowModel : ObservableObject, IAsyncDisposable {
 	}
 
 	public async ValueTask DisposeAsync() {
-		if (mainContentScreenModel != null) {
-			await mainContentScreenModel.DisposeAsync();
-		}
-		
+		mainContentScreenModel?.Dispose();
 		await DisposeState();
 	}
 }

app/Desktop/Main/Pages/DownloadsPage.axaml

@@ -31,14 +31,8 @@
     </UserControl.Styles>
 
     <StackPanel Orientation="Vertical" Spacing="20">
-        <StackPanel Orientation="Horizontal" Spacing="10">
-            <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
-            <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
-        </StackPanel>
+        <Button Command="{Binding OnClickToggleDownload}" Content="{Binding ToggleDownloadButtonText}" IsEnabled="{Binding IsToggleDownloadButtonEnabled}" />
         <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.
-        </TextBlock>
         <StackPanel Orientation="Vertical" Spacing="12">
             <Expander Header="Download Status" IsExpanded="True">
                 <DataGrid ItemsSource="{Binding StatisticsRows}" AutoGenerateColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserSortColumns="False" IsReadOnly="True">
@@ -49,6 +43,9 @@
                     </DataGrid.Columns>
                 </DataGrid>
             </Expander>
+            <StackPanel Orientation="Horizontal" Spacing="10">
+                <Button Command="{Binding OnClickRetryFailedDownloads}" IsEnabled="{Binding IsRetryFailedOnDownloadsButtonEnabled}">Retry Failed Downloads</Button>
+            </StackPanel>
         </StackPanel>
     </StackPanel>
 </UserControl>

app/Desktop/Main/Pages/DownloadsPageModel.cs

@@ -9,14 +9,13 @@ using DHT.Desktop.Main.Controls;
 using DHT.Server;
 using DHT.Server.Data.Aggregations;
 using DHT.Server.Data.Filters;
-using DHT.Server.Data.Settings;
 using DHT.Server.Download;
 using DHT.Utils.Logging;
 using DHT.Utils.Tasks;
 
 namespace DHT.Desktop.Main.Pages;
 
-sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
+sealed partial class DownloadsPageModel : ObservableObject, IDisposable {
 	private static readonly Log Log = Log.ForType<DownloadsPageModel>();
 
 	[ObservableProperty(Setter = Access.Private)]
@@ -74,22 +73,14 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 
 		RecomputeDownloadStatistics();
 	}
-	
-	public async Task Initialize() {
-		await FilterModel.Initialize();
-		
-		if (await state.Db.Settings.Get(SettingsKey.DownloadsAutoStart, false)) {
-			await StartDownload();
-		}
-	}
 
-	public async ValueTask DisposeAsync() {
+	public void Dispose() {
 		finishedItemsSubscription?.Dispose();
 		
 		downloadItemCountSubscription.Dispose();
 		downloadStatisticsTask.Dispose();
 
-		await FilterModel.DisposeAsync();
+		FilterModel.Dispose();
 	}
 
 	private void OnDownloadCountChanged(long newDownloadCount) {
@@ -100,41 +91,26 @@ sealed partial class DownloadsPageModel : ObservableObject, IAsyncDisposable {
 		IsToggleDownloadButtonEnabled = false;
 
 		if (IsDownloading) {
-			await StopDownload();
+			await state.Downloader.Stop();
+			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+
+			finishedItemsSubscription?.Dispose();
+			finishedItemsSubscription = null;
+			
+			currentDownloadFilter = null;
 		}
 		else {
-			await StartDownload();
+			await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
+			
+			var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
+			finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
 		}
 
-		await state.Db.Settings.Set(SettingsKey.DownloadsAutoStart, IsDownloading);
-		IsToggleDownloadButtonEnabled = true;
-	}
-
-	private async Task StartDownload() {
-		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
-		
-		var finishedItems = await state.Downloader.Start(currentDownloadFilter = FilterModel.CreateFilter());
-		finishedItemsSubscription = finishedItems.ObserveOn(AvaloniaScheduler.Instance).Subscribe(OnItemFinished);
-		
-		OnDownloadStateChanged();
-	}
-
-	private async Task StopDownload() {
-		await state.Downloader.Stop();
-		await state.Db.Downloads.MoveDownloadingItemsBackToQueue();
-
-		finishedItemsSubscription?.Dispose();
-		finishedItemsSubscription = null;
-			
-		currentDownloadFilter = null;
-		OnDownloadStateChanged();
-	}
-
-	private void OnDownloadStateChanged() {
 		RecomputeDownloadStatistics();
 
 		OnPropertyChanged(nameof(ToggleDownloadButtonText));
 		OnPropertyChanged(nameof(IsDownloading));
+		IsToggleDownloadButtonEnabled = true;
 	}
 
 	private void OnItemFinished(DownloadItem item) {

app/Desktop/Main/Screens/MainContentScreenModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using Avalonia.Controls;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Main.Pages;
@@ -7,7 +6,7 @@ using DHT.Server;
 
 namespace DHT.Desktop.Main.Screens;
 
-sealed class MainContentScreenModel : IAsyncDisposable {
+sealed class MainContentScreenModel : IDisposable {
 	public DatabasePage DatabasePage { get; }
 	private DatabasePageModel DatabasePageModel { get; }
 
@@ -71,13 +70,9 @@ sealed class MainContentScreenModel : IAsyncDisposable {
 
 		StatusBarModel = new StatusBarModel(state);
 	}
-	
-	public async Task Initialize() {
-		await DownloadsPageModel.Initialize();
-	}
 
-	public async ValueTask DisposeAsync() {
-		await DownloadsPageModel.DisposeAsync();
+	public void Dispose() {
+		DownloadsPageModel.Dispose();
 		ViewerPageModel.Dispose();
 		AdvancedPageModel.Dispose();
 		StatusBarModel.Dispose();

app/Desktop/Main/Screens/WelcomeScreenModel.cs

@@ -7,7 +7,6 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
-using DHT.Server.Data.Settings;
 using DHT.Server.Database;
 using DHT.Server.Database.Sqlite.Schema;
 
@@ -47,18 +46,10 @@ sealed partial class WelcomeScreenModel : ObservableObject {
 	public async Task OpenOrCreateDatabaseFromPath(string path) {
 		dbFilePath = path;
 		
-		bool isNew = !File.Exists(path);
-		
 		var db = await DatabaseGui.TryOpenOrCreateDatabaseFromPath(path, window, new SchemaUpgradeCallbacks(window));
-		if (db == null) {
-			return;
+		if (db != null) {
+			DatabaseSelected?.Invoke(this, db);
 		}
-		
-		if (isNew && await Dialog.ShowYesNo(window, "Automatic Downloads", "Do you want to automatically download files hosted on Discord? You can change this later in the Downloads tab.") == DialogResult.YesNo.Yes) {
-			await db.Settings.Set(SettingsKey.DownloadsAutoStart, true);
-		}
-		
-		DatabaseSelected?.Invoke(this, db);
 	}
 
 	private sealed class SchemaUpgradeCallbacks : ISchemaUpgradeCallbacks {

app/Resources/Tracker/bootstrap.js

@@ -10,11 +10,16 @@
 		return;
 	}
 	
+	/*[IMPORTS]*/
+	
+	if (!DISCORD.isCompatible()) {
+		alert("Discord History Tracker is not compatible with this version of Discord.");
+		return;
+	}
+	
 	window.DHT_LOADED = true;
 	window.DHT_ON_UNLOAD = [];
 	
-	/*[IMPORTS]*/
-	
 	const port = 0; /*[PORT]*/
 	const token = "/*[TOKEN]*/";
 	STATE.setup(port, token);
@@ -46,7 +51,7 @@
 		return action === null || action === CONSTANTS.AUTOSCROLL_ACTION_NOTHING;
 	};
 	
-	const onTrackingContinued = function(anyNewMessages) {
+	const onTrackingContinued = function(anyNewMessages, hasMoreBefore) {
 		if (!STATE.isTracking()) {
 			return;
 		}
@@ -63,7 +68,7 @@
 		if (SETTINGS.autoscroll) {
 			let action = null;
 			
-			if (!DISCORD.hasMoreMessages()) {
+			if (!hasMoreBefore) {
 				console.debug("[DHT] Reached first message.");
 				action = SETTINGS.afterFirstMsg;
 			}
@@ -84,7 +89,7 @@
 	
 	let waitUntilSendingFinishedTimer = null;
 	
-	const onMessagesUpdated = async messages => {
+	const onMessagesUpdated = async (server, channel, messages, hasMoreBefore) => {
 		if (!STATE.isTracking() || delayedStopRequests > 0) {
 			return;
 		}
@@ -94,24 +99,16 @@
 			
 			waitUntilSendingFinishedTimer = window.setTimeout(() => {
 				waitUntilSendingFinishedTimer = null;
-				onMessagesUpdated(messages);
+				onMessagesUpdated(server, channel, messages, hasMoreBefore);
 			}, 100);
 			
 			return;
 		}
 		
-		const info = DISCORD.getSelectedChannel();
-		
-		if (!info) {
-			GUI.setStatus("Error (Unknown Channel)");
-			stopTrackingDelayed();
-			return;
-		}
-		
 		isSending = true;
 		
 		try {
-			await STATE.addDiscordChannel(info.server, info.channel);
+			await STATE.addDiscordChannel(server, channel);
 		} catch (e) {
 			onError(e);
 			return;
@@ -120,32 +117,28 @@
 		try {
 			if (!messages.length) {
 				isSending = false;
-				onTrackingContinued(false);
+				onTrackingContinued(false, hasMoreBefore);
 			}
 			else {
 				const anyNewMessages = await STATE.addDiscordMessages(messages);
-				onTrackingContinued(anyNewMessages);
+				onTrackingContinued(anyNewMessages, hasMoreBefore);
 			}
 		} catch (e) {
 			onError(e);
 		}
 	};
 	
-	DISCORD.setupMessageCallback(onMessagesUpdated);
+	const starter = DISCORD.setupMessageCallback(onMessagesUpdated);
 	
 	STATE.onTrackingStateChanged(enabled => {
 		if (enabled) {
-			const messages = DISCORD.getMessages();
-			
-			if (messages.length === 0) {
-				stopTrackingDelayed(() => alert("Cannot see any messages."));
-				return;
-			}
-			
 			GUI.setStatus("Starting");
 			hasJustStarted = true;
-			// noinspection JSIgnoredPromiseFromCall
-			onMessagesUpdated(messages);
+			
+			if (!starter()) {
+				stopTrackingDelayed(() => alert("Cannot see any messages."));
+				hasJustStarted = false;
+			}
 		}
 		else {
 			isSending = false;

app/Resources/Tracker/scripts/discord.js

@@ -4,11 +4,26 @@ class DISCORD {
 	
 	// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 	static CHANNEL_TYPE = {
+		GUILD_TEXT: 0,
 		DM: 1,
 		GROUP_DM: 3,
+		GUILD_ANNOUNCEMENT: 5,
 		ANNOUNCEMENT_THREAD: 10,
 		PUBLIC_THREAD: 11,
-		PRIVATE_THREAD: 12
+		PRIVATE_THREAD: 12,
+		
+		isPrivate(type) {
+			return type === this.DM
+				|| type === this.GROUP_DM;
+		},
+		
+		isNavigableGuildChannel(type) {
+			return type === this.GUILD_TEXT
+				|| type === this.GUILD_ANNOUNCEMENT
+				|| type === this.ANNOUNCEMENT_THREAD
+				|| type === this.PUBLIC_THREAD
+				|| type === this.PRIVATE_THREAD;
+		}
 	};
 	
 	// https://discord.com/developers/docs/resources/channel#message-object-message-types
@@ -18,6 +33,74 @@ class DISCORD {
 		THREAD_STARTER: 21
 	};
 	
+	// https://discord.com/developers/docs/topics/permissions#permissions-bitwise-permission-flags
+	static PERMISSION = {
+		VIEW_CHANNEL: 1n << 10n
+	};
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): ?DiscordGuild} getGuild
+	 */
+	static #guildStore = WEBPACK.findModule(WEBPACK.filterByProps("getGuild", "getGuilds", "getGuildIds"));
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): Boolean} isOptInEnabled
+	 * @property {function(String): Set<String>} getOptedInChannels
+	 */
+	static #guildSettings = WEBPACK.findModule(WEBPACK.filterByProps("isOptInEnabled", "getOptedInChannels"));
+	
+	/**
+	 * @type {Object}
+	 * @property {function(String): ?DiscordChannel} getChannel
+	 * @property {function(String): Array<DiscordChannel>} getMutableGuildChannelsForGuild
+	 * @property {function(): Array<DiscordChannel>} getSortedPrivateChannels
+	 */
+	static #channelStore = WEBPACK.findModule(WEBPACK.filterByProps("getChannel", "getMutableGuildChannelsForGuild", "getSortedPrivateChannels"));
+	
+	/**
+	 * @type {function(BigInt, Object): Boolean}
+	 */
+	static #hasPermission = WEBPACK.findFunction("can", [ "getGuildPermissions", "getChannelPermissions" ]);
+	
+	/**
+	 * @type {function(String): MessageData}
+	 */
+	static #getMessages = WEBPACK.findFunction("getMessages");
+	
+	/**
+	 * @type {function(String): void}
+	 */
+	static #jumpToMessage = WEBPACK.findFunction("jumpToMessage");
+	
+	/**
+	 * @type {function(): String}
+	 */
+	static #getCurrentlySelectedChannelId = WEBPACK.findFunction("getCurrentlySelectedChannelId");
+	
+	/**
+	 * @type {function(String): void}
+	 */
+	static #selectPrivateChannel = WEBPACK.findFunction("selectPrivateChannel", [ "selectChannel" ]);
+	
+	/**
+	 * @type {function(String, String, String=null): void}
+	 */
+	static #transitionToGuild = WEBPACK.findFunction("transitionToGuild", [ "transitionTo" ]);
+	
+	static isCompatible() {
+		return !!this.#guildStore
+			&& !!this.#guildSettings
+			&& !!this.#channelStore
+			&& !!this.#hasPermission
+			&& !!this.#getMessages
+			&& !!this.#jumpToMessage
+			&& !!this.#getCurrentlySelectedChannelId
+			&& !!this.#selectPrivateChannel
+			&& !!this.#transitionToGuild;
+	}
+	
 	static getMessageOuterElement() {
 		return DOM.queryReactClass("messagesWrapper");
 	}
@@ -26,14 +109,6 @@ class DISCORD {
 		return DOM.queryReactClass("scroller", this.getMessageOuterElement());
 	}
 	
-	static getMessageElements() {
-		return this.getMessageOuterElement().querySelectorAll("[class*='message_']");
-	}
-	
-	static hasMoreMessages() {
-		return document.querySelector("#messagesNavigationDescription + [class^=container]") === null;
-	}
-	
 	static loadOlderMessages() {
 		const view = this.getMessageScrollerElement();
 		
@@ -48,20 +123,36 @@ class DISCORD {
 	static setupMessageCallback(callback) {
 		const previousMessages = new Set();
 		
-		const onMessageElementsChanged = function() {
-			const messages = DISCORD.getMessages();
-			const hasChanged = messages.some(message => !previousMessages.has(message.id)) || !DISCORD.hasMoreMessages();
+		const onMessageElementsChanged = force => {
+			const channelId = this.#getCurrentlySelectedChannelId();
+			if (!channelId) {
+				return false;
+			}
 			
+			const messages = this.#getMessages(channelId);
+			if (!messages || !messages.ready || messages.loadingMore) {
+				return false;
+			}
+			
+			const channel = this.#channelStore.getChannel(channelId);
+			if (!channel) {
+				return false;
+			}
+			
+			const hasChanged = force || !messages.hasMoreBefore || messages.some(message => !previousMessages.has(message.id));
 			if (!hasChanged) {
-				return;
+				return false;
 			}
 			
 			previousMessages.clear();
-			for (const message of messages) {
+			for (const message of messages._array) {
 				previousMessages.add(message.id);
 			}
 			
-			callback(messages);
+			const server = this.#guildStore.getGuild(channel.guild_id);
+			
+			callback(server, channel, messages._array, messages.hasMoreBefore);
+			return true;
 		};
 		
 		let debounceTimer;
@@ -74,7 +165,7 @@ class DISCORD {
 			debounceTimer = window.setTimeout(onMessageElementsChanged, 100);
 		};
 		
-		const observer = new MutationObserver(function () {
+		const observer = new MutationObserver(function() {
 			onMessageElementsChangedLater();
 		});
 		
@@ -112,216 +203,55 @@ class DISCORD {
 			observedElement = null;
 			window.clearInterval(observerTimer);
 		});
-	}
-	
-	/**
-	 * Returns the message from a message element.
-	 * @returns { null | DiscordMessage } }
-	 */
-	static getMessageFromElement(ele) {
-		const props = DOM.getReactProps(ele);
 		
-		if (props && Array.isArray(props.children)) {
-			for (const child of props.children) {
-				if (!(child instanceof Object)) {
-					continue;
-				}
-				
-				const childProps = child.props;
-				if (childProps instanceof Object && "message" in childProps) {
-					return childProps.message;
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Returns an array containing currently loaded messages.
-	 */
-	static getMessages() {
-		try {
-			const messages = [];
-			
-			for (const ele of this.getMessageElements()) {
-				try {
-					const message = this.getMessageFromElement(ele);
-					
-					if (message != null) {
-						messages.push(message);
-					}
-				} catch (e) {
-					console.error("[DHT] Error extracing message data, skipping it.", e, ele, DOM.tryGetReactProps(ele));
-				}
-			}
-			
-			return messages;
-		} catch (e) {
-			console.error("[DHT] Error retrieving messages.", e);
-			return [];
-		}
-	}
-	
-	/**
-	 * Returns an object containing the selected server and channel information.
-	 * For types DM and GROUP, the server and channel ids and names are identical.
-	 * @returns { {} | null }
-	 */
-	static getSelectedChannel() {
-		try {
-			let obj = null;
-			
-			try {
-				for (const child of DOM.getReactProps(DOM.queryReactClass("chatContent")).children) {
-					if (child && child.props && child.props.channel) {
-						obj = child.props.channel;
-						break;
-					}
-				}
-			} catch (e) {
-				console.error("[DHT] Error retrieving selected channel from 'chatContent' element.", e);
-			}
-			
-			if (!obj || typeof obj.id !== "string") {
-				return null;
-			}
-			
-			const dms = DOM.queryReactClass("privateChannels");
-			
-			if (dms) {
-				let name;
-				
-				for (const ele of dms.querySelectorAll("[class*='channel_'] [class*='selected_'] [class^='name_'] *")) {
-					const node = Array.prototype.find.call(ele.childNodes, node => node.nodeType === Node.TEXT_NODE);
-					
-					if (node) {
-						name = node.nodeValue;
-						break;
-					}
-				}
-				
-				if (!name) {
-					return null;
-				}
-				
-				let type;
-				
-				// https://discord.com/developers/docs/resources/channel#channel-object-channel-types
-				switch (obj.type) {
-					case DISCORD.CHANNEL_TYPE.DM: type = "DM"; break;
-					case DISCORD.CHANNEL_TYPE.GROUP_DM: type = "GROUP"; break;
-					default: return null;
-				}
-				
-				const id = obj.id;
-				const server = { id, name, type };
-				const channel = { id, name };
-				
-				return { server, channel };
-			}
-			else if (obj.guild_id) {
-				let guild;
-				
-				for (const child of DOM.getReactProps(document.querySelector("nav header [class*='headerContent_']")).children) {
-					if (child && child.props && child.props.guild) {
-						guild = child.props.guild;
-						break;
-					}
-				}
-				
-				if (!guild || typeof guild.name !== "string" || obj.guild_id !== guild.id) {
-					return null;
-				}
-				
-				const server = {
-					"id": guild.id,
-					"name": guild.name,
-					"type": "SERVER"
-				};
-				
-				const channel = {
-					"id": obj.id,
-					"name": obj.name,
-					"extra": {
-						"nsfw": obj.nsfw
-					}
-				};
-				
-				if (obj.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || obj.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
-					channel["extra"]["parent"] = obj.parent_id;
-				}
-				else {
-					channel["extra"]["position"] = obj.position;
-					channel["extra"]["topic"] = obj.topic;
-				}
-				
-				return { server, channel };
-			}
-			else {
-				return null;
-			}
-		} catch (e) {
-			console.error("[DHT] Error retrieving selected channel.", e);
-			return null;
-		}
+		return () => onMessageElementsChanged(true);
 	}
 	
 	/**
 	 * Selects the next text channel and returns true, otherwise returns false if there are no more channels.
 	 */
 	static selectNextTextChannel() {
-		const dms = DOM.queryReactClass("privateChannels");
+		const currentChannel = this.#channelStore.getChannel(this.#getCurrentlySelectedChannelId());
+		if (!currentChannel) {
+			return false;
+		}
 		
-		if (dms) {
-			const currentChannel = DOM.queryReactClass("selected", dms);
-			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel_']");
-			const nextChannel = currentChannelContainer && currentChannelContainer.nextElementSibling;
+		if (this.CHANNEL_TYPE.isPrivate(currentChannel.type)) {
+			const privateChannel = this.#channelStore.getSortedPrivateChannels();
+			const currentIndex = privateChannel.findIndex(channel => channel.id === currentChannel.id);
 			
-			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel_")) {
+			if (currentIndex === -1 || currentIndex === privateChannel.length - 1) {
 				return false;
 			}
 			
-			const nextChannelLink = nextChannel.querySelector("a[href*='/@me/']");
-			if (!nextChannelLink) {
-				return false;
-			}
-			
-			nextChannelLink.click();
-			nextChannelLink.scrollIntoView(true);
+			this.#selectPrivateChannel(privateChannel[currentIndex + 1].id);
 			return true;
 		}
 		else {
-			const channelListEle = document.getElementById("channels");
-			if (!channelListEle) {
+			const guildId = currentChannel.guild_id;
+			
+			let isChannelOptedIn;
+			if (this.#guildSettings.isOptInEnabled(guildId)) {
+				const optedInChannels = this.#guildSettings.getOptedInChannels(guildId);
+				isChannelOptedIn = channel => optedInChannels.has(channel.id);
+			}
+			else {
+				isChannelOptedIn = _ => true;
+			}
+			
+			const guildChannelMap = this.#channelStore.getMutableGuildChannelsForGuild(guildId);
+			const guildChannels = Object.values(guildChannelMap)
+				.filter(channel => this.CHANNEL_TYPE.isNavigableGuildChannel(channel.type) && isChannelOptedIn(channel) && this.#hasPermission(this.PERMISSION.VIEW_CHANNEL, channel))
+				.sort((a, b) => a.position - b.position);
+			
+			debugger;
+			const currentIndex = guildChannels.findIndex(channel => channel.id === currentChannel.id);
+			
+			if (currentIndex === -1 || currentIndex === guildChannels.length - 1) {
 				return false;
 			}
 			
-			function getLinkElement(channel) {
-				return channel.querySelector("a[href^='/channels/'][role='link']");
-			}
-			
-			const allTextChannels = Array.prototype.filter.call(channelListEle.querySelectorAll("[class*='containerDefault']"), ele => getLinkElement(ele) !== null);
-			let nextChannel = null;
-			
-			for (let index = 0; index < allTextChannels.length - 1; index++) {
-				if (allTextChannels[index].className.includes("selected_")) {
-					nextChannel = allTextChannels[index + 1];
-					break;
-				}
-			}
-			
-			if (nextChannel === null) {
-				return false;
-			}
-			
-			const nextChannelLink = getLinkElement(nextChannel);
-			if (!nextChannelLink) {
-				return false;
-			}
-			
-			nextChannelLink.click();
-			nextChannel.scrollIntoView(true);
+			this.#transitionToGuild(guildId, guildChannels[currentIndex + 1].id);
 			return true;
 		}
 	}

app/Resources/Tracker/scripts/dom.js

@@ -55,31 +55,4 @@ class DOM {
 		const value = document.cookie.replace(new RegExp("(?:(?:^|.*;\\s*)" + name + "\\s*\\=\\s*([^;]*).*$)|^.*$"), "$1");
 		return value.length ? JSON.parse(decodeURIComponent(value)) : null;
 	}
-	
-	/**
-	 * Returns internal React state object of an element.
-	 */
-	static getReactProps(ele) {
-		const keys = Object.keys(ele || {});
-		let key = keys.find(key => key.startsWith("__reactInternalInstance"));
-		
-		if (key) {
-			// noinspection JSUnresolvedVariable
-			return ele[key].memoizedProps;
-		}
-		
-		key = keys.find(key => key.startsWith("__reactProps$"));
-		return key ? ele[key] : null;
-	}
-	
-	/**
-	 * Returns internal React state object of an element, or null if the retrieval throws.
-	 */
-	static tryGetReactProps(ele) {
-		try {
-			return this.getReactProps(ele);
-		} catch (e) {
-			return null;
-		}
-	}
 }

app/Resources/Tracker/scripts/state.js

@@ -58,65 +58,39 @@ const STATE = (function() {
 		}
 	};
 	
+	/**
+	 * @param {DiscordChannel} channel
+	 */
+	const getPrivateChannelName = function(channel) {
+		if (channel.name === "") {
+			return channel.rawRecipients.map(user => user.username).join(", ");
+		}
+		else {
+			return channel.name;
+		}
+	};
+	
+	/**
+	 * @param {Number} type
+	 */
+	const getChannelTypeName = function(type) {
+		if (type === DISCORD.CHANNEL_TYPE.DM) {
+			return "DM";
+		}
+		else if (type === DISCORD.CHANNEL_TYPE.GROUP_DM) {
+			return "GROUP";
+		}
+		else {
+			return "SERVER";
+		}
+	};
+	
 	const trackingStateChangedListeners = [];
 	let isTracking = false;
 	
 	const addedChannels = new Set();
 	const addedUsers = new Set();
 	
-	/**
-	 * @name DiscordUser
-	 * @property {String} id
-	 * @property {String} username
-	 * @property {String} discriminator
-	 * @property {String} [globalName]
-	 * @property {String} [avatar]
-	 * @property {Boolean} [bot]
-	 */
-	
-	/**
-	 * @name DiscordMessage
-	 * @property {String} id
-	 * @property {String} channel_id
-	 * @property {DiscordUser} author
-	 * @property {String} content
-	 * @property {Date} timestamp
-	 * @property {Date|null} editedTimestamp
-	 * @property {DiscordAttachment[]} attachments
-	 * @property {Object[]} embeds
-	 * @property {DiscordMessageReaction[]} [reactions]
-	 * @property {DiscordMessageReference} [messageReference]
-	 * @property {Number} type
-	 * @property {String} state
-	 */
-	
-	/**
-	 * @name DiscordAttachment
-	 * @property {String} id
-	 * @property {String} filename
-	 * @property {String} [content_type]
-	 * @property {String} size
-	 * @property {String} url
-	 */
-	
-	/**
-	 * @name DiscordMessageReaction
-	 * @property {DiscordEmoji} emoji
-	 * @property {Number} count
-	 */
-	
-	/**
-	 * @name DiscordMessageReference
-	 * @property {String} [message_id]
-	 */
-	
-	/**
-	 * @name DiscordEmoji
-	 * @property {String|null} id
-	 * @property {String|null} name
-	 * @property {Boolean} animated
-	 */
-	
 	return {
 		setup(port, token) {
 			serverPort = port;
@@ -147,32 +121,51 @@ const STATE = (function() {
 			}
 		},
 		
+		/**
+		 * @param {?DiscordGuild} serverInfo
+		 * @param {DiscordChannel} channelInfo
+		 */
 		async addDiscordChannel(serverInfo, channelInfo) {
 			if (addedChannels.has(channelInfo.id)) {
 				return;
 			}
 			
 			const server = {
-				id: serverInfo.id,
-				name: serverInfo.name,
-				type: serverInfo.type
+				type: getChannelTypeName(channelInfo.type)
 			};
 			
 			const channel = {
 				id: channelInfo.id,
-				name: channelInfo.name
+				extra: {}
 			};
 			
-			if ("extra" in channelInfo) {
-				const extra = channelInfo.extra;
-				
-				if ("parent" in extra) {
-					channel.parent = extra.parent;
-				}
-				
-				channel.position = extra.position;
-				channel.topic = extra.topic;
-				channel.nsfw = extra.nsfw;
+			if (DISCORD.CHANNEL_TYPE.isPrivate(channelInfo.type)) {
+				server.id = channelInfo.id;
+				server.name = channel.name = getPrivateChannelName(channelInfo);
+			}
+			else if (serverInfo) {
+				server.id = serverInfo.id;
+				server.name = serverInfo.name;
+				channel.name = channelInfo.name;
+			}
+			else {
+				return;
+			}
+			
+			if ("nsfw" in channelInfo) {
+				channel.extra.nsfw = channelInfo.nsfw;
+			}
+			
+			if ("topic" in channelInfo) {
+				channel.extra.topic = channelInfo.topic;
+			}
+			
+			if ("position" in channelInfo) {
+				channel.extra.position = channelInfo.position;
+			}
+			
+			if (channelInfo.type === DISCORD.CHANNEL_TYPE.ANNOUNCEMENT_THREAD || channelInfo.type === DISCORD.CHANNEL_TYPE.PUBLIC_THREAD || channelInfo.type === DISCORD.CHANNEL_TYPE.PRIVATE_THREAD) {
+				channel.extra.parent = channelInfo.parent_id;
 			}
 			
 			await post("/track-channel", { server, channel });

app/Resources/Tracker/scripts/types.js

@@ -0,0 +1,81 @@
+/**
+ * @name DiscordGuild
+ * @property {String} id
+ * @property {String} name
+ */
+
+/**
+ * @name DiscordChannel
+ * @property {String} id
+ * @property {String} name
+ * @property {Number} type
+ * @property {String} [guild_id]
+ * @property {String} [parent_id]
+ * @property {Number} [position]
+ * @property {String} [topic]
+ * @property {Boolean} [nsfw]
+ * @property {DiscordUser[]} [rawRecipients]
+ */
+
+/**
+ * @name DiscordUser
+ * @property {String} id
+ * @property {String} username
+ * @property {String} discriminator
+ * @property {String} [globalName]
+ * @property {String} [avatar]
+ * @property {Boolean} [bot]
+ */
+
+/**
+ * @name DiscordMessage
+ * @property {String} id
+ * @property {String} channel_id
+ * @property {DiscordUser} author
+ * @property {String} content
+ * @property {Date} timestamp
+ * @property {Date|null} editedTimestamp
+ * @property {DiscordAttachment[]} attachments
+ * @property {Object[]} embeds
+ * @property {DiscordMessageReaction[]} [reactions]
+ * @property {DiscordMessageReference} [messageReference]
+ * @property {Number} type
+ * @property {String} state
+ */
+
+/**
+ * @name DiscordAttachment
+ * @property {String} id
+ * @property {String} filename
+ * @property {String} [content_type]
+ * @property {String} size
+ * @property {String} url
+ */
+
+/**
+ * @name DiscordMessageReaction
+ * @property {DiscordEmoji} emoji
+ * @property {Number} count
+ */
+
+/**
+ * @name DiscordMessageReference
+ * @property {String} [message_id]
+ */
+
+/**
+ * @name DiscordEmoji
+ * @property {String|null} id
+ * @property {String|null} name
+ * @property {Boolean} animated
+ */
+
+/**
+ * @name MessageData
+ * @type {Object}
+ * @property {Boolean} ready
+ * @property {Boolean} loadingMore
+ * @property {Boolean} hasMoreAfter
+ * @property {Boolean} hasMoreBefore
+ * @property {Array<DiscordMessage>} _array
+ */

app/Resources/Tracker/scripts/webpack.js

@@ -0,0 +1,93 @@
+/**
+ * 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
+ */
+class WEBPACK {
+	static get require() {
+		if (this._require) {
+			return this._require;
+		}
+		
+		/**
+		 * @type {Object}
+		 * @property {Object} m
+		 * @property {Object} c
+		 */
+		let hookedRequire;
+		
+		const id = "dht-webpackmodules-" + new Date().getTime();
+		if (typeof (window["webpackChunkdiscord_app"]) !== "undefined") {
+			window["webpackChunkdiscord_app"].push([ [ id ], {}, internalRequire => hookedRequire = internalRequire ]);
+		}
+		
+		delete hookedRequire.m[id];
+		delete hookedRequire.c[id];
+		return this._require = hookedRequire;
+	}
+	
+	static getAllModules() {
+		return this.require.c;
+	}
+	
+	static filterByProps(...props) {
+		return module => props.every(prop => prop in module);
+	}
+	
+	static filterByPropsWithPredicate(predicate, ...props) {
+		return module => props.every(prop => prop in module && predicate(module[prop]));
+	}
+	
+	static findModules(filter) {
+		const defaultExport = true;
+		const moduleFilter = module => (typeof module === "object" || typeof module === "function") && filter(module);
+		
+		const results = [];
+		
+		for (const module of Object.values(this.getAllModules())) {
+			/**
+			 * @type {Object}
+			 * @property [Z]
+			 * @property [ZP]
+			 * @property [__esModule]
+			 * @property [default]
+			 */
+			const exports = module.exports;
+			if (!exports || exports === window || exports === document.documentElement || exports[Symbol.toStringTag] === "DOMTokenList") {
+				continue;
+			}
+			
+			let foundModule = null;
+			if (exports.Z && moduleFilter(exports.Z)) {
+				foundModule = defaultExport ? exports.Z : exports;
+			}
+			if (exports.ZP && moduleFilter(exports.ZP)) {
+				foundModule = defaultExport ? exports.ZP : exports;
+			}
+			if (exports.__esModule && exports.default && moduleFilter(exports.default)) {
+				foundModule = defaultExport ? exports.default : exports;
+			}
+			if (moduleFilter(exports)) {
+				foundModule = exports;
+			}
+			
+			if (foundModule) {
+				results.push(foundModule);
+			}
+		}
+		
+		return results;
+	}
+	
+	static findModule(filter) {
+		const modules = this.findModules(filter);
+		return modules.length === 1 ? modules[0] : null;
+	}
+	
+	static findFunction(name, additionalRequiredProps) {
+		const searchedProps = additionalRequiredProps ? [name, ...additionalRequiredProps] : [name];
+		const matchingModule = this.findModule(this.filterByPropsWithPredicate(prop => typeof(prop) === "function", ...searchedProps));
+		return matchingModule == null ? null : matchingModule[name].bind(matchingModule);
+	}
+}

app/Server/Data/Settings/SettingsKey.cs

@@ -1,60 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace DHT.Server.Data.Settings;
-
-public static class SettingsKey {
-	public static Bool DownloadsAutoStart { get; } = new ("downloads_auto_start");
-	public static Bool DownloadsLimitSize { get; } = new ("downloads_limit_size");
-	public static UnsignedLong DownloadsMaximumSize { get; } = new ("downloads_maximum_size");
-	public static String DownloadsMaximumSizeUnit { get; } = new ("downloads_maximum_size_unit");
-
-	public sealed class String(string key) : SettingsKey<string>(key) {
-		internal override bool FromString(string value, out string result) {
-			result = value;
-			return true;
-		}
-
-		internal override string ToString(string value) {
-			return value;
-		}
-	}
-	
-	public sealed class Bool(string key) : SettingsKey<bool>(key) {
-		internal override bool FromString(string value, out bool result) {
-			switch (value) {
-				case "1":
-					result = true;
-					return true;
-
-				case "0":
-					result = false;
-					return true;
-
-				default:
-					result = false;
-					return false;
-			}
-		}
-
-		internal override string ToString(bool value) {
-			return value ? "1" : "0";
-		}
-	}
-	
-	public sealed class UnsignedLong(string key) : SettingsKey<ulong>(key) {
-		internal override bool FromString(string value, out ulong result) {
-			return ulong.TryParse(value, out result);
-		}
-
-		internal override string ToString(ulong value) {
-			return value.ToString();
-		}
-	}
-}
-
-public abstract class SettingsKey<T>(string key) {
-	internal string Key => key;
-
-	internal abstract bool FromString(string value, [NotNullWhen(true)] out T result);
-	internal abstract string ToString(T value);
-}

app/Server/Database/DummyDatabaseFile.cs

@@ -10,7 +10,6 @@ sealed class DummyDatabaseFile : IDatabaseFile {
 
 	public string Path => "";
 	
-	public ISettingsRepository Settings { get; } = new ISettingsRepository.Dummy();
 	public IUserRepository Users { get; } = new IUserRepository.Dummy();
 	public IServerRepository Servers { get; } = new IServerRepository.Dummy();
 	public IChannelRepository Channels { get; } = new IChannelRepository.Dummy();

app/Server/Database/IDatabaseFile.cs

@@ -7,7 +7,6 @@ namespace DHT.Server.Database;
 public interface IDatabaseFile : IAsyncDisposable {
 	string Path { get; }
 
-	ISettingsRepository Settings { get; }
 	IUserRepository Users { get; }
 	IServerRepository Servers { get; }
 	IChannelRepository Channels { get; }

app/Server/Database/Repositories/ISettingsRepository.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DHT.Server.Data.Settings;
-
-namespace DHT.Server.Database.Repositories;
-
-public interface ISettingsRepository {
-	Task Set<T>(SettingsKey<T> key, T value);
-	
-	Task Set(Func<ISetter, Task> setter);
-	
-	Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue);
-	
-	interface ISetter {
-		Task Set<T>(SettingsKey<T> key, T value);
-	}
-	
-	internal sealed class Dummy : ISettingsRepository {
-		public Task Set<T>(SettingsKey<T> key, T value) {
-			return Task.CompletedTask;
-		}
-
-		public Task Set(Func<ISetter, Task> setter) {
-			return Task.CompletedTask;
-		}
-
-		public Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue) {
-			return Task.FromResult(defaultValue);
-		}
-	}
-}

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

@@ -20,7 +20,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 
 	internal sealed class NewDownloadCollector : IAsyncDisposable {
 		private readonly SqliteDownloadRepository repository;
-		private bool hasChanged = false;
+		private bool hasAdded = false;
 
 		private readonly SqliteCommand metadataCmd;
 
@@ -31,16 +31,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 				"""
 				INSERT INTO download_metadata (normalized_url, download_url, status, type, size)
 				VALUES (:normalized_url, :download_url, :status, :type, :size)
-				ON CONFLICT (normalized_url)
-				DO UPDATE SET
-					download_url = excluded.download_url,
-					type = IFNULL(excluded.type, type),
-					size = IFNULL(excluded.size, size)
-				WHERE status != :success
-				  AND (download_url != excluded.download_url
-				    OR (excluded.type IS NOT NULL AND type IS NOT excluded.type)
-				    OR (excluded.size IS NOT NULL AND size IS NOT excluded.size)
-				  )
+				ON CONFLICT DO NOTHING
 				"""
 			);
 			metadataCmd.Add(":normalized_url", SqliteType.Text);
@@ -48,7 +39,6 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			metadataCmd.Add(":status", SqliteType.Integer);
 			metadataCmd.Add(":type", SqliteType.Text);
 			metadataCmd.Add(":size", SqliteType.Integer);
-			metadataCmd.AddAndSet(":success", SqliteType.Integer, (int) DownloadStatus.Success);
 		}
 
 		public async Task Add(Data.Download download) {
@@ -57,11 +47,11 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 			metadataCmd.Set(":status", (int) download.Status);
 			metadataCmd.Set(":type", download.Type);
 			metadataCmd.Set(":size", download.Size);
-			hasChanged |= await metadataCmd.ExecuteNonQueryAsync() > 0;
+			hasAdded |= await metadataCmd.ExecuteNonQueryAsync() > 0;
 		}
 
 		public void OnCommitted() {
-			if (hasChanged) {
+			if (hasAdded) {
 				repository.UpdateTotalCount();
 			}
 		}
@@ -100,8 +90,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 					"""
 					INSERT INTO download_blobs (normalized_url, blob)
 					VALUES (:normalized_url, ZEROBLOB(:blob_length))
-					ON CONFLICT (normalized_url)
-					DO UPDATE SET blob = excluded.blob
+					ON CONFLICT (normalized_url) DO UPDATE SET blob = excluded.blob
 					RETURNING rowid
 					"""
 				);

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

@@ -14,8 +14,16 @@ using Microsoft.Data.Sqlite;
 
 namespace DHT.Server.Database.Sqlite.Repositories;
 
-sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : BaseSqliteRepository(Log), IMessageRepository {
+sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository {
 	private static readonly Log Log = Log.ForType<SqliteMessageRepository>();
+	
+	private readonly SqliteConnectionPool pool;
+	private readonly SqliteDownloadRepository downloads;
+
+	public SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRepository downloads) : base(Log) {
+		this.pool = pool;
+		this.downloads = downloads;
+	}
 
 	public async Task Add(IReadOnlyList<Message> messages) {
 		if (messages.Count == 0) {
@@ -42,7 +50,25 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				("timestamp", SqliteType.Integer)
 			]);
 
-			await using var attachmentCmd = conn.Upsert("attachments", [
+			await using var deleteEditTimestampCmd = DeleteByMessageId(conn, "edit_timestamps");
+			await using var deleteRepliedToCmd = DeleteByMessageId(conn, "replied_to");
+
+			await using var deleteAttachmentsCmd = DeleteByMessageId(conn, "attachments");
+			await using var deleteEmbedsCmd = DeleteByMessageId(conn, "embeds");
+			await using var deleteReactionsCmd = DeleteByMessageId(conn, "reactions");
+
+			await using var editTimestampCmd = conn.Insert("edit_timestamps", [
+				("message_id", SqliteType.Integer),
+				("edit_timestamp", SqliteType.Integer)
+			]);
+
+			await using var repliedToCmd = conn.Insert("replied_to", [
+				("message_id", SqliteType.Integer),
+				("replied_to_id", SqliteType.Integer)
+			]);
+
+			await using var attachmentCmd = conn.Insert("attachments", [
+				("message_id", SqliteType.Integer),
 				("attachment_id", SqliteType.Integer),
 				("name", SqliteType.Text),
 				("type", SqliteType.Text),
@@ -53,41 +79,19 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				("height", SqliteType.Integer)
 			]);
 
-			await using var deleteMessageEditTimestampCmd = DeleteByMessageId(conn, "message_edit_timestamps");
-			await using var deleteMessageRepliedToCmd = DeleteByMessageId(conn, "message_replied_to");
-
-			await using var deleteMessageAttachmentsCmd = DeleteByMessageId(conn, "message_attachments");
-			await using var deleteMessageEmbedsCmd = DeleteByMessageId(conn, "message_embeds");
-			await using var deleteMessageReactionsCmd = DeleteByMessageId(conn, "message_reactions");
-
-			await using var messageEditTimestampCmd = conn.Insert("message_edit_timestamps", [
-				("message_id", SqliteType.Integer),
-				("edit_timestamp", SqliteType.Integer)
-			]);
-
-			await using var messageRepliedToCmd = conn.Insert("message_replied_to", [
-				("message_id", SqliteType.Integer),
-				("replied_to_id", SqliteType.Integer)
-			]);
-
-			await using var messageAttachmentCmd = conn.Insert("message_attachments", [
-				("message_id", SqliteType.Integer),
-				("attachment_id", SqliteType.Integer)
-			]);
-
-			await using var messageEmbedCmd = conn.Insert("message_embeds", [
+			await using var embedCmd = conn.Insert("embeds", [
 				("message_id", SqliteType.Integer),
 				("json", SqliteType.Text)
 			]);
 
-			await using var messageReactionCmd = conn.Insert("message_reactions", [
+			await using var reactionCmd = conn.Insert("reactions", [
 				("message_id", SqliteType.Integer),
 				("emoji_id", SqliteType.Integer),
 				("emoji_name", SqliteType.Text),
 				("emoji_flags", SqliteType.Integer),
 				("count", SqliteType.Integer)
 			]);
-
+			
 			await using var downloadCollector = new SqliteDownloadRepository.NewDownloadCollector(downloads, conn);
 
 			foreach (var message in messages) {
@@ -100,30 +104,29 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 				messageCmd.Set(":timestamp", message.Timestamp);
 				await messageCmd.ExecuteNonQueryAsync();
 
-				await ExecuteDeleteByMessageId(deleteMessageEditTimestampCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteMessageRepliedToCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteEditTimestampCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteRepliedToCmd, messageId);
 
-				await ExecuteDeleteByMessageId(deleteMessageAttachmentsCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteMessageEmbedsCmd, messageId);
-				await ExecuteDeleteByMessageId(deleteMessageReactionsCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteAttachmentsCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteEmbedsCmd, messageId);
+				await ExecuteDeleteByMessageId(deleteReactionsCmd, messageId);
 
 				if (message.EditTimestamp is {} timestamp) {
-					messageEditTimestampCmd.Set(":message_id", messageId);
-					messageEditTimestampCmd.Set(":edit_timestamp", timestamp);
-					await messageEditTimestampCmd.ExecuteNonQueryAsync();
+					editTimestampCmd.Set(":message_id", messageId);
+					editTimestampCmd.Set(":edit_timestamp", timestamp);
+					await editTimestampCmd.ExecuteNonQueryAsync();
 				}
 
 				if (message.RepliedToId is {} repliedToId) {
-					messageRepliedToCmd.Set(":message_id", messageId);
-					messageRepliedToCmd.Set(":replied_to_id", repliedToId);
-					await messageRepliedToCmd.ExecuteNonQueryAsync();
+					repliedToCmd.Set(":message_id", messageId);
+					repliedToCmd.Set(":replied_to_id", repliedToId);
+					await repliedToCmd.ExecuteNonQueryAsync();
 				}
 
 				if (!message.Attachments.IsEmpty) {
 					foreach (var attachment in message.Attachments) {
-						object attachmentId = attachment.Id;
-
-						attachmentCmd.Set(":attachment_id", attachmentId);
+						attachmentCmd.Set(":message_id", messageId);
+						attachmentCmd.Set(":attachment_id", attachment.Id);
 						attachmentCmd.Set(":name", attachment.Name);
 						attachmentCmd.Set(":type", attachment.Type);
 						attachmentCmd.Set(":normalized_url", attachment.NormalizedUrl);
@@ -132,20 +135,16 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 						attachmentCmd.Set(":width", attachment.Width);
 						attachmentCmd.Set(":height", attachment.Height);
 						await attachmentCmd.ExecuteNonQueryAsync();
-
-						messageAttachmentCmd.Set(":message_id", messageId);
-						messageAttachmentCmd.Set(":attachment_id", attachmentId);
-						await messageAttachmentCmd.ExecuteNonQueryAsync();
-
+						
 						await downloadCollector.Add(DownloadLinkExtractor.FromAttachment(attachment));
 					}
 				}
 
 				if (!message.Embeds.IsEmpty) {
 					foreach (var embed in message.Embeds) {
-						messageEmbedCmd.Set(":message_id", messageId);
-						messageEmbedCmd.Set(":json", embed.Json);
-						await messageEmbedCmd.ExecuteNonQueryAsync();
+						embedCmd.Set(":message_id", messageId);
+						embedCmd.Set(":json", embed.Json);
+						await embedCmd.ExecuteNonQueryAsync();
 
 						if (DownloadLinkExtractor.TryFromEmbedJson(embed.Json) is {} download) {
 							await downloadCollector.Add(download);
@@ -155,12 +154,12 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 
 				if (!message.Reactions.IsEmpty) {
 					foreach (var reaction in message.Reactions) {
-						messageReactionCmd.Set(":message_id", messageId);
-						messageReactionCmd.Set(":emoji_id", reaction.EmojiId);
-						messageReactionCmd.Set(":emoji_name", reaction.EmojiName);
-						messageReactionCmd.Set(":emoji_flags", (int) reaction.EmojiFlags);
-						messageReactionCmd.Set(":count", reaction.Count);
-						await messageReactionCmd.ExecuteNonQueryAsync();
+						reactionCmd.Set(":message_id", messageId);
+						reactionCmd.Set(":emoji_id", reaction.EmojiId);
+						reactionCmd.Set(":emoji_name", reaction.EmojiName);
+						reactionCmd.Set(":emoji_flags", (int) reaction.EmojiFlags);
+						reactionCmd.Set(":count", reaction.Count);
+						await reactionCmd.ExecuteNonQueryAsync();
 
 						if (reaction.EmojiId is {} emojiId) {
 							await downloadCollector.Add(DownloadLinkExtractor.FromEmoji(emojiId, reaction.EmojiFlags));
@@ -179,7 +178,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 	public override Task<long> Count(CancellationToken cancellationToken) {
 		return Count(filter: null, cancellationToken);
 	}
-
+	
 	public async Task<long> Count(MessageFilter? filter, CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();
 		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM messages" + filter.GenerateConditions().BuildWhereClause(), static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
@@ -222,8 +221,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 			"""
 			SELECT attachment_id, name, type, normalized_url, download_url, size, width, height
 			FROM attachments
-			JOIN message_attachments USING (attachment_id)
-			WHERE message_attachments.message_id = :message_id
+			WHERE message_id = :message_id
 			""";
 
 		await using var attachmentCmd = new MessageToManyCommand<Attachment>(conn, AttachmentSql, static reader => new Attachment {
@@ -240,7 +238,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 		const string EmbedSql =
 			"""
 			SELECT json
-			FROM message_embeds
+			FROM embeds
 			WHERE message_id = :message_id
 			""";
 
@@ -251,7 +249,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 		const string ReactionSql =
 			"""
 			SELECT emoji_id, emoji_name, emoji_flags, count
-			FROM message_reactions
+			FROM reactions
 			WHERE message_id = :message_id
 			""";
 
@@ -264,10 +262,10 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 
 		await using var messageCmd = conn.Command(
 			$"""
-			 SELECT m.message_id, m.sender_id, m.channel_id, m.text, m.timestamp, met.edit_timestamp, mrt.replied_to_id
+			 SELECT m.message_id, m.sender_id, m.channel_id, m.text, m.timestamp, et.edit_timestamp, rt.replied_to_id
 			 FROM messages m
-			 LEFT JOIN message_edit_timestamps met ON m.message_id = met.message_id
-			 LEFT JOIN message_replied_to mrt ON m.message_id = mrt.message_id
+			 LEFT JOIN edit_timestamps et ON m.message_id = et.message_id
+			 LEFT JOIN replied_to rt ON m.message_id = rt.message_id
 			 {filter.GenerateConditions("m").BuildWhereClause()}
 			 """
 		);
@@ -294,7 +292,7 @@ sealed class SqliteMessageRepository(SqliteConnectionPool pool, SqliteDownloadRe
 
 	public async IAsyncEnumerable<ulong> GetIds(MessageFilter? filter) {
 		await using var conn = await pool.Take();
-
+		
 		await using var cmd = conn.Command("SELECT message_id FROM messages" + filter.GenerateConditions().BuildWhereClause());
 		await using var reader = await cmd.ExecuteReaderAsync();
 

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

@@ -1,58 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using DHT.Server.Data.Settings;
-using DHT.Server.Database.Repositories;
-using DHT.Server.Database.Sqlite.Utils;
-using Microsoft.Data.Sqlite;
-
-namespace DHT.Server.Database.Sqlite.Repositories;
-
-sealed class SqliteSettingsRepository(SqliteConnectionPool pool) : ISettingsRepository {
-	public Task Set<T>(SettingsKey<T> key, T value) {
-		return Set(setter => setter.Set(key, value));
-	}
-
-	public async Task Set(Func<ISettingsRepository.ISetter, Task> setter) {
-		await using var conn = await pool.Take();
-		await conn.BeginTransactionAsync();
-		
-		await using var cmd = conn.Command(
-			"""
-			INSERT INTO metadata (key, value)
-			VALUES (:key, :value)
-			ON CONFLICT (key)
-			DO UPDATE SET value = excluded.value
-			"""
-		);
-
-		cmd.Add(":key", SqliteType.Text);
-		cmd.Add(":value", SqliteType.Text);
-		
-		await setter(new Setter(cmd));
-
-		await cmd.ExecuteNonQueryAsync();
-		await conn.CommitTransactionAsync();
-	}
-	
-	private sealed class Setter(SqliteCommand cmd) : ISettingsRepository.ISetter {
-		public async Task Set<T>(SettingsKey<T> key, T value) {
-			cmd.Set(":key", key.Key);
-			cmd.Set(":value", key.ToString(value));
-			await cmd.ExecuteNonQueryAsync();
-		}
-	}
-
-	public async Task<T?> Get<T>(SettingsKey<T> key, T? defaultValue) {
-		string? value;
-		
-		await using (var conn = await pool.Take()) {
-			await using var cmd = conn.Command("SELECT value FROM metadata WHERE key = :key");
-			cmd.AddAndSet(":key", SqliteType.Text, key.Key);
-
-			await using var reader = await cmd.ExecuteReaderAsync();
-			value = await reader.ReadAsync() ? reader.GetString(0) : null;
-		}
-
-		return value != null && key.FromString(value, out var convertedValue) ? convertedValue : defaultValue;
-	}
-}

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

@@ -8,10 +8,7 @@ sealed class SqliteSchemaUpgradeTo3 : ISchemaUpgrade {
 		await reporter.MainWork("Applying schema changes...", 0, 1);
 
 		await SqliteSchema.CreateMessageEditTimestampTable(conn);
-		await conn.ExecuteAsync("ALTER TABLE message_edit_timestamps RENAME TO edit_timestamps");
-		
 		await SqliteSchema.CreateMessageRepliedToTable(conn);
-		await conn.ExecuteAsync("ALTER TABLE message_replied_to RENAME TO replied_to");
 
 		await conn.ExecuteAsync("""
 		                        INSERT INTO edit_timestamps (message_id, edit_timestamp)

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

@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using DHT.Server.Database.Sqlite.Utils;
-
-namespace DHT.Server.Database.Sqlite.Schema;
-
-sealed class SqliteSchemaUpgradeTo9 : ISchemaUpgrade {
-	async Task ISchemaUpgrade.Run(ISqliteConnection conn, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
-		await reporter.MainWork("Applying schema changes...", 0, 3);
-		await SqliteSchema.CreateMessageAttachmentsTable(conn);
-		
-		await reporter.MainWork("Migrating message attachments...", 1, 3);
-		await conn.ExecuteAsync("INSERT INTO message_attachments (message_id, attachment_id) SELECT message_id, attachment_id FROM attachments a JOIN messages m USING (message_id)");
-		
-		await reporter.MainWork("Applying schema changes...", 2, 3);
-		await conn.ExecuteAsync("DROP INDEX attachments_message_ix");
-		await conn.ExecuteAsync("ALTER TABLE attachments DROP COLUMN message_id");
-		
-		await conn.ExecuteAsync("ALTER TABLE embeds RENAME TO message_embeds");
-		await conn.ExecuteAsync("ALTER TABLE edit_timestamps RENAME TO message_edit_timestamps");
-		await conn.ExecuteAsync("ALTER TABLE replied_to RENAME TO message_replied_to");
-		await conn.ExecuteAsync("ALTER TABLE reactions RENAME TO message_reactions");
-	}
-}

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -39,7 +39,6 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 
 	public string Path { get; }
 	
-	public ISettingsRepository Settings => settings;
 	public IUserRepository Users => users;
 	public IServerRepository Servers => servers;
 	public IChannelRepository Channels => channels;
@@ -48,7 +47,6 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 	
 	private readonly SqliteConnectionPool pool;
 	
-	private readonly SqliteSettingsRepository settings;
 	private readonly SqliteUserRepository users;
 	private readonly SqliteServerRepository servers;
 	private readonly SqliteChannelRepository channels;
@@ -60,7 +58,6 @@ public sealed class SqliteDatabaseFile : IDatabaseFile {
 		this.pool = pool;
 
 		downloads = new SqliteDownloadRepository(pool);
-		settings = new SqliteSettingsRepository(pool);
 		users = new SqliteUserRepository(pool, downloads);
 		servers = new SqliteServerRepository(pool);
 		channels = new SqliteChannelRepository(pool);

app/Server/Database/Sqlite/SqliteSchema.cs

@@ -8,7 +8,7 @@ using DHT.Utils.Logging;
 namespace DHT.Server.Database.Sqlite;
 
 sealed class SqliteSchema {
-	internal const int Version = 9;
+	internal const int Version = 8;
 
 	private static readonly Log Log = Log.ForType<SqliteSchema>();
 
@@ -86,6 +86,7 @@ sealed class SqliteSchema {
 
 		await conn.ExecuteAsync("""
 		                        CREATE TABLE attachments (
+		                        	message_id     INTEGER NOT NULL,
 		                        	attachment_id  INTEGER NOT NULL PRIMARY KEY NOT NULL,
 		                        	name           TEXT NOT NULL,
 		                        	type           TEXT,
@@ -98,14 +99,14 @@ sealed class SqliteSchema {
 		                        """);
 
 		await conn.ExecuteAsync("""
-		                        CREATE TABLE message_embeds (
+		                        CREATE TABLE embeds (
 		                        	message_id INTEGER NOT NULL,
 		                        	json       TEXT NOT NULL
 		                        )
 		                        """);
 
 		await conn.ExecuteAsync("""
-		                        CREATE TABLE message_reactions (
+		                        CREATE TABLE reactions (
 		                        	message_id  INTEGER NOT NULL,
 		                        	emoji_id    INTEGER,
 		                        	emoji_name  TEXT,
@@ -117,17 +118,17 @@ sealed class SqliteSchema {
 		await CreateMessageEditTimestampTable(conn);
 		await CreateMessageRepliedToTable(conn);
 		await CreateDownloadTables(conn);
-		await CreateMessageAttachmentsTable(conn);
 
-		await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON message_embeds(message_id)");
-		await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON message_reactions(message_id)");
+		await conn.ExecuteAsync("CREATE INDEX attachments_message_ix ON attachments(message_id)");
+		await conn.ExecuteAsync("CREATE INDEX embeds_message_ix ON embeds(message_id)");
+		await conn.ExecuteAsync("CREATE INDEX reactions_message_ix ON reactions(message_id)");
 
 		await conn.ExecuteAsync("INSERT INTO metadata (key, value) VALUES ('version', " + Version + ")");
 	}
 
 	internal static async Task CreateMessageEditTimestampTable(ISqliteConnection conn) {
 		await conn.ExecuteAsync("""
-		                        CREATE TABLE message_edit_timestamps (
+		                        CREATE TABLE edit_timestamps (
 		                        	message_id     INTEGER PRIMARY KEY NOT NULL,
 		                        	edit_timestamp INTEGER NOT NULL
 		                        )
@@ -136,7 +137,7 @@ sealed class SqliteSchema {
 
 	internal static async Task CreateMessageRepliedToTable(ISqliteConnection conn) {
 		await conn.ExecuteAsync("""
-		                        CREATE TABLE message_replied_to (
+		                        CREATE TABLE replied_to (
 		                        	message_id    INTEGER PRIMARY KEY NOT NULL,
 		                        	replied_to_id INTEGER NOT NULL
 		                        )
@@ -162,18 +163,6 @@ sealed class SqliteSchema {
 		                        )
 		                        """);
 	}
-	
-	internal static async Task CreateMessageAttachmentsTable(ISqliteConnection conn) {
-		await conn.ExecuteAsync("""
-		                        CREATE TABLE message_attachments (
-		                        	message_id    INTEGER NOT NULL,
-		                        	attachment_id INTEGER NOT NULL,
-		                        	PRIMARY KEY (message_id, attachment_id),
-		                            FOREIGN KEY (message_id) REFERENCES messages (message_id) ON UPDATE CASCADE ON DELETE CASCADE,
-		                            FOREIGN KEY (attachment_id) REFERENCES attachments (attachment_id) ON UPDATE CASCADE ON DELETE CASCADE
-		                        )
-		                        """);
-	}
 
 	private async Task UpgradeSchemas(int dbVersion, ISchemaUpgradeCallbacks.IProgressReporter reporter) {
 		var upgrades = new Dictionary<int, ISchemaUpgrade> {
@@ -184,14 +173,13 @@ sealed class SqliteSchema {
 			{ 5, new SqliteSchemaUpgradeTo6() },
 			{ 6, new SqliteSchemaUpgradeTo7() },
 			{ 7, new SqliteSchemaUpgradeTo8() },
-			{ 8, new SqliteSchemaUpgradeTo9() },
 		};
 
 		var perf = Log.Start("from version " + dbVersion);
 
 		for (int fromVersion = dbVersion; fromVersion < Version; fromVersion++) {
 			var toVersion = fromVersion + 1;
-
+			
 			if (upgrades.TryGetValue(fromVersion, out var upgrade)) {
 				await upgrade.Run(conn, reporter);
 			}

app/Server/Endpoints/GetTrackingScriptEndpoint.cs

@@ -15,7 +15,7 @@ sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parame
 		string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
 		string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + parameters.Port + ";")
 		                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(parameters.Token))
-		                         .Replace("/*[IMPORTS]*/", await resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
+		                         .Replace("/*[IMPORTS]*/", await resources.ReadJoinedAsync("Tracker/scripts/", '\n', [ "/webpack.js" ]))
 		                         .Replace("/*[CSS-CONTROLLER]*/", await resources.ReadTextAsync("Tracker/styles/controller.css"))
 		                         .Replace("/*[CSS-SETTINGS]*/", await resources.ReadTextAsync("Tracker/styles/settings.css"))
 		                         .Replace("/*[DEBUGGER]*/", request.Query.ContainsKey("debug") ? "debugger;" : "");

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="8.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
   

app/Utils/Resources/ResourceLoader.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
@@ -43,14 +45,26 @@ public sealed class ResourceLoader(Assembly assembly) {
 		return TryGetEmbeddedStream(filename) is {} stream ? await ReadBytesAsync(stream) : null;
 	}
 
-	public async Task<string> ReadJoinedAsync(string path, char separator) {
-		StringBuilder joined = new ();
+	public async Task<string> ReadJoinedAsync(string path, char separator, string[] order) {
+		List<(string, Stream)> resourceNames = [];
 
 		foreach (var embeddedName in assembly.GetManifestResourceNames()) {
-			if (embeddedName.Replace('\\', '/').StartsWith(path)) {
-				joined.Append(await ReadTextAsync(assembly.GetManifestResourceStream(embeddedName)!)).Append(separator);
+			var embeddedNameNormalized = embeddedName.Replace('\\', '/');
+			if (embeddedNameNormalized.StartsWith(path)) {
+				resourceNames.Add((embeddedNameNormalized, assembly.GetManifestResourceStream(embeddedName)!));
 			}
 		}
+		
+		StringBuilder joined = new ();
+		
+		int GetOrderKey(string name) {
+			int key = Array.FindIndex(order, name.EndsWith);
+			return key == -1 ? order.Length : key;
+		}
+		
+		foreach(var (_, stream) in resourceNames.OrderBy(item => GetOrderKey(item.Item1))) {
+			joined.Append(await ReadTextAsync(stream)).Append(separator);
+		}
 
 		return joined.ToString(0, Math.Max(0, joined.Length - 1));
 	}

app/Utils/Tasks/DelayedThrottledTask.cs

@@ -1,61 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Channels;
-using System.Threading.Tasks;
-using DHT.Utils.Logging;
-
-namespace DHT.Utils.Tasks;
-
-public sealed class DelayedThrottledTask<T> : IDisposable {
-	private readonly Channel<T> taskChannel = Channel.CreateBounded<T>(new BoundedChannelOptions(capacity: 1) {
-		SingleReader = true,
-		SingleWriter = false,
-		AllowSynchronousContinuations = false,
-		FullMode = BoundedChannelFullMode.DropOldest
-	});
-
-	private readonly CancellationTokenSource cancellationTokenSource = new ();
-	private readonly Log log;
-	private readonly TimeSpan delay;
-	private readonly Func<T, Task> inputProcessor;
-
-	public DelayedThrottledTask(Log log, TimeSpan delay, Func<T, Task> inputProcessor) {
-		this.log = log;
-		this.delay = delay;
-		this.inputProcessor = inputProcessor;
-
-		Task.Run(ReaderTask);
-	}
-
-	private async Task ReaderTask() {
-		var cancellationToken = cancellationTokenSource.Token;
-
-		try {
-			while (await taskChannel.Reader.WaitToReadAsync(cancellationToken)) {
-				await Task.Delay(delay, cancellationToken);
-
-				T input = await taskChannel.Reader.ReadAsync(cancellationToken);
-				try {
-					await inputProcessor(input);
-				} catch (OperationCanceledException) {
-					throw;
-				} catch (Exception e) {
-					log.Error("Caught exception in task: " + e);
-				}
-			}
-		} catch (OperationCanceledException) {
-			// Ignore.
-		} finally {
-			cancellationTokenSource.Dispose();
-		}
-	}
-	
-	public void Post(T input) {
-		taskChannel.Writer.TryWrite(input);
-	}
-
-	public void Dispose() {
-		taskChannel.Writer.Complete();
-		cancellationTokenSource.Cancel();
-	}
-}

app/Version.cs

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