From 7211e6ee1eb34d3a016f0c0c4e65e0f1f2641ca8 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Thu, 19 Mar 2015 02:22:09 +0300
Subject: [PATCH] Supported new read updates

---
 app/js/services.js | 53 +++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/app/js/services.js b/app/js/services.js
index f27e9f75..15938499 100755
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -2368,13 +2368,35 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
         incrementMaxSeenID(message.id);
         break;
 
-      case 'updateReadMessages':
-        var dialogsUpdated = {},
-            messageID, message, i, peerID, foundDialog, dialog,
-            foundAffected = false;
-        for (i = 0; i < update.messages.length; i++) {
-          messageID = update.messages[i];
+      case 'updateReadHistoryInbox':
+      case 'updateReadHistoryOutbox':
+        var maxID = update.max_id;
+        var isOut = update._ == 'updateReadHistoryOutbox';
+        var peerID = AppPeersManager.getPeerID(update.peer);
+        var foundDialog = getDialogByPeerID(peerID);
+        var history = (historiesStorage[peerID] || {}).history || [];
+        var newUnreadCount = false;
+        var length = history.length;
+        var foundAffected = false;
+        var messageID, message, i;
+
+        if (peerID > 0 && isOut) {
+          AppUsersManager.forceUserOnline(peerID);
+        }
+
+        for (i = 0; i < length; i++) {
+          messageID = history[i];
+          if (messageID > maxID) {
+            continue;
+          }
           message = messagesStorage[messageID];
+
+          if (message.out != isOut) {
+            continue;
+          }
+          if (!message.unread) {
+            break;
+          }
           // console.log('read', messageID, message.unread, message);
           if (message && message.unread) {
             message.unread = false;
@@ -2387,36 +2409,27 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
             if (messagesForDialogs[messageID]) {
               messagesForDialogs[messageID].unread = false;
             }
-            peerID = getMessagePeer(message);
             if (!message.out) {
-              foundDialog = getDialogByPeerID(peerID);
               if (foundDialog) {
-                dialogsUpdated[peerID] = --foundDialog[0].unread_count;
+                newUnreadCount = --foundDialog[0].unread_count;
               }
-
               NotificationsManager.cancel('msg' + messageID);
             }
-            else if (peerID > 0) {
-              AppUsersManager.forceUserOnline(peerID);
-            }
           }
         }
 
-        angular.forEach(dialogsUpdated, function(count, peerID) {
-          $rootScope.$broadcast('dialog_unread', {peerID: peerID, count: count});
-        });
+        if (newUnreadCount !== false) {
+          $rootScope.$broadcast('dialog_unread', {peerID: peerID, count: newUnreadCount});
+        }
         if (foundAffected) {
           $rootScope.$broadcast('messages_read');
         }
         break;
 
-      // case 'updateReadHistoryInbox':
-      // case 'updateReadHistoryOutbox':
-
       case 'updateDeleteMessages':
         var dialogsUpdated = {},
             historiesUpdated = {},
-            messageID, message, i, peerID, foundDialog, dialog, history;
+            messageID, message, i, peerID, foundDialog, history;
 
         for (i = 0; i < update.messages.length; i++) {
           messageID = update.messages[i];