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

fix -favgroup: for tag scripts, add -fav:

Browse Source
This commit is contained in:
Toks
2015-06-30 09:47:20 -04:00
parent 1d9596d7f2
commit bb879cc4fd
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@
} }
} else if (command === "[reset]") { } else if (command === "[reset]") {
return []; return [];
} else if (command[0] === "-" && !command.match(/^(?:-pool|-parent):/i)) { } else if (command[0] === "-" && !command.match(/^(?:-pool|-parent|-fav|-favgroup):/i)) {
return Danbooru.reject(tags, function(x) {return x === command.substr(1, 100)}); return Danbooru.reject(tags, function(x) {return x === command.substr(1, 100)});
} else { } else {
tags.push(command); tags.push(command);

5
app/models/post.rb
View File

@@ -629,7 +629,7 @@ class Post < ActiveRecord::Base
def filter_metatags(tags) def filter_metatags(tags)
@pre_metatags, tags = tags.partition {|x| x =~ /\A(?:rating|parent|-parent):/i} @pre_metatags, tags = tags.partition {|x| x =~ /\A(?:rating|parent|-parent):/i}
@post_metatags, tags = tags.partition {|x| x =~ /\A(?:-pool|pool|newpool|fav|child|-favgroup|favgroup):/i} @post_metatags, tags = tags.partition {|x| x =~ /\A(?:-pool|pool|newpool|fav|-fav|child|-favgroup|favgroup):/i}
apply_pre_metatags apply_pre_metatags
return tags return tags
end end
@@ -665,6 +665,9 @@ class Post < ActiveRecord::Base
when /^fav:(.+)$/i when /^fav:(.+)$/i
add_favorite!(CurrentUser.user) add_favorite!(CurrentUser.user)
when /^-fav:(.+)$/i
remove_favorite!(CurrentUser.user)
when /^child:(.+)$/i when /^child:(.+)$/i
child = Post.find($1) child = Post.find($1)
child.parent_id = id child.parent_id = id