Rewrite tracker to use Discord client functions instead of React properties

Release v42.0
Fix broken links to image embeds in viewer
2025-11-04 03:40:12 +01:00 · 2024-05-01 10:36:25 +02:00 · 2024-04-23 03:56:27 +02:00 · 2024-04-21 20:55:06 +02:00 · 2024-04-21 20:55:05 +02:00 · 2024-04-21 18:48:19 +02:00
60 changed files with 1128 additions and 863 deletions
--- a/app/.idea/.idea.DiscordHistoryTracker/.idea/codeStyles/Project.xml
+++ b/app/.idea/.idea.DiscordHistoryTracker/.idea/codeStyles/Project.xml
@@ -13,10 +13,10 @@
    <CssCodeStyleSettings>
      <option name="HEX_COLOR_LOWER_CASE" value="true" />
    </CssCodeStyleSettings>
-    <DB2CodeStyleSettings version="6">
+    <DB2CodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </DB2CodeStyleSettings>
-    <DerbyCodeStyleSettings version="6">
+    <DerbyCodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </DerbyCodeStyleSettings>
    <GoCodeStyleSettings>
@@ -26,10 +26,10 @@
      <option name="WRAP_FUNC_PARAMS" value="5" />
      <option name="WRAP_FUNC_RESULT" value="5" />
    </GoCodeStyleSettings>
-    <H2CodeStyleSettings version="6">
+    <H2CodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </H2CodeStyleSettings>
-    <HSQLCodeStyleSettings version="6">
+    <HSQLCodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </HSQLCodeStyleSettings>
    <HTMLCodeStyleSettings>
@@ -85,10 +85,10 @@
    <LessCodeStyleSettings>
      <option name="HEX_COLOR_LOWER_CASE" value="true" />
    </LessCodeStyleSettings>
-    <MSSQLCodeStyleSettings version="6">
+    <MSSQLCodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </MSSQLCodeStyleSettings>
-    <MySQLCodeStyleSettings version="6">
+    <MySQLCodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </MySQLCodeStyleSettings>
    <Objective-C>
@@ -98,7 +98,7 @@
      <option name="SPACE_BEFORE_INIT_LIST" value="true" />
      <option name="SPACE_AFTER_DICTIONARY_LITERAL_COLON" value="false" />
    </Objective-C>
-    <OracleCodeStyleSettings version="6">
+    <OracleCodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </OracleCodeStyleSettings>
    <PHPCodeStyleSettings>
@@ -116,7 +116,7 @@
      <option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
      <option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
    </PHPCodeStyleSettings>
-    <PostgresCodeStyleSettings version="6">
+    <PostgresCodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </PostgresCodeStyleSettings>
    <Properties>
@@ -143,13 +143,16 @@
      <option name="INDENT_WHEN_CASES" value="true" />
      <option name="CHAIN_CALLS_ALIGNMENT" value="2" />
    </Ruby>
-    <SQLiteCodeStyleSettings version="6">
+    <SQLiteCodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </SQLiteCodeStyleSettings>
    <ScssCodeStyleSettings>
      <option name="HEX_COLOR_LOWER_CASE" value="true" />
    </ScssCodeStyleSettings>
-    <SqlCodeStyleSettings version="6">
+    <Shell_Script>
+      <option name="KEEP_COLUMN_ALIGNMENT_PADDING" value="true" />
+    </Shell_Script>
+    <SqlCodeStyleSettings version="7">
      <option name="KEYWORD_CASE" value="2" />
      <option name="TYPE_CASE" value="2" />
      <option name="CUSTOM_TYPE_CASE" value="2" />
@@ -173,9 +176,10 @@
      <option name="CONSTRAINT_WRAP_3" value="true" />
      <option name="CONSTRAINT_WRAP_4" value="true" />
      <option name="VIEW_INDENT_QUERY" value="true" />
+      <option name="IMP_LOOP_LOOP_INDENT" value="false" />
      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
    </SqlCodeStyleSettings>
-    <SybaseCodeStyleSettings version="6">
+    <SybaseCodeStyleSettings version="7">
      <option name="USE_GENERIC_STYLE" value="true" />
    </SybaseCodeStyleSettings>
    <TypeScriptCodeStyleSettings version="0">
@@ -203,6 +207,11 @@
        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
      </indentOptions>
    </codeStyleSettings>
+    <codeStyleSettings language="Gherkin">
+      <indentOptions>
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
    <codeStyleSettings language="Groovy">
      <option name="ELSE_ON_NEW_LINE" value="true" />
      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
@@ -282,6 +291,13 @@
        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
      </indentOptions>
    </codeStyleSettings>
+    <codeStyleSettings language="Markdown">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
    <codeStyleSettings language="ObjectiveC">
      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
@@ -342,7 +358,6 @@
      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="Rust">
-      <option name="RIGHT_MARGIN" value="140" />
      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
      <indentOptions>
        <option name="USE_TAB_CHARACTER" value="true" />
@@ -357,6 +372,7 @@
    </codeStyleSettings>
    <codeStyleSettings language="SCSS">
      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
      </indentOptions>
    </codeStyleSettings>
@@ -367,13 +383,6 @@
        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
      </indentOptions>
    </codeStyleSettings>
-    <codeStyleSettings language="Shell Script">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="4" />
-        <option name="USE_TAB_CHARACTER" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
    <codeStyleSettings language="TOML">
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -427,6 +436,9 @@
    </codeStyleSettings>
    <codeStyleSettings language="liquid">
      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
      </indentOptions>
    </codeStyleSettings>
--- a/app/.idea/.idea.DiscordHistoryTracker/.idea/inspectionProfiles/Project.xml
+++ b/app/.idea/.idea.DiscordHistoryTracker/.idea/inspectionProfiles/Project.xml
@@ -91,7 +91,6 @@
    <inspection_tool class="ComparatorNotSerializable" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="CompareToUsesNonFinalVariable" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ComparisonOfShortAndChar" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ComposeMissingKeys" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="ConditionSignal" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ConditionalExpression" enabled="true" level="INFORMATION" enabled_by_default="true">
      <option name="ignoreSimpleAssignmentsAndReturns" value="true" />
@@ -362,7 +361,7 @@
    </inspection_tool>
    <inspection_tool class="LocalVariableDeclarationSideOnly" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="LocalVariableNamingConventionJS" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_regex" value="[a-z][A-Za-z]*" />
+      <option name="m_regex" value="[a-z][A-Za-z0-9]*" />
      <option name="m_minLength" value="0" />
      <option name="m_maxLength" value="99" />
    </inspection_tool>
--- a/app/.idea/.idea.DiscordHistoryTracker/.idea/libraries/Generated_files.xml
+++ b/app/.idea/.idea.DiscordHistoryTracker/.idea/libraries/Generated_files.xml
@@ -1,22 +0,0 @@
-<component name="libraryTable">
-  <library name="Generated files" type="javaScript">
-    <properties>
-      <sourceFilesUrls>
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/discord.js" />
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/dom.js" />
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/gui.js" />
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/settings.js" />
-        <item url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/state.js" />
-      </sourceFilesUrls>
-    </properties>
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/discord.js" />
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/dom.js" />
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/gui.js" />
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/settings.js" />
-      <root url="file://$PROJECT_DIR$/Resources/Tracker/scripts.min/state.js" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/app/Desktop/Desktop.csproj
+++ b/app/Desktop/Desktop.csproj
@@ -39,11 +39,6 @@
    <EmbeddedResource Include="Resources/tracker-loader.js">
      <LogicalName>tracker-loader.js</LogicalName>
    </EmbeddedResource>
-    <EmbeddedResource Include="../Resources/Viewer/**">
-      <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
-      <Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
-      <Visible>false</Visible>
-    </EmbeddedResource>
  </ItemGroup>
  
 </Project>
--- a/app/Desktop/Main/MainWindow.axaml.cs
+++ b/app/Desktop/Main/MainWindow.axaml.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Threading.Tasks;
 using Avalonia.Controls;
-using DHT.Desktop.Main.Pages;
 using DHT.Utils.Logging;
 using JetBrains.Annotations;

@@ -43,13 +41,5 @@ public sealed partial class MainWindow : Window {
 				Log.Error("Caught exception while disposing window: " + ex);
 			}
 		}
-
-		foreach (var temporaryFile in ViewerPageModel.TemporaryFiles) {
-			try {
-				File.Delete(temporaryFile);
-			} catch (Exception) {
-				// ignored
-			}
-		}
 	}
 }
--- a/app/Desktop/Main/Pages/ViewerPage.axaml
+++ b/app/Desktop/Main/Pages/ViewerPage.axaml
@@ -21,7 +21,6 @@
    <StackPanel Orientation="Vertical" Spacing="20">
        <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
            <Button Command="{Binding OnClickOpenViewer}" Margin="0 0 5 0">Open Viewer</Button>
-            <Button Command="{Binding OnClickSaveViewer}" Margin="5 0 0 0">Save Viewer</Button>
        </StackPanel>
        <controls:MessageFilterPanel DataContext="{Binding FilterModel}" />
        <Expander Header="Database Tools">
--- a/app/Desktop/Main/Pages/ViewerPageModel.cs
+++ b/app/Desktop/Main/Pages/ViewerPageModel.cs
@@ -1,34 +1,22 @@
 using System;
-using System.Collections.Concurrent;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
-using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Avalonia.Controls;
-using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using DHT.Desktop.Common;
-using DHT.Desktop.Dialogs.File;
 using DHT.Desktop.Dialogs.Message;
 using DHT.Desktop.Dialogs.Progress;
 using DHT.Desktop.Main.Controls;
 using DHT.Desktop.Server;
 using DHT.Server;
 using DHT.Server.Data.Filters;
-using DHT.Server.Database.Export;
-using static DHT.Desktop.Program;
+using DHT.Server.Service.Viewer;

 namespace DHT.Desktop.Main.Pages;

 sealed partial class ViewerPageModel : ObservableObject, IDisposable {
-	public static readonly ConcurrentBag<string> TemporaryFiles = [];
-
-	private static readonly FilePickerFileType[] ViewerFileTypes = [
-		FileDialogs.CreateFilter("Discord History Viewer", ["html"])
-	];
-
 	public bool DatabaseToolFilterModeKeep { get; set; } = true;
 	public bool DatabaseToolFilterModeRemove { get; set; } = false;

@@ -61,101 +49,18 @@ sealed partial class ViewerPageModel : ObservableObject, IDisposable {

 	public async void OnClickOpenViewer() {
 		try {
-			var fullPath = await PrepareTemporaryViewerFile();
+			string serverUrl = "http://127.0.0.1:" + ServerConfiguration.Port;
+			string serverToken = ServerConfiguration.Token;
+			string sessionId = state.ViewerSessions.Register(new ViewerSession(FilterModel.CreateFilter())).ToString();
 			
-			string jsConstants = $"""
-			                      window.DHT_SERVER_URL = "{HttpUtility.JavaScriptStringEncode("http://127.0.0.1:" + ServerConfiguration.Port)}";
-			                      window.DHT_SERVER_TOKEN = "{HttpUtility.JavaScriptStringEncode(ServerConfiguration.Token)}";
-			                      """;
-
-			await ProgressDialog.ShowIndeterminate(window, "Open Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(fullPath, jsConstants)));
-			
-			Process.Start(new ProcessStartInfo(fullPath) {
+			Process.Start(new ProcessStartInfo(serverUrl + "/viewer/?token=" + HttpUtility.UrlEncode(serverToken) + "&session=" + HttpUtility.UrlEncode(sessionId)) {
 				UseShellExecute = true
 			});
 		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Open Viewer", "Could not create or save viewer: " + e.Message);
+			await Dialog.ShowOk(window, "Open Viewer", "Could not open viewer: " + e.Message);
 		}
 	}

-	private async Task<string> PrepareTemporaryViewerFile() {
-		return await Task.Run(() => {
-			string rootPath = Path.Combine(Path.GetTempPath(), "DiscordHistoryTracker");
-			string filenameBase = Path.GetFileNameWithoutExtension(state.Db.Path) + "-" + DateTime.Now.ToString("yyyy-MM-dd");
-			string fullPath = Path.Combine(rootPath, filenameBase + ".html");
-			
-			int counter = 0;
-
-			while (File.Exists(fullPath)) {
-				++counter;
-				fullPath = Path.Combine(rootPath, filenameBase + "-" + counter + ".html");
-			}
-
-			TemporaryFiles.Add(fullPath);
-
-			Directory.CreateDirectory(rootPath);
-
-			return fullPath;
-		});
-	}
-
-	public async void OnClickSaveViewer() {
-		string? path = await window.StorageProvider.SaveFile(new FilePickerSaveOptions {
-			Title = "Save Viewer",
-			FileTypeChoices = ViewerFileTypes,
-			SuggestedFileName = Path.GetFileNameWithoutExtension(state.Db.Path) + ".html",
-			SuggestedStartLocation = await FileDialogs.GetSuggestedStartLocation(window, Path.GetDirectoryName(state.Db.Path)),
-		});
-
-		if (path == null) {
-			return;
-		}
-
-		try {
-			await ProgressDialog.ShowIndeterminate(window, "Save Viewer", "Creating viewer...", _ => Task.Run(() => WriteViewerFile(path, string.Empty)));
-		} catch (Exception e) {
-			await Dialog.ShowOk(window, "Save Viewer", "Could not create or save viewer: " + e.Message);
-		}
-	}
-
-	private async Task WriteViewerFile(string path, string jsConstants) {
-		const string ArchiveTag = "/*[ARCHIVE]*/";
-
-		string indexFile = await Resources.ReadTextAsync("Viewer/index.html");
-		string viewerTemplate = indexFile.Replace("/*[CONSTANTS]*/", jsConstants)
-		                                 .Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
-		                                 .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'));
-
-		int viewerArchiveTagStart = viewerTemplate.IndexOf(ArchiveTag);
-		int viewerArchiveTagEnd = viewerArchiveTagStart + ArchiveTag.Length;
-
-		string jsonTempFile = path + ".tmp";
-
-		await using (var jsonStream = new FileStream(jsonTempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read)) {
-			await ViewerJsonExport.Generate(jsonStream, state.Db, FilterModel.CreateFilter());
-
-			char[] jsonBuffer = new char[Math.Min(32768, jsonStream.Position)];
-			jsonStream.Position = 0;
-
-			await using (var outputStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
-			await using (var outputWriter = new StreamWriter(outputStream, Encoding.UTF8)) {
-				await outputWriter.WriteAsync(viewerTemplate[..viewerArchiveTagStart]);
-
-				using (var jsonReader = new StreamReader(jsonStream, Encoding.UTF8)) {
-					int readBytes;
-					while ((readBytes = await jsonReader.ReadAsync(jsonBuffer, 0, jsonBuffer.Length)) > 0) {
-						string jsonChunk = new string(jsonBuffer, 0, readBytes);
-						await outputWriter.WriteAsync(HttpUtility.JavaScriptStringEncode(jsonChunk));
-					}
-				}
-
-				await outputWriter.WriteAsync(viewerTemplate[viewerArchiveTagEnd..]);
-			}
-		}
-
-		File.Delete(jsonTempFile);
-	}
-
 	public async Task OnClickApplyFiltersToDatabase() {
 		var filter = FilterModel.CreateFilter();
 		var messageCount = await ProgressDialog.ShowIndeterminate(window, "Apply Filters", "Counting matching messages...", _ => state.Db.Messages.Count(filter));
--- a/app/Resources/Tracker/bootstrap.js
+++ b/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;
--- a/app/Resources/Tracker/scripts/discord.js
+++ b/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");
-		
-		if (dms) {
-			const currentChannel = DOM.queryReactClass("selected", dms);
-			const currentChannelContainer = currentChannel && currentChannel.closest("[class*='channel_']");
-			const nextChannel = currentChannelContainer && currentChannelContainer.nextElementSibling;
-			
-			if (!nextChannel || !nextChannel.getAttribute("class").includes("channel_")) {
+		const currentChannel = this.#channelStore.getChannel(this.#getCurrentlySelectedChannelId());
+		if (!currentChannel) {
 			return false;
 		}
 		
-			const nextChannelLink = nextChannel.querySelector("a[href*='/@me/']");
-			if (!nextChannelLink) {
+		if (this.CHANNEL_TYPE.isPrivate(currentChannel.type)) {
+			const privateChannel = this.#channelStore.getSortedPrivateChannels();
+			const currentIndex = privateChannel.findIndex(channel => channel.id === currentChannel.id);
+			
+			if (currentIndex === -1 || currentIndex === privateChannel.length - 1) {
 				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;
 		}
 	}
--- a/app/Resources/Tracker/scripts/dom.js
+++ b/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;
-		}
-	}
 }
--- a/app/Resources/Tracker/scripts/state.js
+++ b/app/Resources/Tracker/scripts/state.js
@@ -58,64 +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} [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;
@@ -146,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;
+			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;
 			}
 			
-				channel.position = extra.position;
-				channel.topic = extra.topic;
-				channel.nsfw = extra.nsfw;
+			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 });
--- a/app/Resources/Tracker/scripts/types.js
+++ b/app/Resources/Tracker/scripts/types.js
@@ -0,0 +1,80 @@
+/**
+ * @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} [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
+ */
--- a/app/Resources/Tracker/scripts/webpack.js
+++ b/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);
+	}
+}
--- a/app/Resources/Viewer/index.html
+++ b/app/Resources/Viewer/index.html
@@ -2,16 +2,24 @@
 <html lang="en">
  <head>
    <meta charset="utf-8">
+    <meta name="referrer" content="no-referrer">
+    
    <title>Discord Offline History</title>
    
+    <link rel="icon" href="favicon.ico">
+    
+    <link rel="stylesheet" href="styles/main.css">
+    <link rel="stylesheet" href="styles/menu.css">
+    <link rel="stylesheet" href="styles/channels.css">
+    <link rel="stylesheet" href="styles/messages.css">
+    <link rel="stylesheet" href="styles/modal.css">
+    
    <script type="text/javascript">
-		window.DHT_EMBEDDED = "/*[ARCHIVE]*/";
-		/*[CONSTANTS]*/
-		/*[JS]*/
+		const query = new URLSearchParams(location.search);
+		window.DHT_SERVER_TOKEN = query.get("token");
+		window.DHT_SERVER_SESSION = query.get("session");
    </script>
-    <style>
-      /*[CSS]*/
-    </style>
+    <script type="module" src="scripts/bootstrap.mjs"></script>
  </head>
  <body>
    <div id="menu">
@@ -65,7 +73,9 @@
    </div>
    
    <div id="app">
-      <div id="channels"></div>
+      <div id="channels">
+        <div class="loading"></div>
+      </div>
      <div id="messages"></div>
    </div>
    
--- a/app/Resources/Viewer/scripts/bootstrap.js
+++ b/app/Resources/Viewer/scripts/bootstrap.js
@@ -1,39 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
-	DISCORD.setup();
-	GUI.setup();
-	
-	GUI.onOptionMessagesPerPageChanged(() => {
-		STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
-	});
-	
-	STATE.setMessagesPerPage(GUI.getOptionMessagesPerPage());
-	
-	GUI.onOptMessageFilterChanged(filter => {
-		STATE.setActiveFilter(filter);
-	});
-	
-	GUI.onNavigationButtonClicked(action => {
-		STATE.updateCurrentPage(action);
-	});
-	
-	STATE.onUsersRefreshed(users => {
-		GUI.updateUserList(users);
-	});
-	
-	STATE.onChannelsRefreshed((channels, selected) => {
-		GUI.updateChannelList(channels, selected, STATE.selectChannel);
-	});
-	
-	STATE.onMessagesRefreshed(messages => {
-		GUI.updateNavigation(STATE.getCurrentPage(), STATE.getPageCount());
-		GUI.updateMessageList(messages);
-		GUI.scrollMessagesToTop();
-	});
-	
-	try {
-		STATE.uploadFile(JSON.parse(window.DHT_EMBEDDED));
-	} catch (e) {
-		console.error(e);
-		alert("Could not parse embedded file, see console for details.");
-	}
-});
--- a/app/Resources/Viewer/scripts/bootstrap.mjs
+++ b/app/Resources/Viewer/scripts/bootstrap.mjs
@@ -0,0 +1,110 @@
+import discord from "./discord.mjs";
+import gui from "./gui.mjs";
+import state from "./state.mjs";
+
+window.DISCORD = discord;
+
+document.addEventListener("DOMContentLoaded", () => {
+	discord.setup();
+	gui.setup();
+	
+	gui.onOptionMessagesPerPageChanged(() => {
+		state.setMessagesPerPage(gui.getOptionMessagesPerPage());
+	});
+	
+	state.setMessagesPerPage(gui.getOptionMessagesPerPage());
+	
+	gui.onOptMessageFilterChanged(filter => {
+		state.setActiveFilter(filter);
+	});
+	
+	gui.onNavigationButtonClicked(action => {
+		state.updateCurrentPage(action);
+	});
+	
+	state.onUsersRefreshed(users => {
+		gui.updateUserList(users);
+	});
+	
+	state.onChannelsRefreshed((channels, selected) => {
+		gui.updateChannelList(channels, selected, state.selectChannel);
+	});
+	
+	state.onMessagesRefreshed(messages => {
+		gui.updateNavigation(state.getCurrentPage(), state.getPageCount());
+		gui.updateMessageList(messages);
+		gui.scrollMessagesToTop();
+	});
+	
+	async function fetchUrl(path, contentType) {
+		const response = await fetch("/" + path + "?token=" + encodeURIComponent(window.DHT_SERVER_TOKEN) + "&session=" + encodeURIComponent(window.DHT_SERVER_SESSION), {
+			method: "GET",
+			headers: {
+				"Content-Type": contentType,
+			},
+			credentials: "omit",
+			redirect: "error",
+		});
+		
+		if (!response.ok) {
+			throw "Unexpected response status: " + response.statusText;
+		}
+		
+		return response;
+	}
+	
+	async function processLines(response, callback) {
+		let body = "";
+		
+		for await (const chunk of response.body.pipeThrough(new TextDecoderStream("utf-8"))) {
+			body += chunk;
+			
+			let startIndex = 0;
+			
+			while (true) {
+				const endIndex = body.indexOf("\n", startIndex);
+				if (endIndex === -1) {
+					break;
+				}
+				
+				callback(body.substring(startIndex, endIndex));
+				startIndex = endIndex + 1;
+			}
+			
+			body = body.substring(startIndex);
+		}
+		
+		if (body !== "") {
+			callback(body);
+		}
+	}
+	
+	async function loadData() {
+		try {
+			const metadataResponse = await fetchUrl("get-viewer-metadata", "application/json");
+			const metadataJson = await metadataResponse.json();
+			
+			const messagesResponse = await fetchUrl("get-viewer-messages", "application/x-ndjson");
+			const messages = {};
+			
+			await processLines(messagesResponse, line => {
+				const message = JSON.parse(line);
+				const channel = message.c;
+				
+				const channelMessages = messages[channel] || (messages[channel] = {});
+				channelMessages[message.id] = message;
+				
+				delete message.id;
+				delete message.c;
+			});
+			
+			state.uploadFile(metadataJson, messages);
+		} catch (e) {
+			console.error(e);
+			alert("Could not load data, see console for details.");
+			document.querySelector("#channels > div.loading").remove();
+		}
+	}
+	
+	loadData();
+});
--- a/app/Resources/Viewer/scripts/discord.mjs
+++ b/app/Resources/Viewer/scripts/discord.mjs
@@ -1,4 +1,10 @@
-const DISCORD = (function() {
+import discord from "./discord.mjs";
+import dom from "./dom.mjs";
+import template from "./template.mjs";
+import settings from "./settings.mjs";
+import state from "./state.mjs";
+
+export default (function() {
 	const regex = {
 		formatBold: /\*\*([\s\S]+?)\*\*(?!\*)/g,
 		formatItalic1: /\*([\s\S]+?)\*(?!\*)/g,
@@ -35,17 +41,14 @@ const DISCORD = (function() {
 	let templateReaction;
 	let templateReactionCustom;
 	
-	const fileUrlProcessor = function(serverUrl, serverToken) {
-		if (typeof serverUrl === "string" && typeof serverToken === "string") {
-			return url => serverUrl + "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
+	const fileUrlProcessor = function(serverToken) {
+		if (typeof serverToken === "string") {
+			return url => "/get-downloaded-file/" + encodeURIComponent(url) + "?token=" + encodeURIComponent(serverToken);
 		}
 		else {
 			return url => url;
 		}
-	}(
-		window["DHT_SERVER_URL"],
-		window["DHT_SERVER_TOKEN"]
-	);
+	}(window.DHT_SERVER_TOKEN);
 	
 	const getEmoji = function(name, id, extension) {
 		const tag = ":" + name + ":";
@@ -53,9 +56,9 @@ const DISCORD = (function() {
 	};
 	
 	const processMessageContents = function(contents) {
-		let processed = DOM.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
+		let processed = dom.escapeHTML(contents.replace(regex.formatUrlNoEmbed, "$1"));
 		
-		if (SETTINGS.enableFormatting) {
+		if (settings.enableFormatting) {
 			const escapeHtmlMatch = (full, match) => "&#" + match.charCodeAt(0) + ";";
 			
 			processed = processed
@@ -71,13 +74,13 @@ const DISCORD = (function() {
 				.replace(regex.formatStrike, "<s>$1</s>");
 		}
 		
-		const animatedEmojiExtension = SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
+		const animatedEmojiExtension = settings.enableAnimatedEmoji ? "gif" : "webp";
 		
 		// noinspection HtmlUnknownTarget
 		processed = processed
 			.replace(regex.formatUrl, "<a href='$1' target='_blank' rel='noreferrer'>$1</a>")
-			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + STATE.getChannelName(match) + "</span>")
-			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (STATE.getUserTag(match) || "????") + "'>@" + STATE.getUserName(match) + "</span>")
+			.replace(regex.mentionChannel, (full, match) => "<span class='link mention-chat'>#" + state.getChannelName(match) + "</span>")
+			.replace(regex.mentionUser, (full, match) => "<span class='link mention-user' title='#" + (state.getUserTag(match) || "????") + "'>@" + state.getUserName(match) + "</span>")
 			.replace(regex.customEmojiStatic, (full, m1, m2) => getEmoji(m1, m2, "webp"))
 			.replace(regex.customEmojiAnimated, (full, m1, m2) => getEmoji(m1, m2, animatedEmojiExtension));
 		
@@ -89,7 +92,7 @@ const DISCORD = (function() {
 	};
 	
 	const getImageEmbed = function(url, image) {
-		if (!SETTINGS.enableImagePreviews) {
+		if (!settings.enableImagePreviews) {
 			return "";
 		}
 		
@@ -109,21 +112,21 @@ const DISCORD = (function() {
 	
 	return {
 		setup() {
-			templateChannelServer = new TEMPLATE([
-				"<div data-channel='{id}'>",
+			templateChannelServer = new template([
+				"<div class='channel' data-channel='{id}'>",
 				"<div class='info' title='{topic}'><strong class='name'>#{name}</strong>{nsfw}<span class='tag'>{msgcount}</span></div>",
 				"<span class='server'>{server.name} ({server.type})</span>",
 				"</div>"
 			].join(""));
 			
-			templateChannelPrivate = new TEMPLATE([
-				"<div data-channel='{id}'>",
+			templateChannelPrivate = new template([
+				"<div class='channel' data-channel='{id}'>",
 				"<div class='info'><strong class='name'>{name}</strong><span class='tag'>{msgcount}</span></div>",
 				"<span class='server'>({server.type})</span>",
 				"</div>"
 			].join(""));
 			
-			templateMessageNoAvatar = new TEMPLATE([
+			templateMessageNoAvatar = new template([
 				"<div>",
 				"<div class='reply-message'>{reply}</div>",
 				"<h2><strong class='username' title='#{user.tag}'>{user.name}</strong><span class='info time'>{timestamp}</span>{edit}{jump}</h2>",
@@ -132,7 +135,7 @@ const DISCORD = (function() {
 				"</div>"
 			].join(""));
 			
-			templateMessageWithAvatar = new TEMPLATE([
+			templateMessageWithAvatar = new template([
 				"<div>",
 				"<div class='reply-message reply-message-with-avatar'>{reply}</div>",
 				"<div class='avatar-wrapper'>",
@@ -147,50 +150,50 @@ const DISCORD = (function() {
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateUserAvatar = new TEMPLATE([
+			templateUserAvatar = new template([
 				"<img src='{url}' alt=''>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateAttachmentDownload = new TEMPLATE([
+			templateAttachmentDownload = new template([
 				"<a href='{url}' class='embed download'>Download {name}</a>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedImage = new TEMPLATE([
-				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
+			templateEmbedImage = new template([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedImageWithSize = new TEMPLATE([
-				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
+			templateEmbedImageWithSize = new template([
+				"<a href='{url}' class='embed thumbnail loading'><img src='{src}' width='{width}' height='{height}' alt='' onload='window.DISCORD.handleImageLoad(this)' onerror='window.DISCORD.handleImageLoadError(this)'></a><br>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedRich = new TEMPLATE([
+			templateEmbedRich = new template([
 				"<div class='embed download'><a href='{url}' class='title'>{title}</a><p class='desc'>{description}</p></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedRichNoDescription = new TEMPLATE([
+			templateEmbedRichNoDescription = new template([
 				"<div class='embed download'><a href='{url}' class='title'>{title}</a></div>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateEmbedUrl = new TEMPLATE([
+			templateEmbedUrl = new template([
 				"<a href='{url}' class='embed download'>{url}</a>"
 			].join(""));
 			
-			templateEmbedUnsupported = new TEMPLATE([
+			templateEmbedUnsupported = new template([
 				"<div class='embed download'><p>(Unsupported embed)</p></div>"
 			].join(""));
 			
-			templateReaction = new TEMPLATE([
+			templateReaction = new template([
 				"<span class='reaction-wrapper'><span class='reaction-emoji'>{n}</span><span class='count'>{c}</span></span>"
 			].join(""));
 			
 			// noinspection HtmlUnknownTarget
-			templateReactionCustom = new TEMPLATE([
+			templateReactionCustom = new template([
 				"<span class='reaction-wrapper'><img src='{url}' alt=':{n}:' title=':{n}:' class='reaction-emoji-custom'><span class='count'>{c}</span></span>"
 			].join(""));
 		},
@@ -207,7 +210,7 @@ const DISCORD = (function() {
 		},
 		
 		isImageAttachment(attachment) {
-			const url = DOM.tryParseUrl(attachment.url);
+			const url = dom.tryParseUrl(attachment.url);
 			return url != null && isImageUrl(url);
 		},
 		
@@ -220,7 +223,7 @@ const DISCORD = (function() {
 		},
 		
 		getMessageHTML(message) { // noinspection FunctionWithInconsistentReturnsJS
-			return (SETTINGS.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
+			return (settings.enableUserAvatars ? templateMessageWithAvatar : templateMessageNoAvatar).apply(message, (property, value) => {
 				if (property === "avatar") {
 					return value ? templateUserAvatar.apply(getAvatarUrlObject(value)) : "";
 				}
@@ -228,7 +231,7 @@ const DISCORD = (function() {
 					return value ? value : "????";
 				}
 				else if (property === "timestamp") {
-					return DOM.getHumanReadableTime(value);
+					return dom.getHumanReadableTime(value);
 				}
 				else if (property === "contents") {
 					return value && value.length > 0 ? processMessageContents(value) : "";
@@ -243,10 +246,10 @@ const DISCORD = (function() {
 							return templateEmbedUnsupported.apply(embed);
 						}
 						else if ("image" in embed && embed.image.url) {
-							return getImageEmbed(fileUrlProcessor(embed.url), embed.image);
+							return getImageEmbed(embed.url, embed.image);
 						}
 						else if ("thumbnail" in embed && embed.thumbnail.url) {
-							return getImageEmbed(fileUrlProcessor(embed.url), embed.thumbnail);
+							return getImageEmbed(embed.url, embed.thumbnail);
 						}
 						else if ("title" in embed && "description" in embed) {
 							return templateEmbedRich.apply(embed);
@@ -267,7 +270,7 @@ const DISCORD = (function() {
 					return value.map(attachment => {
 						const url = fileUrlProcessor(attachment.url);
 						
-						if (!DISCORD.isImageAttachment(attachment) || !SETTINGS.enableImagePreviews) {
+						if (!discord.isImageAttachment(attachment) || !settings.enableImagePreviews) {
 							return templateAttachmentDownload.apply({ url, name: attachment.name });
 						}
 						else if ("width" in attachment && "height" in attachment) {
@@ -279,10 +282,10 @@ const DISCORD = (function() {
 					}).join("");
 				}
 				else if (property === "edit") {
-					return value ? "<span class='info edited'>Edited " + DOM.getHumanReadableTime(value) + "</span>" : "";
+					return value ? "<span class='info edited'>Edited " + dom.getHumanReadableTime(value) + "</span>" : "";
 				}
 				else if (property === "jump") {
-					return STATE.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
+					return state.hasActiveFilter ? "<span class='info jump' data-jump='" + value + "'>Jump to message</span>" : "";
 				}
 				else if (property === "reply") {
 					if (!value) {
@@ -290,7 +293,7 @@ const DISCORD = (function() {
 					}
 					
 					const user = "<span class='reply-username' title='#" + (value.user.tag ? value.user.tag : "????") + "'>" + value.user.name + "</span>";
-					const avatar = SETTINGS.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
+					const avatar = settings.enableUserAvatars && value.avatar ? "<span class='reply-avatar'>" + templateUserAvatar.apply(getAvatarUrlObject(value.avatar)) + "</span>" : "";
 					const contents = value.contents ? "<span class='reply-contents'>" + processMessageContents(value.contents) + "</span>" : "";
 					
 					return "<span class='jump' data-jump='" + value.id + "'>Jump to reply</span><span class='user'>" + avatar + user + "</span>" + contents;
@@ -302,7 +305,7 @@ const DISCORD = (function() {
 					
 					return "<div class='reactions'>" + value.map(reaction => {
 						if ("id" in reaction){
-							const ext = reaction.a && SETTINGS.enableAnimatedEmoji ? "gif" : "webp";
+							const ext = reaction.a && settings.enableAnimatedEmoji ? "gif" : "webp";
 							const url = fileUrlProcessor("https://cdn.discordapp.com/emojis/" + reaction.id + "." + ext);
 							// noinspection JSUnusedGlobalSymbols
 							return templateReactionCustom.apply({ url, n: reaction.n, c: reaction.c });
--- a/app/Resources/Viewer/scripts/dom.mjs
+++ b/app/Resources/Viewer/scripts/dom.mjs
@@ -8,9 +8,12 @@ const HTML_ENTITY_MAP = {

 const HTML_ENTITY_REGEX = /[&<>"']/g;

-class DOM {
+export default class {
 	/**
 	 * Returns a child element by its ID. Parent defaults to the entire document.
+	 * @param {string} id
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement|null}
 	 */
 	static id(id, parent) {
 		return (parent || document).getElementById(id);
@@ -18,6 +21,9 @@ class DOM {
 	
 	/**
 	 * Returns an array of all child elements containing the specified class. Parent defaults to the entire document.
+	 * @param {string} cls
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement[]}
 	 */
 	static cls(cls, parent) {
 		return Array.prototype.slice.call((parent || document).getElementsByClassName(cls));
@@ -25,6 +31,9 @@ class DOM {
 	
 	/**
 	 * Returns an array of all child elements that have the specified tag. Parent defaults to the entire document.
+	 * @param {string} tag
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement[]}
 	 */
 	static tag(tag, parent) {
 		return Array.prototype.slice.call((parent || document).getElementsByTagName(tag));
@@ -32,6 +41,9 @@ class DOM {
 	
 	/**
 	 * Returns the first child element containing the specified class. Parent defaults to the entire document.
+	 * @param {string} cls
+	 * @param {HTMLElement} [parent]
+	 * @returns {HTMLElement}
 	 */
 	static fcls(cls, parent) {
 		return (parent || document).getElementsByClassName(cls)[0];
--- a/app/Resources/Viewer/scripts/gui.mjs
+++ b/app/Resources/Viewer/scripts/gui.mjs
@@ -1,10 +1,16 @@
-const GUI = (function() {
+import dom from "./dom.mjs";
+import discord from "./discord.mjs";
+import settings from "./settings.mjs";
+import state from "./state.mjs";
+
+export default (function() {
 	let eventOnOptMessagesPerPageChanged;
 	let eventOnOptMessageFilterChanged;
 	let eventOnNavButtonClicked;
 	
 	const getActiveFilter = function() {
-		const active = DOM.fcls("active", DOM.id("opt-filter-list"));
+		/** @type HTMLSelectElement */
+		const active = dom.fcls("active", dom.id("opt-filter-list"));
 		
 		return active && active.value !== "" ? {
 			"type": active.getAttribute("data-filter-type"),
@@ -17,12 +23,12 @@ const GUI = (function() {
 	};
 	
 	const showModal = function(width, html) {
-		const dialog = DOM.id("dialog");
+		const dialog = dom.id("dialog");
 		dialog.innerHTML = html;
 		dialog.style.width = width + "px";
 		dialog.style.marginLeft = (-width / 2) + "px";
 		
-		DOM.id("modal").classList.add("visible");
+		dom.id("modal").classList.add("visible");
 		return dialog;
 	};
 	
@@ -38,9 +44,9 @@ const GUI = (function() {
 <label><input id='dht-cfg-animemoji' type='checkbox'> Animated Emoji</label><br>`);
 		
 		const setupCheckBox = function(id, settingName) {
-			const ele = DOM.id(id);
-			ele.checked = SETTINGS[settingName];
-			ele.addEventListener("change", () => SETTINGS[settingName] = ele.checked);
+			const ele = dom.id(id);
+			ele.checked = settings[settingName];
+			ele.addEventListener("change", () => settings[settingName] = ele.checked);
 		};
 		
 		setupCheckBox("dht-cfg-imgpreviews", "enableImagePreviews");
@@ -65,20 +71,20 @@ const GUI = (function() {
 		// ---------
 		
 		setup() {
-			const inputMessageFilter = DOM.id("opt-messages-filter");
-			const containerFilterList = DOM.id("opt-filter-list");
+			const inputMessageFilter = dom.id("opt-messages-filter");
+			const containerFilterList = dom.id("opt-filter-list");
 			
 			const resetActiveFilter = function() {
 				inputMessageFilter.value = "";
 				inputMessageFilter.dispatchEvent(new Event("change"));
 				
-				DOM.id("opt-filter-contents").value = "";
+				dom.id("opt-filter-contents").value = "";
 			};
 			
 			inputMessageFilter.value = ""; // required to prevent browsers from remembering old value
 			
 			inputMessageFilter.addEventListener("change", () => {
-				DOM.cls("active", containerFilterList).forEach(ele => ele.classList.remove("active"));
+				dom.cls("active", containerFilterList).forEach(ele => ele.classList.remove("active"));
 				
 				if (inputMessageFilter.value) {
 					containerFilterList.querySelector("[data-filter-type='" + inputMessageFilter.value + "']").classList.add("active");
@@ -91,11 +97,11 @@ const GUI = (function() {
 				ele.addEventListener(ele.tagName === "SELECT" ? "change" : "input", () => triggerFilterChanged());
 			});
 			
-			DOM.id("opt-messages-per-page").addEventListener("change", () => {
+			dom.id("opt-messages-per-page").addEventListener("change", () => {
 				eventOnOptMessagesPerPageChanged && eventOnOptMessagesPerPageChanged();
 			});
 			
-			DOM.tag("button", DOM.fcls("nav")).forEach(button => {
+			dom.tag("button", dom.fcls("nav")).forEach(button => {
 				button.disabled = true;
 				
 				button.addEventListener("click", () => {
@@ -103,34 +109,34 @@ const GUI = (function() {
 				});
 			});
 			
-			DOM.id("btn-settings").addEventListener("click", () => {
+			dom.id("btn-settings").addEventListener("click", () => {
 				showSettingsModal();
 			});
 			
-			DOM.id("btn-about").addEventListener("click", () => {
+			dom.id("btn-about").addEventListener("click", () => {
 				showInfoModal();
 			});
 			
-			DOM.id("messages").addEventListener("click", e => {
+			dom.id("messages").addEventListener("click", e => {
 				const jump = e.target.getAttribute("data-jump");
 				
 				if (jump) {
 					resetActiveFilter();
 					
-					const index = STATE.navigateToMessage(jump);
+					const index = state.navigateToMessage(jump);
 					
 					if (index === -1) {
 						alert("Message not found.");
 					}
 					else {
-						DOM.id("messages").children[index].scrollIntoView();
+						dom.id("messages").children[index].scrollIntoView();
 					}
 				}
 			});
 			
-			DOM.id("overlay").addEventListener("click", () => {
-				DOM.id("modal").classList.remove("visible");
-				DOM.id("dialog").innerHTML = "";
+			dom.id("overlay").addEventListener("click", () => {
+				dom.id("modal").classList.remove("visible");
+				dom.id("dialog").innerHTML = "";
 			});
 		},
 		
@@ -168,19 +174,19 @@ const GUI = (function() {
 		 */
 		getOptionMessagesPerPage() {
 			/** @type HTMLInputElement */
-			const messagesPerPage = DOM.id("opt-messages-per-page");
+			const messagesPerPage = dom.id("opt-messages-per-page");
 			return parseInt(messagesPerPage.value, 10);
 		},
 		
 		updateNavigation(currentPage, totalPages) {
-			DOM.id("nav-page-current").innerHTML = currentPage;
-			DOM.id("nav-page-total").innerHTML = totalPages || "?";
+			dom.id("nav-page-current").innerHTML = currentPage;
+			dom.id("nav-page-total").innerHTML = totalPages || "?";
 			
-			DOM.id("nav-first").disabled = currentPage === 1;
-			DOM.id("nav-prev").disabled = currentPage === 1;
-			DOM.id("nav-pick").disabled = (totalPages || 0) <= 1;
-			DOM.id("nav-next").disabled = currentPage === (totalPages || 1);
-			DOM.id("nav-last").disabled = currentPage === (totalPages || 1);
+			dom.id("nav-first").disabled = currentPage === 1;
+			dom.id("nav-prev").disabled = currentPage === 1;
+			dom.id("nav-pick").disabled = (totalPages || 0) <= 1;
+			dom.id("nav-next").disabled = currentPage === (totalPages || 1);
+			dom.id("nav-last").disabled = currentPage === (totalPages || 1);
 		},
 		
 		// --------------
@@ -191,7 +197,7 @@ const GUI = (function() {
 		 * Updates the channel list and sets up their click events. The callback is triggered whenever a channel is selected, and takes the channel ID as its argument.
 		 */
 		updateChannelList(channels, selected, callback) {
-			const eleChannels = DOM.id("channels");
+			const eleChannels = dom.id("channels");
 			
 			if (!channels) {
 				eleChannels.innerHTML = "";
@@ -201,11 +207,11 @@ const GUI = (function() {
 					channels = channels.filter(channel => channel.msgcount > 0);
 				}
 				
-				eleChannels.innerHTML = channels.map(channel => DISCORD.getChannelHTML(channel)).join("");
+				eleChannels.innerHTML = channels.map(channel => discord.getChannelHTML(channel)).join("");
 				
 				Array.prototype.forEach.call(eleChannels.children, ele => {
 					ele.addEventListener("click", () => {
-						const currentChannel = DOM.fcls("active", eleChannels);
+						const currentChannel = dom.fcls("active", eleChannels);
 						
 						if (currentChannel) {
 							currentChannel.classList.remove("active");
@@ -224,12 +230,12 @@ const GUI = (function() {
 		},
 		
 		updateMessageList(messages) {
-			DOM.id("messages").innerHTML = messages ? messages.map(message => DISCORD.getMessageHTML(message)).join("") : "";
+			dom.id("messages").innerHTML = messages ? messages.map(message => discord.getMessageHTML(message)).join("") : "";
 		},
 		
 		updateUserList(users) {
 			/** @type HTMLSelectElement */
-			const eleSelect = DOM.id("opt-filter-user");
+			const eleSelect = dom.id("opt-filter-user");
 			
 			while (eleSelect.length > 1) {
 				eleSelect.remove(1);
@@ -249,7 +255,7 @@ const GUI = (function() {
 		},
 		
 		scrollMessagesToTop() {
-			DOM.id("messages").scrollTop = 0;
+			dom.id("messages").scrollTop = 0;
 		}
 	};
 })();
--- a/app/Resources/Viewer/scripts/processor.mjs
+++ b/app/Resources/Viewer/scripts/processor.mjs
@@ -1,16 +1,16 @@
-const PROCESSOR = {};
+import discord from "./discord.mjs";

 // ------------------------
 // Global filter generators
 // ------------------------

-PROCESSOR.FILTER = {
-	byUser: ((userindex) => message => message.u === userindex),
+const filter = {
+	byUser: ((user) => message => message.u === user),
 	byTime: ((timeStart, timeEnd) => message => message.t >= timeStart && message.t <= timeEnd),
 	byContents: ((substr) => message => ("m" in message ? message.m : "").indexOf(substr) !== -1),
 	byRegex: ((regex) => message => regex.test("m" in message ? message.m : "")),
-	withImages: (() => message => (message.e && message.e.some(embed => embed.type === "image")) || (message.a && message.a.some(DISCORD.isImageAttachment))),
-	withDownloads: (() => message => message.a && message.a.some(attachment => !DISCORD.isImageAttachment(attachment))),
+	withImages: (() => message => (message.e && message.e.some(embed => embed.type === "image")) || (message.a && message.a.some(discord.isImageAttachment))),
+	withDownloads: (() => message => message.a && message.a.some(attachment => !discord.isImageAttachment(attachment))),
 	withEmbeds: (() => message => message.e && message.e.length > 0),
 	withAttachments: (() => message => message.a && message.a.length > 0),
 	isEdited: (() => message => ("te" in message) ? message.te : (message.f & 1) === 1)
@@ -20,7 +20,7 @@ PROCESSOR.FILTER = {
 // Global sorters
 // --------------

-PROCESSOR.SORTER = {
+const sorter = {
 	oldestToNewest: (key1, key2) => {
 		if (key1.length === key2.length) {
 			return key1 > key2 ? 1 : key1 < key2 ? -1 : 0;
@@ -39,3 +39,8 @@ PROCESSOR.SORTER = {
 		}
 	}
 };
+
+export default {
+	FILTER: filter,
+	SORTER: sorter
+};
--- a/app/Resources/Viewer/scripts/settings.mjs
+++ b/app/Resources/Viewer/scripts/settings.mjs
@@ -1,4 +1,4 @@
-const SETTINGS = (function() {
+export default (function() {
 	/**
 	 * @type {{}}
 	 * @property {Function} onSettingsChanged
--- a/app/Resources/Viewer/scripts/state.mjs
+++ b/app/Resources/Viewer/scripts/state.mjs
@@ -1,10 +1,12 @@
+import settings from "./settings.mjs";
+import processor from "./processor.mjs";
+
 // noinspection FunctionWithInconsistentReturnsJS
-const STATE = (function() {
+export default (function() {
 	/**
 	 * @type {{}}
 	 * @property {{}} users
-	 * @property {String[]} userindex
-	 * @property {{}[]} servers
+	 * @property {{}} servers
 	 * @property {{}} channels
 	 */
 	let loadedFileMeta;
@@ -17,20 +19,16 @@ const STATE = (function() {
 	let currentPage;
 	let messagesPerPage;
 	
-	const getUser = function(index) {
-		return loadedFileMeta.users[loadedFileMeta.userindex[index]] || { "name": "&lt;unknown&gt;" };
-	};
-	
-	const getUserId = function(index) {
-		return loadedFileMeta.userindex[index];
+	const getUser = function(id) {
+		return loadedFileMeta.users[id] || { "name": "&lt;unknown&gt;" };
 	};
 	
 	const getUserList = function() {
 		return loadedFileMeta ? loadedFileMeta.users : [];
 	};
 	
-	const getServer = function(index) {
-		return loadedFileMeta.servers[index] || { "name": "&lt;unknown&gt;", "type": "unknown" };
+	const getServer = function(id) {
+		return loadedFileMeta.servers[id] || { "name": "&lt;unknown&gt;", "type": "unknown" };
 	};
 	
 	const generateChannelHierarchy = function() {
@@ -204,7 +202,7 @@ const STATE = (function() {
 			 */
 			const message = messages[key];
 			const user = getUser(message.u);
-			const avatar = user.avatar ? { id: getUserId(message.u), path: user.avatar } : null;
+			const avatar = user.avatar ? { id: message.u, path: user.avatar } : null;
 			
 			const obj = {
 				user,
@@ -232,7 +230,7 @@ const STATE = (function() {
 			if ("r" in message) {
 				const replyMessage = getMessageById(message.r);
 				const replyUser = replyMessage ? getUser(replyMessage.u) : null;
-				const replyAvatar = replyUser && replyUser.avatar ? { id: getUserId(replyMessage.u), path: replyUser.avatar } : null;
+				const replyAvatar = replyUser && replyUser.avatar ? { id: replyMessage.u, path: replyUser.avatar } : null;
 				
 				obj["reply"] = replyMessage ? {
 					"id": message.r,
@@ -290,20 +288,17 @@ const STATE = (function() {
 			eventOnUsersRefreshed = callback;
 		},
 		
-		/**
-		 * @param {{ meta, data }} file
-		 */
-		uploadFile(file) {
+		uploadFile(meta, data) {
 			if (loadedFileMeta != null) {
 				throw "A file is already loaded!";
 			}
 			
-			if (!file || typeof file.meta !== "object" || typeof file.data !== "object") {
+			if (typeof meta !== "object" || typeof data !== "object") {
 				throw "Invalid file format!";
 			}
 			
-			loadedFileMeta = file.meta;
-			loadedFileData = file.data;
+			loadedFileMeta = meta;
+			loadedFileData = data;
 			loadedMessages = null;
 			
 			selectedChannel = null;
@@ -313,7 +308,7 @@ const STATE = (function() {
 			triggerChannelsRefreshed();
 			triggerMessagesRefreshed();
 			
-			SETTINGS.onSettingsChanged(() => triggerMessagesRefreshed());
+			settings.onSettingsChanged(() => triggerMessagesRefreshed());
 		},
 		
 		getChannelName(channel) {
@@ -335,7 +330,7 @@ const STATE = (function() {
 			currentPage = 1;
 			selectedChannel = channel;
 			
-			loadedMessages = getFilteredMessageKeys(channel).sort(PROCESSOR.SORTER.oldestToNewest);
+			loadedMessages = getFilteredMessageKeys(channel).sort(processor.SORTER.oldestToNewest);
 			triggerMessagesRefreshed();
 		},
 		
@@ -416,23 +411,23 @@ const STATE = (function() {
 		setActiveFilter(filter) {
 			switch (filter ? filter.type : "") {
 				case "user":
-					filterFunction = PROCESSOR.FILTER.byUser(loadedFileMeta.userindex.indexOf(filter.value));
+					filterFunction = processor.FILTER.byUser(filter.value);
 					break;
 				
 				case "contents":
-					filterFunction = PROCESSOR.FILTER.byContents(filter.value);
+					filterFunction = processor.FILTER.byContents(filter.value);
 					break;
 				
 				case "withimages":
-					filterFunction = PROCESSOR.FILTER.withImages();
+					filterFunction = processor.FILTER.withImages();
 					break;
 				
 				case "withdownloads":
-					filterFunction = PROCESSOR.FILTER.withDownloads();
+					filterFunction = processor.FILTER.withDownloads();
 					break;
 				
 				case "edited":
-					filterFunction = PROCESSOR.FILTER.isEdited();
+					filterFunction = processor.FILTER.isEdited();
 					break;
 				
 				default:
--- a/app/Resources/Viewer/scripts/template.mjs
+++ b/app/Resources/Viewer/scripts/template.mjs
@@ -1,6 +1,8 @@
+import dom from "./dom.mjs";
+
 const TEMPLATE_REGEX = /{([^{}]+?)}/g;

-class TEMPLATE {
+export default class {
 	constructor(contents) {
 		this.contents = contents;
 	};
@@ -11,10 +13,10 @@ class TEMPLATE {
 			
 			if (processor) {
 				const updated = processor(match, value);
-				return typeof updated === "undefined" ? DOM.escapeHTML(value) : updated;
+				return typeof updated === "undefined" ? dom.escapeHTML(value) : updated;
 			}
 			
-			return DOM.escapeHTML(value);
+			return dom.escapeHTML(value);
 		});
 	}
 }
--- a/app/Resources/Viewer/styles/channels.css
+++ b/app/Resources/Viewer/styles/channels.css
@@ -3,18 +3,24 @@
  min-width: 215px;
  max-width: 300px;
  overflow-y: auto;
+  color: #eee;
  background-color: #1c1e22;
+  font-size: 15px;
 }

-#channels > div {
+#channels > div.loading {
+  margin: 0 auto;
+  width: 150px;
+  height: 150px;
+}
+
+#channels > div.channel {
  cursor: pointer;
  padding: 10px 12px;
-  color: #eee;
-  font-size: 15px;
  border-bottom: 1px solid #333333;
 }

-#channels > div:hover, #channels > div.active {
+#channels > div.channel:hover, #channels > div.channel.active {
  background-color: #282b30;
 }

--- a/app/Resources/Viewer/styles/main.css
+++ b/app/Resources/Viewer/styles/main.css
@@ -11,3 +11,20 @@ body {
  display: flex;
  flex-direction: row;
 }
+
+.loading {
+  position: relative;
+  --loading-backdrop: rgba(0, 0, 0, 0);
+}
+
+.loading::after {
+  content: "";
+  background: var(--loading-backdrop)
+  url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
+  no-repeat center center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
--- a/app/Resources/Viewer/styles/messages.css
+++ b/app/Resources/Viewer/styles/messages.css
@@ -107,23 +107,11 @@
 }

 .message .thumbnail {
-  position: relative;
+  --loading-backdrop: rgba(0, 0, 0, 0.75);
  max-width: calc(100% - 20px);
  max-height: 320px;
 }

-.message .thumbnail.loading::after {
-  content: "";
-  background: rgba(0, 0, 0, 0.75)
-              url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 300 300' preserveAspectRatio='xMidYMid'%3E %3Ccircle cx='150' cy='150' fill='none' stroke='%237983f5' stroke-width='8' r='42' stroke-dasharray='198 68'%3E %3CanimateTransform attributeName='transform' type='rotate' repeatCount='indefinite' dur='1.25s' values='0 150 150;360 150 150' keyTimes='0;1' /%3E %3C/circle%3E %3C/svg%3E")
-              no-repeat center center;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-
 .message .thumbnail img {
  width: auto;
  max-width: 100%;
--- a/app/Server/Database/Export/Snowflake.cs
+++ b/app/Server/Database/Export/Snowflake.cs
@@ -1,3 +1,5 @@
 namespace DHT.Server.Database.Export;

-readonly record struct Snowflake(ulong Id);
+readonly record struct Snowflake(ulong Id) {
+	public static implicit operator Snowflake(ulong id) => new (id);
+}
--- a/app/Server/Database/Export/ViewerJson.cs
+++ b/app/Server/Database/Export/ViewerJson.cs
@@ -3,14 +3,10 @@ using System.Text.Json.Serialization;

 namespace DHT.Server.Database.Export;

-sealed class ViewerJson {
-	public required JsonMeta Meta { get; init; }
-	public required Dictionary<Snowflake, Dictionary<Snowflake, JsonMessage>> Data { get; init; }
-
+static class ViewerJson {
 	public sealed class JsonMeta {
 		public required Dictionary<Snowflake, JsonUser> Users { get; init; }
-		public required List<Snowflake> Userindex { get; init; }
-		public required List<JsonServer> Servers { get; init; }
+		public required Dictionary<Snowflake, JsonServer> Servers { get; init; }
 		public required Dictionary<Snowflake, JsonChannel> Channels { get; init; }
 	}
 	
@@ -30,7 +26,7 @@ sealed class ViewerJson {
 	}

 	public sealed class JsonChannel {
-		public required int Server { get; init; }
+		public required Snowflake Server { get; init; }
 		public required string Name { get; init; }
 		
 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -47,7 +43,9 @@ sealed class ViewerJson {
 	}

 	public sealed class JsonMessage {
-		public required int U { get; init; }
+		public required Snowflake Id { get; init; }
+		public required Snowflake C { get; init; }
+		public required Snowflake U { get; init; }
 		public required long T { get; init; }

 		[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
--- a/app/Server/Database/Export/ViewerJsonExport.cs
+++ b/app/Server/Database/Export/ViewerJsonExport.cs
@@ -2,7 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
@@ -10,109 +12,93 @@ using DHT.Utils.Logging;

 namespace DHT.Server.Database.Export;

-public static class ViewerJsonExport {
+static class ViewerJsonExport {
 	private static readonly Log Log = Log.ForType(typeof(ViewerJsonExport));

-	public static async Task Generate(Stream stream, IDatabaseFile db, MessageFilter? filter = null) {
+	public static async Task GetMetadata(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
 		var perf = Log.Start();

-		var includedUserIds = new HashSet<ulong>();
-		var includedChannelIds = new HashSet<ulong>();
+		var includedChannels = new List<Channel>();
 		var includedServerIds = new HashSet<ulong>();

-		var includedMessages = await db.Messages.Get(filter).ToListAsync();
-		var includedChannels = new List<Channel>();
+		var channelIdFilter = filter?.ChannelIds;

-		foreach (var message in includedMessages) {
-			includedUserIds.Add(message.Sender);
-			includedChannelIds.Add(message.Channel);
-		}
-
-		await foreach (var channel in db.Channels.Get()) {
-			if (includedChannelIds.Contains(channel.Id)) {
+		await foreach (var channel in db.Channels.Get(cancellationToken)) {
+			if (channelIdFilter == null || channelIdFilter.Contains(channel.Id)) {
 				includedChannels.Add(channel);
 				includedServerIds.Add(channel.Server);
 			}
 		}

-		var (users, userIndex, userIndices) = await GenerateUserList(db, includedUserIds);
-		var (servers, serverIndices) = await GenerateServerList(db, includedServerIds);
-		var channels = GenerateChannelList(includedChannels, serverIndices);
+		var users = await GenerateUserList(db, cancellationToken);
+		var servers = await GenerateServerList(db, includedServerIds, cancellationToken);
+		var channels = GenerateChannelList(includedChannels);
+
+		var meta = new ViewerJson.JsonMeta {
+			Users = users,
+			Servers = servers,
+			Channels = channels
+		};

 		perf.Step("Collect database data");

-		var value = new ViewerJson {
-			Meta = new ViewerJson.JsonMeta {
-				Users = users,
-				Userindex = userIndex,
-				Servers = servers,
-				Channels = channels
-			},
-			Data = GenerateMessageList(includedMessages, userIndices)
-		};
-
-		perf.Step("Generate value object");
-
-		await JsonSerializer.SerializeAsync(stream, value, ViewerJsonContext.Default.ViewerJson);
+		await JsonSerializer.SerializeAsync(stream, meta, ViewerJsonMetadataContext.Default.JsonMeta, cancellationToken);

 		perf.Step("Serialize to JSON");
 		perf.End();
 	}

-	private static async Task<(Dictionary<Snowflake, ViewerJson.JsonUser> Users, List<Snowflake> UserIndex, Dictionary<ulong, int> UserIndices)> GenerateUserList(IDatabaseFile db, HashSet<ulong> userIds) {
-		var users = new Dictionary<Snowflake, ViewerJson.JsonUser>();
-		var userIndex = new List<Snowflake>();
-		var userIndices = new Dictionary<ulong, int>();
+	public static async Task GetMessages(Stream stream, IDatabaseFile db, MessageFilter? filter = null, CancellationToken cancellationToken = default) {
+		var perf = Log.Start();

-		await foreach (var user in db.Users.Get()) {
-			var id = user.Id;
-			if (!userIds.Contains(id)) {
-				continue;
+		ReadOnlyMemory<byte> newLine = "\n"u8.ToArray();
+		
+		await foreach(var message in GenerateMessageList(db, filter, cancellationToken)) {
+			await JsonSerializer.SerializeAsync(stream, message, ViewerJsonMessageContext.Default.JsonMessage, cancellationToken);
+			await stream.WriteAsync(newLine, cancellationToken);
 		}

-			var idSnowflake = new Snowflake(id);
-			userIndices[id] = users.Count;
-			userIndex.Add(idSnowflake);
+		perf.Step("Generate and serialize messages to JSON");
+		perf.End();
+	}

-			users[idSnowflake] = new ViewerJson.JsonUser {
+	private static async Task<Dictionary<Snowflake, ViewerJson.JsonUser>> GenerateUserList(IDatabaseFile db, CancellationToken cancellationToken) {
+		var users = new Dictionary<Snowflake, ViewerJson.JsonUser>();
+
+		await foreach (var user in db.Users.Get(cancellationToken)) {
+			users[user.Id] = new ViewerJson.JsonUser {
 				Name = user.Name,
 				Avatar = user.AvatarUrl,
 				Tag = user.Discriminator
 			};
 		}

-		return (users, userIndex, userIndices);
+		return users;
 	}

-	private static async Task<(List<ViewerJson.JsonServer> Servers, Dictionary<ulong, int> ServerIndices)> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds) {
-		var servers = new List<ViewerJson.JsonServer>();
-		var serverIndices = new Dictionary<ulong, int>();
+	private static async Task<Dictionary<Snowflake, ViewerJson.JsonServer>> GenerateServerList(IDatabaseFile db, HashSet<ulong> serverIds, CancellationToken cancellationToken) {
+		var servers = new Dictionary<Snowflake, ViewerJson.JsonServer>();

-		await foreach (var server in db.Servers.Get()) {
-			var id = server.Id;
-			if (!serverIds.Contains(id)) {
+		await foreach (var server in db.Servers.Get(cancellationToken)) {
+			if (!serverIds.Contains(server.Id)) {
 				continue;
 			}

-			serverIndices[id] = servers.Count;
-			
-			servers.Add(new ViewerJson.JsonServer {
+			servers[server.Id] = new ViewerJson.JsonServer {
 				Name = server.Name,
 				Type = ServerTypes.ToJsonViewerString(server.Type)
-			});
+			};
 		}

-		return (servers, serverIndices);
+		return servers;
 	}

-	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels, Dictionary<ulong, int> serverIndices) {
+	private static Dictionary<Snowflake, ViewerJson.JsonChannel> GenerateChannelList(List<Channel> includedChannels) {
 		var channels = new Dictionary<Snowflake, ViewerJson.JsonChannel>();

 		foreach (var channel in includedChannels) {
-			var channelIdSnowflake = new Snowflake(channel.Id);
-			
-			channels[channelIdSnowflake] = new ViewerJson.JsonChannel {
-				Server = serverIndices[channel.Server],
+			channels[channel.Id] = new ViewerJson.JsonChannel {
+				Server = channel.Server,
 				Name = channel.Name,
 				Parent = channel.ParentId?.ToString(),
 				Position = channel.Position,
@@ -124,18 +110,12 @@ public static class ViewerJsonExport {
 		return channels;
 	}

-	private static Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>> GenerateMessageList(List<Message> includedMessages, Dictionary<ulong, int> userIndices) {
-		var data = new Dictionary<Snowflake, Dictionary<Snowflake, ViewerJson.JsonMessage>>();
-
-		foreach (var grouping in includedMessages.GroupBy(static message => message.Channel)) {
-			var channelIdSnowflake = new Snowflake(grouping.Key);
-			var channelData = new Dictionary<Snowflake, ViewerJson.JsonMessage>();
-
-			foreach (var message in grouping) {
-				var messageIdSnowflake = new Snowflake(message.Id);
-				
-				channelData[messageIdSnowflake] = new ViewerJson.JsonMessage {
-					U = userIndices[message.Sender],
+	private static async IAsyncEnumerable<ViewerJson.JsonMessage> GenerateMessageList(IDatabaseFile db, MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
+		await foreach (var message in db.Messages.Get(filter, cancellationToken)) {
+			yield return new ViewerJson.JsonMessage {
+				Id = message.Id,
+				C = message.Channel,
+				U = message.Sender,
 				T = message.Timestamp,
 				M = string.IsNullOrEmpty(message.Text) ? null : message.Text,
 				Te = message.EditTimestamp,
@@ -165,10 +145,5 @@ public static class ViewerJsonExport {
 				}).ToArray()
 			};
 		}
-
-			data[channelIdSnowflake] = channelData;
-		}
-
-		return data;
 	}
 }
--- a/app/Server/Database/Export/ViewerJsonMessageContext.cs
+++ b/app/Server/Database/Export/ViewerJsonMessageContext.cs
@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace DHT.Server.Database.Export;
+
+[JsonSourceGenerationOptions(
+	Converters = [typeof(SnowflakeJsonSerializer)],
+	PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
+	GenerationMode = JsonSourceGenerationMode.Default
+)]
+[JsonSerializable(typeof(ViewerJson.JsonMessage))]
+sealed partial class ViewerJsonMessageContext : JsonSerializerContext;
--- a/app/Server/Database/Export/ViewerJsonMetadataContext.cs
+++ b/app/Server/Database/Export/ViewerJsonMetadataContext.cs
@@ -7,5 +7,5 @@ namespace DHT.Server.Database.Export;
 	PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
 	GenerationMode = JsonSourceGenerationMode.Default
 )]
-[JsonSerializable(typeof(ViewerJson))]
-sealed partial class ViewerJsonContext : JsonSerializerContext;
+[JsonSerializable(typeof(ViewerJson.JsonMeta))]
+sealed partial class ViewerJsonMetadataContext : JsonSerializerContext;
--- a/app/Server/Database/Repositories/IChannelRepository.cs
+++ b/app/Server/Database/Repositories/IChannelRepository.cs
@@ -15,7 +15,7 @@ public interface IChannelRepository {
 	
 	Task<long> Count(CancellationToken cancellationToken = default);
 	
-	IAsyncEnumerable<Channel> Get();
+	IAsyncEnumerable<Channel> Get(CancellationToken cancellationToken = default);

 	internal sealed class Dummy : IChannelRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
@@ -28,7 +28,7 @@ public interface IChannelRepository {
 			return Task.FromResult(0L);
 		}

-		public IAsyncEnumerable<Channel> Get() {
+		public IAsyncEnumerable<Channel> Get(CancellationToken cancellationToken) {
 			return AsyncEnumerable.Empty<Channel>();
 		}
 	}
--- a/app/Server/Database/Repositories/IDownloadRepository.cs
+++ b/app/Server/Database/Repositories/IDownloadRepository.cs
@@ -24,7 +24,7 @@ public interface IDownloadRepository {

 	Task<bool> GetDownloadData(string normalizedUrl, Func<Stream, Task> dataProcessor);
 	
-	Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor);
+	Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken = default);

 	IAsyncEnumerable<DownloadItem> PullPendingDownloadItems(int count, DownloadItemFilter filter, CancellationToken cancellationToken = default);
 	
@@ -55,7 +55,7 @@ public interface IDownloadRepository {
 			return Task.FromResult(false);
 		}

-		public Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor) {
+		public Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken) {
 			return Task.FromResult(false);
 		}

--- a/app/Server/Database/Repositories/IMessageRepository.cs
+++ b/app/Server/Database/Repositories/IMessageRepository.cs
@@ -16,7 +16,7 @@ public interface IMessageRepository {
 	
 	Task<long> Count(MessageFilter? filter = null, CancellationToken cancellationToken = default);
 	
-	IAsyncEnumerable<Message> Get(MessageFilter? filter = null);
+	IAsyncEnumerable<Message> Get(MessageFilter? filter = null, CancellationToken cancellationToken = default);
 	
 	IAsyncEnumerable<ulong> GetIds(MessageFilter? filter = null);
 	
@@ -33,7 +33,7 @@ public interface IMessageRepository {
 			return Task.FromResult(0L);
 		}

-		public IAsyncEnumerable<Message> Get(MessageFilter? filter) {
+		public IAsyncEnumerable<Message> Get(MessageFilter? filter, CancellationToken cancellationToken) {
 			return AsyncEnumerable.Empty<Message>();
 		}

--- a/app/Server/Database/Repositories/IServerRepository.cs
+++ b/app/Server/Database/Repositories/IServerRepository.cs
@@ -14,7 +14,7 @@ public interface IServerRepository {
 	
 	Task<long> Count(CancellationToken cancellationToken = default);
 	
-	IAsyncEnumerable<Data.Server> Get();
+	IAsyncEnumerable<Data.Server> Get(CancellationToken cancellationToken = default);

 	internal sealed class Dummy : IServerRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
@@ -27,7 +27,7 @@ public interface IServerRepository {
 			return Task.FromResult(0L);
 		}

-		public IAsyncEnumerable<Data.Server> Get() {
+		public IAsyncEnumerable<Data.Server> Get(CancellationToken cancellationToken) {
 			return AsyncEnumerable.Empty<Data.Server>();
 		}
 	}
--- a/app/Server/Database/Repositories/IUserRepository.cs
+++ b/app/Server/Database/Repositories/IUserRepository.cs
@@ -15,7 +15,7 @@ public interface IUserRepository {
 	
 	Task<long> Count(CancellationToken cancellationToken = default);
 	
-	IAsyncEnumerable<User> Get();
+	IAsyncEnumerable<User> Get(CancellationToken cancellationToken = default);

 	internal sealed class Dummy : IUserRepository {
 		public IObservable<long> TotalCount { get; } = Observable.Return(0L);
@@ -28,7 +28,7 @@ public interface IUserRepository {
 			return Task.FromResult(0L);
 		}

-		public IAsyncEnumerable<User> Get() {
+		public IAsyncEnumerable<User> Get(CancellationToken cancellationToken) {
 			return AsyncEnumerable.Empty<User>();
 		}
 	}
--- a/app/Server/Database/Sqlite/Repositories/SqliteChannelRepository.cs
+++ b/app/Server/Database/Sqlite/Repositories/SqliteChannelRepository.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
@@ -54,13 +55,13 @@ sealed class SqliteChannelRepository : BaseSqliteRepository, IChannelRepository
 		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM channels", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
 	}

-	public async IAsyncEnumerable<Channel> Get() {
+	public async IAsyncEnumerable<Channel> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();

 		await using var cmd = conn.Command("SELECT id, server, name, parent_id, position, topic, nsfw FROM channels");
-		await using var reader = await cmd.ExecuteReaderAsync();
+		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);

-		while (await reader.ReadAsync()) {
+		while (await reader.ReadAsync(cancellationToken)) {
 			yield return new Channel {
 				Id = reader.GetUint64(0),
 				Server = reader.GetUint64(1),
--- a/app/Server/Database/Sqlite/Repositories/SqliteDownloadRepository.cs
+++ b/app/Server/Database/Sqlite/Repositories/SqliteDownloadRepository.cs
@@ -210,7 +210,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		return true;
 	}

-	public async Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, Task> dataProcessor) {
+	public async Task<bool> GetSuccessfulDownloadWithData(string normalizedUrl, Func<Data.Download, Stream, CancellationToken, Task> dataProcessor, CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();

 		await using var cmd = conn.Command(
@@ -228,8 +228,8 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		string? type;
 		long rowid;
 		
-		await using (var reader = await cmd.ExecuteReaderAsync()) {
-			if (!await reader.ReadAsync()) {
+		await using (var reader = await cmd.ExecuteReaderAsync(cancellationToken)) {
+			if (!await reader.ReadAsync(cancellationToken)) {
 				return false;
 			}

@@ -239,7 +239,7 @@ sealed class SqliteDownloadRepository(SqliteConnectionPool pool) : BaseSqliteRep
 		}
 		
 		await using (var blob = new SqliteBlob(conn.InnerConnection, "download_blobs", "blob", rowid, readOnly: true)) {
-			await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob);
+			await dataProcessor(new Data.Download(normalizedUrl, downloadUrl, DownloadStatus.Success, type, (ulong) blob.Length), blob, cancellationToken);
 		}

 		return true;
--- a/app/Server/Database/Sqlite/Repositories/SqliteMessageRepository.cs
+++ b/app/Server/Database/Sqlite/Repositories/SqliteMessageRepository.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
@@ -213,7 +214,7 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 		}
 	}

-	public async IAsyncEnumerable<Message> Get(MessageFilter? filter) {
+	public async IAsyncEnumerable<Message> Get(MessageFilter? filter, [EnumeratorCancellation] CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();

 		const string AttachmentSql =
@@ -269,9 +270,9 @@ sealed class SqliteMessageRepository : BaseSqliteRepository, IMessageRepository
 			 """
 		);

-		await using var reader = await messageCmd.ExecuteReaderAsync();
+		await using var reader = await messageCmd.ExecuteReaderAsync(cancellationToken);

-		while (await reader.ReadAsync()) {
+		while (await reader.ReadAsync(cancellationToken)) {
 			ulong messageId = reader.GetUint64(0);

 			yield return new Message {
--- a/app/Server/Database/Sqlite/Repositories/SqliteServerRepository.cs
+++ b/app/Server/Database/Sqlite/Repositories/SqliteServerRepository.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
@@ -46,13 +47,13 @@ sealed class SqliteServerRepository : BaseSqliteRepository, IServerRepository {
 		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM servers", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
 	}

-	public async IAsyncEnumerable<Data.Server> Get() {
+	public async IAsyncEnumerable<Data.Server> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();

 		await using var cmd = conn.Command("SELECT id, name, type FROM servers");
-		await using var reader = await cmd.ExecuteReaderAsync();
+		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);

-		while (await reader.ReadAsync()) {
+		while (await reader.ReadAsync(cancellationToken)) {
 			yield return new Data.Server {
 				Id = reader.GetUint64(0),
 				Name = reader.GetString(1),
--- a/app/Server/Database/Sqlite/Repositories/SqliteUserRepository.cs
+++ b/app/Server/Database/Sqlite/Repositories/SqliteUserRepository.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
@@ -58,13 +59,13 @@ sealed class SqliteUserRepository : BaseSqliteRepository, IUserRepository {
 		return await conn.ExecuteReaderAsync("SELECT COUNT(*) FROM users", static reader => reader?.GetInt64(0) ?? 0L, cancellationToken);
 	}

-	public async IAsyncEnumerable<User> Get() {
+	public async IAsyncEnumerable<User> Get([EnumeratorCancellation] CancellationToken cancellationToken) {
 		await using var conn = await pool.Take();

 		await using var cmd = conn.Command("SELECT id, name, avatar_url, discriminator FROM users");
-		await using var reader = await cmd.ExecuteReaderAsync();
+		await using var reader = await cmd.ExecuteReaderAsync(cancellationToken);

-		while (await reader.ReadAsync()) {
+		while (await reader.ReadAsync(cancellationToken)) {
 			yield return new User {
 				Id = reader.GetUint64(0),
 				Name = reader.GetString(1),
--- a/app/Server/Endpoints/BaseEndpoint.cs
+++ b/app/Server/Endpoints/BaseEndpoint.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Net;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
 using DHT.Utils.Http;
@@ -19,7 +20,9 @@ abstract class BaseEndpoint(IDatabaseFile db) {

 		try {
 			response.StatusCode = (int) HttpStatusCode.OK;
-			await Respond(ctx.Request, response);
+			await Respond(ctx.Request, response, ctx.RequestAborted);
+		} catch (OperationCanceledException) {
+			throw;
 		} catch (HttpException e) {
 			Log.Error(e);
 			response.StatusCode = (int) e.StatusCode;
@@ -35,7 +38,7 @@ abstract class BaseEndpoint(IDatabaseFile db) {
 		}
 	}

-	protected abstract Task Respond(HttpRequest request, HttpResponse response);
+	protected abstract Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken);

 	protected static async Task<JsonElement> ReadJson(HttpRequest request) {
 		try {
@@ -44,4 +47,13 @@ abstract class BaseEndpoint(IDatabaseFile db) {
 			throw new HttpException(HttpStatusCode.UnsupportedMediaType, "This endpoint only accepts JSON.");
 		}
 	}
+	
+	protected static Guid GetSessionId(HttpRequest request) {
+		if (request.Query.TryGetValue("session", out var sessionIdValue) && sessionIdValue.Count == 1 && Guid.TryParse(sessionIdValue[0], out Guid sessionId)) {
+			return sessionId;
+		}
+		else {
+			throw new HttpException(HttpStatusCode.BadRequest, "Invalid session ID.");
+		}
+	}
 }
--- a/app/Server/Endpoints/GetDownloadedFileEndpoint.cs
+++ b/app/Server/Endpoints/GetDownloadedFileEndpoint.cs
@@ -1,4 +1,7 @@
+using System;
+using System.IO;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
 using DHT.Server.Download;
@@ -8,12 +11,16 @@ using Microsoft.AspNetCore.Http;
 namespace DHT.Server.Endpoints;

 sealed class GetDownloadedFileEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
-	protected override async Task Respond(HttpRequest request, HttpResponse response) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		string url = WebUtility.UrlDecode((string) request.RouteValues["url"]!);
 		string normalizedUrl = DiscordCdn.NormalizeUrl(url);
 		
-		if (!await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, (download, stream) => response.WriteStreamAsync(download.Type, download.Size, stream))) {
+		if (!await Db.Downloads.GetSuccessfulDownloadWithData(normalizedUrl, WriteDataTo(response), cancellationToken)) {
 			response.Redirect(url, permanent: false);
 		}
 	}
+	
+	private static Func<Data.Download, Stream, CancellationToken, Task> WriteDataTo(HttpResponse response) {
+		return (download, stream, cancellationToken) => response.WriteStreamAsync(download.Type, download.Size, stream, cancellationToken);
+	}
 }
--- a/app/Server/Endpoints/GetTrackingScriptEndpoint.cs
+++ b/app/Server/Endpoints/GetTrackingScriptEndpoint.cs
@@ -1,5 +1,5 @@
 using System.Net.Mime;
-using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using DHT.Server.Database;
@@ -10,19 +10,17 @@ using Microsoft.AspNetCore.Http;

 namespace DHT.Server.Endpoints;

-sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters) : BaseEndpoint(db) {
-	private static ResourceLoader Resources { get; } = new (Assembly.GetExecutingAssembly());
-
-	protected override async Task Respond(HttpRequest request, HttpResponse response) {
-		string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
+sealed class GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters, ResourceLoader resources) : BaseEndpoint(db) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+		string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
 		string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + parameters.Port + ";")
 		                         .Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(parameters.Token))
-		                         .Replace("/*[IMPORTS]*/", await Resources.ReadJoinedAsync("Tracker/scripts/", '\n'))
-		                         .Replace("/*[CSS-CONTROLLER]*/", await Resources.ReadTextAsync("Tracker/styles/controller.css"))
-		                         .Replace("/*[CSS-SETTINGS]*/", await Resources.ReadTextAsync("Tracker/styles/settings.css"))
+		                         .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;" : "");
 		
 		response.Headers.Append("X-DHT", "1");
-		await response.WriteTextAsync(MediaTypeNames.Text.JavaScript, script);
+		await response.WriteTextAsync(MediaTypeNames.Text.JavaScript, script, cancellationToken);
 	}
 }
--- a/app/Server/Endpoints/GetViewerMessagesEndpoint.cs
+++ b/app/Server/Endpoints/GetViewerMessagesEndpoint.cs
@@ -0,0 +1,18 @@
+using System.Threading;
+using System.Threading.Tasks;
+using DHT.Server.Database;
+using DHT.Server.Database.Export;
+using DHT.Server.Service.Viewer;
+using Microsoft.AspNetCore.Http;
+
+namespace DHT.Server.Endpoints; 
+
+sealed class GetViewerMessagesEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
+	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+		var sessionId = GetSessionId(request);
+		var session = viewerSessions.Get(sessionId);
+		
+		response.ContentType = "application/x-ndjson";
+		return ViewerJsonExport.GetMessages(response.Body, Db, session.MessageFilter, cancellationToken);
+	}
+}
--- a/app/Server/Endpoints/GetViewerMetadataEndpoint.cs
+++ b/app/Server/Endpoints/GetViewerMetadataEndpoint.cs
@@ -0,0 +1,19 @@
+using System.Net.Mime;
+using System.Threading;
+using System.Threading.Tasks;
+using DHT.Server.Database;
+using DHT.Server.Database.Export;
+using DHT.Server.Service.Viewer;
+using Microsoft.AspNetCore.Http;
+
+namespace DHT.Server.Endpoints; 
+
+sealed class GetViewerMetadataEndpoint(IDatabaseFile db, ViewerSessions viewerSessions) : BaseEndpoint(db) {
+	protected override Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+		var sessionId = GetSessionId(request);
+		var session = viewerSessions.Get(sessionId);
+		
+		response.ContentType = MediaTypeNames.Application.Json;
+		return ViewerJsonExport.GetMetadata(response.Body, Db, session.MessageFilter, cancellationToken);
+	}
+}
--- a/app/Server/Endpoints/TrackChannelEndpoint.cs
+++ b/app/Server/Endpoints/TrackChannelEndpoint.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database;
@@ -9,7 +10,7 @@ using Microsoft.AspNetCore.Http;
 namespace DHT.Server.Endpoints;

 sealed class TrackChannelEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
-	protected override async Task Respond(HttpRequest request, HttpResponse response) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		var root = await ReadJson(request);
 		var server = ReadServer(root.RequireObject("server"), "server");
 		var channel = ReadChannel(root.RequireObject("channel"), "channel", server.Id);
--- a/app/Server/Endpoints/TrackMessagesEndpoint.cs
+++ b/app/Server/Endpoints/TrackMessagesEndpoint.cs
@@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Data.Filters;
@@ -19,7 +20,7 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 	private const string HasNewMessages = "1";
 	private const string NoNewMessages = "0";

-	protected override async Task Respond(HttpRequest request, HttpResponse response) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		var root = await ReadJson(request);

 		if (root.ValueKind != JsonValueKind.Array) {
@@ -37,11 +38,11 @@ sealed class TrackMessagesEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
 		}

 		var addedMessageFilter = new MessageFilter { MessageIds = addedMessageIds };
-		bool anyNewMessages = await Db.Messages.Count(addedMessageFilter) < addedMessageIds.Count;
+		bool anyNewMessages = await Db.Messages.Count(addedMessageFilter, CancellationToken.None) < addedMessageIds.Count;

 		await Db.Messages.Add(messages);

-		await response.WriteTextAsync(anyNewMessages ? HasNewMessages : NoNewMessages);
+		await response.WriteTextAsync(anyNewMessages ? HasNewMessages : NoNewMessages, cancellationToken);
 	}

 	private static Message ReadMessage(JsonElement json, string path) => new () {
--- a/app/Server/Endpoints/TrackUsersEndpoint.cs
+++ b/app/Server/Endpoints/TrackUsersEndpoint.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Data;
 using DHT.Server.Database;
@@ -9,7 +10,7 @@ using Microsoft.AspNetCore.Http;
 namespace DHT.Server.Endpoints;

 sealed class TrackUsersEndpoint(IDatabaseFile db) : BaseEndpoint(db) {
-	protected override async Task Respond(HttpRequest request, HttpResponse response) {
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
 		var root = await ReadJson(request);

 		if (root.ValueKind != JsonValueKind.Array) {
--- a/app/Server/Endpoints/ViewerEndpoint.cs
+++ b/app/Server/Endpoints/ViewerEndpoint.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using DHT.Server.Database;
+using DHT.Utils.Http;
+using DHT.Utils.Resources;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
+
+namespace DHT.Server.Endpoints;
+
+sealed class ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : BaseEndpoint(db) {
+	private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
+
+	private readonly Dictionary<string, byte[]?> cache = new ();
+	private readonly SemaphoreSlim cacheSemaphore = new (1);
+
+	protected override async Task Respond(HttpRequest request, HttpResponse response, CancellationToken cancellationToken) {
+		string path = (string?) request.RouteValues["path"] ?? "index.html";
+		string resourcePath = "Viewer/" + path;
+		
+		byte[]? resourceBytes;
+
+		await cacheSemaphore.WaitAsync(cancellationToken);
+		try {
+			if (!cache.TryGetValue(resourcePath, out resourceBytes)) {
+				cache[resourcePath] = resourceBytes = await resources.ReadBytesAsyncIfExists(resourcePath);
+			}
+		} finally {
+			cacheSemaphore.Release();
+		}
+
+		if (resourceBytes == null) {
+			throw new HttpException(HttpStatusCode.NotFound, "File not found: " + path);
+		}
+		else {
+			var contentType = ContentTypeProvider.TryGetContentType(path, out string? type) ? type : null;
+			await response.WriteFileAsync(contentType, resourceBytes, cancellationToken);
+		}
+	}
+}
--- a/app/Server/Server.csproj
+++ b/app/Server/Server.csproj
@@ -39,6 +39,16 @@
      <Link>Resources/Tracker/styles/%(RecursiveDir)%(Filename)%(Extension)</Link>
      <Visible>false</Visible>
    </EmbeddedResource>
+    <EmbeddedResource Include="../Resources/Viewer/**">
+      <LogicalName>Viewer\%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
+      <Link>Resources/Viewer/%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <Visible>false</Visible>
+    </EmbeddedResource>
+    <EmbeddedResource Include="../Desktop/Resources/icon.ico">
+      <LogicalName>Viewer\favicon.ico</LogicalName>
+      <Link>Resources/icon.ico</Link>
+      <Visible>false</Visible>
+    </EmbeddedResource>
  </ItemGroup>
  
 </Project>
--- a/app/Server/Service/Middlewares/ServerLoggingMiddleware.cs
+++ b/app/Server/Service/Middlewares/ServerLoggingMiddleware.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using DHT.Utils.Logging;
@@ -6,24 +7,34 @@ using Microsoft.AspNetCore.Http.Extensions;

 namespace DHT.Server.Service.Middlewares;

-sealed class ServerLoggingMiddleware {
+sealed class ServerLoggingMiddleware(RequestDelegate next) {
 	private static readonly Log Log = Log.ForType<ServerLoggingMiddleware>();

-	private readonly RequestDelegate next;
-	
-	public ServerLoggingMiddleware(RequestDelegate next) {
-		this.next = next;
-	}
-
 	public async Task InvokeAsync(HttpContext context) {
 		var stopwatch = Stopwatch.StartNew();
+		try {
 			await next(context);
+		} catch (OperationCanceledException) {
+			OnFinished(stopwatch, context);
+			throw;
+		}
+
+		OnFinished(stopwatch, context);
+	}
+
+	private static void OnFinished(Stopwatch stopwatch, HttpContext context) {
 		stopwatch.Stop();

 		var request = context.Request;
 		var requestLength = request.ContentLength ?? 0L;
-		var responseStatus = context.Response.StatusCode;
 		var elapsedMs = stopwatch.ElapsedMilliseconds;
+
+		if (context.RequestAborted.IsCancellationRequested) {
+			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) was cancelled after " + elapsedMs + " ms");
+		}
+		else {
+			var responseStatus = context.Response.StatusCode;
 			Log.Debug("Request to " + request.GetEncodedPathAndQuery() + " (" + requestLength + " B) returned " + responseStatus + ", took " + elapsedMs + " ms");
 		}
+	}
 }
--- a/app/Server/Service/ServerManager.cs
+++ b/app/Server/Service/ServerManager.cs
@@ -1,8 +1,11 @@
 using System;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using DHT.Server.Database;
+using DHT.Server.Service.Viewer;
 using DHT.Utils.Logging;
+using DHT.Utils.Resources;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.DependencyInjection;
@@ -25,10 +28,12 @@ public sealed class ServerManager {
 	}

 	private readonly IDatabaseFile db;
+	private readonly ViewerSessions viewerSessions;
 	private readonly SemaphoreSlim semaphore = new (1, 1);

-	internal ServerManager(IDatabaseFile db) {
+	internal ServerManager(IDatabaseFile db, ViewerSessions viewerSessions) {
 		this.db = db;
+		this.viewerSessions = viewerSessions;
 	}

 	public async Task Start(ushort port, string token) {
@@ -57,6 +62,8 @@ public sealed class ServerManager {
 		void AddServices(IServiceCollection services) {
 			services.AddSingleton(typeof(IDatabaseFile), db);
 			services.AddSingleton(typeof(ServerParameters), new ServerParameters(port, token));
+			services.AddSingleton(typeof(ResourceLoader), new ResourceLoader(Assembly.GetExecutingAssembly()));
+			services.AddSingleton(typeof(ViewerSessions), viewerSessions);
 		}

 		void SetKestrelOptions(KestrelServerOptions options) {
--- a/app/Server/Service/ServerStartup.cs
+++ b/app/Server/Service/ServerStartup.cs
@@ -3,6 +3,8 @@ using System.Text.Json.Serialization;
 using DHT.Server.Database;
 using DHT.Server.Endpoints;
 using DHT.Server.Service.Middlewares;
+using DHT.Server.Service.Viewer;
+using DHT.Utils.Resources;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http.Json;
 using Microsoft.Extensions.DependencyInjection;
@@ -33,14 +35,24 @@ sealed class Startup {
 	}

 	[SuppressMessage("ReSharper", "UnusedMember.Global")]
-	public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime, IDatabaseFile db, ServerParameters parameters) {
+	public void Configure(IApplicationBuilder app, IHostApplicationLifetime lifetime, IDatabaseFile db, ServerParameters parameters, ResourceLoader resources, ViewerSessions viewerSessions) {
 		app.UseMiddleware<ServerLoggingMiddleware>();
 		app.UseCors();
-		app.UseMiddleware<ServerAuthorizationMiddleware>();
-		app.UseRouting();
 		
+		app.Map("/viewer", node => {
+			node.UseRouting();
+			node.UseEndpoints(endpoints => {
+				endpoints.MapGet("/{**path}", new ViewerEndpoint(db, resources).Handle);
+			});
+		});
+		
+		app.UseMiddleware<ServerAuthorizationMiddleware>();
+		
+		app.UseRouting();
 		app.UseEndpoints(endpoints => {
-			endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(db, parameters).Handle);
+			endpoints.MapGet("/get-tracking-script", new GetTrackingScriptEndpoint(db, parameters, resources).Handle);
+			endpoints.MapGet("/get-viewer-metadata", new GetViewerMetadataEndpoint(db, viewerSessions).Handle);
+			endpoints.MapGet("/get-viewer-messages", new GetViewerMessagesEndpoint(db, viewerSessions).Handle);
 			endpoints.MapGet("/get-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
 			endpoints.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
 			endpoints.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
--- a/app/Server/Service/Viewer/ViewerSession.cs
+++ b/app/Server/Service/Viewer/ViewerSession.cs
@@ -0,0 +1,5 @@
+using DHT.Server.Data.Filters;
+
+namespace DHT.Server.Service.Viewer; 
+
+public readonly record struct ViewerSession(MessageFilter? MessageFilter);
--- a/app/Server/Service/Viewer/ViewerSessions.cs
+++ b/app/Server/Service/Viewer/ViewerSessions.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+
+namespace DHT.Server.Service.Viewer;
+
+public sealed class ViewerSessions : IDisposable {
+	private readonly Dictionary<Guid, ViewerSession> sessions = new ();
+	private bool isDisposed = false;
+
+	public Guid Register(ViewerSession session) {
+		Guid guid = Guid.NewGuid();
+		
+		lock (this) {
+			ObjectDisposedException.ThrowIf(isDisposed, this);
+			sessions[guid] = session;
+		}
+		
+		return guid;
+	}
+
+	internal ViewerSession Get(Guid guid) {
+		lock (this) {
+			return sessions.GetValueOrDefault(guid);
+		}
+	}
+
+	public void Dispose() {
+		lock (this) {
+			if (!isDisposed) {
+				isDisposed = true;
+				sessions.Clear();
+			}
+		}
+	}
+}
--- a/app/Server/State.cs
+++ b/app/Server/State.cs
@@ -3,19 +3,29 @@ using System.Threading.Tasks;
 using DHT.Server.Database;
 using DHT.Server.Download;
 using DHT.Server.Service;
+using DHT.Server.Service.Viewer;

 namespace DHT.Server;

-public sealed class State(IDatabaseFile db, int? concurrentDownloads) : IAsyncDisposable {
+public sealed class State : IAsyncDisposable {
 	public static State Dummy { get; } = new (DummyDatabaseFile.Instance, null);

-	public IDatabaseFile Db { get; } = db;
-	public Downloader Downloader { get; } = new (db, concurrentDownloads);
-	public ServerManager Server { get; } = new (db);
+	public IDatabaseFile Db { get; }
+	public Downloader Downloader { get; }
+	public ViewerSessions ViewerSessions { get; }
+	public ServerManager Server { get; }
+
+	public State(IDatabaseFile db, int? concurrentDownloads) {
+		Db = db;
+		Downloader = new Downloader(db, concurrentDownloads);
+		ViewerSessions = new ViewerSessions();
+		Server = new ServerManager(db, ViewerSessions);
+	}

 	public async ValueTask DisposeAsync() {
 		await Downloader.Stop();
 		await Server.Stop();
 		await Db.DisposeAsync();
+		ViewerSessions.Dispose();
 	}
 }
--- a/app/Utils/Http/HttpExtensions.cs
+++ b/app/Utils/Http/HttpExtensions.cs
@@ -1,33 +1,34 @@
 using System.IO;
 using System.Net.Mime;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;

 namespace DHT.Utils.Http; 

 public static class HttpExtensions {
-	public static Task WriteTextAsync(this HttpResponse response, string text) {
-		return WriteTextAsync(response, MediaTypeNames.Text.Plain, text);
+	public static Task WriteTextAsync(this HttpResponse response, string text, CancellationToken cancellationToken) {
+		return WriteTextAsync(response, MediaTypeNames.Text.Plain, text, cancellationToken);
 	}
 	
-	public static async Task WriteTextAsync(this HttpResponse response, string contentType, string text) {
+	public static async Task WriteTextAsync(this HttpResponse response, string contentType, string text, CancellationToken cancellationToken) {
 		response.ContentType = contentType;
-		await response.StartAsync();
-		await response.WriteAsync(text, Encoding.UTF8);
+		await response.StartAsync(cancellationToken);
+		await response.WriteAsync(text, Encoding.UTF8, cancellationToken);
 	}
 	
-	public static async Task WriteFileAsync(this HttpResponse response, string? contentType, byte[] bytes) {
+	public static async Task WriteFileAsync(this HttpResponse response, string? contentType, byte[] bytes, CancellationToken cancellationToken) {
 		response.ContentType = contentType ?? string.Empty;
 		response.ContentLength = bytes.Length;
-		await response.StartAsync();
-		await response.Body.WriteAsync(bytes);
+		await response.StartAsync(cancellationToken);
+		await response.Body.WriteAsync(bytes, cancellationToken);
 	}
 	
-	public static async Task WriteStreamAsync(this HttpResponse response, string? contentType, ulong? contentLength, Stream source) {
+	public static async Task WriteStreamAsync(this HttpResponse response, string? contentType, ulong? contentLength, Stream source, CancellationToken cancellationToken) {
 		response.ContentType = contentType ?? string.Empty;
 		response.ContentLength = (long?) contentLength;
-		await response.StartAsync();
-		await source.CopyToAsync(response.Body);
+		await response.StartAsync(cancellationToken);
+		await source.CopyToAsync(response.Body, cancellationToken);
 	}
 }
--- a/app/Utils/Resources/ResourceLoader.cs
+++ b/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;
@@ -7,8 +9,9 @@ using System.Threading.Tasks;
 namespace DHT.Utils.Resources;

 public sealed class ResourceLoader(Assembly assembly) {
-	private Stream GetEmbeddedStream(string filename) {
+	private Stream? TryGetEmbeddedStream(string filename) {
 		Stream? stream = null;
+		
 		foreach (var embeddedName in assembly.GetManifestResourceNames()) {
 			if (embeddedName.Replace('\\', '/') == filename) {
 				stream = assembly.GetManifestResourceStream(embeddedName);
@@ -16,7 +19,11 @@ public sealed class ResourceLoader(Assembly assembly) {
 			}
 		}

-		return stream ?? throw new ArgumentException("Missing embedded resource: " + filename);
+		return stream;
+	}
+	
+	private Stream GetEmbeddedStream(string filename) {
+		return TryGetEmbeddedStream(filename) ?? throw new ArgumentException("Missing embedded resource: " + filename);
 	}

 	private async Task<string> ReadTextAsync(Stream stream) {
@@ -24,19 +31,41 @@ public sealed class ResourceLoader(Assembly assembly) {
 		return await reader.ReadToEndAsync();
 	}
 	
+	private async Task<byte[]> ReadBytesAsync(Stream stream) {
+		using var memoryStream = new MemoryStream();
+		await stream.CopyToAsync(memoryStream);
+		return memoryStream.ToArray();
+	}
+
 	public async Task<string> ReadTextAsync(string filename) {
 		return await ReadTextAsync(GetEmbeddedStream(filename));
 	}
 	
-	public async Task<string> ReadJoinedAsync(string path, char separator) {
-		StringBuilder joined = new ();
+	public async Task<byte[]?> ReadBytesAsyncIfExists(string filename) {
+		return TryGetEmbeddedStream(filename) is {} stream ? await ReadBytesAsync(stream) : null;
+	}
+
+	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));
 	}
 }
--- a/app/Version.cs
+++ b/app/Version.cs
@@ -8,5 +8,5 @@ using DHT.Utils;
 namespace DHT.Utils;

 static class Version {
-	public const string Tag = "41.2.0.0";
+	public const string Tag = "42.0.0.0";
 }
Author	SHA1	Message	Date
chylex	86dd64119d	Rewrite tracker to use Discord client functions instead of React properties	2024-05-01 10:36:25 +02:00
chylex	2d55ca4013	Release v42.0	2024-04-23 03:56:27 +02:00
chylex	0072e025f4	Fix broken links to image embeds in viewer	2024-04-21 20:55:06 +02:00
chylex	383ee5c90e	Stream messages to viewer using JSON lines	2024-04-21 20:55:05 +02:00
chylex	2b1c178f49	Handle request cancellation in the integrated HTTP server	2024-04-21 18:48:19 +02:00
chylex	16d7e5a6f8	Serve viewer page and JSON data from the integrated HTTP server	2024-04-21 18:48:19 +02:00
chylex	052d24d1e7	Remove unused file library in Rider	2024-04-20 02:06:17 +02:00
chylex	b058f1fb77	Update Rider code style and inspections	2024-04-20 02:06:17 +02:00