From e3493f6cd3d9699665d8d21c3e4ab9f6d881e1e1 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Mon, 13 May 2013 10:45:33 -0700 Subject: [PATCH] hide deleted posts in tag subscriptions/favorites --- app/logical/post_sets/favorite.rb | 4 ++++ app/models/tag_subscription.rb | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/logical/post_sets/favorite.rb b/app/logical/post_sets/favorite.rb index b0d051260..f5bae6a00 100644 --- a/app/logical/post_sets/favorite.rb +++ b/app/logical/post_sets/favorite.rb @@ -6,6 +6,10 @@ module PostSets @params = params @user = ::User.find(user_id) @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 def limit diff --git a/app/models/tag_subscription.rb b/app/models/tag_subscription.rb index d745ff9aa..dcc3c297e 100644 --- a/app/models/tag_subscription.rb +++ b/app/models/tag_subscription.rb @@ -124,7 +124,13 @@ class TagSubscription < ActiveRecord::Base end 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 def self.process_all