Skip to content

fix rss feed item guid #1536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 5 commits into from
Jan 31, 2024
Merged

fix rss feed item guid #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a08515
fix rss feed item guid
mcnesium Jan 23, 2024
cb38326
Merge branch 'master' into fix_guid
mcnesium Jan 25, 2024
2cc730e
improve string concatenation
mcnesium Jan 30, 2024
ac10d47
Merge branch 'master' into fix_guid
mcnesium Jan 30, 2024
c26241a
add full url to test string
mcnesium Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/rss.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] . '?id=' . $activity['activity_id']); ?></guid>
<?php if (!empty($activity['subject'])): ?>
<title><?php p(str_replace("\n", ' ', $activity['subject'])); ?></title>
<?php endif; ?>
Expand Down
6 changes: 3 additions & 3 deletions tests/Template/RssTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ 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>',
],
[
[
['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>'
Expand All @@ -98,7 +98,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>'
Expand Down