Merge remote-tracking branch 'upstream/develop' into attachment-meta

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