X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftemplates%2Ffeed%2Ffeed%2F_activity.rss.eex;h=279f2171d811a491ed133edd9713c9df5bda54ed;hb=40bec73db6479850cb8b231dabc2123a93623307;hp=6ef24d0ef595dee79dce09b18616a7bf1fbdde78;hpb=87b13c543039859007d9e2ba27c0236ab4092a9d;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 6ef24d0ef..279f2171d 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.rss.eex
@@ -9,7 +9,6 @@
<%= activity_context(@activity) %>
- <%= activity_context(@activity) %>
<%= if @data["summary"] do %>
<%= escape(@data["summary"]) %>
@@ -21,8 +20,10 @@
<%= @data["external_url"] %>
<% end %>
- <%= for hashtag <- Object.hashtags(@data) do %>
-
+ <%= activity_context(@activity) %>
+
+ <%= for tag <- Pleroma.Object.hashtags(@object) do %>
+
<% end %>
<%= for attachment <- @data["attachment"] || [] do %>
@@ -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 %>