X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/e02706eef130529aac80bb58cf9755c850e316a7..218c239a4dc23c0dbe3878109c2f844d978ec626:/widget/issue/activity.php

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index 153034e..1d1a37a 100644
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -6,39 +6,54 @@ $limit = $Page->place['n'] ?? 50;
 $cols = 'm.*, i.subject, i.updated, i.closed';
 $sql = "SELECT $cols FROM messages m JOIN issues i ON i.id = issue";
 $sql .= " WHERE message IS NOT NULL";
+$sql .= " AND i.page <> 'spam'";
+$sql .= " AND m.announced";
 $sql .= " ORDER BY m.created DESC LIMIT $limit";
 $query = $Db->query($sql);
+$rows = $query->fetchall();
 
 $msgformat = [
-	"{(?=</p>\n).+}s" => ' <small class="footer">(Meer op de site)</small>',
-	'{(.*)(<p><img [^>]+></p>)\s*}' => "$2\n$1",
-	'{(?<=<img src=")(?=/)}' => '/thumb/300x',
+	'{(.*)(<p><img [^>]+></p>)\s*}s' => "$2$1",
+	"{(</p>\n).{20,}}s" => ' <small class="footer">(Meer op de site)</small>$1',
+	'{(?<=<img src=")(?:/thumb/[^/]+)?(?=/)}' => '/thumb/300x',
 ];
 
 print '<dl class="replies">';
 
-$group = 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>';
-		}
+$prev = NULL;
+foreach ($rows as $i => $row) {
+	$next = $rows[$i + 1] ?? NULL;
+
+	if ($next and $next->issue === $row->issue
+	and preg_match('/\A(?:<p><img[^>]*><\/p>)+\z/', $row->message)) {
+		# postpone related image to the following message
+		$next->message = $row->message . $next->message;
+		continue;
 	}
-	print '<span class="right">';
-	if ($row->author and $rowuser = new User("profile/{$row->author}")) {
-		printf('<strong>%s</strong> ', $rowuser->html);
+
+	if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author
+	or !preg_match('/\A<p><img/', $prev->message)) {
+		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>';
 	}
-	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";
+	print "\n";
+	$prev = $row;
 }
 
 print "</dl>\n";