Create Object.hashtags/1 wrapper

lib/pleroma/object.ex

@@ -344,4 +344,8 @@ defmodule Pleroma.Object do
 
   def self_replies(object, opts \\ []),
     do: replies(object, Keyword.put(opts, :self_only, true))
+
+  def hashtags(%{"hashtags" => hashtags}), do: hashtags || []
+  def hashtags(%{"tag" => tags}), do: Enum.filter(tags, &is_bitstring(&1))
+  def hashtags(_), do: []
 end

lib/pleroma/web/activity_pub/mrf/simple_policy.ex

@@ -8,6 +8,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
 
   alias Pleroma.Config
   alias Pleroma.FollowingRelationship
+  alias Pleroma.Object
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.MRF
 
@@ -76,7 +77,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
       if MRF.subdomain_match?(media_nsfw, actor_host) do
         child_object =
           child_object
-          |> Map.put("hashtags", (child_object["hashtags"] || []) ++ ["nsfw"])
+          |> Map.put("hashtags", Object.hashtags(child_object) ++ ["nsfw"])
           |> Map.put("sensitive", true)
 
         Map.put(object, "object", child_object)

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -863,23 +863,18 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   def maybe_fix_object_url(data), do: data
 
   def add_hashtags(object) do
-    tags =
+    hashtags =
-      ((object["hashtags"] || []) ++ (object["tag"] || []))
+      object
-      |> Enum.map(fn
+      |> Object.hashtags()
-        # Expand internal representation tags into AS2 tags.
+      |> Enum.map(fn tag ->
-        tag when is_binary(tag) ->
+        %{
-          %{
+          "href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}",
-            "href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}",
+          "name" => "##{tag}",
-            "name" => "##{tag}",
+          "type" => "Hashtag"
-            "type" => "Hashtag"
+        }
-          }
-
-        # Do not process tags which are already AS2 tag objects.
-        tag when is_map(tag) ->
-          tag
       end)
 
-    Map.put(object, "tag", tags)
+    Map.put(object, "tag", hashtags ++ (object["tag"] || []))
   end
 
   # TODO These should be added on our side on insertion, it doesn't make much

lib/pleroma/web/mastodon_api/views/status_view.ex

@@ -347,7 +347,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       media_attachments: attachments,
       poll: render(PollView, "show.json", object: object, for: opts[:for]),
       mentions: mentions,
-      tags: build_tags(object.data["hashtags"] || tags),
+      tags: build_tags(Object.hashtags(object.data)),
       application: %{
         name: "Web",
         website: nil

lib/pleroma/web/templates/feed/feed/_activity.atom.eex

@@ -22,7 +22,7 @@
     <link type="text/html" href='<%= @data["external_url"] %>' rel="alternate"/>
   <% end %>
 
-  <%= for hashtag <- @data["hashtags"] || [] do %>
+  <%= for hashtag <- Object.hashtags(@data) do %>
     <category term="<%= hashtag %>"></category>
   <% end %>
 

lib/pleroma/web/templates/feed/feed/_activity.rss.eex

@@ -21,7 +21,7 @@
     <link><%= @data["external_url"] %></link>
   <% end %>
 
-  <%= for hashtag <- @data["hashtags"] || [] do %>
+  <%= for hashtag <- Object.hashtags(@data) do %>
     <category term="<%= hashtag %>"></category>
   <% end %>
 

lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex

@@ -41,7 +41,7 @@
       <% end %>
     <% end %>
 
-    <%= for hashtag <- @data["hashtags"] || [] do %>
+    <%= for hashtag <- Object.hashtags(@data) do %>
       <category term="<%= hashtag %>"></category>
     <% end %>