Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix reported accounts not being whitelisted when resolving a spamcheck report (#13289)

Browse source
This commit is contained in:
ThibG 2020-03-21 03:08:09 +01:00 • committed by GitHub
parent c39ad4ab2f
commit 61f35c1a8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/admin/account_action.rb
View file

@ -62,8 +62,6 @@ class Admin::AccountAction
def process_action!
case type
when 'none'
handle_resolve!
when 'disable'
handle_disable!
when 'silence'
@ -105,16 +103,6 @@ class Admin::AccountAction
end
end
def handle_resolve!
if with_report? && report.account_id == -99 && target_account.trust_level == Account::TRUST_LEVELS[:untrusted]
# This is an automated report and it is being dismissed, so it's
# a false positive, in which case update the account's trust level
# to prevent further spam checks
target_account.update(trust_level: Account::TRUST_LEVELS[:trusted])
end
end
def handle_disable!
authorize(target_account.user, :disable?)
log_action(:disable, target_account.user)