Merge remote-tracking branch 'upstream/develop' into feature/move-activity

[akkoma] / lib / pleroma / web / templates / feed / feed / feed.xml.eex

diff --git a/lib/pleroma/web/templates/feed/feed/feed.xml.eex b/lib/pleroma/web/templates/feed/feed/feed.xml.eex
index 45df9dc09a20594a721d7020e835df2cb0098ba4..5ae36d345d79bc88e663eeeab60d3dc634fc9082 100644 (file)
--- a/lib/pleroma/web/templates/feed/feed/feed.xml.eex
+++ b/lib/pleroma/web/templates/feed/feed/feed.xml.eex
@@ -19,6 +19,6 @@
   <% end %>
 
   <%= for activity <- @activities do %>
-    <%= render @view_module, "_activity.xml", Map.merge(assigns, %{activity: activity, data: activity_object_data(activity)}) %>
+  <%= render @view_module, "_activity.xml", Map.merge(assigns, prepare_activity(activity)) %>
   <% end %>
 </feed>