Merge pull request #155 from QuickBlox/privacyListFix

add the MutualBlock flag

Author: IegorKozakov

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "homepage": "https://quickblox.com/developers/Javascript",
   "main": "quickblox.js",
   "license": "Apache 2.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "quickblox",
   "description": "QuickBlox JavaScript SDK",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "homepage": "https://quickblox.com/developers/Javascript",
   "main": "src/qbMain.js",
   "license": [

quickblox.min.js

@@ -245,7 +245,7 @@ describe('Chat API', function() {
       //
       it("can create new list with items", function(done) {
         var usersObj = [
-              {user_id: 1111111, action: "deny"},
+              {user_id: 1111111, action: "deny", mutualBlock: true},
               {user_id: 1010101, action: "allow"}
             ];
 

spec/QB-ChatSpec.js

@@ -1054,55 +1054,93 @@ PrivacyListProxy.prototype = {
   },
 
   create: function(list, callback) {
-    var iq, self = this,
-        userId, userJid,
-        userAction, userMuc,
-        listObj = {},
-        listKeys = [];
-
-    iq = $iq({
-      from: connection.jid,
-      type: 'set',
-      id: connection.getUniqueId('edit')
-    }).c('query', {
-      xmlns: Strophe.NS.PRIVACY_LIST
-    }).c('list', {
-      name: list.name
-    });
-
-    $(list.items).each(function(e, i){
-      listObj[i.user_id] = i.action;
-    });
+    var self = this,
+        userId, userJid, userMuc,
+        userAction,
+        mutualBlock,
+        listPrivacy = {},
+        listUserId = [];
+
+    /** Filled listPrivacys */
+    for (var i = list.items.length - 1; i >= 0; i--) {
+      var user = list.items[i];
+
+      listPrivacy[user.user_id] = {
+        action: user.action,
+        mutualBlock: user.mutualBlock === true ? true : false
+      };
+    }
 
-    listKeys = Object.keys(listObj);
+    /** Filled listUserId */
+    listUserId = Object.keys(listPrivacy);
 
-    for (var index = 0, i = 0, len = listKeys.length; index < len; index++, i=i+2) {
-      userId = listKeys[index];
-      userAction = listObj[userId];
-      userJid = self.helpers.jidOrUserId(parseInt(userId, 10));
-      userMuc = self.helpers.getUserNickWithMucDomain(userId);
+    var iqParams = {
+          type: 'set',
+          from: connection.jid,
+          id: connection.getUniqueId('edit')
+        },
+        iq = $iq(iqParams).c('query', {
+            xmlns: Strophe.NS.PRIVACY_LIST
+          }).c('list', {
+            name: list.name
+          });
 
+    function createPrivacyItem(iq, params){
       iq.c('item', {
         type: 'jid',
-        value: userJid,
-        action: userAction,
-        order: i+1
-      }).c('message', {
-      }).up().c('presence-in', {
-      }).up().c('presence-out', {
-      }).up().c('iq', {
-      }).up().up();
+        value: params.jidOrMuc,
+        action: params.userAction,
+        order: params.order
+      }).c('message', {})
+          .up().c('presence-in', {})
+          .up().c('presence-out', {})
+          .up().c('iq', {})
+          .up().up();
+      return iq;
+    }
 
+    function createPrivacyItemMutal(iq, params) {
       iq.c('item', {
         type: 'jid',
-        value: userMuc,
-        action: userAction,
-        order: i+2
-      }).c('message', {
-      }).up().c('presence-in', {
-      }).up().c('presence-out', {
-      }).up().c('iq', {
-      }).up().up();
+        value: params.jidOrMuc,
+        action: params.userAction,
+        order: params.order
+      }).up();
+
+      return iq;
+    }
+
+    for (var index = 0, i = 0, len = listUserId.length; index < len; index++, i=i+2) {
+      userId = listUserId[index];
+      mutualBlock = listPrivacy[userId].mutualBlock;
+
+      userAction = listPrivacy[userId].action;
+      userJid = self.helpers.jidOrUserId(parseInt(userId, 10));
+      userMuc = self.helpers.getUserNickWithMucDomain(userId);
+
+      if(mutualBlock && userAction === 'deny'){
+        iq = createPrivacyItemMutal(iq, {
+          order: i+1,
+          jidOrMuc: userJid,
+          userAction: userAction
+        });
+        iq = createPrivacyItemMutal(iq, {
+          order: i+2,
+          jidOrMuc: userMuc,
+          userAction: userAction
+        }).up().up();
+      } else {
+        iq = createPrivacyItem(iq, {
+          order: i+1,
+          jidOrMuc: userJid,
+          userAction: userAction
+        });
+        iq = createPrivacyItem(iq, {
+          order: i+2,
+          jidOrMuc: userMuc,
+          userAction: userAction
+        });
+      }
     }
 
     connection.sendIQ(iq, function(stanzaResult) {
@@ -1115,6 +1153,7 @@ PrivacyListProxy.prototype = {
         callback(Utils.getError(408));
       }
     });
+
   },
 
   update: function(list, callback) {

src/modules/qbChat.js

@@ -10,7 +10,7 @@
  */
 
 var config = {
-  version: '2.2.1',
+  version: '2.2.2',
   creds: {
     appId: '',
     authKey: '',