From 1049c858ac651a46ab5795b5cd2d39c95d2cc4b4 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Wed, 17 Jul 2019 02:00:34 -0500 Subject: [PATCH] make admin bangtag output use html --- app/lib/bangtags.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/lib/bangtags.rb b/app/lib/bangtags.rb index fd3cd72d1..52fc7bf9b 100644 --- a/app/lib/bangtags.rb +++ b/app/lib/bangtags.rb @@ -504,7 +504,8 @@ class Bangtags next if cmd[1].nil? case cmd[1].downcase when 'silence', 'unsilence', 'suspend', 'unsuspend', 'forgive' - chunk = "`admin:#{cmd[1].downcase}`:\n" + @status.content_type = 'text/markdown' + chunk = "admin:#{cmd[1].downcase}:\n" @tf_cmds.push(cmd) @component_stack.push(:tf) end @@ -534,7 +535,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 @@ -550,7 +551,7 @@ 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 @@ -563,7 +564,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) @@ -574,7 +575,7 @@ 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 @@ -587,7 +588,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/) @@ -603,7 +604,7 @@ 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