BUGFIX: filter by topic

discourse · Jan 20, 2014 · 76a2503 · 76a2503
1 parent c7c1c93
commit 76a2503
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/models/post_alert_observer.rb b/app/models/post_alert_observer.rb
@@ -64,7 +64,7 @@ def after_create_post(post)
         next if user.blank?
 
         destroy_notifications(user, Notification.types[:private_message], post.topic)
-        unread_post = first_unread_post(user,post.topic)
+        unread_post = first_unread_post(user,post.topic) || post
         create_notification(user, Notification.types[:private_message], unread_post)
       end
     elsif post.post_type != Post.types[:moderator_action]
@@ -84,6 +84,7 @@ def first_unread_post(user, topic)
                  SELECT last_read_post_number FROM topic_users tu
                  WHERE tu.user_id = ? AND tu.topic_id = ? ),0)',
                   user.id, topic.id)
+          .where(topic_id: topic.id)
           .order('post_number').first
     end