X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftemplates%2Ffeed%2Ffeed%2F_activity.atom.eex;h=57bd9246836434d0bd5dc1524ce589ebbb49360a;hb=f6d2bd738d6cf4c495ba8fcd311ebf4705cf4343;hp=ac8a75009de834a7e97d422c1a9002121879b39a;hpb=19335be24c25739e2334180af6c59dd8919d5fc8;p=akkoma
diff --git a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
index ac8a75009..57bd92468 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@ -2,17 +2,17 @@
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) %>
<%= if @data["summary"] do %>
- <%= @data["summary"] %>
+ <%= escape(@data["summary"]) %>
<% end %>
<%= if @activity.local do %>
@@ -22,7 +22,7 @@
<% end %>
- <%= for tag <- @data["tag"] || [] do %>
+ <%= for tag <- Pleroma.Object.hashtags(@object) do %>
<% end %>
@@ -38,7 +38,7 @@
<%= if id == Pleroma.Constants.as_public() do %>
<% else %>
- <%= unless Regex.match?(~r/^#{Pleroma.Web.base_url()}.+followers$/, id) do %>
+ <%= unless Regex.match?(~r/^#{Pleroma.Web.Endpoint.url()}.+followers$/, id) do %>
<% end %>
<% end %>