@webex/internal-plugin-conversation 3.10.0-next.3 → 3.10.0-next.4

package/dist/conversation.js

@@ -43,9 +43,9 @@ var _shareActivity = _interopRequireDefault(require("./share-activity"));
 var _activityThreadOrdering = require("./activity-thread-ordering");
 var _activities = require("./activities");
 var _constants = require("./constants");
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && o[_Symbol$iterator] || o["@@iterator"]; if (!it) { if (_Array$isArray2(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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof _Symbol && r[_Symbol$iterator] || r["@@iterator"]; if (!t) { if (_Array$isArray2(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? _Array$from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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.
@@ -329,20 +329,20 @@ var Conversation = _webexCore.WebexPlugin.extend({
    */
   addReaction: function addReaction(conversation, displayName, parentActivity, actorId, recipientId) {
     var _this7 = this;
-    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee() {
       var hmac, addReactionPayload;
-      return _regenerator.default.wrap(function _callee$(_context) {
+      return _regenerator.default.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!_this7.config.includeEncryptionTransforms) {
-              _context.next = 4;
+              _context.next = 2;
               break;
             }
-            _context.next = 3;
+            _context.next = 1;
             return _this7.createReactionHmac(displayName, parentActivity);
-          case 3:
+          case 1:
             hmac = _context.sent;
-          case 4:
+          case 2:
             addReactionPayload = {
               actor: {
                 objectType: 'person',
@@ -373,7 +373,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
               };
             }
             return _context.abrupt("return", _this7.sendReaction(conversation, addReactionPayload));
-          case 7:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -576,7 +576,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Conversation>}
    */
   get: function get(conversation) {
-    var _this10 = this;
+    var _this0 = this;
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var user = conversation.user;
     var uri;
@@ -612,12 +612,12 @@ var Conversation = _webexCore.WebexPlugin.extend({
       } else {
         params.uri = uri;
       }
-      return _this10.request(params);
+      return _this0.request(params);
     }).then((0, _common.tap)(function (_ref2) {
       var body = _ref2.body;
       var id = body.id,
         url = body.url;
-      _this10._recordUUIDs(body);
+      _this0._recordUUIDs(body);
       idToUrl.set(id, url);
     })).then(function (res) {
       return res.body;
@@ -635,18 +635,18 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Activity>}
    */
   leave: function leave(conversation, participant, activity) {
-    var _this11 = this;
+    var _this1 = this;
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
     });
     return _promise.default.resolve().then(function () {
       if (!participant) {
-        participant = _this11.webex.internal.device.userId;
+        participant = _this1.webex.internal.device.userId;
       }
-      return _this11.webex.internal.user.asUUID(participant).then(function (id) {
-        return _this11.prepare(activity, {
+      return _this1.webex.internal.user.asUUID(participant).then(function (id) {
+        return _this1.prepare(activity, {
           verb: 'leave',
-          target: _this11.prepareConversation(convoWithUrl),
+          target: _this1.prepareConversation(convoWithUrl),
           object: {
             id: id,
             objectType: 'person'
@@ -660,7 +660,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
         });
       });
     }).then(function (a) {
-      return _this11.submit(a);
+      return _this1.submit(a);
     });
   },
   /**
@@ -713,31 +713,31 @@ var Conversation = _webexCore.WebexPlugin.extend({
    */
   paginate: function paginate() {
     var _arguments = arguments,
-      _this12 = this;
-    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      _this10 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2() {
       var options, queryOptions, reqOptions;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
+      return _regenerator.default.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             options = _arguments.length > 0 && _arguments[0] !== undefined ? _arguments[0] : {};
             if (!options.page) {
-              _context2.next = 5;
+              _context2.next = 2;
               break;
             }
             if (!(!options.page.links || !options.page.links.next)) {
-              _context2.next = 4;
+              _context2.next = 1;
               break;
             }
             throw new Error('No link to follow for the provided page');
-          case 4:
-            return _context2.abrupt("return", _this12.request({
+          case 1:
+            return _context2.abrupt("return", _this10.request({
               url: options.page.links.next
             }).then(function (res) {
               return {
-                page: new _webexCore.Page(res, _this12.webex)
+                page: new _webexCore.Page(res, _this10.webex)
               };
             }));
-          case 5:
+          case 2:
             // No page - so this is the first request to kick off the pagination process
             queryOptions = _objectSpread({
               personRefresh: true,
@@ -758,16 +758,16 @@ var Conversation = _webexCore.WebexPlugin.extend({
               reqOptions.service = 'conversation';
               reqOptions.resource = 'conversations';
             }
-            return _context2.abrupt("return", _this12.request(reqOptions).then(function (res) {
+            return _context2.abrupt("return", _this10.request(reqOptions).then(function (res) {
               var response = {
-                page: new _webexCore.Page(res, _this12.webex)
+                page: new _webexCore.Page(res, _this10.webex)
               };
               if (res.body && res.body.additionalUrls) {
                 response.additionalUrls = res.body.additionalUrls;
               }
               return response;
             }));
-          case 9:
+          case 3:
           case "end":
             return _context2.stop();
         }
@@ -831,10 +831,10 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Array<String>>}
    */
   listParentActivityIds: function listParentActivityIds(conversationUrl, query) {
-    var _this13 = this;
-    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+    var _this11 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3() {
       var params, response;
-      return _regenerator.default.wrap(function _callee3$(_context3) {
+      return _regenerator.default.wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             params = {
@@ -842,12 +842,12 @@ var Conversation = _webexCore.WebexPlugin.extend({
               url: "".concat(conversationUrl, "/parents"),
               qs: query
             };
-            _context3.next = 3;
-            return _this13.request(params);
-          case 3:
+            _context3.next = 1;
+            return _this11.request(params);
+          case 1:
             response = _context3.sent;
             return _context3.abrupt("return", response.body);
-          case 5:
+          case 2:
           case "end":
             return _context3.stop();
         }
@@ -864,29 +864,29 @@ var Conversation = _webexCore.WebexPlugin.extend({
    */
   listAllChildActivitiesByParentId: function listAllChildActivitiesByParentId() {
     var _arguments2 = arguments,
-      _this14 = this;
-    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      _this12 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4() {
       var options, conversationUrl, activityParentId, query, activityType, initialResponse, page, items, _iterator3, _step3, activity;
-      return _regenerator.default.wrap(function _callee4$(_context4) {
+      return _regenerator.default.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             options = _arguments2.length > 0 && _arguments2[0] !== undefined ? _arguments2[0] : {};
             conversationUrl = options.conversationUrl, activityParentId = options.activityParentId, query = options.query;
             activityType = query.activityType;
-            _context4.next = 5;
-            return _this14.listChildActivitiesByParentId(conversationUrl, activityParentId, activityType, query);
-          case 5:
+            _context4.next = 1;
+            return _this12.listChildActivitiesByParentId(conversationUrl, activityParentId, activityType, query);
+          case 1:
             initialResponse = _context4.sent;
-            page = new _webexCore.Page(initialResponse, _this14.webex);
+            page = new _webexCore.Page(initialResponse, _this12.webex);
             items = (0, _toConsumableArray2.default)(page.items);
-          case 8:
+          case 2:
             if (!page.hasNext()) {
-              _context4.next = 16;
+              _context4.next = 4;
               break;
             }
-            _context4.next = 11;
+            _context4.next = 3;
             return page.next();
-          case 11:
+          case 3:
             page = _context4.sent;
             _iterator3 = _createForOfIteratorHelper(page);
             try {
@@ -899,15 +899,15 @@ var Conversation = _webexCore.WebexPlugin.extend({
             } finally {
               _iterator3.f();
             }
-            _context4.next = 8;
+            _context4.next = 2;
             break;
-          case 16:
+          case 4:
             // reverse list if needed (see _list for precedent)
             if (items.length && (0, _lodash.last)(items).published < items[0].published) {
               items.reverse();
             }
             return _context4.abrupt("return", items);
-          case 18:
+          case 5:
           case "end":
             return _context4.stop();
         }
@@ -925,10 +925,10 @@ var Conversation = _webexCore.WebexPlugin.extend({
    */
   listChildActivitiesByParentId: function listChildActivitiesByParentId(conversationUrl, activityParentId, activityType) {
     var _arguments3 = arguments,
-      _this15 = this;
-    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+      _this13 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5() {
       var query, finalQuery, params;
-      return _regenerator.default.wrap(function _callee5$(_context5) {
+      return _regenerator.default.wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             query = _arguments3.length > 3 && _arguments3[3] !== undefined ? _arguments3[3] : {};
@@ -940,8 +940,8 @@ var Conversation = _webexCore.WebexPlugin.extend({
               url: "".concat(conversationUrl, "/parents/").concat(activityParentId),
               qs: finalQuery
             };
-            return _context5.abrupt("return", _this15.request(params));
-          case 4:
+            return _context5.abrupt("return", _this13.request(params));
+          case 1:
           case "end":
             return _context5.stop();
         }
@@ -956,26 +956,26 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Array>}
    */
   getReactionSummaryByParentId: function getReactionSummaryByParentId(conversationUrl, activityParentId, query) {
-    var _this16 = this;
-    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-      var _yield$_this16$reques, body, reactionObjects;
-      return _regenerator.default.wrap(function _callee6$(_context6) {
+    var _this14 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6() {
+      var _yield$_this14$reques, body, reactionObjects;
+      return _regenerator.default.wrap(function (_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context6.next = 2;
-            return _this16.request({
+            _context6.next = 1;
+            return _this14.request({
               method: 'GET',
               url: "".concat(conversationUrl, "/activities/").concat(activityParentId),
               qs: query
             });
-          case 2:
-            _yield$_this16$reques = _context6.sent;
-            body = _yield$_this16$reques.body;
+          case 1:
+            _yield$_this14$reques = _context6.sent;
+            body = _yield$_this14$reques.body;
             reactionObjects = body.children ? body.children.filter(function (child) {
               return child.type === 'reactionSelfSummary' || child.type === 'reactionSummary';
             }) : [];
             return _context6.abrupt("return", reactionObjects);
-          case 6:
+          case 2:
           case "end":
             return _context6.stop();
         }
@@ -1035,7 +1035,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise}
    */
   cardAction: function cardAction(conversation, inputs, parentActivity) {
-    var _this17 = this;
+    var _this15 = this;
     var activity = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
@@ -1051,7 +1051,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
         objectType: 'submit'
       }, inputs)
     }).then(function (a) {
-      return _this17.submit(a);
+      return _this15.submit(a);
     });
   },
   /**
@@ -1065,7 +1065,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Activity>}
    */
   post: function post(conversation, message, activity) {
-    var _this18 = this;
+    var _this16 = this;
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
     });
@@ -1081,7 +1081,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
         objectType: 'comment'
       }, message)
     }).then(function (a) {
-      return _this18.submit(a);
+      return _this16.submit(a);
     });
   },
   prepareConversation: function prepareConversation(conversation) {
@@ -1090,7 +1090,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     });
   },
   prepare: function prepare(activity, params) {
-    var _this19 = this;
+    var _this17 = this;
     params = params || {};
     activity = activity || {};
     return _promise.default.resolve(activity.prepare ? activity.prepare(params) : activity).then(function (act) {
@@ -1099,7 +1099,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
         kmsMessage: params.kmsMessage,
         objectType: 'activity',
         clientTempId: _uuid.default.v4(),
-        actor: _this19.webex.internal.device.userId
+        actor: _this17.webex.internal.device.userId
       });
 
       // Workaround because parent is a reserved props in Ampersand
@@ -1153,12 +1153,12 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Array<Activity>>}
    */
   listThreads: function listThreads(options) {
-    var _this20 = this;
-    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
-      return _regenerator.default.wrap(function _callee7$(_context7) {
+    var _this18 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7() {
+      return _regenerator.default.wrap(function (_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            return _context7.abrupt("return", _this20._list({
+            return _context7.abrupt("return", _this18._list({
               service: 'conversation',
               resource: 'threads',
               qs: (0, _lodash.omit)(options, 'showAllTypes')
@@ -1222,7 +1222,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Activity>}
    */
   assign: function assign(conversation, avatar) {
-    var _this21 = this;
+    var _this19 = this;
     var uploadOptions = {
       role: 'spaceAvatar'
     };
@@ -1233,17 +1233,17 @@ var Conversation = _webexCore.WebexPlugin.extend({
       url: this.getConvoUrl(conversation)
     });
     return _promise.default.resolve().then(function () {
-      var activity = _shareActivity.default.create(conversation, null, _this21.webex);
+      var activity = _shareActivity.default.create(conversation, null, _this19.webex);
       activity.enableThumbnails = false;
       activity.add(avatar, uploadOptions);
-      return _this21.prepare(activity, {
-        target: _this21.prepareConversation(convoWithUrl)
+      return _this19.prepare(activity, {
+        target: _this19.prepareConversation(convoWithUrl)
       });
     }).then(function (a) {
       // yes, this seems a little hacky; will likely be resolved as a result
       // of #213
       a.verb = 'assign';
-      return _this21.submit(a);
+      return _this19.submit(a);
     });
   },
   /**
@@ -1331,7 +1331,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Activity>}
    */
   share: function share(conversation, activity) {
-    var _this22 = this;
+    var _this20 = this;
     if ((0, _lodash.isArray)(activity)) {
       activity = {
         object: {
@@ -1348,7 +1348,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
     return this.prepare(activity, {
       target: this.prepareConversation(convoWithUrl)
     }).then(function (a) {
-      return _this22.submit(a);
+      return _this20.submit(a);
     });
   },
   /**
@@ -1358,7 +1358,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Activity>}
    */
   submit: function submit(activity, endpoint) {
-    var _this23 = this;
+    var _this21 = this;
     var url = endpoint || this.getConvoUrl(activity.target);
     var resource = activity.verb === 'share' ? 'content' : 'activities';
     var params = {
@@ -1400,16 +1400,16 @@ var Conversation = _webexCore.WebexPlugin.extend({
       // handle when key need to rotate
       if (error.body && error.body.errorCode === _constants.KEY_ROTATION_REQUIRED) {
         cloneActivity.body.target.defaultActivityEncryptionKeyUrl = null;
-        _this23.request(cloneActivity);
+        _this21.request(cloneActivity);
       } else if (error.body && (error.body.errorCode === _constants.KEY_ALREADY_ROTATED || error.body.errorCode === _constants.ENCRYPTION_KEY_URL_MISMATCH)) {
         // handle when key need to update
-        _this23.webex.request({
+        _this21.webex.request({
           method: 'GET',
           api: 'conversation',
           resource: "conversations/".concat(params.body.target.id)
         }).then(function (res) {
           cloneActivity.body.target.defaultActivityEncryptionKeyUrl = res.body.defaultActivityEncryptionkeyUrl;
-          _this23.request(cloneActivity);
+          _this21.request(cloneActivity);
         });
       } else {
         throw error;
@@ -1423,7 +1423,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise}
    */
   unassign: function unassign(conversation, activity) {
-    var _this24 = this;
+    var _this22 = this;
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
     });
@@ -1437,7 +1437,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
         }
       }
     }).then(function (a) {
-      return _this24.submit(a);
+      return _this22.submit(a);
     });
   },
   /**
@@ -1481,7 +1481,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise}
    */
   update: function update(conversation, object, activity) {
-    var _this25 = this;
+    var _this23 = this;
     if (!(0, _lodash.isObject)(object)) {
       return _promise.default.reject(new Error('`object` must be an object'));
     }
@@ -1493,7 +1493,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       target: this.prepareConversation(convoWithUrl),
       object: object
     }).then(function (a) {
-      return _this25.submit(a);
+      return _this23.submit(a);
     });
   },
   /**
@@ -1506,7 +1506,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Activity>}
    */
   updateKey: function updateKey(conversation, key, activity) {
-    var _this26 = this;
+    var _this24 = this;
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
     });
@@ -1514,7 +1514,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       activitiesLimit: 0,
       includeParticipants: true
     }).then(function (c) {
-      return _this26._updateKey(c, key, activity);
+      return _this24._updateKey(c, key, activity);
     });
   },
   /**
@@ -1528,7 +1528,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Activity>}
    */
   _updateKey: function _updateKey(conversation, key, activity) {
-    var _this27 = this;
+    var _this25 = this;
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
     });
@@ -1538,7 +1538,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       var k = (0, _lodash.isArray)(keys) ? keys[0] : keys;
       var params = {
         verb: 'updateKey',
-        target: _this27.prepareConversation(convoWithUrl),
+        target: _this25.prepareConversation(convoWithUrl),
         object: {
           defaultActivityEncryptionKeyUrl: k.uri,
           objectType: 'conversation'
@@ -1562,8 +1562,8 @@ var Conversation = _webexCore.WebexPlugin.extend({
           keyUris: [k.uri]
         };
       }
-      return _this27.prepare(activity, params).then(function (a) {
-        return _this27.submit(a);
+      return _this25.prepare(activity, params).then(function (a) {
+        return _this25.submit(a);
       });
     });
   },
@@ -1613,7 +1613,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<string>} - conversation url
    */
   getConversationUrl: function getConversationUrl() {
-    var _this28 = this;
+    var _this26 = this;
     this.logger.info('conversation: getting the conversation service url');
     var convoUrl = this.webex.internal.services.get('conversation');
 
@@ -1626,9 +1626,9 @@ var Conversation = _webexCore.WebexPlugin.extend({
     // Wait for the postauth catalog to update and then try to retrieve the
     // conversation service url again.
     return this.webex.internal.waitForCatalog('postauth').then(function () {
-      return _this28.webex.internal.services.get('conversation');
+      return _this26.webex.internal.services.get('conversation');
     }).catch(function (error) {
-      _this28.logger.warn('conversation: unable to get conversation url', error.message);
+      _this26.logger.warn('conversation: unable to get conversation url', error.message);
       return _promise.default.reject(error);
     });
   },
@@ -1638,23 +1638,23 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise}
    */
   _inferConversationUrl: function _inferConversationUrl(conversation) {
-    var _this29 = this;
+    var _this27 = this;
     if (conversation.id) {
       return this.webex.internal.feature.getFeature('developer', 'web-high-availability').then(function (haMessagingEnabled) {
         if (haMessagingEnabled) {
           // recompute conversation URL each time as the host may have changed
           // since last usage
-          return _this29.getConversationUrl().then(function (url) {
+          return _this27.getConversationUrl().then(function (url) {
             conversation.url = "".concat(url, "/conversations/").concat(conversation.id);
             return conversation;
           });
         }
         if (!conversation.url) {
-          return _this29.getConversationUrl().then(function (url) {
+          return _this27.getConversationUrl().then(function (url) {
             conversation.url = "".concat(url, "/conversations/").concat(conversation.id);
             /* istanbul ignore else */
             if (process.env.NODE_ENV !== 'production') {
-              _this29.logger.warn('conversation: inferred conversation url from conversation id; please pass whole conversation objects to Conversation methods');
+              _this27.logger.warn('conversation: inferred conversation url from conversation id; please pass whole conversation objects to Conversation methods');
             }
             return conversation;
           });
@@ -1708,7 +1708,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * jumpToActivity - gets searched-for activity and surrounding activities
    */
   listActivitiesThreadOrdered: function listActivitiesThreadOrdered(options) {
-    var _this30 = this;
+    var _this28 = this;
     var conversationUrl = options.conversationUrl,
       conversationId = options.conversationId;
     if (!conversationUrl && !conversationId) {
@@ -1734,40 +1734,40 @@ var Conversation = _webexCore.WebexPlugin.extend({
      * @returns {IGeneratorResponse}
      */
     var jumpToActivity = /*#__PURE__*/function () {
-      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(searchObject) {
+      var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8(searchObject) {
         var newUrl, searchOptions, _yield$threadOrderer$, searchResults;
-        return _regenerator.default.wrap(function _callee8$(_context8) {
+        return _regenerator.default.wrap(function (_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (searchObject) {
-                _context8.next = 2;
+                _context8.next = 1;
                 break;
               }
               throw new Error('Search must be an activity object from conversation service');
-            case 2:
+            case 1:
               newUrl = searchObject.target && searchObject.target.url;
               if (newUrl) {
-                _context8.next = 5;
+                _context8.next = 2;
                 break;
               }
               throw new Error('Search object must have a target url!');
-            case 5:
+            case 2:
               searchOptions = _objectSpread(_objectSpread({}, baseOptions), {}, {
                 url: newUrl,
                 queryType: _activities.MID,
                 search: searchObject
               });
-              threadOrderer = _this30._listActivitiesThreadOrdered(searchOptions);
-              _context8.next = 9;
+              threadOrderer = _this28._listActivitiesThreadOrdered(searchOptions);
+              _context8.next = 3;
               return threadOrderer.next(searchOptions);
-            case 9:
+            case 3:
               _yield$threadOrderer$ = _context8.sent;
               searchResults = _yield$threadOrderer$.value;
               return _context8.abrupt("return", {
                 done: true,
                 value: searchResults
               });
-            case 12:
+            case 4:
             case "end":
               return _context8.stop();
           }
@@ -1783,14 +1783,14 @@ var Conversation = _webexCore.WebexPlugin.extend({
      * @returns {IGeneratorResponse}
      */
     var getOlder = /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
+      var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9() {
         var _yield$threadOrderer$2, _yield$threadOrderer$3, value, oldestInBatch, moreActivitiesExist;
-        return _regenerator.default.wrap(function _callee9$(_context9) {
+        return _regenerator.default.wrap(function (_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context9.next = 2;
+              _context9.next = 1;
               return threadOrderer.next(olderOptions);
-            case 2:
+            case 1:
               _yield$threadOrderer$2 = _context9.sent;
               _yield$threadOrderer$3 = _yield$threadOrderer$2.value;
               value = _yield$threadOrderer$3 === void 0 ? [] : _yield$threadOrderer$3;
@@ -1800,7 +1800,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
                 done: !moreActivitiesExist,
                 value: value
               });
-            case 8:
+            case 2:
             case "end":
               return _context9.stop();
           }
@@ -1816,28 +1816,28 @@ var Conversation = _webexCore.WebexPlugin.extend({
      * @returns {IGeneratorResponse}
      */
     var getNewer = /*#__PURE__*/function () {
-      var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
+      var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee0() {
         var newerOptions, _yield$threadOrderer$4, value;
-        return _regenerator.default.wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regenerator.default.wrap(function (_context0) {
+          while (1) switch (_context0.prev = _context0.next) {
             case 0:
               newerOptions = _objectSpread(_objectSpread({}, baseOptions), {}, {
                 queryType: _activities.NEWER
               });
-              _context10.next = 3;
+              _context0.next = 1;
               return threadOrderer.next(newerOptions);
-            case 3:
-              _yield$threadOrderer$4 = _context10.sent;
+            case 1:
+              _yield$threadOrderer$4 = _context0.sent;
               value = _yield$threadOrderer$4.value;
-              return _context10.abrupt("return", {
+              return _context0.abrupt("return", {
                 done: !value.length,
                 value: value
               });
-            case 6:
+            case 2:
             case "end":
-              return _context10.stop();
+              return _context0.stop();
           }
-        }, _callee10);
+        }, _callee0);
       }));
       return function getNewer() {
         return _ref6.apply(this, arguments);
@@ -1879,390 +1879,392 @@ var Conversation = _webexCore.WebexPlugin.extend({
    */
   _listActivitiesThreadOrdered: function _listActivitiesThreadOrdered() {
     var _this = this;
-    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    return (0, _wrapAsyncGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
-      var _options$minActivitie, minActivities, _options$queryType, queryType, convoUrl, _options$search, search, includeChildren, _bookendManager, setBookends, getNewestAct, getOldestAct, defaultBatchSize, batchSize, _activityManager, getActivityHandlerByKey, getActivityByTypeAndParentId, query, _loop, _ret;
-      return _regenerator.default.wrap(function _callee11$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
-          case 0:
-            // ***********************************************
-            // INSTANCE STATE VARIABLES
-            // variables that will be used for the life of the generator
-            // ***********************************************
-            _options$minActivitie = options.minActivities, minActivities = _options$minActivitie === void 0 ? _activityThreadOrdering.defaultMinDisplayableActivities : _options$minActivitie, _options$queryType = options.queryType, queryType = _options$queryType === void 0 ? _activities.INITIAL : _options$queryType; // must fetch initially before getting newer activities!
-            if (queryType === _activities.NEWER) {
-              queryType = _activities.INITIAL;
-            }
-            convoUrl = options.url, _options$search = options.search, search = _options$search === void 0 ? {} : _options$search, includeChildren = options.includeChildren; // manage oldest, newest activities (ie bookends)
-            _bookendManager = (0, _activityThreadOrdering.bookendManager)(), setBookends = _bookendManager.setBookends, getNewestAct = _bookendManager.getNewestAct, getOldestAct = _bookendManager.getOldestAct; // default batch should be equal to minActivities when fetching back in time, but halved when fetching newer due to subsequent child fetches filling up the minActivities count
-            // reduces server RTs when fetching older activities
-            defaultBatchSize = queryType === _activities.INITIAL || queryType === _activities.OLDER ? minActivities : Math.max(_activityThreadOrdering.minBatchSize, Math.ceil(minActivities / 2));
-            batchSize = defaultBatchSize; // exposes activity states and handlers with simple getters
-            _activityManager = (0, _activityThreadOrdering.activityManager)(), getActivityHandlerByKey = _activityManager.getActivityHandlerByKey, getActivityByTypeAndParentId = _activityManager.getActivityByTypeAndParentId; // set initial query
-            query = (0, _activityThreadOrdering.getQuery)(queryType, {
-              activityToSearch: search,
-              batchSize: batchSize
-            });
-            /* 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, orderedActivities, getRepliesByParentId, orderedRoots, nextOptions, currentOldestPublishedDate, currentNewestPublishedDate;
-              return _regenerator.default.wrap(function _loop$(_context12) {
-                while (1) switch (_context12.prev = _context12.next) {
-                  case 0:
-                    // ***********************************************
-                    // EXECUTION STATE VARIABLES
-                    // variables that will be used for each "batch" of activities asked for
-                    // ***********************************************
-                    // stores all "root" activities (activities that are, or could be, thread parents)
-                    _rootActivityManager = (0, _activityThreadOrdering.rootActivityManager)(), getRootActivityHash = _rootActivityManager.getRootActivityHash, addNewRoot = _rootActivityManager.addNewRoot; // used to determine if we should continue to fetch older activities
-                    // 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) {
-                      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);
+    return (0, _wrapAsyncGenerator2.default)(function () {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return /*#__PURE__*/_regenerator.default.mark(function _callee1() {
+        var _options$minActivitie, minActivities, _options$queryType, queryType, convoUrl, _options$search, search, includeChildren, _bookendManager, setBookends, getNewestAct, getOldestAct, defaultBatchSize, batchSize, _activityManager, getActivityHandlerByKey, getActivityByTypeAndParentId, query, _loop, _ret;
+        return _regenerator.default.wrap(function (_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
+            case 0:
+              // ***********************************************
+              // INSTANCE STATE VARIABLES
+              // variables that will be used for the life of the generator
+              // ***********************************************
+              _options$minActivitie = options.minActivities, minActivities = _options$minActivitie === void 0 ? _activityThreadOrdering.defaultMinDisplayableActivities : _options$minActivitie, _options$queryType = options.queryType, queryType = _options$queryType === void 0 ? _activities.INITIAL : _options$queryType; // must fetch initially before getting newer activities!
+              if (queryType === _activities.NEWER) {
+                queryType = _activities.INITIAL;
+              }
+              convoUrl = options.url, _options$search = options.search, search = _options$search === void 0 ? {} : _options$search, includeChildren = options.includeChildren; // manage oldest, newest activities (ie bookends)
+              _bookendManager = (0, _activityThreadOrdering.bookendManager)(), setBookends = _bookendManager.setBookends, getNewestAct = _bookendManager.getNewestAct, getOldestAct = _bookendManager.getOldestAct; // default batch should be equal to minActivities when fetching back in time, but halved when fetching newer due to subsequent child fetches filling up the minActivities count
+              // reduces server RTs when fetching older activities
+              defaultBatchSize = queryType === _activities.INITIAL || queryType === _activities.OLDER ? minActivities : Math.max(_activityThreadOrdering.minBatchSize, Math.ceil(minActivities / 2));
+              batchSize = defaultBatchSize; // exposes activity states and handlers with simple getters
+              _activityManager = (0, _activityThreadOrdering.activityManager)(), getActivityHandlerByKey = _activityManager.getActivityHandlerByKey, getActivityByTypeAndParentId = _activityManager.getActivityByTypeAndParentId; // set initial query
+              query = (0, _activityThreadOrdering.getQuery)(queryType, {
+                activityToSearch: search,
+                batchSize: batchSize
+              });
+              /* 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, orderedActivities, getRepliesByParentId, orderedRoots, nextOptions, currentOldestPublishedDate, currentNewestPublishedDate;
+                return _regenerator.default.wrap(function (_context10) {
+                  while (1) switch (_context10.prev = _context10.next) {
+                    case 0:
+                      // ***********************************************
+                      // EXECUTION STATE VARIABLES
+                      // variables that will be used for each "batch" of activities asked for
+                      // ***********************************************
+                      // stores all "root" activities (activities that are, or could be, thread parents)
+                      _rootActivityManager = (0, _activityThreadOrdering.rootActivityManager)(), getRootActivityHash = _rootActivityManager.getRootActivityHash, addNewRoot = _rootActivityManager.addNewRoot; // used to determine if we should continue to fetch older activities
+                      // 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) {
+                        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);
 
-                      // ignore deletes
-                      if ((0, _activities.isDeleteActivity)(activity)) {
-                        return;
-                      }
-                      var activityHandler = getActivityHandlerByType(actType);
-                      activityHandler(activity);
-                    };
-                    handleNewActivities = function handleNewActivities(activities) {
-                      activities.forEach(function (act) {
-                        handleNewActivity(act);
-                        checkAndSetNoOlderActs(act);
-                      });
-                    };
-                    handleOlderQuery = function handleOlderQuery(activities) {
-                      setBookends(activities, _activities.OLDER);
-                      handleNewActivities(activities);
-                    };
-                    handleNewerQuery = function handleNewerQuery(activities) {
-                      checkAndSetNoNewerActs(activities);
-                      if (activities.length) {
-                        setBookends(activities, _activities.NEWER);
+                        // ignore deletes
+                        if ((0, _activities.isDeleteActivity)(activity)) {
+                          return;
+                        }
+                        var activityHandler = getActivityHandlerByType(actType);
+                        activityHandler(activity);
+                      };
+                      handleNewActivities = function handleNewActivities(activities) {
+                        activities.forEach(function (act) {
+                          handleNewActivity(act);
+                          checkAndSetNoOlderActs(act);
+                        });
+                      };
+                      handleOlderQuery = function handleOlderQuery(activities) {
+                        setBookends(activities, _activities.OLDER);
                         handleNewActivities(activities);
-                      }
-                    };
-                    handleSearch = function handleSearch(activities) {
-                      setBookends(activities, _activities.MID);
-                      handleNewActivities(activities);
-                    };
-                    getQueryResponseHandler = function getQueryResponseHandler(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
-                    // fetch until minActivities is reached, or no more acts to fetch, or we hit our max fetch count
-                    // ***********************************************
-                    incrementLoopCounter = (0, _activityThreadOrdering.getLoopCounterFailsafe)();
-                    _loop2 = /*#__PURE__*/_regenerator.default.mark(function _loop2() {
-                      var allBatchActivitiesConfig, $allBatchActivitiesFetch, $fetchRequests, params, $parentsFetch, _yield$_awaitAsyncGen, _yield$_awaitAsyncGen2, allBatchActivities, _yield$_awaitAsyncGen3, parents, handler, _parents$reply, replyIds, _parents$edit, editIds, _parents$reaction, reactionIds, $reactionFetches, $replyFetches, $editFetches, _iterator4, _step4, activity, actId, childFetchOptions, _yield$_awaitAsyncGen4, _yield$_awaitAsyncGen5, reactions, replies, edits, newReplyReactions, allReactions, rootActivityHash, visibleActivitiesCount, _iterator5, _step5, rootActivity, rootId, repliesByRootId, currentOldestPublishedDate, currentNewestPublishedDate;
-                      return _regenerator.default.wrap(function _loop2$(_context11) {
-                        while (1) switch (_context11.prev = _context11.next) {
-                          case 0:
-                            // count loops and throw if we detect infinite loop
-                            incrementLoopCounter();
+                      };
+                      handleNewerQuery = function handleNewerQuery(activities) {
+                        checkAndSetNoNewerActs(activities);
+                        if (activities.length) {
+                          setBookends(activities, _activities.NEWER);
+                          handleNewActivities(activities);
+                        }
+                      };
+                      handleSearch = function handleSearch(activities) {
+                        setBookends(activities, _activities.MID);
+                        handleNewActivities(activities);
+                      };
+                      getQueryResponseHandler = function getQueryResponseHandler(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
+                      // fetch until minActivities is reached, or no more acts to fetch, or we hit our max fetch count
+                      // ***********************************************
+                      incrementLoopCounter = (0, _activityThreadOrdering.getLoopCounterFailsafe)();
+                      _loop2 = /*#__PURE__*/_regenerator.default.mark(function _loop2() {
+                        var allBatchActivitiesConfig, $allBatchActivitiesFetch, $fetchRequests, params, $parentsFetch, _yield$_awaitAsyncGen, _yield$_awaitAsyncGen2, allBatchActivities, _yield$_awaitAsyncGen3, parents, handler, _parents$reply, replyIds, _parents$edit, editIds, _parents$reaction, reactionIds, $reactionFetches, $replyFetches, $editFetches, _iterator4, _step4, activity, actId, childFetchOptions, _yield$_awaitAsyncGen4, _yield$_awaitAsyncGen5, reactions, replies, edits, newReplyReactions, allReactions, rootActivityHash, visibleActivitiesCount, _iterator5, _step5, rootActivity, rootId, repliesByRootId, currentOldestPublishedDate, currentNewestPublishedDate;
+                        return _regenerator.default.wrap(function (_context1) {
+                          while (1) switch (_context1.prev = _context1.next) {
+                            case 0:
+                              // count loops and throw if we detect infinite loop
+                              incrementLoopCounter();
 
-                            // configure fetch request. Use a smaller limit when fetching newer or mids to account for potential children fetches
-                            allBatchActivitiesConfig = _objectSpread({
-                              conversationUrl: convoUrl,
-                              limit: batchSize,
-                              includeChildren: includeChildren
-                            }, query); // request activities in batches
-                            $allBatchActivitiesFetch = _this.listActivities(allBatchActivitiesConfig); // contain fetches in array to parallelize fetching as needed
-                            $fetchRequests = [$allBatchActivitiesFetch]; // if query requires recursive fetches for children acts, add the additional fetch
-                            if (queryType === _activities.MID || queryType === _activities.NEWER) {
-                              params = {
-                                activityType: null
-                              };
-                              if (query.sinceDate) {
-                                params.sinceDate = query.sinceDate;
+                              // configure fetch request. Use a smaller limit when fetching newer or mids to account for potential children fetches
+                              allBatchActivitiesConfig = _objectSpread({
+                                conversationUrl: convoUrl,
+                                limit: batchSize,
+                                includeChildren: includeChildren
+                              }, query); // request activities in batches
+                              $allBatchActivitiesFetch = _this.listActivities(allBatchActivitiesConfig); // contain fetches in array to parallelize fetching as needed
+                              $fetchRequests = [$allBatchActivitiesFetch]; // if query requires recursive fetches for children acts, add the additional fetch
+                              if (queryType === _activities.MID || queryType === _activities.NEWER) {
+                                params = {
+                                  activityType: null
+                                };
+                                if (query.sinceDate) {
+                                  params.sinceDate = query.sinceDate;
+                                }
+                                $parentsFetch = _this.listParentActivityIds(convoUrl, params);
+                                $fetchRequests.push($parentsFetch);
                               }
-                              $parentsFetch = _this.listParentActivityIds(convoUrl, params);
-                              $fetchRequests.push($parentsFetch);
-                            }
 
-                            // we dont always need to fetch for parents
-                            _context11.next = 7;
-                            return (0, _awaitAsyncGenerator2.default)(_promise.default.all($fetchRequests));
-                          case 7:
-                            _yield$_awaitAsyncGen = _context11.sent;
-                            _yield$_awaitAsyncGen2 = (0, _slicedToArray2.default)(_yield$_awaitAsyncGen, 2);
-                            allBatchActivities = _yield$_awaitAsyncGen2[0];
-                            _yield$_awaitAsyncGen3 = _yield$_awaitAsyncGen2[1];
-                            parents = _yield$_awaitAsyncGen3 === void 0 ? {} : _yield$_awaitAsyncGen3;
-                            // use query type to decide how to handle response
-                            handler = getQueryResponseHandler(queryType);
-                            handler(allBatchActivities);
+                              // we dont always need to fetch for parents
+                              _context1.next = 1;
+                              return (0, _awaitAsyncGenerator2.default)(_promise.default.all($fetchRequests));
+                            case 1:
+                              _yield$_awaitAsyncGen = _context1.sent;
+                              _yield$_awaitAsyncGen2 = (0, _slicedToArray2.default)(_yield$_awaitAsyncGen, 2);
+                              allBatchActivities = _yield$_awaitAsyncGen2[0];
+                              _yield$_awaitAsyncGen3 = _yield$_awaitAsyncGen2[1];
+                              parents = _yield$_awaitAsyncGen3 === void 0 ? {} : _yield$_awaitAsyncGen3;
+                              // use query type to decide how to handle response
+                              handler = getQueryResponseHandler(queryType);
+                              handler(allBatchActivities);
 
-                            /*
-                              next we must selectively fetch the children of each of the parents to ensure completeness
-                              do this by checking the hash for each of the above parent IDs
-                              fetch children when we have a parent whose ID is represented in the parent ID lists
-                            */
-                            _parents$reply = parents.reply, replyIds = _parents$reply === void 0 ? [] : _parents$reply, _parents$edit = parents.edit, editIds = _parents$edit === void 0 ? [] : _parents$edit, _parents$reaction = parents.reaction, reactionIds = _parents$reaction === void 0 ? [] : _parents$reaction; // if no parent IDs returned, do nothing
-                            if (!(replyIds.length || editIds.length || reactionIds.length)) {
-                              _context11.next = 35;
-                              break;
-                            }
-                            $reactionFetches = [];
-                            $replyFetches = [];
-                            $editFetches = [];
-                            _iterator4 = _createForOfIteratorHelper(allBatchActivities);
-                            try {
-                              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                                activity = _step4.value;
-                                actId = activity.id;
-                                childFetchOptions = {
-                                  conversationUrl: convoUrl,
-                                  activityParentId: actId
-                                };
-                                if (reactionIds.includes(actId)) {
-                                  $reactionFetches.push(_this.getReactionSummaryByParentId(convoUrl, actId, {
-                                    activityType: 'reactionSummary',
-                                    includeChildren: true
-                                  }));
-                                }
-                                if (replyIds.includes(actId)) {
-                                  childFetchOptions.query = {
-                                    activityType: 'reply'
-                                  };
-                                  $replyFetches.push(_this.listAllChildActivitiesByParentId(childFetchOptions));
-                                }
-                                if (editIds.includes(actId)) {
-                                  childFetchOptions.query = {
-                                    activityType: 'edit'
+                              /*
+                                next we must selectively fetch the children of each of the parents to ensure completeness
+                                do this by checking the hash for each of the above parent IDs
+                                fetch children when we have a parent whose ID is represented in the parent ID lists
+                              */
+                              _parents$reply = parents.reply, replyIds = _parents$reply === void 0 ? [] : _parents$reply, _parents$edit = parents.edit, editIds = _parents$edit === void 0 ? [] : _parents$edit, _parents$reaction = parents.reaction, reactionIds = _parents$reaction === void 0 ? [] : _parents$reaction; // if no parent IDs returned, do nothing
+                              if (!(replyIds.length || editIds.length || reactionIds.length)) {
+                                _context1.next = 4;
+                                break;
+                              }
+                              $reactionFetches = [];
+                              $replyFetches = [];
+                              $editFetches = [];
+                              _iterator4 = _createForOfIteratorHelper(allBatchActivities);
+                              try {
+                                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                                  activity = _step4.value;
+                                  actId = activity.id;
+                                  childFetchOptions = {
+                                    conversationUrl: convoUrl,
+                                    activityParentId: actId
                                   };
-                                  $editFetches.push(_this.listAllChildActivitiesByParentId(childFetchOptions));
+                                  if (reactionIds.includes(actId)) {
+                                    $reactionFetches.push(_this.getReactionSummaryByParentId(convoUrl, actId, {
+                                      activityType: 'reactionSummary',
+                                      includeChildren: true
+                                    }));
+                                  }
+                                  if (replyIds.includes(actId)) {
+                                    childFetchOptions.query = {
+                                      activityType: 'reply'
+                                    };
+                                    $replyFetches.push(_this.listAllChildActivitiesByParentId(childFetchOptions));
+                                  }
+                                  if (editIds.includes(actId)) {
+                                    childFetchOptions.query = {
+                                      activityType: 'edit'
+                                    };
+                                    $editFetches.push(_this.listAllChildActivitiesByParentId(childFetchOptions));
+                                  }
                                 }
-                              }
 
-                              // parallelize fetch for speeedz
-                            } catch (err) {
-                              _iterator4.e(err);
-                            } finally {
-                              _iterator4.f();
-                            }
-                            _context11.next = 23;
-                            return (0, _awaitAsyncGenerator2.default)(_promise.default.all([_promise.default.all($reactionFetches), _promise.default.all($replyFetches), _promise.default.all($editFetches)]));
-                          case 23:
-                            _yield$_awaitAsyncGen4 = _context11.sent;
-                            _yield$_awaitAsyncGen5 = (0, _slicedToArray2.default)(_yield$_awaitAsyncGen4, 3);
-                            reactions = _yield$_awaitAsyncGen5[0];
-                            replies = _yield$_awaitAsyncGen5[1];
-                            edits = _yield$_awaitAsyncGen5[2];
-                            _context11.next = 30;
-                            return (0, _awaitAsyncGenerator2.default)(_promise.default.all(replies.filter(function (reply) {
-                              return replyIds.includes(reply.id);
-                            }).map(function (reply) {
-                              return _this.getReactionSummaryByParentId(convoUrl, reply.id, {
-                                activityType: 'reactionSummary',
-                                includeChildren: true
+                                // parallelize fetch for speeedz
+                              } catch (err) {
+                                _iterator4.e(err);
+                              } finally {
+                                _iterator4.f();
+                              }
+                              _context1.next = 2;
+                              return (0, _awaitAsyncGenerator2.default)(_promise.default.all([_promise.default.all($reactionFetches), _promise.default.all($replyFetches), _promise.default.all($editFetches)]));
+                            case 2:
+                              _yield$_awaitAsyncGen4 = _context1.sent;
+                              _yield$_awaitAsyncGen5 = (0, _slicedToArray2.default)(_yield$_awaitAsyncGen4, 3);
+                              reactions = _yield$_awaitAsyncGen5[0];
+                              replies = _yield$_awaitAsyncGen5[1];
+                              edits = _yield$_awaitAsyncGen5[2];
+                              _context1.next = 3;
+                              return (0, _awaitAsyncGenerator2.default)(_promise.default.all(replies.filter(function (reply) {
+                                return replyIds.includes(reply.id);
+                              }).map(function (reply) {
+                                return _this.getReactionSummaryByParentId(convoUrl, reply.id, {
+                                  activityType: 'reactionSummary',
+                                  includeChildren: true
+                                });
+                              })));
+                            case 3:
+                              newReplyReactions = _context1.sent;
+                              allReactions = [].concat((0, _toConsumableArray2.default)(reactions), (0, _toConsumableArray2.default)(newReplyReactions)); // stick them into activity hashes
+                              replies.forEach(function (replyArr) {
+                                return handleNewActivities(replyArr);
                               });
-                            })));
-                          case 30:
-                            newReplyReactions = _context11.sent;
-                            allReactions = [].concat((0, _toConsumableArray2.default)(reactions), (0, _toConsumableArray2.default)(newReplyReactions)); // stick them into activity hashes
-                            replies.forEach(function (replyArr) {
-                              return handleNewActivities(replyArr);
-                            });
-                            edits.forEach(function (editArr) {
-                              return handleNewActivities(editArr);
-                            });
-                            allReactions.forEach(function (reactionArr) {
-                              return handleNewActivities(reactionArr);
-                            });
-                          case 35:
-                            rootActivityHash = getRootActivityHash();
-                            visibleActivitiesCount = rootActivityHash.size;
-                            _iterator5 = _createForOfIteratorHelper(rootActivityHash.values());
-                            try {
-                              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                                rootActivity = _step5.value;
-                                rootId = rootActivity.id;
-                                repliesByRootId = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REPLY, rootId);
-                                if (repliesByRootId && repliesByRootId.size) {
-                                  visibleActivitiesCount += repliesByRootId.size || 0;
+                              edits.forEach(function (editArr) {
+                                return handleNewActivities(editArr);
+                              });
+                              allReactions.forEach(function (reactionArr) {
+                                return handleNewActivities(reactionArr);
+                              });
+                            case 4:
+                              rootActivityHash = getRootActivityHash();
+                              visibleActivitiesCount = rootActivityHash.size;
+                              _iterator5 = _createForOfIteratorHelper(rootActivityHash.values());
+                              try {
+                                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                                  rootActivity = _step5.value;
+                                  rootId = rootActivity.id;
+                                  repliesByRootId = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REPLY, rootId);
+                                  if (repliesByRootId && repliesByRootId.size) {
+                                    visibleActivitiesCount += repliesByRootId.size || 0;
+                                  }
                                 }
-                              }
 
-                              // stop fetching if we've reached desired count of visible activities
-                            } catch (err) {
-                              _iterator5.e(err);
-                            } finally {
-                              _iterator5.f();
-                            }
-                            if (!(visibleActivitiesCount >= minActivities)) {
-                              _context11.next = 41;
-                              break;
-                            }
-                            return _context11.abrupt("return", 1);
-                          case 41:
-                            checkAndSetNoMoreActs(queryType, visibleActivitiesCount, batchSize);
+                                // stop fetching if we've reached desired count of visible activities
+                              } catch (err) {
+                                _iterator5.e(err);
+                              } finally {
+                                _iterator5.f();
+                              }
+                              if (!(visibleActivitiesCount >= minActivities)) {
+                                _context1.next = 5;
+                                break;
+                              }
+                              return _context1.abrupt("return", 1);
+                            case 5:
+                              checkAndSetNoMoreActs(queryType, visibleActivitiesCount, batchSize);
 
-                            // batchSize should be equal to minimum activities when fetching older activities
-                            // covers "best case" when we reach minActivities on the first fetch
-                            if (queryType === _activities.OLDER) {
-                              batchSize = minActivities;
-                            }
+                              // batchSize should be equal to minimum activities when fetching older activities
+                              // covers "best case" when we reach minActivities on the first fetch
+                              if (queryType === _activities.OLDER) {
+                                batchSize = minActivities;
+                              }
 
-                            // since a MID query can bump the batchSize, we need to reset it _after_ a potential MID query
-                            // reset batchSize in case of MID queries bumping it up
-                            if (queryType === _activities.NEWER) {
-                              batchSize = defaultBatchSize;
-                            }
-                            currentOldestPublishedDate = (0, _activities.getPublishedDate)(getOldestAct());
-                            currentNewestPublishedDate = (0, _activities.getPublishedDate)(getNewestAct()); // we're still building our activity list - derive new query from prior query and start loop again
-                            if (queryType === _activities.INITIAL) {
-                              query = (0, _activityThreadOrdering.getQuery)(_activities.OLDER, {
-                                oldestPublishedDate: currentOldestPublishedDate,
-                                batchSize: batchSize
-                              });
-                            } else {
-                              query = (0, _activityThreadOrdering.getQuery)(queryType, {
-                                batchSize: batchSize,
-                                activityToSearch: search,
-                                oldestPublishedDate: currentOldestPublishedDate,
-                                newestPublishedDate: currentNewestPublishedDate
-                              });
-                            }
+                              // since a MID query can bump the batchSize, we need to reset it _after_ a potential MID query
+                              // reset batchSize in case of MID queries bumping it up
+                              if (queryType === _activities.NEWER) {
+                                batchSize = defaultBatchSize;
+                              }
+                              currentOldestPublishedDate = (0, _activities.getPublishedDate)(getOldestAct());
+                              currentNewestPublishedDate = (0, _activities.getPublishedDate)(getNewestAct()); // we're still building our activity list - derive new query from prior query and start loop again
+                              if (queryType === _activities.INITIAL) {
+                                query = (0, _activityThreadOrdering.getQuery)(_activities.OLDER, {
+                                  oldestPublishedDate: currentOldestPublishedDate,
+                                  batchSize: batchSize
+                                });
+                              } else {
+                                query = (0, _activityThreadOrdering.getQuery)(queryType, {
+                                  batchSize: batchSize,
+                                  activityToSearch: search,
+                                  oldestPublishedDate: currentOldestPublishedDate,
+                                  newestPublishedDate: currentNewestPublishedDate
+                                });
+                              }
 
-                            // if we're still building out the midDate search, bump the search limit to include activities on both sides
-                            if (queryType === _activities.MID) {
-                              batchSize += _activityThreadOrdering.batchSizeIncrementCount;
-                            }
-                          case 48:
-                          case "end":
-                            return _context11.stop();
-                        }
-                      }, _loop2);
-                    });
-                  case 11:
-                    if (getNoMoreActs()) {
-                      _context12.next = 17;
-                      break;
-                    }
-                    return _context12.delegateYield(_loop2(), "t0", 13);
-                  case 13:
-                    if (!_context12.t0) {
-                      _context12.next = 15;
+                              // if we're still building out the midDate search, bump the search limit to include activities on both sides
+                              if (queryType === _activities.MID) {
+                                batchSize += _activityThreadOrdering.batchSizeIncrementCount;
+                              }
+                            case 6:
+                            case "end":
+                              return _context1.stop();
+                          }
+                        }, _loop2);
+                      });
+                    case 1:
+                      if (getNoMoreActs()) {
+                        _context10.next = 4;
+                        break;
+                      }
+                      return _context10.delegateYield(_loop2(), "t0", 2);
+                    case 2:
+                      if (!_context10.t0) {
+                        _context10.next = 3;
+                        break;
+                      }
+                      return _context10.abrupt("continue", 4);
+                    case 3:
+                      _context10.next = 1;
                       break;
-                    }
-                    return _context12.abrupt("break", 17);
-                  case 15:
-                    _context12.next = 11;
-                    break;
-                  case 17:
-                    orderedActivities = [];
-                    getRepliesByParentId = function getRepliesByParentId(replyParentId) {
-                      var replies = [];
-                      var repliesByParentId = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REPLY, replyParentId);
-                      if (!repliesByParentId) {
+                    case 4:
+                      orderedActivities = [];
+                      getRepliesByParentId = function getRepliesByParentId(replyParentId) {
+                        var replies = [];
+                        var repliesByParentId = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REPLY, replyParentId);
+                        if (!repliesByParentId) {
+                          return replies;
+                        }
+                        var sortedReplies = (0, _activities.sortActivitiesByPublishedDate)((0, _activityThreadOrdering.getActivityObjectsFromMap)(repliesByParentId));
+                        sortedReplies.forEach(function (replyActivity) {
+                          var replyId = replyActivity.id;
+                          var edit = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.EDIT, replyId);
+                          var reaction = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REACTION, replyId);
+                          var reactionSelf = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REACTION_SELF, replyId);
+                          var latestActivity = edit || replyActivity;
+                          // hash of root activities (in case of plain reply) and the reply activity (in case of edit)
+                          var allRelevantActivitiesArr = [].concat((0, _toConsumableArray2.default)((0, _activityThreadOrdering.getActivityObjectsFromMap)(getRootActivityHash())), (0, _toConsumableArray2.default)((0, _activityThreadOrdering.getActivityObjectsFromMap)(repliesByParentId)));
+                          var allRelevantActivities = allRelevantActivitiesArr.reduce(function (hashMap, act) {
+                            hashMap[act.id] = act;
+                            return hashMap;
+                          }, {});
+                          var finalReply = _this._createParsedServerActivity(latestActivity, allRelevantActivities);
+                          var fullReply = {
+                            id: replyId,
+                            activity: finalReply,
+                            reaction: reaction,
+                            reactionSelf: reactionSelf
+                          };
+                          var sanitizedFullReply = (0, _activities.sanitizeActivity)(fullReply);
+                          replies.push(sanitizedFullReply);
+                        });
                         return replies;
-                      }
-                      var sortedReplies = (0, _activities.sortActivitiesByPublishedDate)((0, _activityThreadOrdering.getActivityObjectsFromMap)(repliesByParentId));
-                      sortedReplies.forEach(function (replyActivity) {
-                        var replyId = replyActivity.id;
-                        var edit = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.EDIT, replyId);
-                        var reaction = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REACTION, replyId);
-                        var reactionSelf = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REACTION_SELF, replyId);
-                        var latestActivity = edit || replyActivity;
-                        // hash of root activities (in case of plain reply) and the reply activity (in case of edit)
-                        var allRelevantActivitiesArr = [].concat((0, _toConsumableArray2.default)((0, _activityThreadOrdering.getActivityObjectsFromMap)(getRootActivityHash())), (0, _toConsumableArray2.default)((0, _activityThreadOrdering.getActivityObjectsFromMap)(repliesByParentId)));
-                        var allRelevantActivities = allRelevantActivitiesArr.reduce(function (hashMap, act) {
-                          hashMap[act.id] = act;
-                          return hashMap;
-                        }, {});
-                        var finalReply = _this._createParsedServerActivity(latestActivity, allRelevantActivities);
-                        var fullReply = {
-                          id: replyId,
-                          activity: finalReply,
+                      };
+                      orderedRoots = (0, _activities.sortActivitiesByPublishedDate)((0, _activityThreadOrdering.getActivityObjectsFromMap)(getRootActivityHash()));
+                      orderedRoots.forEach(function (rootActivity) {
+                        var rootId = rootActivity.id;
+                        var replies = getRepliesByParentId(rootId);
+                        var edit = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.EDIT, rootId);
+                        var reaction = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REACTION, rootId);
+                        var reactionSelf = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REACTION_SELF, rootId);
+                        var latestActivity = edit || rootActivity;
+                        var finalActivity = _this._createParsedServerActivity(latestActivity, (0, _defineProperty2.default)({}, rootId, rootActivity));
+                        var fullRoot = {
+                          id: rootId,
+                          activity: finalActivity,
                           reaction: reaction,
                           reactionSelf: reactionSelf
                         };
-                        var sanitizedFullReply = (0, _activities.sanitizeActivity)(fullReply);
-                        replies.push(sanitizedFullReply);
+                        var sanitizedFullRoot = (0, _activities.sanitizeActivity)(fullRoot);
+                        orderedActivities.push(sanitizedFullRoot);
+                        replies.forEach(function (reply) {
+                          return orderedActivities.push(reply);
+                        });
                       });
-                      return replies;
-                    };
-                    orderedRoots = (0, _activities.sortActivitiesByPublishedDate)((0, _activityThreadOrdering.getActivityObjectsFromMap)(getRootActivityHash()));
-                    orderedRoots.forEach(function (rootActivity) {
-                      var rootId = rootActivity.id;
-                      var replies = getRepliesByParentId(rootId);
-                      var edit = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.EDIT, rootId);
-                      var reaction = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REACTION, rootId);
-                      var reactionSelf = getActivityByTypeAndParentId(_activities.ACTIVITY_TYPES.REACTION_SELF, rootId);
-                      var latestActivity = edit || rootActivity;
-                      var finalActivity = _this._createParsedServerActivity(latestActivity, (0, _defineProperty2.default)({}, rootId, rootActivity));
-                      var fullRoot = {
-                        id: rootId,
-                        activity: finalActivity,
-                        reaction: reaction,
-                        reactionSelf: reactionSelf
-                      };
-                      var sanitizedFullRoot = (0, _activities.sanitizeActivity)(fullRoot);
-                      orderedActivities.push(sanitizedFullRoot);
-                      replies.forEach(function (reply) {
-                        return orderedActivities.push(reply);
+                      _context10.next = 5;
+                      return orderedActivities;
+                    case 5:
+                      nextOptions = _context10.sent;
+                      if (!nextOptions) {
+                        _context10.next = 6;
+                        break;
+                      }
+                      minActivities = nextOptions.minActivities || minActivities;
+                      currentOldestPublishedDate = (0, _activities.getPublishedDate)(getOldestAct());
+                      currentNewestPublishedDate = (0, _activities.getPublishedDate)(getNewestAct());
+                      queryType = nextOptions.queryType;
+                      query = (0, _activityThreadOrdering.getQuery)(queryType, {
+                        activityToSearch: search,
+                        oldestPublishedDate: currentOldestPublishedDate,
+                        newestPublishedDate: currentNewestPublishedDate,
+                        batchSize: batchSize
                       });
-                    });
-                    _context12.next = 23;
-                    return orderedActivities;
-                  case 23:
-                    nextOptions = _context12.sent;
-                    if (!nextOptions) {
-                      _context12.next = 32;
+                      _context10.next = 7;
                       break;
-                    }
-                    minActivities = nextOptions.minActivities || minActivities;
-                    currentOldestPublishedDate = (0, _activities.getPublishedDate)(getOldestAct());
-                    currentNewestPublishedDate = (0, _activities.getPublishedDate)(getNewestAct());
-                    queryType = nextOptions.queryType;
-                    query = (0, _activityThreadOrdering.getQuery)(queryType, {
-                      activityToSearch: search,
-                      oldestPublishedDate: currentOldestPublishedDate,
-                      newestPublishedDate: currentNewestPublishedDate,
-                      batchSize: batchSize
-                    });
-                    _context12.next = 33;
-                    break;
-                  case 32:
-                    return _context12.abrupt("return", {
-                      v: void 0
-                    });
-                  case 33:
-                  case "end":
-                    return _context12.stop();
-                }
-              }, _loop);
-            });
-          case 9:
-            if (!true) {
-              _context13.next = 16;
-              break;
-            }
-            return _context13.delegateYield(_loop(), "t0", 11);
-          case 11:
-            _ret = _context13.t0;
-            if (!_ret) {
-              _context13.next = 14;
+                    case 6:
+                      return _context10.abrupt("return", {
+                        v: void 0
+                      });
+                    case 7:
+                    case "end":
+                      return _context10.stop();
+                  }
+                }, _loop);
+              });
+            case 1:
+              if (!true) {
+                _context11.next = 4;
+                break;
+              }
+              return _context11.delegateYield(_loop(), "t0", 2);
+            case 2:
+              _ret = _context11.t0;
+              if (!_ret) {
+                _context11.next = 3;
+                break;
+              }
+              return _context11.abrupt("return", _ret.v);
+            case 3:
+              _context11.next = 1;
               break;
-            }
-            return _context13.abrupt("return", _ret.v);
-          case 14:
-            _context13.next = 9;
-            break;
-          case 16:
-          case "end":
-            return _context13.stop();
-        }
-      }, _callee11);
-    }))();
+            case 4:
+            case "end":
+              return _context11.stop();
+          }
+        }, _callee1);
+      })();
+    }).apply(this, arguments);
   },
   /**
    * @typedef {object} EditActivity
@@ -2326,11 +2328,11 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Array<Conversation>>}
    */
   _list: function _list(options) {
-    var _this31 = this;
-    return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12() {
+    var _this29 = this;
+    return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
       var res, list, limit, results, _iterator6, _step6, result, items;
-      return _regenerator.default.wrap(function _callee12$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+      return _regenerator.default.wrap(function (_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
             options.qs = _objectSpread({
               personRefresh: true,
@@ -2338,10 +2340,10 @@ var Conversation = _webexCore.WebexPlugin.extend({
               activitiesLimit: 0,
               participantsLimit: 0
             }, options.qs);
-            _context14.next = 3;
-            return _this31.request(options);
-          case 3:
-            res = _context14.sent;
+            _context12.next = 1;
+            return _this29.request(options);
+          case 1:
+            res = _context12.sent;
             if (!res.body || !res.body.items || res.body.items.length === 0) {
               list = [];
             } else {
@@ -2354,7 +2356,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
             // The user has more data in another cluster.
             // Follow the 'additionalUrls' for that data.
             if (!res.body.additionalUrls) {
-              _context14.next = 14;
+              _context12.next = 3;
               break;
             }
             limit = 0; // If the user asked for a specific amount of data,
@@ -2370,10 +2372,10 @@ var Conversation = _webexCore.WebexPlugin.extend({
             // If the limit is 0 for some reason,
             // don't bother requesting from other clusters
             if (!(!options.limit || limit !== 0)) {
-              _context14.next = 14;
+              _context12.next = 3;
               break;
             }
-            _context14.next = 11;
+            _context12.next = 2;
             return _promise.default.all(res.body.additionalUrls.map(function (host) {
               var url = "".concat(host, "/").concat(options.resource);
               var newOptions = _objectSpread(_objectSpread({}, options), {}, {
@@ -2383,10 +2385,10 @@ var Conversation = _webexCore.WebexPlugin.extend({
               if (options.limit) {
                 newOptions.qs[newOptions.limit.name] = limit;
               }
-              return _this31.request(newOptions);
+              return _this29.request(newOptions);
             }));
-          case 11:
-            results = _context14.sent;
+          case 2:
+            results = _context12.sent;
             _iterator6 = _createForOfIteratorHelper(results);
             try {
               for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
@@ -2404,18 +2406,18 @@ var Conversation = _webexCore.WebexPlugin.extend({
             } finally {
               _iterator6.f();
             }
-          case 14:
-            _context14.next = 16;
+          case 3:
+            _context12.next = 4;
             return _promise.default.all(list.map(function (item) {
-              return _this31._recordUUIDs(item);
+              return _this29._recordUUIDs(item);
             }));
-          case 16:
-            return _context14.abrupt("return", list);
-          case 17:
+          case 4:
+            return _context12.abrupt("return", list);
+          case 5:
           case "end":
-            return _context14.stop();
+            return _context12.stop();
         }
-      }, _callee12);
+      }, _callee10);
     }))();
   },
   /**
@@ -2425,7 +2427,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise<Conversation>}
    */
   _maybeCreateOneOnOneThenPost: function _maybeCreateOneOnOneThenPost(params, options) {
-    var _this32 = this;
+    var _this30 = this;
     return this.get((0, _lodash.defaults)({
       // the use of uniq in Conversation#create guarantees participant[1] will
       // always be the other user
@@ -2435,7 +2437,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       includeParticipants: true
     })).then(function (conversation) {
       if (params.comment || params.html) {
-        return _this32.post(conversation, {
+        return _this30.post(conversation, {
           content: params.html,
           displayName: params.comment
         }).then(function (activity) {
@@ -2448,7 +2450,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       if (reason.statusCode !== 404) {
         return _promise.default.reject(reason);
       }
-      return _this32._createOneOnOne(params);
+      return _this30._createOneOnOne(params);
     });
   },
   /**
@@ -2457,7 +2459,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Object}
    */
   _prepareConversationForCreation: function _prepareConversationForCreation(params) {
-    var _this33 = this;
+    var _this31 = this;
     var payload = {
       activities: {
         items: [this.expand('create')]
@@ -2477,7 +2479,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       payload.tags = params.tags;
     }
     params.participants.forEach(function (participant) {
-      payload.activities.items.push(_this33.expand('add', {
+      payload.activities.items.push(_this31.expand('add', {
         objectType: 'person',
         id: participant
       }));
@@ -2509,7 +2511,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
    * @returns {Promise}
    */
   _recordUUIDs: function _recordUUIDs(conversation) {
-    var _this34 = this;
+    var _this32 = this;
     if (!conversation.participants || !conversation.participants.items) {
       return _promise.default.resolve(conversation);
     }
@@ -2519,16 +2521,16 @@ var Conversation = _webexCore.WebexPlugin.extend({
       if (participant.type === 'ROOM' || participant.type === 'LYRA_SPACE') {
         return _promise.default.resolve();
       }
-      return _this34.webex.internal.user.recordUUID(participant).catch(function (err) {
-        return _this34.logger.warn('Could not record uuid', err);
+      return _this32.webex.internal.user.recordUUID(participant).catch(function (err) {
+        return _this32.logger.warn('Could not record uuid', err);
       });
     }));
   },
-  version: "3.10.0-next.3"
+  version: "3.10.0-next.4"
 });
 ['favorite', 'hide', 'lock', 'mute', 'unfavorite', 'unhide', 'unlock', 'unmute'].forEach(function (verb) {
   Conversation.prototype[verb] = function submitSimpleActivity(conversation, activity) {
-    var _this35 = this;
+    var _this33 = this;
     var convoWithUrl = this.prepareConversation(_objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
     }));
@@ -2537,13 +2539,13 @@ var Conversation = _webexCore.WebexPlugin.extend({
       object: convoWithUrl,
       target: convoWithUrl
     }).then(function (a) {
-      return _this35.submit(a);
+      return _this33.submit(a);
     });
   };
 });
 ['assignModerator', 'unassignModerator'].forEach(function (verb) {
   Conversation.prototype[verb] = function submitModerationChangeActivity(conversation, moderator, activity) {
-    var _this36 = this;
+    var _this34 = this;
     var convoWithUrl = _objectSpread(_objectSpread({}, conversation), {}, {
       url: this.getConvoUrl(conversation)
     });
@@ -2551,16 +2553,16 @@ var Conversation = _webexCore.WebexPlugin.extend({
       var _ref8 = (0, _slicedToArray2.default)(_ref7, 2),
         c = _ref8[0],
         userId = _ref8[1];
-      return _this36.prepare(activity, {
+      return _this34.prepare(activity, {
         verb: verb,
-        target: _this36.prepareConversation(c),
+        target: _this34.prepareConversation(c),
         object: {
           id: userId,
           objectType: 'person'
         }
       });
     }).then(function (a) {
-      return _this36.submit(a);
+      return _this34.submit(a);
     });
   };
 });
@@ -2575,7 +2577,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
 ['setSpaceProperty', 'unsetSpaceProperty'].forEach(function (fnName) {
   var verb = fnName.startsWith('set') ? 'set' : 'unset';
   Conversation.prototype[fnName] = function submitSpacePropertyActivity(conversation, tag, activity) {
-    var _this37 = this;
+    var _this35 = this;
     if (!(0, _lodash.isString)(tag)) {
       return _promise.default.reject(new Error('`tag` must be a string'));
     }
@@ -2590,13 +2592,13 @@ var Conversation = _webexCore.WebexPlugin.extend({
         objectType: 'spaceProperty'
       }
     }).then(function (a) {
-      return _this37.submit(a);
+      return _this35.submit(a);
     });
   };
 });
 ['tag', 'untag'].forEach(function (verb) {
   Conversation.prototype[verb] = function submitObjectActivity(conversation, object, activity) {
-    var _this38 = this;
+    var _this36 = this;
     if (!(0, _lodash.isObject)(object)) {
       return _promise.default.reject(new Error('`object` must be an object'));
     }
@@ -2608,7 +2610,7 @@ var Conversation = _webexCore.WebexPlugin.extend({
       target: c,
       object: (0, _assign.default)(c, object)
     }).then(function (a) {
-      return _this38.submit(a);
+      return _this36.submit(a);
     });
   };
 });