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

deprecate tag subscriptions with warnings

Browse Source
This commit is contained in:
r888888888
2017-04-14 16:00:20 -07:00
parent 8b38e4d39a
commit 97da8f8647
16 changed files with 22 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/logical/post_query_builder.rb
View File

@@ -80,27 +80,6 @@ class PostQueryBuilder
relation
end
def add_tag_subscription_relation(subscriptions, relation)
subscriptions.each do |subscription|
if subscription =~ /^(.+?):(.+)$/
user_name = $1
subscription_name = $2
user = User.find_by_name(user_name)
return relation if user.nil?
post_ids = TagSubscription.find_post_ids(user.id, subscription_name)
else
user = User.find_by_name(subscription)
return relation if user.nil?
post_ids = TagSubscription.find_post_ids(user.id)
end
post_ids = [0] if post_ids.empty?
relation = relation.where(["posts.id IN (?)", post_ids])
end
relation
end
def add_saved_search_relation(saved_searches, relation)
if SavedSearch.enabled?
saved_searches.each do |saved_search|
@@ -228,11 +207,6 @@ class PostQueryBuilder
relation = relation.where("posts.pool_string != ''")
end
if q[:subscriptions]
relation = add_tag_subscription_relation(q[:subscriptions], relation)
has_constraints!
end
if q[:saved_searches]
relation = add_saved_search_relation(q[:saved_searches], relation)
has_constraints!