1
0
mirror of https://github.com/mastodon/mastodon synced 2024-11-23 22:56:20 +09:00

Fix logic of block/mute bypass for mentions from moderators (#31271)

This commit is contained in:
Claire 2024-08-07 08:52:10 +02:00 committed by GitHub
parent c8b9e60ec1
commit 719cabe024
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 1 deletions

View File

@ -48,7 +48,7 @@ class NotifyService < BaseService
end
def from_staff?
@sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role)
@sender.local? && @sender.user.present? && @sender.user_role&.overrides?(@recipient.user_role) && @sender.user_role&.highlighted? && @sender.user_role&.can?(*UserRole::Flags::CATEGORIES[:moderation])
end
def from_self?

View File

@ -129,6 +129,40 @@ RSpec.describe NotifyService do
end
end
context 'when the blocked sender has a role' do
let(:sender) { Fabricate(:user, role: sender_role).account }
let(:activity) { Fabricate(:mention, status: Fabricate(:status, account: sender)) }
let(:type) { :mention }
before do
recipient.block!(sender)
end
context 'when the role is a visible moderator' do
let(:sender_role) { Fabricate(:user_role, highlighted: true, permissions: UserRole::FLAGS[:manage_users]) }
it 'does notify' do
expect { subject }.to change(Notification, :count)
end
end
context 'when the role is a non-visible moderator' do
let(:sender_role) { Fabricate(:user_role, highlighted: false, permissions: UserRole::FLAGS[:manage_users]) }
it 'does not notify' do
expect { subject }.to_not change(Notification, :count)
end
end
context 'when the role is a visible non-moderator' do
let(:sender_role) { Fabricate(:user_role, highlighted: true) }
it 'does not notify' do
expect { subject }.to_not change(Notification, :count)
end
end
end
context 'with filtered notifications' do
let(:unknown) { Fabricate(:account, username: 'unknown') }
let(:status) { Fabricate(:status, account: unknown) }