From 985daf5c722c2a620f9061aada1bdb75f65a973f Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 1 Dec 2016 12:01:23 -0500
Subject: [PATCH] FIX: summary should not include certain post types

---
 app/mailers/user_notifications.rb       |  2 ++
 spec/mailers/user_notifications_spec.rb | 25 +++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 76bf33beac2..e15544fd64d 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -137,6 +137,8 @@ class UserNotifications < ActionMailer::Base
 
     @popular_posts = if SiteSetting.digest_posts > 0
       Post.for_mailing_list(user, min_date)
+          .where('posts.post_type = ?', Post.types[:regular])
+          .where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false')
           .where("posts.post_number > ? AND posts.score > ?", 1, 5.0)
           .order("posts.score DESC")
           .limit(SiteSetting.digest_posts)
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index 51f73a58ae2..a427b6d3b00 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -155,8 +155,7 @@ describe UserNotifications do
     context "with new topics" do
 
       before do
-        Topic.stubs(:for_digest).returns([Fabricate(:topic, user: Fabricate(:coding_horror))])
-        Topic.stubs(:new_since_last_seen).returns(Topic.none)
+        Fabricate(:topic, user: Fabricate(:coding_horror))
       end
 
       it "works" do
@@ -184,6 +183,28 @@ describe UserNotifications do
         expect(html).to_not include deleted.title
         expect(html).to_not include post.raw
       end
+
+      it "excludes whispers and other post types that don't belong" do
+        t = Fabricate(:topic, user: Fabricate(:user), title: "Who likes the same stuff I like?")
+        whisper = Fabricate(:post, topic: t, score: 100.0, post_number: 2, raw: "You like weird stuff", post_type: Post.types[:whisper])
+        mod_action = Fabricate(:post, topic: t, score: 100.0, post_number: 3, raw: "This topic unlisted", post_type: Post.types[:moderator_action])
+        small_action = Fabricate(:post, topic: t, score: 100.0, post_number: 4, raw: "A small action", post_type: Post.types[:small_action])
+        html = subject.html_part.body.to_s
+        expect(html).to_not include whisper.raw
+        expect(html).to_not include mod_action.raw
+        expect(html).to_not include small_action.raw
+      end
+
+      it "excludes deleted and hidden posts" do
+        t = Fabricate(:topic, user: Fabricate(:user), title: "Post objectionable stuff here")
+        deleted = Fabricate(:post, topic: t, score: 100.0, post_number: 2, raw: "This post is uncalled for", deleted_at: 5.minutes.ago)
+        hidden = Fabricate(:post, topic: t, score: 100.0, post_number: 3, raw: "Try to find this post", hidden: true, hidden_at: 5.minutes.ago, hidden_reason_id: Post.hidden_reasons[:flagged_by_tl3_user])
+        user_deleted = Fabricate(:post, topic: t, score: 100.0, post_number: 4, raw: "I regret this post", user_deleted: true)
+        html = subject.html_part.body.to_s
+        expect(html).to_not include deleted.raw
+        expect(html).to_not include hidden.raw
+        expect(html).to_not include user_deleted.raw
+      end
     end
 
   end