From b9a9fb54da351406a8a70b178c7cb885b39c9870 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 8 Oct 2014 13:35:07 +1100
Subject: [PATCH] FIX: streaming incorrect events into all tab

---
 app/assets/javascripts/discourse/models/user.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index c628a759105..f175456a332 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -258,7 +258,10 @@ Discourse.User = Discourse.Model.extend({
     return Discourse.ajax("/user_actions/" + id + ".json", { cache: 'false' }).then(function(result) {
       if (result && result.user_action) {
         var ua = result.user_action;
+
         if ((self.get('stream.filter') || ua.action_type) !== ua.action_type) return;
+        if (!self.get('stream.filter') && !self.inAllStream(ua)) return;
+
         var action = Discourse.UserAction.collapseStream([Discourse.UserAction.create(ua)]);
         stream.set('itemsLoaded', stream.get('itemsLoaded') + 1);
         stream.get('content').insertAt(0, action[0]);
@@ -266,6 +269,11 @@ Discourse.User = Discourse.Model.extend({
     });
   },
 
+  inAllStream: function(ua) {
+    return ua.action_type === Discourse.UserAction.TYPES.posts ||
+           ua.action_type === Discourse.UserAction.TYPES.topics;
+  },
+
   /**
   The user's stat count, excluding PMs.
 
@@ -273,11 +281,12 @@ Discourse.User = Discourse.Model.extend({
     @type {Integer}
   **/
   statsCountNonPM: function() {
+    var self = this;
+
     if (this.blank('statsExcludingPms')) return 0;
     var count = 0;
     _.each(this.get('statsExcludingPms'), function(val) {
-      if (val.action_type === Discourse.UserAction.TYPES.posts ||
-          val.action_type === Discourse.UserAction.TYPES.topics ) {
+      if (self.inAllStream(val)){
         count += val.count;
       }
     });