1 files changed, 18 insertions, 13 deletions

diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index fe73cbcf7..a8496b385 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -102,7 +102,7 @@ function getStateFromStores() {
         }
         readDirectChannels = readDirectChannels.slice(index);
 
-        showDirectChannels.sort(function(a, b) {
+        showDirectChannels.sort(function directSort(a, b) {
             if (a.display_name < b.display_name) {
                 return -1;
             }
@@ -114,7 +114,7 @@ function getStateFromStores() {
     }
 
     return {
-        active_id: currentId,
+        activeId: currentId,
         channels: ChannelStore.getAll(),
         members: members,
         showDirectChannels: showDirectChannels,
@@ -128,6 +128,7 @@ module.exports = React.createClass({
         ChannelStore.addChangeListener(this.onChange);
         UserStore.addChangeListener(this.onChange);
         UserStore.addStatusesChangeListener(this.onChange);
+        TeamStore.addChangeListener(this.onChange);
         SocketStore.addChangeListener(this.onSocketChange);
         $('.nav-pills__container').perfectScrollbar();
 
@@ -146,6 +147,7 @@ module.exports = React.createClass({
         ChannelStore.removeChangeListener(this.onChange);
         UserStore.removeChangeListener(this.onChange);
         UserStore.removeStatusesChangeListener(this.onChange);
+        TeamStore.removeChangeListener(this.onChange);
         SocketStore.removeChangeListener(this.onSocketChange);
     },
     onChange: function() {
@@ -157,9 +159,11 @@ module.exports = React.createClass({
     onSocketChange: function(msg) {
         if (msg.action === 'posted') {
             if (ChannelStore.getCurrentId() === msg.channel_id) {
-                AsyncClient.getChannels(true, window.isActive);
+                if (window.isActive) {
+                    AsyncClient.updateLastViewedAt();
+                }
             } else {
-                AsyncClient.getChannels(true);
+                AsyncClient.getChannels();
             }
 
             if (UserStore.getCurrentId() !== msg.user_id) {
@@ -214,12 +218,12 @@ module.exports = React.createClass({
                 }
             }
         } else if (msg.action === 'viewed') {
-            if (ChannelStore.getCurrentId() != msg.channel_id) {
-                AsyncClient.getChannels(true);
+            if (ChannelStore.getCurrentId() !== msg.channel_id && UserStore.getCurrentId() === msg.user_id) {
+                AsyncClient.getChannel(msg.channel_id);
             }
         } else if (msg.action === 'user_added') {
             if (UserStore.getCurrentId() === msg.user_id) {
-                AsyncClient.getChannels(true);
+                AsyncClient.getChannel(msg.channel_id);
             }
         } else if (msg.action === 'user_removed') {
             if (msg.user_id === UserStore.getCurrentId()) {
@@ -282,7 +286,7 @@ module.exports = React.createClass({
     },
     render: function() {
         var members = this.state.members;
-        var activeId = this.state.active_id;
+        var activeId = this.state.activeId;
         var badgesActive = false;
 
         // keep track of the first and last unread channels so we can use them to set the unread indicators
@@ -294,7 +298,7 @@ module.exports = React.createClass({
             var channelMember = members[channel.id];
 
             var linkClass = '';
-            if (channel.id === self.state.active_id) {
+            if (channel.id === activeId) {
                 linkClass = 'active';
             }
 
@@ -346,15 +350,16 @@ module.exports = React.createClass({
 
             // set up click handler to switch channels (or create a new channel for non-existant ones)
             var clickHandler = null;
-            var href;
+            var href = '#';
+            var teamURL = TeamStore.getCurrentTeamUrl();
             if (!channel.fake) {
                 clickHandler = function(e) {
                     e.preventDefault();
                     utils.switchChannel(channel);
                 };
-                href = '#';
-            } else {
-                href = TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name;
+            }
+            if (channel.fake && teamURL){
+                href = teamURL + '/channels/' + channel.name;
             }
 
             return (