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

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index 371f11a..1d1a37a 100644
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -6,19 +6,31 @@ $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*}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">';
 
 $prev = NULL;
-while ($row = $query->fetch()) {
+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;
+	}
+
 	if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author
 	or !preg_match('/\A<p><img/', $prev->message)) {
 		print '<dt>';
@@ -37,9 +49,10 @@ while ($row = $query->fetch()) {
 		);
 		print "</span>";
 		print '</dt>';
-		print '<dd>';
 	}
+	print '<dd>';
 	print preg_replace(array_keys($msgformat), array_values($msgformat), $row->message);
+	print "\n";
 	$prev = $row;
 }