From 83cb62809ba88b21af6ead3cdda21475178c8245 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Wed, 17 Jul 2019 15:55:40 -0500 Subject: [PATCH] pretty output for `admin:` bangtags --- app/lib/bangtags.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/lib/bangtags.rb b/app/lib/bangtags.rb index a63e908d3..79ce7e7eb 100644 --- a/app/lib/bangtags.rb +++ b/app/lib/bangtags.rb @@ -554,7 +554,7 @@ class Bangtags parts = c.split('@')[1..2] a = Account.find_by(username: parts[0], domain: parts[1]) next if a.nil? - output << " Silenced @#{parts.join('@')}" + output << "Silenced @#{parts.join('@')}." Admin::ActionLog.create(account: @account, action: :silence, target: a) a.silence! a.save @@ -570,12 +570,12 @@ class Bangtags domain_block = DomainBlock.find_or_create_by(domain: c) domain_block.severity = "silence" domain_block.save - output << " Silenced #{c}" + output << "Silenced #{c}." Admin::ActionLog.create(account: @account, action: :create, target: domain_block) BlockDomainService.new.call(domain_block) end end - output = [' No action.'] if output.blank? + output = ['No action.'] if output.blank? chunk = output.join("\n") + "\n" when 'forgive', 'unsilence', 'unsuspend' chunk.split.each do |c| @@ -583,7 +583,7 @@ class Bangtags parts = c.split('@')[1..2] a = Account.find_by(username: parts[0], domain: parts[1]) next if a.nil? - output << " Reset policy for @#{parts.join('@')}" + output << "Reset policy for @#{parts.join('@')}." Admin::ActionLog.create(account: @account, action: :unsilence, target: a) a.unsilence! Admin::ActionLog.create(account: @account, action: :unsuspend, target: a) @@ -594,12 +594,12 @@ class Bangtags next if c.end_with?('monsterpit.net', 'tailma.ws') domain_block = DomainBlock.find_by(domain: c) next if domain_block.nil? - output << " Reset policy for #{c}" + output << "Reset policy for #{c}." Admin::ActionLog.create(account: @account, action: :destroy, target: domain_block) UnblockDomainService.new.call(domain_block) end end - output = [' No action.'] if output.blank? + output = ['No action.'] if output.blank? chunk = output.join("\n") + "\n" when 'suspend' chunk.split.each do |c| @@ -607,7 +607,7 @@ class Bangtags parts = c.split('@')[1..2] a = Account.find_by(username: parts[0], domain: parts[1]) next if a.nil? - output << " Suspended @#{parts.join('@')}" + output << "Suspended @#{parts.join('@')}." Admin::ActionLog.create(account: @account, action: :suspend, target: a) SuspendAccountService.new.call(a, include_user: true) elsif c.match?(/\A[\w\-]+\.[\w\-]+(?:\.[\w\-]+)*\Z/) @@ -623,12 +623,12 @@ class Bangtags domain_block.severity = "suspend" domain_block.reject_media = true domain_block.save - output << " Suspended #{c}" + output << "Suspended #{c}." Admin::ActionLog.create(account: @account, action: :create, target: domain_block) BlockDomainService.new.call(domain_block) end end - output = [' No action.'] if output.blank? + output = ['No action.'] if output.blank? chunk = output.join("\n") + "\n" end end