marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pretty output for `admin:` bangtags

staging
multiple creatures 2019-07-17 15:55:40 -05:00
parent 9f2d158864
commit 83cb62809b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/lib/bangtags.rb
View File

@ -554,7 +554,7 @@ class Bangtags
parts = c.split('@')[1..2] parts = c.split('@')[1..2]
a = Account.find_by(username: parts[0], domain: parts[1]) a = Account.find_by(username: parts[0], domain: parts[1])
next if a.nil? next if a.nil?
output << " Silenced <code>@#{parts.join('@')}</code>" output << "<strong>Silenced<strong> <code>@#{parts.join('@')}</code>."
Admin::ActionLog.create(account: @account, action: :silence, target: a) Admin::ActionLog.create(account: @account, action: :silence, target: a)
a.silence! a.silence!
a.save a.save
@ -570,12 +570,12 @@ class Bangtags
domain_block = DomainBlock.find_or_create_by(domain: c) domain_block = DomainBlock.find_or_create_by(domain: c)
domain_block.severity = "silence" domain_block.severity = "silence"
domain_block.save domain_block.save
output << " Silenced <code>#{c}</code>" output << "<strong>Silenced</strong> <code>#{c}</code>."
Admin::ActionLog.create(account: @account, action: :create, target: domain_block) Admin::ActionLog.create(account: @account, action: :create, target: domain_block)
BlockDomainService.new.call(domain_block) BlockDomainService.new.call(domain_block)
end end
end end
output = [' No action.'] if output.blank? output = ['<em>No action.</em>'] if output.blank?
chunk = output.join("\n") + "\n" chunk = output.join("\n") + "\n"
when 'forgive', 'unsilence', 'unsuspend' when 'forgive', 'unsilence', 'unsuspend'
chunk.split.each do |c| chunk.split.each do |c|
@ -583,7 +583,7 @@ class Bangtags
parts = c.split('@')[1..2] parts = c.split('@')[1..2]
a = Account.find_by(username: parts[0], domain: parts[1]) a = Account.find_by(username: parts[0], domain: parts[1])
next if a.nil? next if a.nil?
output << " Reset policy for <code>@#{parts.join('@')}</code>" output << "<strong>Reset policy</strong> for <code>@#{parts.join('@')}</code>."
Admin::ActionLog.create(account: @account, action: :unsilence, target: a) Admin::ActionLog.create(account: @account, action: :unsilence, target: a)
a.unsilence! a.unsilence!
Admin::ActionLog.create(account: @account, action: :unsuspend, target: a) Admin::ActionLog.create(account: @account, action: :unsuspend, target: a)
@ -594,12 +594,12 @@ class Bangtags
next if c.end_with?('monsterpit.net', 'tailma.ws') next if c.end_with?('monsterpit.net', 'tailma.ws')
domain_block = DomainBlock.find_by(domain: c) domain_block = DomainBlock.find_by(domain: c)
next if domain_block.nil? next if domain_block.nil?
output << " Reset policy for <code>#{c}<code>" output << "<strong>Reset policy</strong> for <code>#{c}<code>."
Admin::ActionLog.create(account: @account, action: :destroy, target: domain_block) Admin::ActionLog.create(account: @account, action: :destroy, target: domain_block)
UnblockDomainService.new.call(domain_block) UnblockDomainService.new.call(domain_block)
end end
end end
output = [' No action.'] if output.blank? output = ['<em>No action.</em>'] if output.blank?
chunk = output.join("\n") + "\n" chunk = output.join("\n") + "\n"
when 'suspend' when 'suspend'
chunk.split.each do |c| chunk.split.each do |c|
@ -607,7 +607,7 @@ class Bangtags
parts = c.split('@')[1..2] parts = c.split('@')[1..2]
a = Account.find_by(username: parts[0], domain: parts[1]) a = Account.find_by(username: parts[0], domain: parts[1])
next if a.nil? next if a.nil?
output << " Suspended <code>@#{parts.join('@')}</code>" output << "<strong>Suspended</strong> <code>@#{parts.join('@')}</code>."
Admin::ActionLog.create(account: @account, action: :suspend, target: a) Admin::ActionLog.create(account: @account, action: :suspend, target: a)
SuspendAccountService.new.call(a, include_user: true) SuspendAccountService.new.call(a, include_user: true)
elsif c.match?(/\A[\w\-]+\.[\w\-]+(?:\.[\w\-]+)*\Z/) elsif c.match?(/\A[\w\-]+\.[\w\-]+(?:\.[\w\-]+)*\Z/)
@ -623,12 +623,12 @@ class Bangtags
domain_block.severity = "suspend" domain_block.severity = "suspend"
domain_block.reject_media = true domain_block.reject_media = true
domain_block.save domain_block.save
output << " Suspended <code>#{c}</code>" output << "<strong>Suspended</strong> <code>#{c}</code>."
Admin::ActionLog.create(account: @account, action: :create, target: domain_block) Admin::ActionLog.create(account: @account, action: :create, target: domain_block)
BlockDomainService.new.call(domain_block) BlockDomainService.new.call(domain_block)
end end
end end
output = [' No action.'] if output.blank? output = ['<em>No action.</em>'] if output.blank?
chunk = output.join("\n") + "\n" chunk = output.join("\n") + "\n"
end end
end end