@webex/internal-plugin-conversation 2.60.0 → 2.60.1-next.2

package/dist/conversation.js

@@ -16,35 +16,23 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
-var _map2 = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/map"));
+var _map = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/map"));
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/assign"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/slicedToArray"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/typeof"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
 var _awaitAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/awaitAsyncGenerator"));
 var _wrapAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/wrapAsyncGenerator"));
-var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
-var _pick2 = _interopRequireDefault(require("lodash/pick"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _merge2 = _interopRequireDefault(require("lodash/merge"));
-var _map3 = _interopRequireDefault(require("lodash/map"));
-var _last2 = _interopRequireDefault(require("lodash/last"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
-var _defaults2 = _interopRequireDefault(require("lodash/defaults"));
-var _cloneDeepWith2 = _interopRequireDefault(require("lodash/cloneDeepWith"));
-var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _querystring = _interopRequireDefault(require("querystring"));
 var _events = require("events");
 var _hmacSha = _interopRequireDefault(require("crypto-js/hmac-sha256"));
 var _encHex = _interopRequireDefault(require("crypto-js/enc-hex"));
 var _common = require("@webex/common");
 var _webexCore = require("@webex/webex-core");
+var _lodash = require("lodash");
 var _helperImage = require("@webex/helper-image");
 var _uuid = _interopRequireDefault(require("uuid"));
 var _convoError = require("./convo-error");
@@ -55,9 +43,11 @@ var _constants = require("./constants");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && o[_Symbol$iterator] || o["@@iterator"]; if (!it) { if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-var idToUrl = new _map2.default();
+function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; } /*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+var idToUrl = new _map.default();
 var getConvoLimit = function getConvoLimit() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var limit;
@@ -99,7 +89,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: url
     });
-    if (!(0, _isObject2.default)(object)) {
+    if (!(0, _lodash.isObject)(object)) {
       return _promise.default.reject(new Error('`object` must be an object'));
     }
     return this.prepare(activity, {
@@ -185,7 +175,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       });
     })).then(function (participants) {
       participants.unshift(_this4.webex.internal.device.userId);
-      participants = (0, _uniq2.default)(participants);
+      participants = (0, _lodash.uniq)(participants);
       var validParticipants = participants.filter(function (participant) {
         return participant;
       });
@@ -268,12 +258,12 @@ var Conversation = _webexCore.WebexPlugin.extend({
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: url
     });
-    if (!(0, _isObject2.default)(reactionPayload)) {
+    if (!(0, _lodash.isObject)(reactionPayload)) {
       return _promise.default.reject(new Error('`object` must be an object'));
     }
     return this.prepare(reactionPayload, {
       target: this.prepareConversation(convoWithUrl),
-      object: (0, _pick2.default)(reactionPayload, 'id', 'url', 'objectType')
+      object: (0, _lodash.pick)(reactionPayload, 'id', 'url', 'objectType')
     }).then(function (act) {
       return _this5.submit(act);
     });
@@ -281,10 +271,11 @@ var Conversation = _webexCore.WebexPlugin.extend({
   /**
    * delete a reaction
    * @param {Object} conversation
-   * @param {Object} reactionId
+   * @param {Object} reactionId,
+   * @param {String} recipientId,
    * @returns {Promise<Activity>}
    */
-  deleteReaction: function deleteReaction(conversation, reactionId) {
+  deleteReaction: function deleteReaction(conversation, reactionId, recipientId) {
     var deleteReactionPayload = {
       actor: {
         objectType: 'person',
@@ -301,6 +292,16 @@ var Conversation = _webexCore.WebexPlugin.extend({
       },
       verb: 'delete'
     };
+
+    // Is not required for the request to be accepted, but follows specification.
+    if (recipientId) {
+      deleteReactionPayload.recipients = {
+        items: [{
+          id: recipientId,
+          objectType: 'person'
+        }]
+      };
+    }
     return this.sendReaction(conversation, deleteReactionPayload);
   },
   /**
@@ -308,9 +309,10 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @param {Object} conversation
    * @param {Object} displayName must be 'celebrate', 'heart', 'thumbsup', 'smiley', 'haha', 'confused', 'sad'
    * @param {Object} activity activity object from convo we are reacting to
+   * @param {String} recipientId,
    * @returns {Promise<Activity>}
    */
-  addReaction: function addReaction(conversation, displayName, activity) {
+  addReaction: function addReaction(conversation, displayName, activity, recipientId) {
     var _this6 = this;
     return this.createReactionHmac(displayName, activity).then(function (hmac) {
       var addReactionPayload = {
@@ -334,6 +336,14 @@ var Conversation = _webexCore.WebexPlugin.extend({
           hmac: hmac
         }
       };
+      if (recipientId) {
+        addReactionPayload.recipients = {
+          items: [{
+            id: recipientId,
+            objectType: 'person'
+          }]
+        };
+      }
       return _this6.sendReaction(conversation, addReactionPayload);
     });
   },
@@ -350,13 +360,13 @@ var Conversation = _webexCore.WebexPlugin.extend({
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: url
     });
-    if (!(0, _isObject2.default)(object)) {
+    if (!(0, _lodash.isObject)(object)) {
       return _promise.default.reject(new Error('`object` must be an object'));
     }
     var request = {
       verb: 'delete',
       target: this.prepareConversation(convoWithUrl),
-      object: (0, _pick2.default)(object, 'id', 'url', 'objectType')
+      object: (0, _lodash.pick)(object, 'id', 'url', 'objectType')
     };
 
     // Deleting meeting container requires KMS message
@@ -391,9 +401,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     var shunt = new _events.EventEmitter();
     var promise;
     if (isEncrypted) {
-      promise = this.webex.internal.encryption.download(item.scr, item.options);
-    } else if (item.scr && item.scr.loc) {
-      promise = this._downloadUnencryptedFile(item.scr.loc, options);
+      promise = this.webex.internal.encryption.download(item.url, item.scr, item.options);
     } else {
       promise = this._downloadUnencryptedFile(item.url, options);
     }
@@ -456,7 +464,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     if (!actor) {
       actor = this.webex.internal.device.userId;
     }
-    if ((0, _isString2.default)(actor)) {
+    if ((0, _lodash.isString)(actor)) {
       activity.actor = {
         objectType: 'person',
         id: actor
@@ -551,7 +559,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
         activitiesLimit: 0,
         includeConvWithDeletedUserUUID: false,
         includeParticipants: false
-      }, (0, _omit2.default)(options, 'id', 'user', 'url')),
+      }, (0, _lodash.omit)(options, 'id', 'user', 'url')),
       disableTransform: options.disableTransform
     };
 
@@ -639,7 +647,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     return this._list({
       service: 'conversation',
       resource: options.summary ? 'conversationsSummary' : 'conversations',
-      qs: (0, _omit2.default)(options, ['deferDecrypt', 'summary']),
+      qs: (0, _lodash.omit)(options, ['deferDecrypt', 'summary']),
       deferDecrypt: options.deferDecrypt,
       limit: getConvoLimit(options)
     }).then(function (results) {
@@ -704,7 +712,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
               activitiesLimit: 0,
               participantsLimit: 0,
               paginate: true
-            }, (0, _omit2.default)(options, ['deferDecrypt', 'url']));
+            }, (0, _lodash.omit)(options, ['deferDecrypt', 'url']));
             reqOptions = {
               qs: queryOptions,
               deferDecrypt: options.deferDecrypt,
@@ -862,7 +870,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
             break;
           case 16:
             // reverse list if needed (see _list for precedent)
-            if (items.length && (0, _last2.default)(items).published < items[0].published) {
+            if (items.length && (0, _lodash.last)(items).published < items[0].published) {
               items.reverse();
             }
             return _context3.abrupt("return", items);
@@ -950,7 +958,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     return this._list({
       service: 'conversation',
       resource: 'mentions',
-      qs: (0, _omit2.default)(options, 'mentions')
+      qs: (0, _lodash.omit)(options, 'mentions')
     });
   },
   /**
@@ -1028,7 +1036,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
     });
-    if ((0, _isString2.default)(message)) {
+    if ((0, _lodash.isString)(message)) {
       message = {
         displayName: message
       };
@@ -1044,7 +1052,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     });
   },
   prepareConversation: function prepareConversation(conversation) {
-    return (0, _defaults2.default)((0, _pick2.default)(conversation, 'id', 'url', 'objectType', 'defaultActivityEncryptionKeyUrl', 'kmsResourceObjectUrl'), {
+    return (0, _lodash.defaults)((0, _lodash.pick)(conversation, 'id', 'url', 'objectType', 'defaultActivityEncryptionKeyUrl', 'kmsResourceObjectUrl'), {
       objectType: 'conversation'
     });
   },
@@ -1053,7 +1061,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     params = params || {};
     activity = activity || {};
     return _promise.default.resolve(activity.prepare ? activity.prepare(params) : activity).then(function (act) {
-      (0, _defaults2.default)(act, {
+      (0, _lodash.defaults)(act, {
         verb: params.verb,
         kmsMessage: params.kmsMessage,
         objectType: 'activity',
@@ -1068,7 +1076,10 @@ var Conversation = _webexCore.WebexPlugin.extend({
           type: activity.activityType || activity.parent.type
         };
       }
-      if ((0, _isString2.default)(act.actor)) {
+      if (activity.recipients) {
+        act.recipients = activity.recipients;
+      }
+      if ((0, _lodash.isString)(act.actor)) {
         act.actor = {
           objectType: 'person',
           id: act.actor
@@ -1077,12 +1088,12 @@ var Conversation = _webexCore.WebexPlugin.extend({
       ['actor', 'object'].forEach(function (key) {
         if (params[key]) {
           act[key] = act[key] || {};
-          (0, _defaults2.default)(act[key], params[key]);
+          (0, _lodash.defaults)(act[key], params[key]);
         }
       });
       if (params.target) {
-        (0, _merge2.default)(act, {
-          target: (0, _pick2.default)(params.target, 'id', 'url', 'objectType', 'kmsResourceObjectUrl', 'defaultActivityEncryptionKeyUrl')
+        (0, _lodash.merge)(act, {
+          target: (0, _lodash.pick)(params.target, 'id', 'url', 'objectType', 'kmsResourceObjectUrl', 'defaultActivityEncryptionKeyUrl')
         });
       }
       ['object', 'target'].forEach(function (key) {
@@ -1117,7 +1128,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
             return _context6.abrupt("return", _this19._list({
               service: 'conversation',
               resource: 'threads',
-              qs: (0, _omit2.default)(options, 'showAllTypes')
+              qs: (0, _lodash.omit)(options, 'showAllTypes')
             }));
           case 1:
           case "end":
@@ -1288,7 +1299,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    */
   share: function share(conversation, activity) {
     var _this21 = this;
-    if ((0, _isArray2.default)(activity)) {
+    if ((0, _lodash.isArray)(activity)) {
       activity = {
         object: {
           files: activity
@@ -1340,13 +1351,13 @@ var Conversation = _webexCore.WebexPlugin.extend({
     var customActivityCopy = function customActivityCopy(value) {
       var files = params.body.object.files;
       if (files && value && files.items.length > 0 && value.constructor === files.items[0].scr.constructor) {
-        var copySrc = (0, _cloneDeep2.default)(value);
+        var copySrc = (0, _lodash.cloneDeep)(value);
         copySrc.toJWE = value.toJWE;
         copySrc.toJSON = value.toJSON;
         return copySrc;
       }
     };
-    var cloneActivity = (0, _cloneDeepWith2.default)(params, customActivityCopy);
+    var cloneActivity = (0, _lodash.cloneDeepWith)(params, customActivityCopy);
 
     // triggers user-activity to reset logout timer
     this.webex.trigger('user-activity');
@@ -1438,7 +1449,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    */
   update: function update(conversation, object, activity) {
     var _this24 = this;
-    if (!(0, _isObject2.default)(object)) {
+    if (!(0, _lodash.isObject)(object)) {
       return _promise.default.reject(new Error('`object` must be an object'));
     }
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
@@ -1491,7 +1502,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     return _promise.default.resolve(key || this.webex.internal.encryption.kms.createUnboundKeys({
       count: 1
     })).then(function (keys) {
-      var k = (0, _isArray2.default)(keys) ? keys[0] : keys;
+      var k = (0, _lodash.isArray)(keys) ? keys[0] : keys;
       var params = {
         verb: 'updateKey',
         target: _this26.prepareConversation(convoWithUrl),
@@ -1514,7 +1525,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
         params.kmsMessage = {
           method: 'create',
           uri: '/resources',
-          userIds: (0, _map3.default)(convoWithUrl.participants.items, 'id'),
+          userIds: (0, _lodash.map)(convoWithUrl.participants.items, 'id'),
           keyUris: [k.uri]
         };
       }
@@ -1635,7 +1646,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     });
     var resource = options.resource;
     return this._list({
-      qs: (0, _omit2.default)(options, 'resource'),
+      qs: (0, _lodash.omit)(options, 'resource'),
       url: "".concat(url, "/").concat(resource)
     });
   },
@@ -1674,7 +1685,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       url: conversationUrl,
       id: conversationId
     });
-    var baseOptions = _objectSpread(_objectSpread({}, (0, _omit2.default)(options, ['conversationUrl', 'conversationId'])), {}, {
+    var baseOptions = _objectSpread(_objectSpread({}, (0, _lodash.omit)(options, ['conversationUrl', 'conversationId'])), {}, {
       url: url
     });
     var olderOptions = _objectSpread(_objectSpread({}, baseOptions), {}, {
@@ -1862,7 +1873,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
             /* eslint-disable no-await-in-loop */
             /* eslint-disable no-loop-func */
             _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
-              var _rootActivityManager, getRootActivityHash, addNewRoot, _noMoreActivitiesMana, getNoMoreActs, checkAndSetNoMoreActs, checkAndSetNoOlderActs, checkAndSetNoNewerActs, getActivityHandlerByType, handleNewActivity, handleNewActivities, handleOlderQuery, handleNewerQuery, handleSearch, getQueryResponseHandler, incrementLoopCounter, _loop2, _ret2, orderedActivities, getRepliesByParentId, orderedRoots, nextOptions, currentOldestPublishedDate, currentNewestPublishedDate;
+              var _rootActivityManager, getRootActivityHash, addNewRoot, _noMoreActivitiesMana, getNoMoreActs, checkAndSetNoMoreActs, checkAndSetNoOlderActs, checkAndSetNoNewerActs, getActivityHandlerByType, handleNewActivity, handleNewActivities, handleOlderQuery, handleNewerQuery, handleSearch, getQueryResponseHandler, incrementLoopCounter, _loop2, orderedActivities, getRepliesByParentId, orderedRoots, nextOptions, currentOldestPublishedDate, currentNewestPublishedDate;
               return _regenerator.default.wrap(function _loop$(_context11) {
                 while (1) switch (_context11.prev = _context11.next) {
                   case 0:
@@ -1875,8 +1886,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
                     // must be set per iteration, as querying newer activities is still valid when all end of convo has been reached
                     _noMoreActivitiesMana = (0, _activityThreadOrdering.noMoreActivitiesManager)(), getNoMoreActs = _noMoreActivitiesMana.getNoMoreActs, checkAndSetNoMoreActs = _noMoreActivitiesMana.checkAndSetNoMoreActs, checkAndSetNoOlderActs = _noMoreActivitiesMana.checkAndSetNoOlderActs, checkAndSetNoNewerActs = _noMoreActivitiesMana.checkAndSetNoNewerActs;
                     getActivityHandlerByType = function getActivityHandlerByType(type) {
-                      var _ACTIVITY_TYPES$ROOT$;
-                      return (_ACTIVITY_TYPES$ROOT$ = {}, (0, _defineProperty2.default)(_ACTIVITY_TYPES$ROOT$, _activities.ACTIVITY_TYPES.ROOT, addNewRoot), (0, _defineProperty2.default)(_ACTIVITY_TYPES$ROOT$, _activities.ACTIVITY_TYPES.REPLY, getActivityHandlerByKey(_activities.ACTIVITY_TYPES.REPLY)), (0, _defineProperty2.default)(_ACTIVITY_TYPES$ROOT$, _activities.ACTIVITY_TYPES.EDIT, getActivityHandlerByKey(_activities.ACTIVITY_TYPES.EDIT)), (0, _defineProperty2.default)(_ACTIVITY_TYPES$ROOT$, _activities.ACTIVITY_TYPES.REACTION, getActivityHandlerByKey(_activities.ACTIVITY_TYPES.REACTION)), (0, _defineProperty2.default)(_ACTIVITY_TYPES$ROOT$, _activities.ACTIVITY_TYPES.REACTION_SELF, getActivityHandlerByKey(_activities.ACTIVITY_TYPES.REACTION_SELF)), (0, _defineProperty2.default)(_ACTIVITY_TYPES$ROOT$, _activities.ACTIVITY_TYPES.TOMBSTONE, addNewRoot), (0, _defineProperty2.default)(_ACTIVITY_TYPES$ROOT$, _activities.ACTIVITY_TYPES.CREATE, addNewRoot), _ACTIVITY_TYPES$ROOT$)[type];
+                      return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _activities.ACTIVITY_TYPES.ROOT, addNewRoot), _activities.ACTIVITY_TYPES.REPLY, getActivityHandlerByKey(_activities.ACTIVITY_TYPES.REPLY)), _activities.ACTIVITY_TYPES.EDIT, getActivityHandlerByKey(_activities.ACTIVITY_TYPES.EDIT)), _activities.ACTIVITY_TYPES.REACTION, getActivityHandlerByKey(_activities.ACTIVITY_TYPES.REACTION)), _activities.ACTIVITY_TYPES.REACTION_SELF, getActivityHandlerByKey(_activities.ACTIVITY_TYPES.REACTION_SELF)), _activities.ACTIVITY_TYPES.TOMBSTONE, addNewRoot), _activities.ACTIVITY_TYPES.CREATE, addNewRoot)[type];
                     };
                     handleNewActivity = function handleNewActivity(activity) {
                       var actType = (0, _activities.getActivityType)(activity);
@@ -1910,8 +1920,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
                       handleNewActivities(activities);
                     };
                     getQueryResponseHandler = function getQueryResponseHandler(type) {
-                      var _OLDER$NEWER$MID$INIT;
-                      return (_OLDER$NEWER$MID$INIT = {}, (0, _defineProperty2.default)(_OLDER$NEWER$MID$INIT, _activities.OLDER, handleOlderQuery), (0, _defineProperty2.default)(_OLDER$NEWER$MID$INIT, _activities.NEWER, handleNewerQuery), (0, _defineProperty2.default)(_OLDER$NEWER$MID$INIT, _activities.MID, handleSearch), (0, _defineProperty2.default)(_OLDER$NEWER$MID$INIT, _activities.INITIAL, handleOlderQuery), _OLDER$NEWER$MID$INIT)[type];
+                      return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _activities.OLDER, handleOlderQuery), _activities.NEWER, handleNewerQuery), _activities.MID, handleSearch), _activities.INITIAL, handleOlderQuery)[type];
                     }; // ***********************************************
                     // INNER LOOP
                     // responsible for fetching and building our maps of activities
@@ -2059,7 +2068,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
                               _context10.next = 41;
                               break;
                             }
-                            return _context10.abrupt("return", "break");
+                            return _context10.abrupt("return", 1);
                           case 41:
                             checkAndSetNoMoreActs(queryType, visibleActivitiesCount, batchSize);
 
@@ -2102,21 +2111,20 @@ var Conversation = _webexCore.WebexPlugin.extend({
                     });
                   case 11:
                     if (getNoMoreActs()) {
-                      _context11.next = 18;
+                      _context11.next = 17;
                       break;
                     }
                     return _context11.delegateYield(_loop2(), "t0", 13);
                   case 13:
-                    _ret2 = _context11.t0;
-                    if (!(_ret2 === "break")) {
-                      _context11.next = 16;
+                    if (!_context11.t0) {
+                      _context11.next = 15;
                       break;
                     }
-                    return _context11.abrupt("break", 18);
-                  case 16:
+                    return _context11.abrupt("break", 17);
+                  case 15:
                     _context11.next = 11;
                     break;
-                  case 18:
+                  case 17:
                     orderedActivities = [];
                     getRepliesByParentId = function getRepliesByParentId(replyParentId) {
                       var replies = [];
@@ -2170,12 +2178,12 @@ var Conversation = _webexCore.WebexPlugin.extend({
                         return orderedActivities.push(reply);
                       });
                     });
-                    _context11.next = 24;
+                    _context11.next = 23;
                     return orderedActivities;
-                  case 24:
+                  case 23:
                     nextOptions = _context11.sent;
                     if (!nextOptions) {
-                      _context11.next = 33;
+                      _context11.next = 32;
                       break;
                     }
                     minActivities = nextOptions.minActivities || minActivities;
@@ -2188,13 +2196,13 @@ var Conversation = _webexCore.WebexPlugin.extend({
                       newestPublishedDate: currentNewestPublishedDate,
                       batchSize: batchSize
                     });
-                    _context11.next = 34;
+                    _context11.next = 33;
                     break;
-                  case 33:
+                  case 32:
                     return _context11.abrupt("return", {
                       v: void 0
                     });
-                  case 34:
+                  case 33:
                   case "end":
                     return _context11.stop();
                 }
@@ -2208,7 +2216,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
             return _context12.delegateYield(_loop(), "t0", 11);
           case 11:
             _ret = _context12.t0;
-            if (!((0, _typeof2.default)(_ret) === "object")) {
+            if (!_ret) {
               _context12.next = 14;
               break;
             }
@@ -2305,7 +2313,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
               list = [];
             } else {
               list = res.body.items.slice(0);
-              if ((0, _last2.default)(list).published < list[0].published) {
+              if ((0, _lodash.last)(list).published < list[0].published) {
                 list.reverse();
               }
             }
@@ -2352,7 +2360,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
                 result = _step6.value;
                 if (result.body && result.body.items && result.body.items.length) {
                   items = result.body.items;
-                  if ((0, _last2.default)(items).published < items[0].published) {
+                  if ((0, _lodash.last)(items).published < items[0].published) {
                     items.reverse();
                   }
                   list = list.concat(items);
@@ -2385,7 +2393,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    */
   _maybeCreateOneOnOneThenPost: function _maybeCreateOneOnOneThenPost(params, options) {
     var _this31 = this;
-    return this.get((0, _defaults2.default)({
+    return this.get((0, _lodash.defaults)({
       // the use of uniq in Conversation#create guarantees participant[1] will
       // always be the other user
       user: params.participants[1]
@@ -2425,7 +2433,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       kmsMessage: {
         method: 'create',
         uri: '/resources',
-        userIds: (0, _cloneDeep2.default)(params.participants),
+        userIds: (0, _lodash.cloneDeep)(params.participants),
         keyUris: []
       }
     };
@@ -2483,7 +2491,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       });
     }));
   },
-  version: "2.60.0"
+  version: "2.60.1-next.2"
 });
 ['favorite', 'hide', 'lock', 'mute', 'unfavorite', 'unhide', 'unlock', 'unmute'].forEach(function (verb) {
   Conversation.prototype[verb] = function submitSimpleActivity(conversation, activity) {
@@ -2535,7 +2543,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
   var verb = fnName.startsWith('set') ? 'set' : 'unset';
   Conversation.prototype[fnName] = function submitSpacePropertyActivity(conversation, tag, activity) {
     var _this36 = this;
-    if (!(0, _isString2.default)(tag)) {
+    if (!(0, _lodash.isString)(tag)) {
       return _promise.default.reject(new Error('`tag` must be a string'));
     }
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
@@ -2556,7 +2564,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
 ['tag', 'untag'].forEach(function (verb) {
   Conversation.prototype[verb] = function submitObjectActivity(conversation, object, activity) {
     var _this37 = this;
-    if (!(0, _isObject2.default)(object)) {
+    if (!(0, _lodash.isObject)(object)) {
       return _promise.default.reject(new Error('`object` must be an object'));
     }
     var c = this.prepareConversation(_objectSpread(_objectSpread({}, conversation), {}, {
@@ -2571,6 +2579,5 @@ var Conversation = _webexCore.WebexPlugin.extend({
     });
   };
 });
-var _default = Conversation;
-exports.default = _default;
+var _default = exports.default = Conversation;
 //# sourceMappingURL=conversation.js.map