Merge pull request #2988 from cpradio/pr-add-deleted-querystring-rebase

FEATURE: Add ?status=deleted querystring

lib/topic_query.rb

@@ -233,7 +233,7 @@ class TopicQuery
       options.reverse_merge!(per_page: SiteSetting.topics_per_page)
 
       # Start with a list of all topics
-      result = Topic
+      result = Topic.unscoped
 
       if @user
         result = result.joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i})")
@@ -286,6 +286,7 @@ class TopicQuery
                                         notification_level = ?)', @user.id, level)
       end
 
+      require_deleted_clause = true
       if status = options[:status]
         case status
         when 'open'
@@ -298,9 +299,16 @@ class TopicQuery
           result = result.where('topics.visible')
         when 'invisible'
           result = result.where('NOT topics.visible')
+        when 'deleted'
+          guardian = Guardian.new(@user)
+          if guardian.is_staff?
+            result = result.where('topics.deleted_at IS NOT NULL')
+            require_deleted_clause = false
+          end
         end
       end
 
+      result = result.where('topics.deleted_at IS NULL') if require_deleted_clause
       result = result.where('topics.posts_count <= ?', options[:max_posts]) if options[:max_posts].present?
       result = result.where('topics.posts_count >= ?', options[:min_posts]) if options[:min_posts].present?
 

spec/components/topic_query_spec.rb

@@ -40,6 +40,17 @@ describe TopicQuery do
 
   end
 
+  context 'deleted filter' do
+    it "filters deleted topics correctly" do
+      topic = Fabricate(:topic, deleted_at: 1.year.ago)
+
+      TopicQuery.new(admin, status: 'deleted').list_latest.topics.size.should == 1
+      TopicQuery.new(moderator, status: 'deleted').list_latest.topics.size.should == 1
+      TopicQuery.new(user, status: 'deleted').list_latest.topics.size.should == 0
+      TopicQuery.new(nil, status: 'deleted').list_latest.topics.size.should == 0
+    end
+  end
+
   context 'category filter' do
     let(:category) { Fabricate(:category) }