Compare commits
4 Commits
ebdabb3dd2
...
f5abc8bebb
| Author | SHA1 | Date |
|---|---|---|
 chylex
|
f5abc8bebb
|
|
|
chylex
|
a268060d03
|
|
|
chylex
|
89476d8f58
|
|
|
chylex
|
1e40a8595f
|
|
|
@ -149,6 +149,9 @@
|
|||
<ScssCodeStyleSettings>
|
||||
<option name="HEX_COLOR_LOWER_CASE" value="true" />
|
||||
</ScssCodeStyleSettings>
|
||||
<Shell_Script>
|
||||
<option name="KEEP_COLUMN_ALIGNMENT_PADDING" value="true" />
|
||||
</Shell_Script>
|
||||
<SqlCodeStyleSettings version="6">
|
||||
<option name="KEYWORD_CASE" value="2" />
|
||||
<option name="TYPE_CASE" value="2" />
|
||||
|
|
@ -173,6 +176,7 @@
|
|||
<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">
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ 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;
|
||||
|
|
@ -17,8 +15,6 @@ 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;
|
||||
|
||||
namespace DHT.Desktop.Main.Pages;
|
||||
|
||||
|
|
@ -61,101 +57,17 @@ 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 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)) {
|
||||
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));
|
||||
|
|
|
|||
|
|
@ -4,14 +4,19 @@
|
|||
<meta charset="utf-8">
|
||||
<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]*/
|
||||
window.DHT_SERVER_URL = location.protocol + "//" + location.host + location.pathname;
|
||||
window.DHT_SERVER_TOKEN = new URLSearchParams(location.search).get("token");
|
||||
</script>
|
||||
<style>
|
||||
/*[CSS]*/
|
||||
</style>
|
||||
<script type="module" src="scripts/bootstrap.mjs"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="menu">
|
||||
|
|
|
|||
|
|
@ -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.");
|
||||
}
|
||||
});
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
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();
|
||||
});
|
||||
|
||||
try {
|
||||
state.uploadFile(JSON.parse(window.DHT_EMBEDDED));
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
alert("Could not parse embedded file, see console for details.");
|
||||
}
|
||||
});
|
||||
|
|
@ -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,
|
||||
|
|
@ -53,9 +59,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 +77,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 +95,7 @@ const DISCORD = (function() {
|
|||
};
|
||||
|
||||
const getImageEmbed = function(url, image) {
|
||||
if (!SETTINGS.enableImagePreviews) {
|
||||
if (!settings.enableImagePreviews) {
|
||||
return "";
|
||||
}
|
||||
|
||||
|
|
@ -109,21 +115,21 @@ const DISCORD = (function() {
|
|||
|
||||
return {
|
||||
setup() {
|
||||
templateChannelServer = new TEMPLATE([
|
||||
templateChannelServer = new template([
|
||||
"<div 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([
|
||||
templateChannelPrivate = new template([
|
||||
"<div 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 +138,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 +153,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([
|
||||
templateEmbedImage = new template([
|
||||
"<a href='{url}' class='embed thumbnail loading'><img src='{src}' alt='' onload='DISCORD.handleImageLoad(this)' onerror='DISCORD.handleImageLoadError(this)'></a><br>"
|
||||
].join(""));
|
||||
|
||||
// noinspection HtmlUnknownTarget
|
||||
templateEmbedImageWithSize = new TEMPLATE([
|
||||
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>"
|
||||
].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 +213,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 +226,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 +234,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) : "";
|
||||
|
|
@ -267,7 +273,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 +285,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 +296,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 +308,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 });
|
||||
|
|
@ -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];
|
||||
|
|
@ -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;
|
||||
}
|
||||
};
|
||||
})();
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
const PROCESSOR = {};
|
||||
import discord from "./discord.mjs";
|
||||
|
||||
// ------------------------
|
||||
// Global filter generators
|
||||
// ------------------------
|
||||
|
||||
PROCESSOR.FILTER = {
|
||||
const filter = {
|
||||
byUser: ((userindex) => message => message.u === userindex),
|
||||
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
|
||||
};
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
const SETTINGS = (function() {
|
||||
export default (function() {
|
||||
/**
|
||||
* @type {{}}
|
||||
* @property {Function} onSettingsChanged
|
||||
|
|
@ -1,5 +1,8 @@
|
|||
import settings from "./settings.mjs";
|
||||
import processor from "./processor.mjs";
|
||||
|
||||
// noinspection FunctionWithInconsistentReturnsJS
|
||||
const STATE = (function() {
|
||||
export default (function() {
|
||||
/**
|
||||
* @type {{}}
|
||||
* @property {{}} users
|
||||
|
|
@ -173,7 +176,7 @@ const STATE = (function() {
|
|||
};
|
||||
|
||||
const getMessageChannel = function(id) {
|
||||
for (const [ channel, messages ] of Object.entries(loadedFileData)) {
|
||||
for (const [ channel, messages ] of Object.entries(loadedFileData)) {
|
||||
if (id in messages) {
|
||||
return channel;
|
||||
}
|
||||
|
|
@ -313,7 +316,7 @@ const STATE = (function() {
|
|||
triggerChannelsRefreshed();
|
||||
triggerMessagesRefreshed();
|
||||
|
||||
SETTINGS.onSettingsChanged(() => triggerMessagesRefreshed());
|
||||
settings.onSettingsChanged(() => triggerMessagesRefreshed());
|
||||
},
|
||||
|
||||
getChannelName(channel) {
|
||||
|
|
@ -335,7 +338,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 +419,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(loadedFileMeta.userindex.indexOf(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:
|
||||
|
|
@ -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);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
|
|
@ -11,21 +10,21 @@ using Microsoft.AspNetCore.Http;
|
|||
namespace DHT.Server.Endpoints;
|
||||
|
||||
sealed class GetTrackingScriptEndpoint : BaseEndpoint {
|
||||
private static ResourceLoader Resources { get; } = new (Assembly.GetExecutingAssembly());
|
||||
|
||||
private readonly ServerParameters serverParameters;
|
||||
|
||||
public GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters) : base(db) {
|
||||
serverParameters = parameters;
|
||||
private readonly ResourceLoader resources;
|
||||
|
||||
public GetTrackingScriptEndpoint(IDatabaseFile db, ServerParameters parameters, ResourceLoader resources) : base(db) {
|
||||
this.serverParameters = parameters;
|
||||
this.resources = resources;
|
||||
}
|
||||
|
||||
protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
|
||||
string bootstrap = await Resources.ReadTextAsync("Tracker/bootstrap.js");
|
||||
string bootstrap = await resources.ReadTextAsync("Tracker/bootstrap.js");
|
||||
string script = bootstrap.Replace("= 0; /*[PORT]*/", "= " + serverParameters.Port + ";")
|
||||
.Replace("/*[TOKEN]*/", HttpUtility.JavaScriptStringEncode(serverParameters.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'))
|
||||
.Replace("/*[CSS-CONTROLLER]*/", await resources.ReadTextAsync("Tracker/styles/controller.css"))
|
||||
.Replace("/*[CSS-SETTINGS]*/", await resources.ReadTextAsync("Tracker/styles/settings.css"))
|
||||
.Replace("/*[DEBUGGER]*/", ctx.Request.Query.ContainsKey("debug") ? "debugger;" : "");
|
||||
|
||||
ctx.Response.Headers.Append("X-DHT", "1");
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
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 : BaseEndpoint {
|
||||
private static readonly FileExtensionContentTypeProvider ContentTypeProvider = new ();
|
||||
|
||||
private readonly ResourceLoader resources;
|
||||
private readonly Dictionary<string, byte[]?> cache = new ();
|
||||
private readonly SemaphoreSlim cacheSemaphore = new (1);
|
||||
|
||||
public ViewerEndpoint(IDatabaseFile db, ResourceLoader resources) : base(db) {
|
||||
this.resources = resources;
|
||||
}
|
||||
|
||||
protected override async Task<IHttpOutput> Respond(HttpContext ctx) {
|
||||
string path = (string?) ctx.Request.RouteValues["path"] ?? "index.html";
|
||||
string resourcePath = "Viewer/" + path;
|
||||
|
||||
byte[]? resourceBytes;
|
||||
|
||||
await cacheSemaphore.WaitAsync();
|
||||
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;
|
||||
return new HttpOutput.File(contentType, resourceBytes);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
using System;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using DHT.Server.Database;
|
||||
using DHT.Utils.Logging;
|
||||
using DHT.Utils.Resources;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Server.Kestrel.Core;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
|
@ -57,6 +59,7 @@ 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()));
|
||||
}
|
||||
|
||||
void SetKestrelOptions(KestrelServerOptions options) {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Text.Json.Serialization;
|
|||
using DHT.Server.Database;
|
||||
using DHT.Server.Endpoints;
|
||||
using DHT.Server.Service.Middlewares;
|
||||
using DHT.Utils.Resources;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Http.Json;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
|
@ -33,14 +34,22 @@ 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) {
|
||||
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-downloaded-file/{url}", new GetDownloadedFileEndpoint(db).Handle);
|
||||
endpoints.MapPost("/track-channel", new TrackChannelEndpoint(db).Handle);
|
||||
endpoints.MapPost("/track-users", new TrackUsersEndpoint(db).Handle);
|
||||
|
|
|
|||
|
|
@ -7,8 +7,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,17 +17,31 @@ 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) {
|
||||
using var reader = new StreamReader(stream, Encoding.UTF8);
|
||||
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<byte[]?> ReadBytesAsyncIfExists(string filename) {
|
||||
return TryGetEmbeddedStream(filename) is {} stream ? await ReadBytesAsync(stream) : null;
|
||||
}
|
||||
|
||||
public async Task<string> ReadJoinedAsync(string path, char separator) {
|
||||
StringBuilder joined = new ();
|
||||
|
|
|
|||
Loading…
Reference in New Issue