diff --git a/config/application.rb b/config/application.rb index 451c741..8af79dd 100644 --- a/config/application.rb +++ b/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 diff --git a/config/routes/domain_constraint.rb b/config/routes/domain_constraint.rb index 7e1b6f5..6a8bf6a 100644 --- a/config/routes/domain_constraint.rb +++ b/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 diff --git a/public/butts-are.cool/custom/balls/favicon.ico b/public/butts-are.cool/custom/balls/favicon.ico new file mode 100644 index 0000000..528c43a Binary files /dev/null and b/public/butts-are.cool/custom/balls/favicon.ico differ diff --git a/public/butts-are.cool/custom/cocks/favicon.ico b/public/butts-are.cool/custom/cocks/favicon.ico new file mode 100644 index 0000000..605b649 Binary files /dev/null and b/public/butts-are.cool/custom/cocks/favicon.ico differ diff --git a/public/butts-are.cool/custom/knots/favicon.ico b/public/butts-are.cool/custom/knots/favicon.ico new file mode 100644 index 0000000..90dd2c2 Binary files /dev/null and b/public/butts-are.cool/custom/knots/favicon.ico differ diff --git a/public/butts-are.cool/custom/sheaths/favicon.ico b/public/butts-are.cool/custom/sheaths/favicon.ico new file mode 100644 index 0000000..a362b98 Binary files /dev/null and b/public/butts-are.cool/custom/sheaths/favicon.ico differ diff --git a/public/butts-are.cool/favicon.ico b/public/butts-are.cool/favicon.ico new file mode 100644 index 0000000..b80c952 Binary files /dev/null and b/public/butts-are.cool/favicon.ico differ diff --git a/public/e621.ws/favicon.ico b/public/e621.ws/favicon.ico new file mode 100644 index 0000000..1e10c35 Binary files /dev/null and b/public/e621.ws/favicon.ico differ diff --git a/public/furry.cool/favicon.ico b/public/furry.cool/favicon.ico new file mode 100644 index 0000000..ed9818d Binary files /dev/null and b/public/furry.cool/favicon.ico differ diff --git a/public/maidboye.cafe/favicon.ico b/public/maidboye.cafe/favicon.ico new file mode 100644 index 0000000..21fa4d4 Binary files /dev/null and b/public/maidboye.cafe/favicon.ico differ diff --git a/public/oceanic.ws/favicon.ico b/public/oceanic.ws/favicon.ico new file mode 100644 index 0000000..e7b0b5a Binary files /dev/null and b/public/oceanic.ws/favicon.ico differ diff --git a/public/yiff.media/favicon.ico b/public/yiff.media/favicon.ico new file mode 100644 index 0000000..48319e5 Binary files /dev/null and b/public/yiff.media/favicon.ico differ