From 4b441d738c39a017c473428322b6e2f72b66301b Mon Sep 17 00:00:00 2001
From: mcnesium <git@mcnesium.com>
Date: Tue, 23 Jan 2024 14:32:56 +0100
Subject: [PATCH 1/3] fix rss feed item guid

Signed-off-by: mcnesium <git@mcnesium.com>
---
 templates/rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/rss.php b/templates/rss.php
index cf8597b1e..1d64fd8af 100644
--- a/templates/rss.php
+++ b/templates/rss.php
@@ -34,7 +34,7 @@
 		<atom:link href="<?php p($_['rssLink']); ?>" rel="self" type="application/rss+xml" />
 <?php foreach ($_['activities'] as $activity) { ?>
 		<item>
-			<guid isPermaLink="false"><?php p($activity['activity_id']); ?></guid>
+			<guid isPermaLink="false"><?php p($_['rssLink']); echo "?id="; p($activity['activity_id']); ?></guid>
 <?php if (!empty($activity['subject'])): ?>
 			<title><?php p(str_replace("\n", ' ', $activity['subject'])); ?></title>
 <?php endif; ?>

From bd376ffb5a143390cba1cdafed5efc1fb4448eb9 Mon Sep 17 00:00:00 2001
From: mcnesium <mcnesium@users.noreply.github.com>
Date: Tue, 30 Jan 2024 17:31:25 +0100
Subject: [PATCH 2/3] improve string concatenation

Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: mcnesium <mcnesium@users.noreply.github.com>
---
 templates/rss.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/rss.php b/templates/rss.php
index 1d64fd8af..ff9ef95aa 100644
--- a/templates/rss.php
+++ b/templates/rss.php
@@ -34,7 +34,7 @@
 		<atom:link href="<?php p($_['rssLink']); ?>" rel="self" type="application/rss+xml" />
 <?php foreach ($_['activities'] as $activity) { ?>
 		<item>
-			<guid isPermaLink="false"><?php p($_['rssLink']); echo "?id="; p($activity['activity_id']); ?></guid>
+			<guid isPermaLink="false"><?php p($_['rssLink'] . '?id=' . $activity['activity_id']); ?></guid>
 <?php if (!empty($activity['subject'])): ?>
 			<title><?php p(str_replace("\n", ' ', $activity['subject'])); ?></title>
 <?php endif; ?>

From 64171ec7934316b138a2a596fc583af21a1972bc Mon Sep 17 00:00:00 2001
From: mcnesium <git@mcnesium.com>
Date: Wed, 31 Jan 2024 15:32:11 +0100
Subject: [PATCH 3/3] add full url to test string

Signed-off-by: mcnesium <git@mcnesium.com>
---
 tests/Template/RssTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Template/RssTest.php b/tests/Template/RssTest.php
index cbd88a39c..3d6ac1bbc 100644
--- a/tests/Template/RssTest.php
+++ b/tests/Template/RssTest.php
@@ -77,7 +77,7 @@ public function dataContent(): array {
 					['activity_id' => 1337, 'subject' => '', 'link' => '', 'timestamp' => 0, 'message' => ''],
 				],
 				'		<item>'
-				. "\n" . '			<guid isPermaLink="false">1337</guid>'
+				. "\n" . '			<guid isPermaLink="false">http://nextcloud.org?id=1337</guid>'
 				. "\n" . '		</item>',
 			],
 			[
@@ -85,7 +85,7 @@ public function dataContent(): array {
 					['activity_id' => 42, 'subject' => 'text', 'link' => 'http://docs.nextcloud.org', 'timestamp' => 21, 'message' => 'text2'],
 				],
 				'		<item>'
-				. "\n" . '			<guid isPermaLink="false">42</guid>'
+				. "\n" . '			<guid isPermaLink="false">http://nextcloud.org?id=42</guid>'
 				. "\n" . '			<title>text</title>'
 				. "\n" . '			<link>http://docs.nextcloud.org</link>'
 				. "\n" . '			<pubDate>Thu, 01 Jan 1970 00:00:21 +0000</pubDate>'
@@ -97,7 +97,7 @@ public function dataContent(): array {
 					['activity_id' => 42, 'subject' => 'text', 'link' => 'http://docs.nextcloud.org', 'timestamp' => 21],
 				],
 				'		<item>'
-				. "\n" . '			<guid isPermaLink="false">42</guid>'
+				. "\n" . '			<guid isPermaLink="false">http://nextcloud.org?id=42</guid>'
 				. "\n" . '			<title>text</title>'
 				. "\n" . '			<link>http://docs.nextcloud.org</link>'
 				. "\n" . '			<pubDate>Thu, 01 Jan 1970 00:00:21 +0000</pubDate>'