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 'upstream/develop' into block-behavior
[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 947bbb09970fa6f01788cf813414a1554eaf44a4..592b9dcdc4331b86ab4ee5c2c2c52203c0745593 100644
(file)
--- a/
lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/
lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@
-22,7
+22,7
@@
<link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
<link rel="ostatus:conversation"><%= activity_context(@activity) %></link>
- <%= for tag <-
@data["tag"] || []
do %>
+ <%= for tag <-
Pleroma.Object.hashtags(@object)
do %>
<category term="<%= tag %>"></category>
<% end %>
<category term="<%= tag %>"></category>
<% end %>