Merge pull request #177 from wangxiao/master

Release 2.3.3

Author: leeyeh

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "leancloud-realtime",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "homepage": "http://github.com/leancloud/js-realtime-sdk/",
   "authors": [
     "WangXiao <[email protected]>"

changelog.md

@@ -1,3 +1,9 @@
+## 2.3.3
+### Bug Fixes
+* query 方法支持搜索多个 members 同时所在的房间
+* query 方法支持搜索多个 roomId 所在的 room 信息
+* 支持地位位置信息的传递
+
 ## 2.3.2
 ### Features
 * 支持 React Native

dist/AV.realtime.js

@@ -23,7 +23,7 @@ var ajax = tool.ajax;
 var extend = tool.extend;
 
 // 当前版本
-var VERSION = '2.3.2';
+var VERSION = '2.3.3';
 
 // 配置项
 var config = {
@@ -579,7 +579,7 @@ var realtime = function realtime(options, callback) {
     };
 
     var realtimeObj = newRealtimeObject();
-    realtimeObj.clientId = options.clientId;
+    realtimeObj.clientId = options.peerId;
     realtimeObj.cache.options = options;
     realtimeObj.cache.ec = tool.eventCenter();
     realtimeObj.cache.authFun = options.auth;
@@ -912,15 +912,32 @@ engine.send = function (cache, options) {
 
 engine.convQuery = function (cache, options) {
   options = options || {};
+  var where = options.where || {};
+
+  // 默认为包含自己的查询 {"m": peerId}
+  where.m = where.m || cache.options.peerId;
+  // 同时查找含有数组中 id 的用户所在的 conversation
+  if (typeof where.m !== 'string') {
+    where.m = {
+      $all: where.m
+    };
+  }
+
+  // 批量查找 room 信息
+  if (where.roomIds || where.convIds) {
+    where.objectId = {
+      $in: where.roomIds || where.convIds
+    };
+    // 避免对查询项产生干扰
+    delete where.roomIds;
+    delete where.convIds;
+  }
+
   engine.wsSend(cache, {
     cmd: 'conv',
     op: 'query',
     // where 可选，对象，默认为包含自己的查询 {"m": peerId}
-    where: options.where || {
-      m: cache.options.peerId
-      // conversation 的 id
-      // objectId: options.cid
-    },
+    where: where,
     // sort 可选，字符串，默认为 -lm，最近对话反序
     sort: options.sort || '-lm',
     // limit 可选，数字，默认10
@@ -1038,6 +1055,9 @@ engine.getMediaMsg = function (cache, msg) {
       break;
     case -5:
       obj.type = 'location';
+      if (msg._lcloc) {
+        obj.location = msg._lcloc;
+      }
       break;
     case -6:
       obj.type = 'file';

dist/AV.realtime.min.js

@@ -13,7 +13,7 @@ var ajax = tool.ajax;
 var extend = tool.extend;
 
 // 当前版本
-var VERSION = '2.3.2';
+var VERSION = '2.3.3';
 
 // 配置项
 var config = {
@@ -903,6 +903,7 @@ engine.send = function (cache, options) {
 engine.convQuery = function (cache, options) {
   options = options || {};
   var where = options.where || {};
+
   // 默认为包含自己的查询 {"m": peerId}
   where.m = where.m || cache.options.peerId;
   // 同时查找含有数组中 id 的用户所在的 conversation
@@ -911,10 +912,21 @@ engine.convQuery = function (cache, options) {
       $all: where.m
     };
   }
+
+  // 批量查找 room 信息
+  if (where.roomIds || where.convIds) {
+    where.objectId = {
+      $in: where.roomIds || where.convIds
+    };
+    // 避免对查询项产生干扰
+    delete where.roomIds;
+    delete where.convIds;
+  }
+
   engine.wsSend(cache, {
     cmd: 'conv',
     op: 'query',
-    // where 可选，查询条件
+    // where 可选，对象，默认为包含自己的查询 {"m": peerId}
     where: where,
     // sort 可选，字符串，默认为 -lm，最近对话反序
     sort: options.sort || '-lm',
@@ -1033,6 +1045,9 @@ engine.getMediaMsg = function (cache, msg) {
       break;
     case -5:
       obj.type = 'location';
+      if (msg._lcloc) {
+        obj.location = msg._lcloc;
+      }
       break;
     case -6:
       obj.type = 'file';

lib/realtime.js

@@ -1,6 +1,6 @@
 {
   "name": "leancloud-realtime",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "LeanCloud Realtime Message JavaScript SDK",
   "main": "lib/realtime.js",
   "directories": {

package.json

@@ -13,7 +13,7 @@ var ajax = tool.ajax;
 var extend = tool.extend;
 
 // 当前版本
-var VERSION = '2.3.2';
+var VERSION = '2.3.3';
 
 // 配置项
 var config = {
@@ -569,7 +569,7 @@ var realtime = function(options, callback) {
     };
 
     var realtimeObj = newRealtimeObject();
-    realtimeObj.clientId = options.clientId;
+    realtimeObj.clientId = options.peerId;
     realtimeObj.cache.options = options;
     realtimeObj.cache.ec = tool.eventCenter();
     realtimeObj.cache.authFun = options.auth;