X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftemplates%2Ffeed%2Ffeed%2F_tag_activity.atom.eex;h=aa3035bca514ef17432c48799716b72d7393e618;hb=7f23dd6cc867e839ec721d34e3c114a68a5aed9e;hp=1377a6bbc72b2ecb41f6e5e2fc7e118ab9baec04;hpb=acb03d591bea1b20a715201f479f1ad7bf7bb67b;p=akkoma

diff --git a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
index 1377a6bbc..aa3035bca 100644
--- a/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex
@@ -33,7 +33,7 @@
           ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"
           href="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 %>
           <link rel="mentioned"
             ostatus:object-type="http://activitystrea.ms/schema/1.0/person"
             href="<%= id %>" />
@@ -41,8 +41,8 @@
       <% end %>
     <% end %>
 
-    <%= for hashtag <- @data["hashtags"] || [] do %>
-      <category term="<%= hashtag %>"></category>
+    <%= for tag <- Pleroma.Object.hashtags(@object) do %>
+      <category term="<%= tag %>"></category>
     <% end %>
 
     <%= for {emoji, file} <- @data["emoji"] || %{} do %>