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

add `admin:unsuspend` bangtag & aliases

staging
multiple creatures 2019-07-17 01:14:08 -05:00
parent 92406964f1
commit 38a3c2b7b9
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/lib/bangtags.rb
View File

@ -495,7 +495,7 @@ class Bangtags
next unless @account.user.admin?
next if cmd[1].nil?
case cmd[1].downcase
when 'silence', 'suspend'
when 'silence', 'unsilence', 'suspend', 'unsuspend', 'forgive'
chunk = "`admin:#{cmd[1].downcase}`:\n"
@tf_cmds.push(cmd)
@component_stack.push(:tf)
@ -549,6 +549,30 @@ class Bangtags
end
output = [' No action.'] if output.blank?
chunk = output.join("\n") + "\n"
when 'forgive', 'unsilence', 'unsuspend'
chunk.split.each do |c|
if c.start_with?('@')
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('@')}`"
Admin::ActionLog.create(account: @account, action: :unsilence, target: a)
a.unsilence!
Admin::ActionLog.create(account: @account, action: :unsuspend, target: a)
a.unsuspend!
a.save
elsif c.match?(/^[\w\-]+\.[\w\-]+(?:\.[\w\-]+)*$/)
c.downcase!
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}`"
Admin::ActionLog.create(account: @account, action: :destroy, target: domain_block)
UnblockDomainService.new.call(domain_block)
end
end
output = [' No action.'] if output.blank?
chunk = output.join("\n") + "\n"
when 'suspend'
chunk.split.each do |c|
if c.start_with?('@')