Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.
		
			
				
	
	
		
			44 lines
		
	
	
		
			935 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			44 lines
		
	
	
		
			935 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
# == Schema Information
 | 
						|
#
 | 
						|
# Table name: domain_allows
 | 
						|
#
 | 
						|
#  id         :bigint(8)        not null, primary key
 | 
						|
#  domain     :string           default(""), not null
 | 
						|
#  created_at :datetime         not null
 | 
						|
#  updated_at :datetime         not null
 | 
						|
#
 | 
						|
 | 
						|
class DomainAllow < ApplicationRecord
 | 
						|
  include Paginable
 | 
						|
  include DomainNormalizable
 | 
						|
  include DomainMaterializable
 | 
						|
 | 
						|
  validates :domain, presence: true, uniqueness: true, domain: true
 | 
						|
 | 
						|
  scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) }
 | 
						|
 | 
						|
  def to_log_human_identifier
 | 
						|
    domain
 | 
						|
  end
 | 
						|
 | 
						|
  class << self
 | 
						|
    def allowed?(domain)
 | 
						|
      !rule_for(domain).nil?
 | 
						|
    end
 | 
						|
 | 
						|
    def allowed_domains
 | 
						|
      select(:domain)
 | 
						|
    end
 | 
						|
 | 
						|
    def rule_for(domain)
 | 
						|
      return if domain.blank?
 | 
						|
 | 
						|
      uri = Addressable::URI.new.tap { |u| u.host = domain.gsub(/[\/]/, '') }
 | 
						|
 | 
						|
      find_by(domain: uri.normalized_host)
 | 
						|
    end
 | 
						|
  end
 | 
						|
end
 |