X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftemplates%2Ffeed%2Ffeed%2F_activity.rss.eex;h=01dddba07132673d324cc04b84d1e9b40883089e;hb=51a9f97e87823cbd9e92c375f4bc4c0bfa8b79db;hp=a4dbed6382aaeabde389221a9206c84555665665;hpb=dfd2c741849e9afaf35e3ddbecbb50feb47f5d22;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..01dddba07 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,6 +20,8 @@
<%= @data["external_url"] %>
<% end %>
+ <%= activity_context(@activity) %>
+
<%= for tag <- @data["tag"] || [] do %>
<% end %>
@@ -37,7 +38,7 @@
<%= if id == Pleroma.Constants.as_public() do %>
http://activityschema.org/collection/public
<% else %>
- <%= unless Regex.match?(~r/^#{Pleroma.Web.base_url()}.+followers$/, id) do %>
+ <%= unless Regex.match?(~r/^#{Pleroma.Web.Endpoint.url()}.+followers$/, id) do %>
<%= id %>
<% end %>
<% end %>