Merge pull request #147 from yipdw/sync/upstream

Fix error when following locked accounts (#4896)

app/controllers/api/v1/accounts_controller.rb

@@ -15,16 +15,9 @@ class Api::V1::AccountsController < Api::BaseController
   def follow
     FollowService.new.call(current_user.account, @account.acct)
 
-    unless @account.locked?
+    options = @account.locked? ? {} : { following_map: { @account.id => true }, requested_map: { @account.id => false } }
-      relationships = AccountRelationshipsPresenter.new(
-        [@account.id],
-        current_user.account_id,
-        following_map: { @account.id => true },
-        requested_map: { @account.id => false }
-      )
-    end
 
-    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
   end
 
   def block
@@ -58,7 +51,7 @@ class Api::V1::AccountsController < Api::BaseController
     @account = Account.find(params[:id])
   end
 
-  def relationships
+  def relationships(options = {})
-    AccountRelationshipsPresenter.new([@account.id], current_user.account_id)
+    AccountRelationshipsPresenter.new([@account.id], current_user.account_id, options)
   end
 end

spec/controllers/api/v1/accounts_controller_spec.rb

@@ -18,25 +18,48 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
   end
 
   describe 'POST #follow' do
-    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+    let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', locked: locked)).account }
 
     before do
       post :follow, params: { id: other_account.id }
     end
 
-    it 'returns http success' do
+    context 'with unlocked account' do
-      expect(response).to have_http_status(:success)
+      let(:locked) { false }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'returns JSON with following=true and requested=false' do
+        json = body_as_json
+
+        expect(json[:following]).to be true
+        expect(json[:requested]).to be false
+      end
+
+      it 'creates a following relation between user and target user' do
+        expect(user.account.following?(other_account)).to be true
+      end
     end
 
-    it 'returns JSON with following=true and requested=false' do
+    context 'with locked account' do
-      json = body_as_json
+      let(:locked) { true }
 
-      expect(json[:following]).to be true
+      it 'returns http success' do
-      expect(json[:requested]).to be false
+        expect(response).to have_http_status(:success)
-    end
+      end
 
-    it 'creates a following relation between user and target user' do
+      it 'returns JSON with following=false and requested=true' do
-      expect(user.account.following?(other_account)).to be true
+        json = body_as_json
+
+        expect(json[:following]).to be false
+        expect(json[:requested]).to be true
+      end
+
+      it 'creates a follow request relation between user and target user' do
+        expect(user.account.requested?(other_account)).to be true
+      end
     end
   end