projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
feed
/
feed
/
_tag_activity.xml.eex
diff --git
a/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
b/lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
index 295574df1c1f5a57ddbb33bc7e0ebe965da3fa20..2334e24a21715bc8e00ad86d2fca66355553c1cd 100644
(file)
--- a/
lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
+++ b/
lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex
@@
-1,15
+1,14
@@
<item>
<item>
- <title><%= activity_title(@
object
, Keyword.get(@feed_config, :post_title, %{})) %></title>
-
-
+ <title><%= activity_title(@
data
, Keyword.get(@feed_config, :post_title, %{})) %></title>
+
+
<guid isPermalink="true"><%= activity_context(@activity) %></guid>
<link><%= activity_context(@activity) %></link>
<guid isPermalink="true"><%= activity_context(@activity) %></guid>
<link><%= activity_context(@activity) %></link>
- <pubDate><%= pub_date(@data["published"]) %></pubDate>
-
- <description><%= activity_content(@
object
) %></description>
+ <pubDate><%= pub_date(@
activity.
data["published"]) %></pubDate>
+
+ <description><%= activity_content(@
data
) %></description>
<%= for attachment <- @data["attachment"] || [] do %>
<enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>"/>
<% end %>
<%= for attachment <- @data["attachment"] || [] do %>
<enclosure url="<%= attachment_href(attachment) %>" type="<%= attachment_type(attachment) %>"/>
<% end %>
-
-</item>
+</item>