From b952007f3b83524f7abeb0cb10123801fa6911c7 Mon Sep 17 00:00:00 2001 From: Gisle Aune Date: Sat, 5 Jan 2019 11:16:29 +0100 Subject: [PATCH] logs-content: Fixed character names being omitted on multipart posts where an action post follows a text post. --- marko/page/logs-content/components/post/component.js | 2 ++ marko/page/logs-content/components/post/index.marko | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/marko/page/logs-content/components/post/component.js b/marko/page/logs-content/components/post/component.js index 854fa8e..839245b 100644 --- a/marko/page/logs-content/components/post/component.js +++ b/marko/page/logs-content/components/post/component.js @@ -13,6 +13,7 @@ module.exports = class { removed: false, multipart: false, anchored: false, + prevWasText: false, } this.mounted = false; @@ -48,6 +49,7 @@ module.exports = class { const timediff = Date.parse(input.post.time) - Date.parse(input.prev.time) this.state.multipart = (input.post.nick == input.prev.nick && input.prev.multipart !== false) && (Math.abs(timediff) < 60000); + this.state.prevWasText = (input.prev.kind === "text"); this.updatePost(input) } diff --git a/marko/page/logs-content/components/post/index.marko b/marko/page/logs-content/components/post/index.marko index 1cdafc5..e70cce1 100644 --- a/marko/page/logs-content/components/post/index.marko +++ b/marko/page/logs-content/components/post/index.marko @@ -26,7 +26,7 @@
- $ const prefix = (!state.multipart ? state.shortName + state.nameSuffix + " " : ""); + $ const prefix = ((!state.multipart || state.prevWasText) ? state.shortName + state.nameSuffix + " " : "");