Skip to content

Commit

Permalink
Fix muting users with duration via the REST api (#15516)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tak committed Jan 10, 2021
1 parent 087ed84 commit 11d6031
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/controllers/api/v1/accounts_controller.rb
Expand Up @@ -42,7 +42,7 @@ def block
end

def mute
MuteService.new.call(current_user.account, @account, notifications: truthy_param?(:notifications), duration: (params[:duration] || 0))
MuteService.new.call(current_user.account, @account, notifications: truthy_param?(:notifications), duration: (params[:duration]&.to_i || 0))
render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
end

Expand Down
28 changes: 28 additions & 0 deletions spec/controllers/api/v1/accounts_controller_spec.rb
Expand Up @@ -268,6 +268,34 @@
it_behaves_like 'forbidden for wrong scope', 'read:accounts'
end

describe 'POST #mute with nonzero duration set' do
let(:scopes) { 'write:mutes' }
let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }

before do
user.account.follow!(other_account)
post :mute, params: { id: other_account.id, duration: 300 }
end

it 'returns http success' do
expect(response).to have_http_status(200)
end

it 'does not remove the following relation between user and target user' do
expect(user.account.following?(other_account)).to be true
end

it 'creates a muting relation' do
expect(user.account.muting?(other_account)).to be true
end

it 'mutes notifications' do
expect(user.account.muting_notifications?(other_account)).to be true
end

it_behaves_like 'forbidden for wrong scope', 'read:accounts'
end

describe 'POST #unmute' do
let(:scopes) { 'write:mutes' }
let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
Expand Down

0 comments on commit 11d6031

Please sign in to comment.