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

add support for saved search metatag + tests

Browse Source
This commit is contained in:
r888888888
2015-11-24 12:55:18 -08:00
parent 268a821354
commit 21ab11d92a
8 changed files with 182 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/models/saved_search.rb
View File

@@ -86,6 +86,25 @@ class SavedSearch < ActiveRecord::Base
Tag.scan_query(tag_query).join(" ")
end
def self.post_ids(user_id, name = nil)
params = {
"key" => Danbooru.config.listbooru_auth_key,
"user_id" => user_id,
"name" => name
}
uri = URI.parse("#{Danbooru.config.listbooru_server}/users")
uri.query = URI.encode_www_form(params)
Net::HTTP.start(uri.host, uri.port) do |http|
resp = http.request_get(uri.request_uri)
if resp.is_a?(Net::HTTPSuccess)
resp.body.scan(/\d+/).map(&:to_i)
else
raise "HTTP error code: #{resp.code} #{resp.message}"
end
end
end
def normalize
self.tag_query = SavedSearch.normalize(tag_query)
end
@@ -107,23 +126,4 @@ class SavedSearch < ActiveRecord::Base
user.update_attribute(:has_saved_searches, false)
end
end
def post_ids
params = {
"key" => Danbooru.config.listbooru_auth_key,
"user_id" => user_id,
"name" => category
}
uri = URI.parse("#{Danbooru.config.listbooru_server}/users")
uri.query = URI.encode_www_form(params)
Net::HTTP.start(uri.host, uri.port) do |http|
resp = http.request_get(uri.request_uri)
if resp.is_a?(Net::HTTPSuccess)
resp.body.scan(/\d+/)
else
raise "HTTP error code: #{resp.code} #{resp.message}"
end
end
end
end

6
app/models/tag.rb
View File

@@ -1,5 +1,5 @@
class Tag < ActiveRecord::Base
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|child|pixiv_id|pixiv"
METATAGS = "-user|user|-approver|approver|commenter|comm|noter|noteupdater|artcomm|-pool|pool|ordpool|-favgroup|favgroup|-fav|fav|ordfav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|ratio|score|favcount|filesize|source|-source|id|-id|date|age|order|limit|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|-parent|child|pixiv_id|pixiv|search"
SUBQUERY_METATAGS = "commenter|comm|noter|noteupdater|artcomm"
attr_accessible :category, :as => [:moderator, :janitor, :gold, :member, :anonymous, :default, :builder, :admin]
attr_accessible :is_locked, :as => [:moderator, :admin]
@@ -493,6 +493,10 @@ class Tag < ActiveRecord::Base
q[:subscriptions] ||= []
q[:subscriptions] << $2
when "search"
q[:saved_searches] ||= []
q[:saved_searches] << $2
when "md5"
q[:md5] = $2.downcase.split(/,/)