Merge pull request #1804 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 18 insertions, 0 deletions

diff --git a/app/serializers/rest/tag_serializer.rb b/app/serializers/rest/tag_serializer.rb
index 74aa571a4..7801e77d1 100644
--- a/app/serializers/rest/tag_serializer.rb
+++ b/app/serializers/rest/tag_serializer.rb
@@ -5,7 +5,25 @@ class REST::TagSerializer < ActiveModel::Serializer
 
   attributes :name, :url, :history
 
+  attribute :following, if: :current_user?
+
   def url
     tag_url(object)
   end
+
+  def name
+    object.display_name
+  end
+
+  def following
+    if instance_options && instance_options[:relationships]
+      instance_options[:relationships].following_map[object.id] || false
+    else
+      TagFollow.where(tag_id: object.id, account_id: current_user.account_id).exists?
+    end
+  end
+
+  def current_user?
+    !current_user.nil?
+  end
 end