From 639efef0918d259fa62e7dc614835e669c2e3543 Mon Sep 17 00:00:00 2001
From: noellabo <noel.yoshiba@gmail.com>
Date: Sat, 23 Jan 2021 09:47:31 +0900
Subject: [PATCH] Change subscribing to account_subscribing in relationship
 response

---
 app/javascript/mastodon/reducers/relationships.js | 5 ++++-
 app/serializers/rest/relationship_serializer.rb   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/reducers/relationships.js b/app/javascript/mastodon/reducers/relationships.js
index 710770e73..7a5895ea2 100644
--- a/app/javascript/mastodon/reducers/relationships.js
+++ b/app/javascript/mastodon/reducers/relationships.js
@@ -28,7 +28,10 @@ import {
 } from '../actions/account_notes';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
-const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship));
+const normalizeRelationship = (state, relationship) => {
+  const { account_subscribing: subscribing, ...other_relationship } = relationship;
+  return state.set(relationship.id, fromJS({ subscribing, ...other_relationship }));
+};
 
 const normalizeRelationships = (state, relationships) => {
   relationships.forEach(relationship => {
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb
index 49c09e64f..774712960 100644
--- a/app/serializers/rest/relationship_serializer.rb
+++ b/app/serializers/rest/relationship_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::RelationshipSerializer < ActiveModel::Serializer
-  attributes :id, :following, :delivery_following, :showing_reblogs, :notifying, :followed_by, :subscribing,
+  attributes :id, :following, :delivery_following, :showing_reblogs, :notifying, :followed_by, :account_subscribing,
              :blocking, :blocked_by, :muting, :muting_notifications, :requested,
              :domain_blocking, :endorsed, :note
 
@@ -35,7 +35,7 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
     instance_options[:relationships].followed_by[object.id] || false
   end
 
-  def subscribing
+  def account_subscribing
     instance_options[:relationships].subscribing[object.id] || {}
   end