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

Merge pull request #3399 from BrokenEagle/fix-gold-safemode-message

Browse Source 
Changed safe mode error message for Gold+ users
This commit is contained in:
Albert Yi
2017-12-13 14:26:50 -08:00
committed by GitHub
parent 1d901e9307 839f0f653f
commit 850ac353ed
4 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/models/post.rb
View File

@@ -1812,11 +1812,22 @@ class Post < ApplicationRecord
)
has_bit_flags BOOLEAN_ATTRIBUTES
def safeblocked?
CurrentUser.safe_mode? && (rating != "s" || has_tag?("toddlercon|toddler|diaper|tentacle|rape|bestiality|beastiality|lolita|loli|nude|shota|pussy|penis"))
end
def levelblocked?
!Danbooru.config.can_user_see_post?(CurrentUser.user, self)
end
def banblocked?
is_banned? && !CurrentUser.is_gold?
end
def visible?
return false if !Danbooru.config.can_user_see_post?(CurrentUser.user, self)
return false if CurrentUser.safe_mode? && rating != "s"
return false if CurrentUser.safe_mode? && has_tag?("toddlercon|toddler|diaper|tentacle|rape|bestiality|beastiality|lolita|loli|nude|shota|pussy|penis")
return false if is_banned? && !CurrentUser.is_gold?
return false if safeblocked?
return false if levelblocked?
return false if banblocked?
return true
end