ncloudchat 1.0.19 → 1.0.23

package/lib/CloudChat.js

@@ -840,7 +840,7 @@ function () {
     });
   };
 
-  NCloudChat.prototype.getMembers = function (filter, sort, option) {
+  NCloudChat.prototype.getMemberBlocks = function (filter, sort, option) {
     if (sort === void 0) {
       sort = {};
     }
@@ -868,7 +868,7 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _queries.getMembers)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
+            , (0, _queries.getMemberBlocks)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
 
           case 2:
             entries = _a.sent();
@@ -901,7 +901,7 @@ function () {
     });
   };
 
-  NCloudChat.prototype.getChannels = function (filter, sort, option) {
+  NCloudChat.prototype.getMembers = function (filter, sort, option) {
     if (sort === void 0) {
       sort = {};
     }
@@ -911,7 +911,7 @@ function () {
     }
 
     return __awaiter(this, void 0, void 0, function () {
-      var entries, channels, e_9;
+      var entries, members, e_9;
 
       var _this = this;
 
@@ -929,20 +929,20 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _queries.getChannels)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
+            , (0, _queries.getMembers)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
 
           case 2:
             entries = _a.sent();
 
             if (entries) {
-              channels = entries.map(function (item) {
+              members = entries.map(function (item) {
                 return __assign(__assign({}, item.node), {
                   id: _this.ObjectId(item.node.id)
                 });
               });
               return [2
               /*return*/
-              , channels];
+              , members];
             }
 
             return [2
@@ -962,9 +962,20 @@ function () {
     });
   };
 
-  NCloudChat.prototype.requestFriend = function (friendId) {
+  NCloudChat.prototype.getChannels = function (filter, sort, option) {
+    if (sort === void 0) {
+      sort = {};
+    }
+
+    if (option === void 0) {
+      option = {};
+    }
+
     return __awaiter(this, void 0, void 0, function () {
-      var e_10;
+      var entries, channels, e_10;
+
+      var _this = this;
+
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -979,12 +990,25 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _mutations.requestFriend)(friendId)];
+            , (0, _queries.getChannels)((0, _stringify["default"])(filter), (0, _stringify["default"])(sort), (0, _stringify["default"])(option))];
 
           case 2:
+            entries = _a.sent();
+
+            if (entries) {
+              channels = entries.map(function (item) {
+                return __assign(__assign({}, item.node), {
+                  id: _this.ObjectId(item.node.id)
+                });
+              });
+              return [2
+              /*return*/
+              , channels];
+            }
+
             return [2
             /*return*/
-            , _a.sent()];
+            , entries];
 
           case 3:
             e_10 = _a.sent();
@@ -999,7 +1023,7 @@ function () {
     });
   };
 
-  NCloudChat.prototype.acceptFriend = function (friendId) {
+  NCloudChat.prototype.requestFriend = function (friendId) {
     return __awaiter(this, void 0, void 0, function () {
       var e_11;
       return __generator(this, function (_a) {
@@ -1016,7 +1040,7 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _mutations.acceptFriend)(friendId)];
+            , (0, _mutations.requestFriend)(friendId)];
 
           case 2:
             return [2
@@ -1036,7 +1060,7 @@ function () {
     });
   };
 
-  NCloudChat.prototype.rejectFriend = function (friendId) {
+  NCloudChat.prototype.acceptFriend = function (friendId) {
     return __awaiter(this, void 0, void 0, function () {
       var e_12;
       return __generator(this, function (_a) {
@@ -1053,7 +1077,7 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _mutations.rejectFriend)(friendId)];
+            , (0, _mutations.acceptFriend)(friendId)];
 
           case 2:
             return [2
@@ -1073,7 +1097,7 @@ function () {
     });
   };
 
-  NCloudChat.prototype.removeFriend = function (friendId) {
+  NCloudChat.prototype.rejectFriend = function (friendId) {
     return __awaiter(this, void 0, void 0, function () {
       var e_13;
       return __generator(this, function (_a) {
@@ -1090,7 +1114,7 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _mutations.removeFriend)(friendId)];
+            , (0, _mutations.rejectFriend)(friendId)];
 
           case 2:
             return [2
@@ -1110,7 +1134,7 @@ function () {
     });
   };
 
-  NCloudChat.prototype.countUnread = function (channelId) {
+  NCloudChat.prototype.removeFriend = function (friendId) {
     return __awaiter(this, void 0, void 0, function () {
       var e_14;
       return __generator(this, function (_a) {
@@ -1127,7 +1151,7 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _queries.unreadCount)(channelId)];
+            , (0, _mutations.removeFriend)(friendId)];
 
           case 2:
             return [2
@@ -1147,7 +1171,7 @@ function () {
     });
   };
 
-  NCloudChat.prototype.getSubscription = function (channelId, id) {
+  NCloudChat.prototype.countUnread = function (channelId) {
     return __awaiter(this, void 0, void 0, function () {
       var e_15;
       return __generator(this, function (_a) {
@@ -1164,7 +1188,7 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _queries.getSubscription)(channelId, id)];
+            , (0, _queries.unreadCount)(channelId)];
 
           case 2:
             return [2
@@ -1178,13 +1202,13 @@ function () {
           case 4:
             return [2
             /*return*/
-            , null];
+            ];
         }
       });
     });
   };
 
-  NCloudChat.prototype.getChannel = function (channelId) {
+  NCloudChat.prototype.getSubscription = function (channelId, id) {
     return __awaiter(this, void 0, void 0, function () {
       var e_16;
       return __generator(this, function (_a) {
@@ -1201,7 +1225,7 @@ function () {
 
             return [4
             /*yield*/
-            , (0, _queries.getChannel)(channelId)];
+            , (0, _queries.getSubscription)(channelId, id)];
 
           case 2:
             return [2
@@ -1221,9 +1245,46 @@ function () {
     });
   };
 
+  NCloudChat.prototype.getChannel = function (channelId) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_17;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!this.isConnected()) {
+              throw Error("You are not connected.");
+            }
+
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , (0, _queries.getChannel)(channelId)];
+
+          case 2:
+            return [2
+            /*return*/
+            , _a.sent()];
+
+          case 3:
+            e_17 = _a.sent();
+            throw e_17;
+
+          case 4:
+            return [2
+            /*return*/
+            , null];
+        }
+      });
+    });
+  };
+
   NCloudChat.prototype.getMessage = function (channelId, messageId) {
     return __awaiter(this, void 0, void 0, function () {
-      var entry, e_17;
+      var entry, e_18;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1255,8 +1316,8 @@ function () {
             , null];
 
           case 3:
-            e_17 = _a.sent();
-            throw e_17;
+            e_18 = _a.sent();
+            throw e_18;
 
           case 4:
             return [2
@@ -1269,7 +1330,7 @@ function () {
 
   NCloudChat.prototype.getMessages = function (filter, sort, option) {
     return __awaiter(this, void 0, void 0, function () {
-      var entries, messages, e_18;
+      var entries, messages, e_19;
 
       var _this = this;
 
@@ -1308,8 +1369,8 @@ function () {
             , entries];
 
           case 3:
-            e_18 = _a.sent();
-            throw e_18;
+            e_19 = _a.sent();
+            throw e_19;
 
           case 4:
             return [2
@@ -1322,7 +1383,7 @@ function () {
 
   NCloudChat.prototype.getSubscriptions = function (filter, sort, option) {
     return __awaiter(this, void 0, void 0, function () {
-      var entries, subscribes, e_19;
+      var entries, subscribes, e_20;
 
       var _this = this;
 
@@ -1361,8 +1422,8 @@ function () {
             , entries];
 
           case 3:
-            e_19 = _a.sent();
-            throw e_19;
+            e_20 = _a.sent();
+            throw e_20;
 
           case 4:
             return [2
@@ -1375,7 +1436,7 @@ function () {
 
   NCloudChat.prototype.createChannel = function (channel) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_20;
+      var e_21;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1398,8 +1459,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_20 = _a.sent();
-            throw e_20;
+            e_21 = _a.sent();
+            throw e_21;
 
           case 4:
             return [2
@@ -1412,7 +1473,7 @@ function () {
 
   NCloudChat.prototype.updateChannel = function (channelId, channel) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_21;
+      var e_22;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1435,8 +1496,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_21 = _a.sent();
-            throw e_21;
+            e_22 = _a.sent();
+            throw e_22;
 
           case 4:
             return [2
@@ -1449,7 +1510,7 @@ function () {
 
   NCloudChat.prototype.deleteChannel = function (channelId) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_22;
+      var e_23;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1472,8 +1533,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_22 = _a.sent();
-            throw e_22;
+            e_23 = _a.sent();
+            throw e_23;
 
           case 4:
             return [2
@@ -1490,7 +1551,7 @@ function () {
     }
 
     return __awaiter(this, void 0, void 0, function () {
-      var e_23;
+      var e_24;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1513,8 +1574,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_23 = _a.sent();
-            throw e_23;
+            e_24 = _a.sent();
+            throw e_24;
 
           case 4:
             return [2
@@ -1527,7 +1588,7 @@ function () {
 
   NCloudChat.prototype.addMembers = function (channelId, memberIds, options) {
     return __awaiter(this, void 0, void 0, function () {
-      var input, e_24;
+      var input, e_25;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1553,8 +1614,8 @@ function () {
             , _a.sent()];
 
           case 3:
-            e_24 = _a.sent();
-            throw e_24;
+            e_25 = _a.sent();
+            throw e_25;
 
           case 4:
             return [2
@@ -1567,7 +1628,7 @@ function () {
 
   NCloudChat.prototype.removeMembers = function (channelId, memberIds, options) {
     return __awaiter(this, void 0, void 0, function () {
-      var e_25;
+      var e_26;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -1578,27 +1639,22 @@ function () {
             _a.label = 1;
 
           case 1:
-            _a.trys.push([1, 4,, 5]);
+            _a.trys.push([1, 3,, 4]);
 
             return [4
             /*yield*/
-            , (0, _mutations.removeChannelMembers)(channelId, memberIds, options)];
+            , (0, _mutations.removeChannelMembers)(channelId, memberIds)];
 
           case 2:
-            return [4
-            /*yield*/
-            , _a.sent()];
-
-          case 3:
             return [2
             /*return*/
             , _a.sent()];
 
-          case 4:
-            e_25 = _a.sent();
-            throw e_25;
+          case 3:
+            e_26 = _a.sent();
+            throw e_26;
 
-          case 5:
+          case 4:
             return [2
             /*return*/
             ];
@@ -1669,6 +1725,84 @@ function () {
     });
   };
 
+  NCloudChat.prototype.banUser = function (channelId, memberId, options) {
+    if (options === void 0) {
+      options = {};
+    }
+
+    return __awaiter(this, void 0, void 0, function () {
+      var e_27;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!this.isConnected()) {
+              throw Error("You are not connected.");
+            }
+
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , (0, _mutations.createMemberBlock)(channelId, memberId, (0, _stringify["default"])(options))];
+
+          case 2:
+            return [2
+            /*return*/
+            , _a.sent()];
+
+          case 3:
+            e_27 = _a.sent();
+            throw e_27;
+
+          case 4:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
+  NCloudChat.prototype.unbanUser = function (channelId, memberId) {
+    return __awaiter(this, void 0, void 0, function () {
+      var e_28;
+      return __generator(this, function (_a) {
+        switch (_a.label) {
+          case 0:
+            if (!this.isConnected()) {
+              throw Error("You are not connected.");
+            }
+
+            _a.label = 1;
+
+          case 1:
+            _a.trys.push([1, 3,, 4]);
+
+            return [4
+            /*yield*/
+            , (0, _mutations.deleteMemberBlock)(channelId, memberId)];
+
+          case 2:
+            return [2
+            /*return*/
+            , _a.sent()];
+
+          case 3:
+            e_28 = _a.sent();
+            throw e_28;
+
+          case 4:
+            return [2
+            /*return*/
+            ];
+        }
+      });
+    });
+  };
+
   return NCloudChat;
 }();
 

package/lib/mutations/channel.js

@@ -22,6 +22,8 @@ var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/pr
 
 var _CoreManager = _interopRequireDefault(require("../CoreManager"));
 
+var _Util = require("../Util");
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -207,6 +209,7 @@ var createChannel = function createChannel(channel) {
           }).then(function (data) {
             if (data.errors) throw data.errors[0];
             if (data.code) throw data;
+            if (data.data.createChannel.channel) data.data.createChannel.channel.id = (0, _Util.ObjectId)(data.data.createChannel.channel.id);
             return data.data.createChannel.channel;
           })];
 
@@ -264,6 +267,7 @@ var updateChannel = function updateChannel(channelId, channel) {
           }).then(function (data) {
             if (data.errors) throw data.errors[0];
             if (data.code) throw data;
+            if (data.data.updateChannel.channel) data.data.updateChannel.channel.id = (0, _Util.ObjectId)(data.data.updateChannel.channel.id);
             return data.data.updateChannel.channel;
           })];
 
@@ -310,6 +314,7 @@ var deleteChannel = function deleteChannel(channelId) {
           }).then(function (data) {
             if (data.errors) throw data.errors[0];
             if (data.code) throw data;
+            if (data.data.deleteChannel.channel) data.data.deleteChannel.channel.id = (0, _Util.ObjectId)(data.data.deleteChannel.channel.id);
             return data.data.deleteChannel.channel;
           })];
 
@@ -358,6 +363,7 @@ var addChannelMembers = function addChannelMembers(channelId, memberIds, options
           }).then(function (data) {
             if (data.errors) throw data.errors[0];
             if (data.code) throw data;
+            if (data.data.addChannelMembers.channel) data.data.addChannelMembers.channel.id = (0, _Util.ObjectId)(data.data.addChannelMembers.channel.id);
             return data.data.addChannelMembers.channel;
           })];
 
@@ -372,7 +378,7 @@ var addChannelMembers = function addChannelMembers(channelId, memberIds, options
 
 exports.addChannelMembers = addChannelMembers;
 
-var removeChannelMembers = function removeChannelMembers(channelId, memberIds, options) {
+var removeChannelMembers = function removeChannelMembers(channelId, memberIds) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -397,8 +403,7 @@ var removeChannelMembers = function removeChannelMembers(channelId, memberIds, o
               variables: {
                 projectId: projectId,
                 channelId: channelId,
-                memberIds: memberIds,
-                options: options
+                memberIds: memberIds
               }
             })
           }).then(function (res) {
@@ -406,6 +411,7 @@ var removeChannelMembers = function removeChannelMembers(channelId, memberIds, o
           }).then(function (data) {
             if (data.errors) throw data.errors[0];
             if (data.code) throw data;
+            if (data.data.removeChannelMembers.channel) data.data.removeChannelMembers.channel.id = (0, _Util.ObjectId)(data.data.removeChannelMembers.channel.id);
             return data.data.removeChannelMembers.channel;
           })];
 

package/lib/mutations/index.js

@@ -10,15 +10,15 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _user = require("./user");
+var _member = require("./member");
 
-_Object$keys(_user).forEach(function (key) {
+_Object$keys(_member).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
 
   _Object$defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _user[key];
+      return _member[key];
     }
   });
 });