From 0405be69d265b81a41be9c253e4b50aa6c8e1ee9 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 18 Jan 2023 16:25:31 +0100
Subject: [PATCH] Fix REST API serializer for Account not including `moved`
when the moved account has itself moved (#22483)
Instead of cutting immediately, cut after one recursion.
---
app/serializers/rest/account_serializer.rb | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index e521dacaaa..6582b5bcf6 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -16,6 +16,16 @@ class REST::AccountSerializer < ActiveModel::Serializer
attribute :silenced, key: :limited, if: :silenced?
attribute :noindex, if: :local?
+ class AccountDecorator < SimpleDelegator
+ def self.model_name
+ Account.model_name
+ end
+
+ def moved?
+ false
+ end
+ end
+
class FieldSerializer < ActiveModel::Serializer
include FormattingHelper
@@ -85,7 +95,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
end
def moved_to_account
- object.suspended? ? nil : object.moved_to_account
+ object.suspended? ? nil : AccountDecorator.new(object.moved_to_account)
end
def emojis
@@ -111,6 +121,6 @@ class REST::AccountSerializer < ActiveModel::Serializer
delegate :suspended?, :silenced?, :local?, to: :object
def moved_and_not_nested?
- object.moved? && object.moved_to_account.moved_to_account_id.nil?
+ object.moved?
end
end
--
GitLab