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

Merge branch 'master' of github.com:r888888888/danbooru

Browse Source
This commit is contained in:
albert
2013-04-02 10:16:38 -04:00
parent c08268f7b3 26ae94f0fa
commit 363a00f178
13 changed files with 67 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/post_version.rb
View File

@@ -84,12 +84,15 @@ class PostVersion < ActiveRecord::Base
old_tags << "source:#{version.source}" if version.source.present?
end
added_tags = new_tags - old_tags
removed_tags = old_tags - new_tags
return {
:added_tags => new_tags - old_tags,
:removed_tags => old_tags - new_tags,
:added_tags => added_tags & latest_tags,
:removed_tags => removed_tags - latest_tags,
:obsolete_added_tags => added_tags - latest_tags,
:obsolete_removed_tags => removed_tags & latest_tags,
:unchanged_tags => new_tags & old_tags,
:obsolete_added_tags => new_tags - latest_tags,
:obsolete_removed_tags => old_tags & latest_tags,
}
end

18
app/models/tag.rb
View File

@@ -1,5 +1,5 @@
class Tag < ActiveRecord::Base
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|-pool|pool|-fav|fav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|score|filesize|source|id|date|order|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|pixiv_id"
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|-pool|pool|-fav|fav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|score|filesize|source|id|date|order|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|pixiv_id|pixiv"
attr_accessible :category
has_one :wiki_page, :foreign_key => "name", :primary_key => "title"
@@ -268,27 +268,29 @@ class Tag < ActiveRecord::Base
case $1
when "-user"
q[:uploader_id_neg] ||= []
q[:uploader_id_neg] << User.name_to_id($2)
user_id = User.name_to_id($2)
q[:uploader_id_neg] << user_id unless user_id.blank?
when "user"
q[:uploader_id] = User.name_to_id($2)
q[:uploader_id] = -1 if q[:uploader_id].nil?
q[:uploader_id] = -1 if q[:uploader_id].blank?
when "-approver"
q[:approver_id_neg] ||= []
q[:approver_id_neg] << User.name_to_id($2)
user_id = User.name_to_id($2)
q[:approver_id_neg] << user_id unless user_id.blank?
when "approver"
q[:approver_id] = User.name_to_id($2)
q[:approver_id] = -1 if q[:approver_id].nil?
q[:approver_id] = -1 if q[:approver_id].blank?
when "commenter", "comm"
q[:commenter_id] = User.name_to_id($2)
q[:commenter_id] = -1 if q[:commenter_id].nil?
q[:commenter_id] = -1 if q[:commenter_id].blank?
when "noter"
q[:noter_id] = User.name_to_id($2)
q[:noter_id] = -1 if q[:noter_id].nil?
q[:noter_id] = -1 if q[:noter_id].blank?
when "-pool"
q[:tags][:exclude] << "pool:#{Pool.name_to_id($2)}"
@@ -372,7 +374,7 @@ class Tag < ActiveRecord::Base
when "status"
q[:status] = $2.downcase
when "pixiv_id"
when "pixiv_id", "pixiv"
q[:pixiv_id] = parse_helper($2)
end