ncloudchat 0.0.19-beta → 0.0.22-beta

package/lib/queries/channel.js

@@ -8,7 +8,7 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.getChannel = exports.getChannels = void 0;
+exports.getChannels = exports.getChannel = void 0;
 
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 
@@ -20,6 +20,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) {
@@ -163,7 +165,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var getChannels = function getChannels(filter, sort, option) {
+var getChannel = function getChannel(id) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -178,7 +180,7 @@ var getChannels = function getChannels(filter, sort, option) {
           /*return*/
           , null];
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n        query channels ($projectId: String!, $filter: String!, $sort: String, $option:String) {\n            channels(projectId: $projectId, filter:$filter, sort:$sort, option:$option) {\n                totalCount\n                edges {\n                    node {\n                        id\n                        project_id\n                        name\n                        user_id\n                        unique_id\n                        is_private\n                        translation\n                        members\n                        push\n                        link_url\n                        image_url      \n                        created_at\n                        updated_at\n                    }\n                }\n            }\n        }\n    ";
+          query = "\n        query channel ($projectId: String!, $id: String!) {\n            channel(projectId: $projectId, id:$id) {\n                id\n                project_id\n                name\n                user_id\n                unique_id\n                is_private\n                translation\n                members\n                push\n                link_url\n                image_url      \n                created_at\n                updated_at\n            }\n        }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -192,19 +194,18 @@ var getChannels = function getChannels(filter, sort, option) {
               query: query,
               variables: {
                 projectId: projectId,
-                filter: filter,
-                sort: sort,
-                option: option
+                id: id
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            if (data.data.channels) {
-              return data.data.channels.edges;
+            if (data.data.channel) {
+              data.data.channel.id = (0, _Util.ObjectId)(data.data.channel.id);
+              return data.data.channel;
             }
 
-            return [];
+            return false;
           })];
 
         case 1:
@@ -216,9 +217,9 @@ var getChannels = function getChannels(filter, sort, option) {
   });
 };
 
-exports.getChannels = getChannels;
+exports.getChannel = getChannel;
 
-var getChannel = function getChannel(id) {
+var getChannels = function getChannels(filter, sort, option) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -233,7 +234,7 @@ var getChannel = function getChannel(id) {
           /*return*/
           , null];
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n        query channel ($projectId: String!, $id: String!) {\n            channel(projectId: $projectId, id:$id) {\n                id\n                project_id\n                name\n                user_id\n                unique_id\n                is_private\n                translation\n                members\n                push\n                link_url\n                image_url      \n                created_at\n                updated_at\n            }\n        }\n    ";
+          query = "\n        query channels ($projectId: String!, $filter: String!, $sort: String, $option:String) {\n            channels(projectId: $projectId, filter:$filter, sort:$sort, option:$option) {\n                totalCount\n                edges {\n                    node {\n                        id\n                        project_id\n                        name\n                        user_id\n                        unique_id\n                        is_private\n                        translation\n                        members\n                        push\n                        link_url\n                        image_url      \n                        created_at\n                        updated_at\n                    }\n                }\n            }\n        }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -247,19 +248,19 @@ var getChannel = function getChannel(id) {
               query: query,
               variables: {
                 projectId: projectId,
-                id: id
+                filter: filter,
+                sort: sort,
+                option: option
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            console.log(data.data);
-
-            if (data.data.channel) {
-              return data.data.channel;
+            if (data.data.channels) {
+              return data.data.channels.edges;
             }
 
-            return false;
+            return [];
           })];
 
         case 1:
@@ -271,4 +272,4 @@ var getChannel = function getChannel(id) {
   });
 };
 
-exports.getChannel = getChannel;
+exports.getChannels = getChannels;

package/lib/queries/index.js

@@ -75,6 +75,19 @@ _Object$keys(_friend).forEach(function (key) {
   });
 });
 
+var _member = require("./member");
+
+_Object$keys(_member).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+
+  _Object$defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _member[key];
+    }
+  });
+});
+
 var _messageread = require("./messageread");
 
 _Object$keys(_messageread).forEach(function (key) {

package/lib/queries/member.js

@@ -0,0 +1,219 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
+
+var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.getMembers = void 0;
+
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
+
+var _iterator = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/symbol/iterator"));
+
+var _symbol = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/symbol"));
+
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
+
+var _CoreManager = _interopRequireDefault(require("../CoreManager"));
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = _promise["default"]))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof _symbol["default"] === "function" && (g[_iterator["default"]] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+
+var getMembers = function getMembers(filter, sort, option) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var token, projectId, endpoint, lquery;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          token = _CoreManager["default"].get('TOKEN');
+          if (!token) return [2
+          /*return*/
+          , null];
+          projectId = _CoreManager["default"].get('PROJECT_ID');
+          if (!projectId) return [2
+          /*return*/
+          , null];
+          endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
+          lquery = "\n        query membersForQuery ($projectId: String!, $option: String!, $filter: String!, $sort: String ) {\n            membersForQuery (projectId: $projectId, option:$option, filter:$filter, sort:$sort) {\n                totalCount\n                edges {\n                    node {\n                        id\n                        name\n                    }\n                }\n            }\n        }\n    ";
+          return [4
+          /*yield*/
+          , fetch(endpoint, {
+            method: 'POST',
+            headers: {
+              Authorization: 'Bearer ' + token,
+              'Content-Type': 'application/json',
+              Accept: 'application/json'
+            },
+            body: (0, _stringify["default"])({
+              query: lquery,
+              variables: {
+                projectId: projectId,
+                filter: filter,
+                sort: sort,
+                option: option
+              }
+            })
+          }).then(function (res) {
+            return res.json();
+          }).then(function (data) {
+            if (data.data.membersForQuery) {
+              return data.data.membersForQuery.edges;
+            }
+
+            return [];
+          })];
+
+        case 1:
+          return [2
+          /*return*/
+          , _a.sent()];
+      }
+    });
+  });
+};
+
+exports.getMembers = getMembers;

package/lib/queries/message.js

@@ -8,7 +8,7 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.getMessage = exports.getMessages = void 0;
+exports.unreadCount = exports.getMessage = exports.getMessages = void 0;
 
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 
@@ -264,4 +264,54 @@ var getMessage = function getMessage(channelId, messageId) {
   });
 };
 
-exports.getMessage = getMessage;
+exports.getMessage = getMessage;
+
+var unreadCount = function unreadCount(channelId) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var token, projectId, endpoint, queries;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          token = _CoreManager["default"].get("TOKEN");
+          if (!token) return [2
+          /*return*/
+          , null];
+          projectId = _CoreManager["default"].get("PROJECT_ID");
+          if (!projectId) return [2
+          /*return*/
+          , null];
+          endpoint = _CoreManager["default"].get("SERVER_URL") + "/graphql";
+          queries = "\n        query mark ($projectId: String!, $channelId: String!) { \n          mark (projectId: $projectId, channelId:$channelId) {  \n              user_id,\n              message_id,\n              sort_id,  \n              unread\n        } \n      }\n  ";
+          return [4
+          /*yield*/
+          , fetch(endpoint, {
+            method: "POST",
+            headers: {
+              Authorization: "Bearer " + token,
+              "Content-Type": "application/json",
+              Accept: "application/json"
+            },
+            body: (0, _stringify["default"])({
+              query: queries,
+              variables: {
+                projectId: projectId,
+                channelId: channelId
+              }
+            })
+          }).then(function (res) {
+            return res.json();
+          }).then(function (data) {
+            if (!data || !data.data.mark) return false;
+            return data.data.mark;
+          })];
+
+        case 1:
+          return [2
+          /*return*/
+          , _a.sent()];
+      }
+    });
+  });
+};
+
+exports.unreadCount = unreadCount;

package/lib/queries/subscription.js

@@ -8,7 +8,7 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.getSubscriptionByConnection = exports.getSubscriptions = void 0;
+exports.getSubscriptions = exports.getSubscription = void 0;
 
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 
@@ -20,6 +20,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) {
@@ -163,7 +165,7 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
   }
 };
 
-var getSubscriptions = function getSubscriptions(filter, sort, option) {
+var getSubscription = function getSubscription(channelId, id) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -178,7 +180,7 @@ var getSubscriptions = function getSubscriptions(filter, sort, option) {
           /*return*/
           , null];
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n        query subscriptions ($projectId: String!, $option: String!, $filter: String!, $sort: String ) {\n            subscriptions (projectId: $projectId, option:$option, filter:$filter, sort:$sort) {\n                totalCount\n                edges {\n                    node {\n                        id\n                        user {\n                            nickname\n                            profile_url\n                            country\n                        }\n                        channel_id\n                        user_id\n                        online\n                        push\n                        created_at\n                    }\n                }\n            }\n        }\n    ";
+          query = "\n        query subscription ($projectId: String!,$channelId: String!, $id: String!) {\n            subscription(projectId: $projectId, channelId: $channelUd, id:$id) {\n                id\n                user {\n                    nickname\n                    profile_url\n                    country\n                }\n                mark {\n                    user_id\n                    message_id\n                    sort_id\n                }\n                channel_id\n                user_id\n                online\n                push\n                created_at\n            }\n        }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -192,15 +194,14 @@ var getSubscriptions = function getSubscriptions(filter, sort, option) {
               query: query,
               variables: {
                 projectId: projectId,
-                option: option,
-                filter: filter,
-                sort: sort
+                channelId: channelId,
+                id: id
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            return data.data.subscriptions.edges;
+            if (data.data.subscription) data.data.subscription.id = (0, _Util.ObjectId)(data.data.subscription.id);
           })];
 
         case 1:
@@ -212,9 +213,9 @@ var getSubscriptions = function getSubscriptions(filter, sort, option) {
   });
 };
 
-exports.getSubscriptions = getSubscriptions;
+exports.getSubscription = getSubscription;
 
-var getSubscriptionByConnection = function getSubscriptionByConnection(channelId) {
+var getSubscriptions = function getSubscriptions(filter, sort, option) {
   return __awaiter(void 0, void 0, void 0, function () {
     var token, projectId, endpoint, query;
     return __generator(this, function (_a) {
@@ -229,7 +230,7 @@ var getSubscriptionByConnection = function getSubscriptionByConnection(channelId
           /*return*/
           , null];
           endpoint = _CoreManager["default"].get('SERVER_URL') + '/graphql';
-          query = "\n    query subscriptionsByConnection(\n        $projectId: String!, \n        $channelId: String!\n    ) {\n        subscriptionsByConnection(\n            projectId: $projectId\n            channelId: $channelId\n        ) {\n            totalCount\n            edges {\n                node {\n                id\n                project_id\n                channel_id\n                user_id\n                notice\n                member_read {\n                    id\n                    project_id\n                    channel_id\n                    member_id\n                    last_member_id\n                    last_message_id\n                    last_sort_id\n                    created_at\n                    updated_at\n                }\n                created_at\n                updated_at\n                }\n            }\n        }\n    }\n    ";
+          query = "\n        query subscriptions ($projectId: String!, $option: String!, $filter: String!, $sort: String ) {\n            subscriptions (projectId: $projectId, option:$option, filter:$filter, sort:$sort) {\n                totalCount\n                edges {\n                    node {\n                        id\n                        user {\n                            nickname\n                            profile_url\n                            country\n                        }\n                        channel_id\n                        user_id\n                        online\n                        push\n                        created_at\n                    }\n                }\n            }\n        }\n    ";
           return [4
           /*yield*/
           , fetch(endpoint, {
@@ -243,13 +244,15 @@ var getSubscriptionByConnection = function getSubscriptionByConnection(channelId
               query: query,
               variables: {
                 projectId: projectId,
-                channelId: channelId
+                option: option,
+                filter: filter,
+                sort: sort
               }
             })
           }).then(function (res) {
             return res.json();
           }).then(function (data) {
-            return data.data.subscriptionsByConnection.edges;
+            return data.data.subscriptions.edges;
           })];
 
         case 1:
@@ -261,4 +264,4 @@ var getSubscriptionByConnection = function getSubscriptionByConnection(channelId
   });
 };
 
-exports.getSubscriptionByConnection = getSubscriptionByConnection;
+exports.getSubscriptions = getSubscriptions;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ncloudchat",
   "jsName": "ncloudchat",
-  "version": "0.0.19-beta",
+  "version": "0.0.22-beta",
   "private": false,
   "description": "",
   "keywords": [