* 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
		
			
				
	
	
		
			66 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			66 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
module AccountFinderConcern
 | 
						|
  extend ActiveSupport::Concern
 | 
						|
 | 
						|
  class_methods do
 | 
						|
    def find_local!(username)
 | 
						|
      find_local(username) || raise(ActiveRecord::RecordNotFound)
 | 
						|
    end
 | 
						|
 | 
						|
    def find_remote!(username, domain)
 | 
						|
      find_remote(username, domain) || raise(ActiveRecord::RecordNotFound)
 | 
						|
    end
 | 
						|
 | 
						|
    def representative
 | 
						|
      find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')) || Account.local.without_suspended.first
 | 
						|
    end
 | 
						|
 | 
						|
    def find_local(username)
 | 
						|
      find_remote(username, nil)
 | 
						|
    end
 | 
						|
 | 
						|
    def find_remote(username, domain)
 | 
						|
      AccountFinder.new(username, domain).account
 | 
						|
    end
 | 
						|
  end
 | 
						|
 | 
						|
  class AccountFinder
 | 
						|
    attr_reader :username, :domain
 | 
						|
 | 
						|
    def initialize(username, domain)
 | 
						|
      @username = username
 | 
						|
      @domain = domain
 | 
						|
    end
 | 
						|
 | 
						|
    def account
 | 
						|
      scoped_accounts.order(id: :asc).take
 | 
						|
    end
 | 
						|
 | 
						|
    private
 | 
						|
 | 
						|
    def scoped_accounts
 | 
						|
      Account.unscoped.tap do |scope|
 | 
						|
        scope.merge! with_usernames
 | 
						|
        scope.merge! matching_username
 | 
						|
        scope.merge! matching_domain
 | 
						|
      end
 | 
						|
    end
 | 
						|
 | 
						|
    def with_usernames
 | 
						|
      Account.where.not(username: '')
 | 
						|
    end
 | 
						|
 | 
						|
    def matching_username
 | 
						|
      Account.where(Account.arel_table[:username].lower.eq username.to_s.downcase)
 | 
						|
    end
 | 
						|
 | 
						|
    def matching_domain
 | 
						|
      if domain.nil?
 | 
						|
        Account.where(domain: nil)
 | 
						|
      else
 | 
						|
        Account.where(Account.arel_table[:domain].lower.eq domain.to_s.downcase)
 | 
						|
      end
 | 
						|
    end
 | 
						|
  end
 | 
						|
end
 |