X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftemplates%2Ffeed%2Ffeed%2F_activity.rss.eex;h=592b9dcdc4331b86ab4ee5c2c2c52203c0745593;hb=52fc59f125c10ad73b9fd1a0639b6dc5681776ca;hp=a4dbed6382aaeabde389221a9206c84555665665;hpb=7dbf1ffa868e4f5fece298b9ea161e1e11a2ffde;p=akkoma
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
index a4dbed638..592b9dcdc 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@ -2,17 +2,16 @@
http://activitystrea.ms/schema/1.0/note
http://activitystrea.ms/schema/1.0/post
<%= @data["id"] %>
-
<%= activity_title(@object, Keyword.get(@feed_config, :post_title, %{})) %>
- <%= activity_content(@object) %>
- <%= @data["published"] %>
- <%= @data["published"] %>
+ <%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %>
+ <%= activity_content(@data) %>
+ <%= @activity.data["published"] %>
+ <%= @activity.data["published"] %>
<%= activity_context(@activity) %>
- <%= activity_context(@activity) %>
<%= if @data["summary"] do %>
- <%= @data["summary"] %>
+ <%= escape(@data["summary"]) %>
<% end %>
<%= if @activity.local do %>
@@ -21,7 +20,9 @@
<%= @data["external_url"] %>
<% end %>
- <%= for tag <- @data["tag"] || [] do %>
+ <%= activity_context(@activity) %>
+
+ <%= for tag <- Pleroma.Object.hashtags(@object) do %>
<% end %>