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

fix for tag blacklists, typo fixes

Browse Source
This commit is contained in:
albert
2013-02-17 02:19:33 -05:00
parent 5ac578adf3
commit 2b0857a3cd
7 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/blacklists.js
View File

@@ -4,7 +4,7 @@
Danbooru.Blacklist.blacklists = [];
Danbooru.Blacklist.parse_entries = function() {
var entries = (Danbooru.meta("blacklisted-tags") || "").replace(/(rating:[qes])\w+/, "$1").split(/,/);
var entries = ($.parseJSON(Danbooru.meta("blacklisted-tags") || "[]")).replace(/(rating:[qes])\w+/, "$1").split(/,/);
$.each(entries, function(i, tags) {
var blacklist = {
"tags": tags,

5
app/models/post.rb
View File

@@ -595,6 +595,11 @@ class Post < ActiveRecord::Base
def fast_count(tags = "")
tags = tags.to_s.strip
if tags.blank?
return Danbooru.config.blank_tag_search_fast_count || 1_000_000
end
count = get_count_from_cache(tags)
if count.nil?
if tags.blank? && Danbooru.config.blank_tag_search_fast_count

2
app/models/user.rb
View File

@@ -219,7 +219,7 @@ class User < ActiveRecord::Base
return {
"Member" => Levels::MEMBER,
"Privileged" => Levels::PRIVILEGED,
"Builder" => Levels::BUIDLER,
"Builder" => Levels::BUILDER,
"Contributor" => Levels::CONTRIBUTOR,
"Janitor" => Levels::JANITOR,
"Moderator" => Levels::MODERATOR,

2
app/views/layouts/default.html.erb
View File

@@ -9,7 +9,7 @@
<meta name="current-user-id" content="<%= CurrentUser.id %>">
<meta name="user-comment-threshold" content="<%= CurrentUser.comment_threshold %>">
<% unless CurrentUser.user.blacklisted_tags.blank? %>
<meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags %>">
<meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tag_array.to_json %>">
<% end %>
<% if flash[:notice] =~ /error/ %>
<meta name="errors" content="true">

2
app/views/legacy/tags.xml.erb
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<tags type="array">
<% @tags.each do |tag| %>
<tag name="<%= tag.name %>" id="<%= tag.id %>" ambiguous="false" created_at="<%= tag.created_at.strftime('%Y-%m-%d %H:%M') %>" count="<%= tag.post_count %>" type="<%= tag.category %>"></user>
<tag name="<%= tag.name %>" id="<%= tag.id %>" ambiguous="false" created_at="<%= tag.created_at.try(:strftime, '%Y-%m-%d %H:%M') %>" count="<%= tag.post_count %>" type="<%= tag.category %>"></user>
<% end %>
</tags>

2
app/views/tags/search.html.erb
View File

@@ -5,7 +5,7 @@
<div class="input">
<label for="search_category">Category</label>
<%= select "search", "category", Tag.canonical_tag_category_mapping.to_a %>
<%= select "search", "category", Danbooru.config.canonical_tag_category_mapping.to_a %>
</div>
<div class="input">

11
config/routes.rb
View File

@@ -224,12 +224,13 @@ Danbooru::Application.routes.draw do
match "/post/index.xml", :controller => "legacy", :action => "posts", :format => "xml"
match "/post/index.json", :controller => "legacy", :action => "posts", :format => "json"
match "/post/create.xml", :controller => "legacy", :action => "create_post"
match "/post/index" => redirect {|params, req| "/posts?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}&page=#{req.params[:page]}"}
match "/post" => redirect {|params, req| "/posts?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}&page=#{req.params[:page]}"}
match "/post/piclens", :controller => "legacy", :action => "unavailable"
match "/post/index" => redirect {|params, req| "/posts?tags=#{u(req.params[:tags])}&page=#{req.params[:page]}"}
match "/post" => redirect {|params, req| "/posts?tags=#{u(req.params[:tags])}&page=#{req.params[:page]}"}
match "/post/upload" => redirect("/uploads/new")
match "/post/moderate" => redirect("/moderator/post/queue")
match "/post/atom" => redirect {|params, req| "/posts.atom?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}"}
match "/post/atom.feed" => redirect {|params, req| "/posts.atom?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}"}
match "/post/atom" => redirect {|params, req| "/posts.atom?tags=#{u(req.params[:tags])}"}
match "/post/atom.feed" => redirect {|params, req| "/posts.atom?tags=#{u(req.params[:tags])}"}
match "/post/popular_by_day" => redirect("/explore/posts/popular")
match "/post/popular_by_week" => redirect("/explore/posts/popular")
match "/post/popular_by_month" => redirect("/explore/posts/popular")
@@ -255,7 +256,7 @@ Danbooru::Application.routes.draw do
match "/wiki" => redirect {|params, req| "/wiki_pages?page=#{req.params[:page]}"}
match "/wiki/index" => redirect {|params, req| "/wiki_pages?page=#{req.params[:page]}"}
match "/wiki/show" => redirect {|params, req| "/wiki_pages?title=#{req.params[:title]}"}
match "/wiki/show" => redirect {|params, req| "/wiki_pages?title=#{u(req.params[:title])}"}
match "/wiki/recent_changes" => redirect("/wiki_page_versions")
match "/wiki/history/:title" => redirect("/wiki_page_versions?title=%{title}")