hide deleted posts in tag subscriptions/favorites
This commit is contained in:
@@ -6,6 +6,10 @@ module PostSets
|
|||||||
@params = params
|
@params = params
|
||||||
@user = ::User.find(user_id)
|
@user = ::User.find(user_id)
|
||||||
@favorites = ::Favorite.for_user(user.id).paginate(page, :limit => limit).order("favorites.id desc")
|
@favorites = ::Favorite.for_user(user.id).paginate(page, :limit => limit).order("favorites.id desc")
|
||||||
|
|
||||||
|
if CurrentUser.user.hide_deleted_posts?
|
||||||
|
@favorites = @favorites.where("is_deleted = false")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def limit
|
def limit
|
||||||
|
|||||||
@@ -124,7 +124,13 @@ class TagSubscription < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
def self.find_posts(user_id, name = nil, limit = Danbooru.config.tag_subscription_post_limit)
|
def self.find_posts(user_id, name = nil, limit = Danbooru.config.tag_subscription_post_limit)
|
||||||
Post.where(["id in (?)", find_post_ids(user_id, name, limit)]).order("id DESC").limit(limit)
|
arel = Post.where(["id in (?)", find_post_ids(user_id, name, limit)])
|
||||||
|
|
||||||
|
if CurrentUser.user.hide_deleted_posts?
|
||||||
|
arel = arel.where("is_deleted = false")
|
||||||
|
end
|
||||||
|
|
||||||
|
arel.order("id DESC").limit(limit)
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.process_all
|
def self.process_all
|
||||||
|
|||||||
Reference in New Issue
Block a user