Merge pull request #104 from HomerSp/work

Fix email and self_entity changing ids server-side. And initial conv list.

Author: averissimo

src/client.coffee

@@ -88,6 +88,8 @@ module.exports = class Client extends EventEmitter
                 return Q.reject ABORT
             # now intialize the chat using the pvt
             @init.initChat @jarstore, pvt
+        .then =>
+            @initrecentconversations @init
         .then =>
             @running = true
             @connected = false
@@ -479,6 +481,14 @@ module.exports = class Client extends EventEmitter
         ], false).then (body) -> # receive as protojson
             CLIENT_SYNC_ALL_NEW_EVENTS_RESPONSE.parse body
 
+    # Initializes the recent conversations.
+    initrecentconversations: (init) ->
+        @chatreq.req('conversations/syncrecentconversations', [
+            @_requestBodyHeader(),
+            null
+        ], false).then (body) -> # receive as protojson
+            data = CLIENT_SYNC_ALL_NEW_EVENTS_RESPONSE.parse body
+            init.conv_states = data.conversation_state
 
     # Search for people.
     searchentities: (search_string, max_results=10) ->

src/init.coffee

@@ -72,15 +72,16 @@ module.exports = class Init
             #   { key: 'ds:3', isError: false, hash: '5', data: [Function] }...
             DICT =
                 apikey: { key:'ds:7',  fn: (d) -> d[0][2] }
-                email:  { key:'ds:36', fn: (d) -> d[0][2] }
+                email:  { key:'ds:31', fn: (d) -> d[0][2] }
                 headerdate:    { key:'ds:2', fn: (d) -> d[0][4] }
                 headerversion: { key:'ds:2', fn: (d) -> d[0][6] }
                 headerid:      { key:'ds:4', fn: (d) -> d[0][7] }
                 timestamp:     { key:'ds:20', fn: (d) -> new Date (d[0][1][4] / 1000) }
-                self_entity:   { key:'ds:21', fn: (d) ->
+                self_entity:   { key:'ds:20', fn: (d) ->
                     CLIENT_GET_SELF_INFO_RESPONSE.parse(d[0]).self_entity
                 }
                 conv_states: { key:'ds:20', fn: (d) ->
+                    # Removed in server-side update
                     CLIENT_CONVERSATION_STATE_LIST.parse(d[0][3])
                 }
 

test/body.html

@@ -58,8 +58,7 @@
 ]
 }});</script><script>AF_initDataCallback({key: 'ds:30', isError:  false , hash: '27', data:function(){return [["cin:acc","https://myphonenumbers-pa.clients6.google.com"]
 ]
-}});</script><script>AF_initDataCallback({key: 'ds:31', isError:  false , hash: '28', data:function(){return [["cic:sc",["AF","DZ","AO","BH","BD","BJ","BF","KH","CM","CG","CD","CI","GH","GU","GN","ID","IQ","IL","JO","KZ","KE","KW","KG","LA","LR","MG","MW","MY","MV","MA","MZ","NE","NG","OM","PK","PS","PH","SA","SN","SC","SL","SO","ZA","LK","TZ","TH","TG","TN","TR","UG","UA","UZ","VN","ZM"]
-]
+}});</script><script>AF_initDataCallback({key: 'ds:31', isError:  false , hash: '37', data:function(){return [["cic:vd","104889609452098951178","[email protected]",0,""]
 ]
 }});</script><script>AF_initDataCallback({key: 'ds:32', isError:  false , hash: '29', data:function(){return [["cib:sc",3600,3600,3,600,10]
 ]

test/test-initparsebody.coffee

@@ -22,5 +22,4 @@ describe 'Init', ->
                 deql init.headerid, '820F7C523A7BC3A6'
                 deql init.timestamp, new Date('2016-12-04T22:40:25.771Z')
                 assert.isNotNull init.self_entity
-                deql init.conv_states?.length, 3
                 assert.isNotNull init.entities