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-plugs
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
feed
/
feed
/
_activity.rss.eex
diff --git
a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
index a304a16afecec2827062775909c9c97d17a4de6e..592b9dcdc4331b86ab4ee5c2c2c52203c0745593 100644
(file)
--- a/
lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/
lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@
-9,10
+9,9
@@
<ostatus:conversation ref="<%= activity_context(@activity) %>">
<%= activity_context(@activity) %>
</ostatus:conversation>
<ostatus:conversation ref="<%= activity_context(@activity) %>">
<%= activity_context(@activity) %>
</ostatus:conversation>
- <link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
<%= if @data["summary"] do %>
<%= if @data["summary"] do %>
- <description><%=
@data["summary"]
%></description>
+ <description><%=
escape(@data["summary"])
%></description>
<% end %>
<%= if @activity.local do %>
<% end %>
<%= if @activity.local do %>
@@
-21,7
+20,9
@@
<link><%= @data["external_url"] %></link>
<% end %>
<link><%= @data["external_url"] %></link>
<% end %>
- <%= for tag <- @data["tag"] || [] do %>
+ <link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
+
+ <%= for tag <- Pleroma.Object.hashtags(@object) do %>
<category term="<%= tag %>"></category>
<% end %>
<category term="<%= tag %>"></category>
<% end %>