Merge pull request #5406 from AntonKhorev/offline-message-oauth

[rails.git] / app / models / acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 26285cef38ac0825ab237a7ba955a6118761d137..aa503f40c539647dfb9d66aea990b57e6f8c76c6 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -42,12 +42,7 @@ class Acl < ApplicationRecord
   end
 
   def self.allow_account_creation(address, options = {})
-    acls = Acl.where("address >>= ?", address)
-              .and(Acl.where(:k => "allow_account_creation"))
-    acls = acls.and(Acl.where(:domain => options[:domain])) if options[:domain]
-    acls = acls.and(Acl.where(:mx => options[:mx])) if options[:mx]
-
-    !acls.empty?
+    match(address, options).exists?(:k => "allow_account_creation")
   end
 
   def self.no_note_comment(address, domain = nil)