Merge pull request #1694 from mattermost/revert-1625-ephemeral_messages

Revert "add helper method to add ephemeral messages; also switch 'delete mess…"

1 files changed, 1 insertions, 14 deletions

diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 9cdbd73a4..88b5aa739 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -82,7 +82,7 @@ export function getChannels(checkVersion) {
     );
 }
 
-export function getChannelAndAddUnreadMessages(id, unreadCount) {
+export function getChannel(id) {
     if (isCallInProgress('getChannel' + id)) {
         return;
     }
@@ -97,7 +97,6 @@ export function getChannelAndAddUnreadMessages(id, unreadCount) {
                 return;
             }
 
-            data.channel.total_msg_count += (unreadCount || 0);
             AppDispatcher.handleServerAction({
                 type: ActionTypes.RECIEVED_CHANNEL,
                 channel: data.channel,
@@ -111,10 +110,6 @@ export function getChannelAndAddUnreadMessages(id, unreadCount) {
     );
 }
 
-export function getChannel(id) {
-    getChannelAndAddUnreadMessages(id, 0);
-}
-
 export function updateLastViewedAt(id) {
     let channelId;
     if (id) {
@@ -136,14 +131,6 @@ export function updateLastViewedAt(id) {
         channelId,
         () => {
             callTracker.updateLastViewed = 0;
-
-            var channel = ChannelStore.get(channelId);
-            var member = ChannelStore.getMember(channelId);
-            if (channel && member) {
-                member.msg_count = channel.total_msg_count;
-                member.last_viewed_at = utils.getTimestamp();
-                ChannelStore.setChannelMember(member);
-            }
         },
         (err) => {
             callTracker.updateLastViewed = 0;