jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: don't hardcode safebooru donmain.

Browse Source
This commit is contained in:
evazion
2022-05-05 19:07:44 -05:00
parent 5ec5eeeebf
commit 52edf5c3be
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/session_loader.rb
View File

@@ -176,7 +176,7 @@ class SessionLoader
end end
def set_safe_mode def set_safe_mode
safe_mode = request.host.match?(/safebooru/i) || params[:safe_mode].to_s.truthy? || CurrentUser.user.enable_safe_mode? safe_mode = request.host.in?(Danbooru.config.safe_mode_hostnames) || params[:safe_mode].to_s.truthy? || CurrentUser.user.enable_safe_mode?
CurrentUser.safe_mode = safe_mode CurrentUser.safe_mode = safe_mode
end end

5
config/danbooru_default_config.rb
View File

@@ -66,6 +66,11 @@ module Danbooru
Socket.gethostname Socket.gethostname
end end
# A list of alternate hostnames where safe mode will automatically be enabled.
def safe_mode_hostnames
["safebooru.donmai.us"]
end
# The URL of your site, e.g. https://danbooru.donmai.us. # The URL of your site, e.g. https://danbooru.donmai.us.
# #
# If you support HTTPS, change this to "https://www.mybooru.com". If you set # If you support HTTPS, change this to "https://www.mybooru.com". If you set

4
test/unit/session_loader_test.rb
View File

@@ -23,8 +23,8 @@ class SessionLoaderTest < ActiveSupport::TestCase
end end
context ".safe_mode?" do context ".safe_mode?" do
should "return true if the host contains the string safebooru" do should "return true if the hostname is safebooru.donmai.us" do
@request.stubs(:host).returns("safebooru") @request.stubs(:host).returns("safebooru.donmai.us")
SessionLoader.new(@request).load SessionLoader.new(@request).load
assert_equal(true, CurrentUser.safe_mode?) assert_equal(true, CurrentUser.safe_mode?)