mirror of https://github.com/Siphonay/mastodon
Fix muting users with duration via the REST api (#15516)
This commit is contained in:
parent
087ed84367
commit
11d603101a
|
@ -42,7 +42,7 @@ class Api::V1::AccountsController < Api::BaseController
|
||||||
end
|
end
|
||||||
|
|
||||||
def mute
|
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
|
render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -268,6 +268,34 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
|
||||||
it_behaves_like 'forbidden for wrong scope', 'read:accounts'
|
it_behaves_like 'forbidden for wrong scope', 'read:accounts'
|
||||||
end
|
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
|
describe 'POST #unmute' do
|
||||||
let(:scopes) { 'write:mutes' }
|
let(:scopes) { 'write:mutes' }
|
||||||
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')).account }
|
||||||
|
|
Loading…
Reference in New Issue