From 95b037f55a21f6bd70c50801f5c6b0a23daee27c Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 27 Apr 2021 20:43:52 +0200
Subject: [PATCH] issue/activity: concatenate similar replies

Omit title for unchanged ticket and author,
causing stacked images from different messages.
Don't bother with closing <dd> for simplicity.
---
 widget/issue/activity.php | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index 153034e..23b95c6 100644
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -17,28 +17,29 @@ $msgformat = [
 
 print '<dl class="replies">';
 
-$group = NULL;
+$prev = NULL;
 while ($row = $query->fetch()) {
-	print '<dt>';
-	if ($group !== $row->issue) {
-		$group = $row->issue;
-		printf('<a href="/%s">%s</a>', $row->page, $row->subject);
-		if ($row->closed) {
-			print ' <em>(opgelost)</em>';
+	if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author) {
+		print '<dt>';
+		if (!$prev or $prev->issue !== $row->issue) {
+			printf('<a href="/%s">%s</a>', $row->page, $row->subject);
+			if ($row->closed) {
+				print ' <em>(opgelost)</em>';
+			}
 		}
+		print '<span class="right">';
+		if ($row->author and $rowuser = new User("profile/{$row->author}")) {
+			printf('<strong>%s</strong> ', $rowuser->html);
+		}
+		printf('<small class="date">%s</small>',
+			showdate(preg_split('/\D/', $row->created))
+		);
+		print "</span>";
+		print '</dt>';
+		print '<dd>';
 	}
-	print '<span class="right">';
-	if ($row->author and $rowuser = new User("profile/{$row->author}")) {
-		printf('<strong>%s</strong> ', $rowuser->html);
-	}
-	printf('<small class="date">%s</small>',
-		showdate(preg_split('/\D/', $row->created))
-	);
-	print "</span>";
-	print '</dt>';
-	print '<dd>';
 	print preg_replace(array_keys($msgformat), array_values($msgformat), $row->message);
-	print "</dd>\n";
+	$prev = $row;
 }
 
 print "</dl>\n";
-- 
2.30.0