Merge branch 'main' into glitch-soc/merge-upstream

2022-10-28 11:36:25 +02:00
parent 371563b0e2 8dfe5179ee
commit cb19be67d1
567 changed files with 14361 additions and 20828 deletions
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -14,6 +14,7 @@ class REST::AccountSerializer < ActiveModel::Serializer

  attribute :suspended, if: :suspended?
  attribute :silenced, key: :limited, if: :silenced?
+  attribute :noindex, if: :local?

  class FieldSerializer < ActiveModel::Serializer
    include FormattingHelper
@@ -107,7 +108,11 @@ class REST::AccountSerializer < ActiveModel::Serializer
    object.silenced?
  end

-  delegate :suspended?, :silenced?, to: :object
+  def noindex
+    object.user_prefers_noindex?
+  end
+
+  delegate :suspended?, :silenced?, :local?, to: :object

  def moved_and_not_nested?
    object.moved? && object.moved_to_account.moved_to_account_id.nil?