X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftemplates%2Ffeed%2Ffeed%2F_activity.atom.eex;h=57bd9246836434d0bd5dc1524ce589ebbb49360a;hb=99cc26bb02f2ac7ab26aa761ee5427406830a778;hp=cb18abb5db9958658ec1d8f7e232480545a72ee9;hpb=87b13c543039859007d9e2ba27c0236ab4092a9d;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 cb18abb5d..57bd92468 100644
--- a/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_activity.atom.eex
@@ -22,8 +22,8 @@
<% end %>
- <%= for hashtag <- Object.hashtags(@data) do %>
-
+ <%= for tag <- Pleroma.Object.hashtags(@object) do %>
+
<% end %>
<%= for attachment <- @data["attachment"] || [] do %>
@@ -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 %>