Add root favicons

config/application.rb

@@ -38,14 +38,27 @@ module Websites
 
     config.middleware.insert_before(0, DevHostMiddleware) if Rails.env.development?
     config.middleware.insert_before(ActionDispatch::Static, CustomStaticMiddleware, {
-      /^i\.furry\.cool/               => "/furry.cool/images",
-      /^i\.maidboye\.cafe/            => "/maidboye.cafe/images",
-      %r{^maidboye\.cafe/images}      => "/maidboye.cafe",
-      %r{^maidboye\.cafe/screenshots} => "/maidboye.cafe",
-      /^assets\.maidboye\.cafe/       => "/maidboye.cafe/assets",
-      /^i\.oceanic\.ws/               => "/oceanic.ws/images",
-      %r{^yiff\.rest/Blep\.png$}      => "/yiff.rest",
-      %r{^yiff\.rocks/mascots}        => "/yiff.rocks",
+      /^i\.furry\.cool/                          => "/furry.cool/images",
+      /^i\.maidboye\.cafe/                       => "/maidboye.cafe/images",
+      %r{^maidboye\.cafe/images}                 => "/maidboye.cafe",
+      %r{^maidboye\.cafe/screenshots}            => "/maidboye.cafe",
+      /^assets\.maidboye\.cafe/                  => "/maidboye.cafe/assets",
+      /^i\.oceanic\.ws/                          => "/oceanic.ws/images",
+      %r{^yiff\.rest/Blep\.png$}                 => "/yiff.rest",
+      %r{^yiff\.rocks/mascots}                   => "/yiff.rocks",
+      # Favicons
+      %r{^balls\.butts-are\.cool/favicon\.ico}   => "/butts-are.cool/custom/balls",
+      %r{^cocks\.butts-are\.cool/favicon\.ico}   => "/butts-are.cool/custom/cocks",
+      %r{^knots\.butts-are\.cool/favicon\.ico}   => "/butts-are.cool/custom/knots",
+      %r{^sheaths\.butts-are\.cool/favicon\.ico} => "/butts-are.cool/custom/sheaths",
+      %r{^(.*\.)?butts-are\.cool/favicon\.ico}   => "/butts-are.cool",
+      %r{^(.*\.)?e621\.ws/favicon\.ico}          => "/e621.ws",
+      %r{^(.*\.)?furry\.cool/favicon\.ico}       => "/furry.cool",
+      %r{^(.*\.)?maidboye\.cafe/favicon\.ico}    => "/maidboye.cafe",
+      %r{^(.*\.)?oceanic\.ws/favicon\.ico}       => "/oceanic.ws",
+      %r{^(.*\.)?yiff\.media/favicon\.ico}       => "/yiff.media",
+      %r{^(.*\.)?yiff\.rest/favicon\.ico}        => "/yiff.media",
+      %r{^(.*\.)?yiff\.rocks/favicon\.ico}       => "/yiff.media",
     })
   end
 end

config/routes/domain_constraint.rb

@@ -18,10 +18,10 @@ class DomainConstraint
   private
 
   def domain_matches?(request)
-    @domain.nil? || request.domain == @domain
+    request.domain == @domain
   end
 
   def subdomain_matches?(request)
-    @subdomain.nil? || request.subdomain == @subdomain
+    (@subdomain.nil? && request.subdomain.blank?) || request.subdomain == @subdomain
   end
 end