* Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive
		
			
				
	
	
		
			42 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			42 lines
		
	
	
	
		
			1.3 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
# == Schema Information
 | 
						|
#
 | 
						|
# Table name: domain_blocks
 | 
						|
#
 | 
						|
#  id             :bigint(8)        not null, primary key
 | 
						|
#  domain         :string           default(""), not null
 | 
						|
#  created_at     :datetime         not null
 | 
						|
#  updated_at     :datetime         not null
 | 
						|
#  severity       :integer          default("silence")
 | 
						|
#  reject_media   :boolean          default(FALSE), not null
 | 
						|
#  reject_reports :boolean          default(FALSE), not null
 | 
						|
#
 | 
						|
 | 
						|
class DomainBlock < ApplicationRecord
 | 
						|
  include DomainNormalizable
 | 
						|
 | 
						|
  enum severity: [:silence, :suspend, :noop]
 | 
						|
 | 
						|
  validates :domain, presence: true, uniqueness: true
 | 
						|
 | 
						|
  has_many :accounts, foreign_key: :domain, primary_key: :domain
 | 
						|
  delegate :count, to: :accounts, prefix: true
 | 
						|
 | 
						|
  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
 | 
						|
 | 
						|
  def self.blocked?(domain)
 | 
						|
    where(domain: domain, severity: :suspend).exists?
 | 
						|
  end
 | 
						|
 | 
						|
  def stricter_than?(other_block)
 | 
						|
    return true if suspend?
 | 
						|
    return false if other_block.suspend? && (silence? || noop?)
 | 
						|
    return false if other_block.silence? && noop?
 | 
						|
    (reject_media || !other_block.reject_media) && (reject_reports || !other_block.reject_reports)
 | 
						|
  end
 | 
						|
 | 
						|
  def affected_accounts_count
 | 
						|
    scope = suspend? ? accounts.where(suspended_at: created_at) : accounts.where(silenced_at: created_at)
 | 
						|
    scope.count
 | 
						|
  end
 | 
						|
end
 |