From 6d2080a74b58578de803a43ca381f5791231b873 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 13 Dec 2018 05:22:01 +0100
Subject: [PATCH] Add account hashtags to ActivityPub actor JSON (#9450)
---
.../activitypub/actor_serializer.rb | 20 ++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 5054bd683..72c30dc73 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -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
--
GitLab