diff --git a/app/logical/note_sanitizer.rb b/app/logical/note_sanitizer.rb index 099a161b8..ed319aa08 100644 --- a/app/logical/note_sanitizer.rb +++ b/app/logical/note_sanitizer.rb @@ -84,7 +84,7 @@ module NoteSanitizer url = Addressable::URI.heuristic_parse(node["href"]).normalize - if url.authority.in?(Danbooru.config.hostnames) + if url.authority == Danbooru.config.hostname url.site = nil node["href"] = url.to_s end diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index e3ac485b2..d0ad440fe 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -34,12 +34,6 @@ module Danbooru Socket.gethostname end - # The list of all domain names this site is accessible under. - # Example: %w[danbooru.donmai.us sonohara.donmai.us hijiribe.donmai.us safebooru.donmai.us] - def hostnames - [hostname] - end - # Contact email address of the admin. def contact_email "webmaster@#{server_host}" diff --git a/test/unit/note_sanitizer_test.rb b/test/unit/note_sanitizer_test.rb index 4301304ee..37d4519c8 100644 --- a/test/unit/note_sanitizer_test.rb +++ b/test/unit/note_sanitizer_test.rb @@ -23,7 +23,7 @@ class NoteSanitizerTest < ActiveSupport::TestCase end should "rewrite absolute links to relative links" do - Danbooru.config.stubs(:hostnames).returns(%w[danbooru.donmai.us sonohara.donmai.us hijiribe.donmai.us]) + Danbooru.config.stubs(:hostname).returns("sonohara.donmai.us") body = 'touhou' assert_equal('touhou', NoteSanitizer.sanitize(body))