]> cat aescling's git repositories - mastodon.git/commitdiff
Add account hashtags to ActivityPub actor JSON (#9450)
authorEugen Rochko <eugen@zeonfederated.com>
Thu, 13 Dec 2018 04:22:01 +0000 (05:22 +0100)
committerGitHub <noreply@github.com>
Thu, 13 Dec 2018 04:22:01 +0000 (05:22 +0100)
app/serializers/activitypub/actor_serializer.rb

index 5054bd68360f243182a74c7e22e46a6b3748f2d1..72c30dc7339432c67f3167da910f1581d46b9ecf 100644 (file)
@@ -105,7 +105,7 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   end
 
   def virtual_tags
-    object.emojis
+    object.emojis + object.tags
   end
 
   def virtual_attachments
@@ -119,6 +119,24 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   class CustomEmojiSerializer < ActivityPub::EmojiSerializer
   end
 
+  class TagSerializer < ActiveModel::Serializer
+    include RoutingHelper
+
+    attributes :type, :href, :name
+
+    def type
+      'Hashtag'
+    end
+
+    def href
+      explore_hashtag_url(object)
+    end
+
+    def name
+      "##{object.name}"
+    end
+  end
+
   class Account::FieldSerializer < ActiveModel::Serializer
     attributes :type, :name, :value