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

posts: add "general" rating; rename "safe" rating to "sensitive".

Browse Source 
* Add "general" rating.
* Rename "safe" rating to "sensitive".
* Change safe mode to include both rating:s and rating:g.
* Treat rating:safe as a synonym for rating:sensitive.
* Link "howto:rate" in the post edit form.
This commit is contained in:
evazion
2022-05-22 12:08:46 -05:00
parent d346adabc9
commit 81bd86d202
11 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/discord_slash_command/post_embed.rb
View File

@@ -63,7 +63,7 @@ class DiscordSlashCommand
end
def is_censored?
(post.rating != "s" && !is_nsfw_channel?) || !post.visible?(User.anonymous) || censored_tags.any? { |tag| tag.in?(post.tag_array) }
(post.rating.in?(["q", "e"]) && !is_nsfw_channel?) || !post.visible?(User.anonymous) || censored_tags.any? { |tag| tag.in?(post.tag_array) }
end
def is_nsfw_channel?

8
app/logical/discord_slash_command/wiki_command.rb
View File

@@ -42,13 +42,13 @@ class DiscordSlashCommand
return nil if tag.nil? || tag.empty?
if tag.artist?
search = "#{tag.name} rating:safe"
search = "#{tag.name} is:sfw"
elsif tag.copyright?
search = "#{tag.name} rating:safe everyone copytags:<5 -parody -crossover"
search = "#{tag.name} is:sfw everyone copytags:<5 -parody -crossover"
elsif tag.character?
search = "#{tag.name} rating:safe solo chartags:<5"
search = "#{tag.name} is:sfw solo chartags:<5"
else # meta or general
search = "#{tag.name} rating:safe -animated -6+girls -comic"
search = "#{tag.name} is:sfw -animated -6+girls -comic"
end
Post.system_tag_match(search).limit(500).sort_by(&:score).last

4
app/logical/post_query.rb
View File

@@ -189,12 +189,12 @@ class PostQuery
TagAlias.aliases_for(tag_names)
end
# Implicit metatags are metatags added by the user's account settings. rating:s is implicit under safe mode.
# Implicit metatags are metatags added by the user's account settings. rating:g,s is implicit under safe mode.
def implicit_metatags
return [] unless safe_mode?
tags = Danbooru.config.safe_mode_restricted_tags.map { |tag| -AST.tag(tag) }
[AST.metatag("rating", "s"), *tags]
[AST.metatag("rating", "g,s"), *tags]
end
# XXX unify with PostSets::Post#show_deleted?