From 6a337a1097c6dbe853b397b6e5dde01a4aaa65fb Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Tue, 30 Sep 2025 12:55:28 -0500 Subject: [PATCH] fixes --- src/webpage/channel.ts | 7 +++---- src/webpage/markdown.ts | 6 ++++++ src/webpage/style.css | 7 +++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/webpage/channel.ts b/src/webpage/channel.ts index 622596f..65bbffb 100644 --- a/src/webpage/channel.ts +++ b/src/webpage/channel.ts @@ -572,11 +572,10 @@ class Channel extends SnowFlake { if (!this.hasPermission("VIEW_CHANNEL")) { return false; } + const lastreadmessage = this.messages.get(this.lastreadmessageid as string); return ( - Boolean(this.lastmessageid) && - (!this.lastreadmessageid || - SnowFlake.stringToUnixTime(this.lastmessageid as string) > - SnowFlake.stringToUnixTime(this.lastreadmessageid)) && + !!this.lastmessage && + (!lastreadmessage || this.lastmessage.timestamp > lastreadmessage.timestamp) && this.type !== 4 ); } diff --git a/src/webpage/markdown.ts b/src/webpage/markdown.ts index 8ac03ca..64c3c12 100644 --- a/src/webpage/markdown.ts +++ b/src/webpage/markdown.ts @@ -983,6 +983,12 @@ class MarkDown { return; } elm.onmouseup = (_) => { + let parent: HTMLElement | null = elm; + while (parent) { + if (parent.classList.contains("unspoiled")) break; + if (parent.classList.contains("spoiler")) return; + parent = parent.parentElement; + } if (_.button === 2) return; console.log(":3"); function open() { diff --git a/src/webpage/style.css b/src/webpage/style.css index b4fb846..4394499 100644 --- a/src/webpage/style.css +++ b/src/webpage/style.css @@ -2027,10 +2027,10 @@ span.instanceStatus { } .spoiler { background: var(--spoiler-bg); - color: var(--spoiler-bg) !important; + color: var(--spoiler-bg); cursor: pointer; a { - color: var(--spoiler-bg) !important; + color: var(--spoiler-bg); } } .spoiler:hover { @@ -2040,6 +2040,9 @@ span.instanceStatus { .unspoiled { color: var(--spoiler-text); } +a.unspoiled { + color: var(--link) !important; +} .quote { display: inline-block; position: relative;