stream-chat 8.41.1 → 8.42.0

package/dist/index.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var base64Js = require('base64-js');
-var _extends = require('@babel/runtime/helpers/extends');
-var _typeof = require('@babel/runtime/helpers/typeof');
-var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
+var _extends = require('@babel/runtime/helpers/extends');
+var _typeof = require('@babel/runtime/helpers/typeof');
+var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
+var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var axios = require('axios');
 var https = require('https');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
@@ -27,15 +27,15 @@ var _wrapNativeSuper = require('@babel/runtime/helpers/wrapNativeSuper');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
-var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
-var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
-var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
 var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
 var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
+var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
+var _typeof__default = /*#__PURE__*/_interopDefaultLegacy(_typeof);
+var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
+var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
 var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
@@ -122,15 +122,220 @@ var decodeBase64 = function decodeBase64(s) {
   return r;
 };
 
-function ownKeys$b(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var Campaign = /*#__PURE__*/function () {
+  function Campaign(client, id, data) {
+    _classCallCheck__default['default'](this, Campaign);
 
-function _objectSpread$b(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$b(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+    _defineProperty__default['default'](this, "id", void 0);
 
-function _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(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) { function e(_x) { return _e.apply(this, arguments); } e.toString = function () { return _e.toString(); }; return e; }(function (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 (_e2) { function e(_x2) { return _e2.apply(this, arguments); } e.toString = function () { return _e2.toString(); }; return e; }(function (e) { didErr = true; err = e; }), f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+    _defineProperty__default['default'](this, "data", void 0);
 
-function _unsupportedIterableToArray$4(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(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$4(o, minLen); }
+    _defineProperty__default['default'](this, "client", void 0);
 
-function _arrayLikeToArray$4(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; }
+    this.client = client;
+    this.id = id;
+    this.data = data;
+  }
+
+  _createClass__default['default'](Campaign, [{
+    key: "create",
+    value: function () {
+      var _create = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+        var _this$data, _this$data2, _this$data3, _this$data4, _this$data5, _this$data6, _this$data7, _this$data8;
+
+        var body, result;
+        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                body = {
+                  id: this.id,
+                  message_template: (_this$data = this.data) === null || _this$data === void 0 ? void 0 : _this$data.message_template,
+                  segment_ids: (_this$data2 = this.data) === null || _this$data2 === void 0 ? void 0 : _this$data2.segment_ids,
+                  sender_id: (_this$data3 = this.data) === null || _this$data3 === void 0 ? void 0 : _this$data3.sender_id,
+                  channel_template: (_this$data4 = this.data) === null || _this$data4 === void 0 ? void 0 : _this$data4.channel_template,
+                  create_channels: (_this$data5 = this.data) === null || _this$data5 === void 0 ? void 0 : _this$data5.create_channels,
+                  description: (_this$data6 = this.data) === null || _this$data6 === void 0 ? void 0 : _this$data6.description,
+                  name: (_this$data7 = this.data) === null || _this$data7 === void 0 ? void 0 : _this$data7.name,
+                  user_ids: (_this$data8 = this.data) === null || _this$data8 === void 0 ? void 0 : _this$data8.user_ids
+                };
+                _context.next = 3;
+                return this.client.createCampaign(body);
+
+              case 3:
+                result = _context.sent;
+                this.id = result.campaign.id;
+                this.data = result.campaign;
+                return _context.abrupt("return", result);
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function create() {
+        return _create.apply(this, arguments);
+      }
+
+      return create;
+    }()
+  }, {
+    key: "verifyCampaignId",
+    value: function verifyCampaignId() {
+      if (!this.id) {
+        throw new Error('Campaign id is missing. Either create the campaign using campaign.create() or set the id during instantiation - const campaign = client.campaign(id)');
+      }
+    }
+  }, {
+    key: "start",
+    value: function () {
+      var _start = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(options) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                this.verifyCampaignId();
+                _context2.next = 3;
+                return this.client.startCampaign(this.id, options);
+
+              case 3:
+                return _context2.abrupt("return", _context2.sent);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function start(_x) {
+        return _start.apply(this, arguments);
+      }
+
+      return start;
+    }()
+  }, {
+    key: "update",
+    value: function () {
+      var _update = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(data) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                this.verifyCampaignId();
+                return _context3.abrupt("return", this.client.updateCampaign(this.id, data));
+
+              case 2:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function update(_x2) {
+        return _update.apply(this, arguments);
+      }
+
+      return update;
+    }()
+  }, {
+    key: "delete",
+    value: function () {
+      var _delete2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
+        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                this.verifyCampaignId();
+                _context4.next = 3;
+                return this.client.deleteCampaign(this.id);
+
+              case 3:
+                return _context4.abrupt("return", _context4.sent);
+
+              case 4:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4, this);
+      }));
+
+      function _delete() {
+        return _delete2.apply(this, arguments);
+      }
+
+      return _delete;
+    }()
+  }, {
+    key: "stop",
+    value: function () {
+      var _stop = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5() {
+        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                this.verifyCampaignId();
+                return _context5.abrupt("return", this.client.stopCampaign(this.id));
+
+              case 2:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5, this);
+      }));
+
+      function stop() {
+        return _stop.apply(this, arguments);
+      }
+
+      return stop;
+    }()
+  }, {
+    key: "get",
+    value: function () {
+      var _get = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6() {
+        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
+              case 0:
+                this.verifyCampaignId();
+                return _context6.abrupt("return", this.client.getCampaign(this.id));
+
+              case 2:
+              case "end":
+                return _context6.stop();
+            }
+          }
+        }, _callee6, this);
+      }));
+
+      function get() {
+        return _get.apply(this, arguments);
+      }
+
+      return get;
+    }()
+  }]);
+
+  return Campaign;
+}();
+
+function ownKeys$c(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$c(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$c(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$c(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _createForOfIteratorHelper$5(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$5(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) { function e(_x) { return _e.apply(this, arguments); } e.toString = function () { return _e.toString(); }; return e; }(function (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 (_e2) { function e(_x2) { return _e2.apply(this, arguments); } e.toString = function () { return _e2.toString(); }; return e; }(function (e) { didErr = true; err = e; }), f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray$5(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$5(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$5(o, minLen); }
+
+function _arrayLikeToArray$5(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; }
 
 /**
  * logChatPromiseExecution - utility function for logging the execution of a promise..
@@ -215,7 +420,7 @@ function normalizeQuerySort(sort) {
   var sortFields = [];
   var sortArr = Array.isArray(sort) ? sort : [sort];
 
-  var _iterator = _createForOfIteratorHelper$4(sortArr),
+  var _iterator = _createForOfIteratorHelper$5(sortArr),
       _step;
 
   try {
@@ -385,7 +590,7 @@ var axiosParamsSerializer = function axiosParamsSerializer(params) {
  */
 
 function formatMessage(message) {
-  return _objectSpread$b(_objectSpread$b({}, message), {}, {
+  return _objectSpread$c(_objectSpread$c({}, message), {}, {
     /**
      * @deprecated please use `html`
      */
@@ -590,7 +795,7 @@ var messagePaginationCreatedAtAround = function messagePaginationCreatedAtAround
       returnedPage = _ref3.returnedPage,
       messagePaginationOptions = _ref3.messagePaginationOptions;
 
-  var newPagination = _objectSpread$b({}, parentSet.pagination);
+  var newPagination = _objectSpread$c({}, parentSet.pagination);
 
   if (!(messagePaginationOptions !== null && messagePaginationOptions !== void 0 && messagePaginationOptions.created_at_around)) return newPagination;
   var hasPrev;
@@ -655,7 +860,7 @@ var messagePaginationIdAround = function messagePaginationIdAround(_ref5) {
       returnedPage = _ref5.returnedPage,
       messagePaginationOptions = _ref5.messagePaginationOptions;
 
-  var newPagination = _objectSpread$b({}, parentSet.pagination);
+  var newPagination = _objectSpread$c({}, parentSet.pagination);
 
   var _ref6 = messagePaginationOptions || {},
       id_around = _ref6.id_around;
@@ -713,7 +918,7 @@ var messagePaginationLinear = function messagePaginationLinear(_ref8) {
       returnedPage = _ref8.returnedPage,
       messagePaginationOptions = _ref8.messagePaginationOptions;
 
-  var newPagination = _objectSpread$b({}, parentSet.pagination);
+  var newPagination = _objectSpread$c({}, parentSet.pagination);
 
   var hasPrev;
   var hasNext;
@@ -767,9 +972,9 @@ var DEFAULT_MESSAGE_SET_PAGINATION = {
   hasPrev: true
 };
 
-function ownKeys$a(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$b(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$a(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$a(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$a(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$b(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$b(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 /**
  * ChannelState - A container class for the channel state.
@@ -842,142 +1047,31 @@ var ChannelState = /*#__PURE__*/function () {
       };
     });
 
-    _defineProperty__default['default'](this, "updatePollVote", function (pollVote, poll, messageId) {
-      var _message$poll;
-
-      var message = _this.findMessage(messageId);
-
-      if (!message) return;
-      if (message.poll_id !== pollVote.poll_id) return;
-
-      var updatedPoll = _objectSpread$a({}, poll);
+    _defineProperty__default['default'](this, "updateUserMessages", function (user) {
+      var _updateUserMessages = function _updateUserMessages(messages, user) {
+        for (var i = 0; i < messages.length; i++) {
+          var _m$user;
 
-      var ownVotes = _toConsumableArray__default['default'](((_message$poll = message.poll) === null || _message$poll === void 0 ? void 0 : _message$poll.own_votes) || []);
+          var m = messages[i];
 
-      if (pollVote.user_id === _this._channel.getClient().userID) {
-        if (pollVote.option_id && poll.enforce_unique_vote) {
-          // remove all previous votes where option_id is not empty
-          ownVotes = ownVotes.filter(function (vote) {
-            return !vote.option_id;
-          });
-        } else if (pollVote.answer_text) {
-          // remove all previous votes where option_id is empty
-          ownVotes = ownVotes.filter(function (vote) {
-            return vote.answer_text;
-          });
+          if (((_m$user = m.user) === null || _m$user === void 0 ? void 0 : _m$user.id) === user.id) {
+            messages[i] = _objectSpread$b(_objectSpread$b({}, m), {}, {
+              user: user
+            });
+          }
         }
+      };
 
-        ownVotes.push(pollVote);
-      }
-
-      updatedPoll.own_votes = ownVotes;
-
-      var newMessage = _objectSpread$a(_objectSpread$a({}, message), {}, {
-        poll: updatedPoll
+      _this.messageSets.forEach(function (set) {
+        return _updateUserMessages(set.messages, user);
       });
 
-      _this.addMessageSorted(newMessage, false, false);
-    });
+      for (var parentId in _this.threads) {
+        _updateUserMessages(_this.threads[parentId], user);
+      }
 
-    _defineProperty__default['default'](this, "addPollVote", function (pollVote, poll, messageId) {
-      var _message$poll2;
-
-      var message = _this.findMessage(messageId);
-
-      if (!message) return;
-      if (message.poll_id !== pollVote.poll_id) return;
-
-      var updatedPoll = _objectSpread$a({}, poll);
-
-      var ownVotes = _toConsumableArray__default['default'](((_message$poll2 = message.poll) === null || _message$poll2 === void 0 ? void 0 : _message$poll2.own_votes) || []);
-
-      if (pollVote.user_id === _this._channel.getClient().userID) {
-        ownVotes.push(pollVote);
-      }
-
-      updatedPoll.own_votes = ownVotes;
-
-      var newMessage = _objectSpread$a(_objectSpread$a({}, message), {}, {
-        poll: updatedPoll
-      });
-
-      _this.addMessageSorted(newMessage, false, false);
-    });
-
-    _defineProperty__default['default'](this, "removePollVote", function (pollVote, poll, messageId) {
-      var _message$poll3;
-
-      var message = _this.findMessage(messageId);
-
-      if (!message) return;
-      if (message.poll_id !== pollVote.poll_id) return;
-
-      var updatedPoll = _objectSpread$a({}, poll);
-
-      var ownVotes = _toConsumableArray__default['default'](((_message$poll3 = message.poll) === null || _message$poll3 === void 0 ? void 0 : _message$poll3.own_votes) || []);
-
-      if (pollVote.user_id === _this._channel.getClient().userID) {
-        var index = ownVotes.findIndex(function (vote) {
-          return vote.option_id === pollVote.option_id;
-        });
-
-        if (index > -1) {
-          ownVotes.splice(index, 1);
-        }
-      }
-
-      updatedPoll.own_votes = ownVotes;
-
-      var newMessage = _objectSpread$a(_objectSpread$a({}, message), {}, {
-        poll: updatedPoll
-      });
-
-      _this.addMessageSorted(newMessage, false, false);
-    });
-
-    _defineProperty__default['default'](this, "updatePoll", function (poll, messageId) {
-      var _message$poll4;
-
-      var message = _this.findMessage(messageId);
-
-      if (!message) return;
-
-      var updatedPoll = _objectSpread$a(_objectSpread$a({}, poll), {}, {
-        own_votes: _toConsumableArray__default['default'](((_message$poll4 = message.poll) === null || _message$poll4 === void 0 ? void 0 : _message$poll4.own_votes) || [])
-      });
-
-      var newMessage = _objectSpread$a(_objectSpread$a({}, message), {}, {
-        poll: updatedPoll
-      });
-
-      _this.addMessageSorted(newMessage, false, false);
-    });
-
-    _defineProperty__default['default'](this, "updateUserMessages", function (user) {
-      var _updateUserMessages = function _updateUserMessages(messages, user) {
-        for (var i = 0; i < messages.length; i++) {
-          var _m$user;
-
-          var m = messages[i];
-
-          if (((_m$user = m.user) === null || _m$user === void 0 ? void 0 : _m$user.id) === user.id) {
-            messages[i] = _objectSpread$a(_objectSpread$a({}, m), {}, {
-              user: user
-            });
-          }
-        }
-      };
-
-      _this.messageSets.forEach(function (set) {
-        return _updateUserMessages(set.messages, user);
-      });
-
-      for (var parentId in _this.threads) {
-        _updateUserMessages(_this.threads[parentId], user);
-      }
-
-      _updateUserMessages(_this.pinnedMessages, user);
-    });
+      _updateUserMessages(_this.pinnedMessages, user);
+    });
 
     _defineProperty__default['default'](this, "deleteUserMessages", function (user) {
       var hardDelete = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -1016,7 +1110,7 @@ var ChannelState = /*#__PURE__*/function () {
               user: m.user
             };
           } else {
-            messages[i] = _objectSpread$a(_objectSpread$a({}, m), {}, {
+            messages[i] = _objectSpread$b(_objectSpread$b({}, m), {}, {
               type: 'deleted',
               deleted_at: user.deleted_at ? new Date(user.deleted_at) : null
             });
@@ -1334,7 +1428,7 @@ var ChannelState = /*#__PURE__*/function () {
       var parseMessage = function parseMessage(m) {
         var _m$pinned_at, _m$updated_at;
 
-        return _objectSpread$a(_objectSpread$a({}, m), {}, {
+        return _objectSpread$b(_objectSpread$b({}, m), {}, {
           created_at: m.created_at.toISOString(),
           pinned_at: (_m$pinned_at = m.pinned_at) === null || _m$pinned_at === void 0 ? void 0 : _m$pinned_at.toISOString(),
           updated_at: (_m$updated_at = m.updated_at) === null || _m$updated_at === void 0 ? void 0 : _m$updated_at.toISOString()
@@ -1344,8 +1438,8 @@ var ChannelState = /*#__PURE__*/function () {
       var update = function update(messages) {
         var updatedMessages = messages.reduce(function (acc, msg) {
           if (msg.quoted_message_id === message.id) {
-            acc.push(_objectSpread$a(_objectSpread$a({}, parseMessage(msg)), {}, {
-              quoted_message: remove ? _objectSpread$a(_objectSpread$a({}, message), {}, {
+            acc.push(_objectSpread$b(_objectSpread$b({}, parseMessage(msg)), {}, {
+              quoted_message: remove ? _objectSpread$b(_objectSpread$b({}, message), {}, {
                 attachments: []
               }) : message
             }));
@@ -1828,15 +1922,15 @@ var ChannelState = /*#__PURE__*/function () {
   return ChannelState;
 }();
 
-function _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(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 _createForOfIteratorHelper$4(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$4(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$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(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$3(o, minLen); }
+function _unsupportedIterableToArray$4(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$4(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$4(o, minLen); }
 
-function _arrayLikeToArray$3(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 _arrayLikeToArray$4(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$a(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$9(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$a(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$a(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$a(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 /**
  * Channel - The Channel class manages it's own state.
  */
@@ -1909,7 +2003,7 @@ var Channel = /*#__PURE__*/function () {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                defaultOptions = _objectSpread$9(_objectSpread$9({}, options), {}, {
+                defaultOptions = _objectSpread$a(_objectSpread$a({}, options), {}, {
                   watch: false,
                   state: false,
                   presence: false
@@ -1981,7 +2075,7 @@ var Channel = /*#__PURE__*/function () {
 
     this.data = data; // this._data is used for the requests...
 
-    this._data = _objectSpread$9({}, data);
+    this._data = _objectSpread$a({}, data);
     this.cid = "".concat(type, ":").concat(id);
     this.listeners = {}; // perhaps the state variable should be private
 
@@ -2043,7 +2137,7 @@ var Channel = /*#__PURE__*/function () {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.next = 2;
-                return this.getClient().post(this._channelURL() + '/message', _objectSpread$9({
+                return this.getClient().post(this._channelURL() + '/message', _objectSpread$a({
                   message: message
                 }, options));
 
@@ -2159,7 +2253,7 @@ var Channel = /*#__PURE__*/function () {
 
               case 3:
                 // Return a list of channels
-                payload = _objectSpread$9(_objectSpread$9({
+                payload = _objectSpread$a(_objectSpread$a({
                   filter_conditions: {
                     cid: this.cid
                   }
@@ -2256,7 +2350,7 @@ var Channel = /*#__PURE__*/function () {
 
                 _context5.next = 6;
                 return this.getClient().get(this.getClient().baseURL + '/members', {
-                  payload: _objectSpread$9({
+                  payload: _objectSpread$a({
                     type: type,
                     id: id,
                     members: members,
@@ -2362,7 +2456,7 @@ var Channel = /*#__PURE__*/function () {
 
               case 4:
                 _context7.next = 6;
-                return this.getClient().post(this.getClient().baseURL + "/messages/".concat(encodeURIComponent(messageID), "/reaction"), _objectSpread$9({
+                return this.getClient().post(this.getClient().baseURL + "/messages/".concat(encodeURIComponent(messageID), "/reaction"), _objectSpread$a({
                   reaction: reaction
                 }, options));
 
@@ -2443,7 +2537,7 @@ var Channel = /*#__PURE__*/function () {
                   delete channelData[key];
                 });
                 _context8.next = 7;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   message: updateMessage,
                   data: channelData
                 }, options));
@@ -2615,7 +2709,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
                 _context12.next = 3;
-                return this.getClient().delete(this._channelURL(), _objectSpread$9({}, options));
+                return this.getClient().delete(this._channelURL(), _objectSpread$a({}, options));
 
               case 3:
                 return _context12.abrupt("return", _context12.sent);
@@ -2691,7 +2785,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
                 _context14.next = 3;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   accept_invite: true
                 }, options));
 
@@ -2732,7 +2826,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
                 _context15.next = 3;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   reject_invite: true
                 }, options));
 
@@ -2774,7 +2868,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args16.length > 2 && _args16[2] !== undefined ? _args16[2] : {};
                 _context16.next = 3;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   add_members: members,
                   message: message
                 }, options));
@@ -2817,7 +2911,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args17.length > 2 && _args17[2] !== undefined ? _args17[2] : {};
                 _context17.next = 3;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   add_moderators: members,
                   message: message
                 }, options));
@@ -2860,7 +2954,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args18.length > 2 && _args18[2] !== undefined ? _args18[2] : {};
                 _context18.next = 3;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   assign_roles: roles,
                   message: message
                 }, options));
@@ -2903,7 +2997,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args19.length > 2 && _args19[2] !== undefined ? _args19[2] : {};
                 _context19.next = 3;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   invites: members,
                   message: message
                 }, options));
@@ -2946,7 +3040,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args20.length > 2 && _args20[2] !== undefined ? _args20[2] : {};
                 _context20.next = 3;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   remove_members: members,
                   message: message
                 }, options));
@@ -2989,7 +3083,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 options = _args21.length > 2 && _args21[2] !== undefined ? _args21[2] : {};
                 _context21.next = 3;
-                return this._update(_objectSpread$9({
+                return this._update(_objectSpread$a({
                   demote_moderators: members,
                   message: message
                 }, options));
@@ -3074,7 +3168,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 opts = _args23.length > 0 && _args23[0] !== undefined ? _args23[0] : {};
                 _context23.next = 3;
-                return this.getClient().post(this.getClient().baseURL + '/moderation/mute/channel', _objectSpread$9({
+                return this.getClient().post(this.getClient().baseURL + '/moderation/mute/channel', _objectSpread$a({
                   channel_cid: this.cid
                 }, opts));
 
@@ -3116,7 +3210,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 opts = _args24.length > 0 && _args24[0] !== undefined ? _args24[0] : {};
                 _context24.next = 3;
-                return this.getClient().post(this.getClient().baseURL + '/moderation/unmute/channel', _objectSpread$9({
+                return this.getClient().post(this.getClient().baseURL + '/moderation/unmute/channel', _objectSpread$a({
                   channel_cid: this.cid
                 }, opts));
 
@@ -3201,7 +3295,7 @@ var Channel = /*#__PURE__*/function () {
 
                 this.lastTypingEvent = new Date();
                 _context25.next = 10;
-                return this.sendEvent(_objectSpread$9({
+                return this.sendEvent(_objectSpread$a({
                   type: 'typing.start',
                   parent_id: parent_id
                 }, options || {}));
@@ -3245,7 +3339,7 @@ var Channel = /*#__PURE__*/function () {
                 this.lastTypingEvent = null;
                 this.isTyping = false;
                 _context26.next = 6;
-                return this.sendEvent(_objectSpread$9({
+                return this.sendEvent(_objectSpread$a({
                   type: 'typing.stop',
                   parent_id: parent_id
                 }, options || {}));
@@ -3332,7 +3426,7 @@ var Channel = /*#__PURE__*/function () {
 
               case 4:
                 _context27.next = 6;
-                return this.getClient().post(this._channelURL() + '/read', _objectSpread$9({}, data));
+                return this.getClient().post(this._channelURL() + '/read', _objectSpread$a({}, data));
 
               case 6:
                 return _context27.abrupt("return", _context27.sent);
@@ -3379,7 +3473,7 @@ var Channel = /*#__PURE__*/function () {
 
               case 3:
                 _context28.next = 5;
-                return this.getClient().post(this._channelURL() + '/unread', _objectSpread$9({}, data));
+                return this.getClient().post(this._channelURL() + '/unread', _objectSpread$a({}, data));
 
               case 5:
                 return _context28.abrupt("return", _context28.sent);
@@ -3447,7 +3541,7 @@ var Channel = /*#__PURE__*/function () {
                   defaultOptions.watch = false;
                 }
 
-                combined = _objectSpread$9(_objectSpread$9({}, defaultOptions), options);
+                combined = _objectSpread$a(_objectSpread$a({}, defaultOptions), options);
                 _context29.next = 7;
                 return this.query(combined, 'latest');
 
@@ -3541,7 +3635,7 @@ var Channel = /*#__PURE__*/function () {
               case 0:
                 normalizedSort = sort ? normalizeQuerySort(sort) : undefined;
                 _context31.next = 3;
-                return this.getClient().get(this.getClient().baseURL + "/messages/".concat(encodeURIComponent(parent_id), "/replies"), _objectSpread$9({
+                return this.getClient().get(this.getClient().baseURL + "/messages/".concat(encodeURIComponent(parent_id), "/replies"), _objectSpread$a({
                   sort: normalizedSort
                 }, options));
 
@@ -3591,7 +3685,7 @@ var Channel = /*#__PURE__*/function () {
                 sort = _args32.length > 1 && _args32[1] !== undefined ? _args32[1] : [];
                 _context32.next = 3;
                 return this.getClient().get(this._channelURL() + '/pinned_messages', {
-                  payload: _objectSpread$9(_objectSpread$9({}, options), {}, {
+                  payload: _objectSpread$a(_objectSpread$a({}, options), {}, {
                     sort: normalizeQuerySort(sort)
                   })
                 });
@@ -3625,7 +3719,7 @@ var Channel = /*#__PURE__*/function () {
   }, {
     key: "getReactions",
     value: function getReactions(message_id, options) {
-      return this.getClient().get(this.getClient().baseURL + "/messages/".concat(encodeURIComponent(message_id), "/reactions"), _objectSpread$9({}, options));
+      return this.getClient().get(this.getClient().baseURL + "/messages/".concat(encodeURIComponent(message_id), "/reactions"), _objectSpread$a({}, options));
     }
     /**
      * getMessagesById - Retrieves a list of messages by ID
@@ -3772,7 +3866,7 @@ var Channel = /*#__PURE__*/function () {
                 }
 
                 _context33.next = 7;
-                return this.getClient().post(queryURL + '/query', _objectSpread$9({
+                return this.getClient().post(queryURL + '/query', _objectSpread$a({
                   data: this._data,
                   state: true
                 }, options));
@@ -3807,13 +3901,14 @@ var Channel = /*#__PURE__*/function () {
 
 
                 _this$_initializeStat = this._initializeState(state, messageSetToAddToIfDoesNotExist), messageSet = _this$_initializeStat.messageSet;
-                messageSet.pagination = _objectSpread$9(_objectSpread$9({}, messageSet.pagination), messageSetPagination({
+                messageSet.pagination = _objectSpread$a(_objectSpread$a({}, messageSet.pagination), messageSetPagination({
                   parentSet: messageSet,
                   messagePaginationOptions: options === null || options === void 0 ? void 0 : options.messages,
                   requestedPageSize: (_options$messages$lim = options === null || options === void 0 ? void 0 : (_options$messages = options.messages) === null || _options$messages === void 0 ? void 0 : _options$messages.limit) !== null && _options$messages$lim !== void 0 ? _options$messages$lim : DEFAULT_QUERY_CHANNEL_MESSAGE_LIST_PAGE_SIZE,
                   returnedPage: state.messages,
                   logger: this.getClient().logger
                 }));
+                this.getClient().polls.hydratePollCache(messageSet.messages, true);
                 areCapabilitiesChanged = _toConsumableArray__default['default'](state.channel.own_capabilities || []).sort().join() !== _toConsumableArray__default['default'](Array.isArray((_this$data6 = this.data) === null || _this$data6 === void 0 ? void 0 : _this$data6.own_capabilities) ? (_this$data7 = this.data) === null || _this$data7 === void 0 ? void 0 : _this$data7.own_capabilities : []).sort().join();
                 this.data = state.channel;
                 this.offlineMode = false;
@@ -3835,7 +3930,7 @@ var Channel = /*#__PURE__*/function () {
                 });
                 return _context33.abrupt("return", state);
 
-              case 18:
+              case 19:
               case "end":
                 return _context33.stop();
             }
@@ -3868,7 +3963,7 @@ var Channel = /*#__PURE__*/function () {
                 this._checkInitialized();
 
                 _context34.next = 3;
-                return this.getClient().banUser(targetUserID, _objectSpread$9(_objectSpread$9({}, options), {}, {
+                return this.getClient().banUser(targetUserID, _objectSpread$a(_objectSpread$a({}, options), {}, {
                   type: this.type,
                   id: this.id
                 }));
@@ -4040,7 +4135,7 @@ var Channel = /*#__PURE__*/function () {
                 this._checkInitialized();
 
                 _context38.next = 3;
-                return this.getClient().shadowBan(targetUserID, _objectSpread$9(_objectSpread$9({}, options), {}, {
+                return this.getClient().shadowBan(targetUserID, _objectSpread$a(_objectSpread$a({}, options), {}, {
                   type: this.type,
                   id: this.id
                 }));
@@ -4494,7 +4589,7 @@ var Channel = /*#__PURE__*/function () {
               });
             }
 
-            channel.data = _objectSpread$9(_objectSpread$9({}, event.channel), {}, {
+            channel.data = _objectSpread$a(_objectSpread$a({}, event.channel), {}, {
               hidden: (_event$channel$hidden = (_event$channel3 = event.channel) === null || _event$channel3 === void 0 ? void 0 : _event$channel3.hidden) !== null && _event$channel$hidden !== void 0 ? _event$channel$hidden : (_channel$data2 = channel.data) === null || _channel$data2 === void 0 ? void 0 : _channel$data2.hidden,
               own_capabilities: (_event$channel$own_ca = (_event$channel4 = event.channel) === null || _event$channel4 === void 0 ? void 0 : _event$channel4.own_capabilities) !== null && _event$channel$own_ca !== void 0 ? _event$channel$own_ca : (_channel$data3 = channel.data) === null || _channel$data3 === void 0 ? void 0 : _channel$data3.own_capabilities
             });
@@ -4502,49 +4597,6 @@ var Channel = /*#__PURE__*/function () {
 
           break;
 
-        case 'poll.updated':
-          if (event.poll) {
-            var _event$message;
-
-            channelState.updatePoll(event.poll, ((_event$message = event.message) === null || _event$message === void 0 ? void 0 : _event$message.id) || '');
-          }
-
-          break;
-
-        case 'poll.vote_casted':
-          if (event.poll_vote && event.poll) {
-            var _event$message2;
-
-            channelState.addPollVote(event.poll_vote, event.poll, ((_event$message2 = event.message) === null || _event$message2 === void 0 ? void 0 : _event$message2.id) || '');
-          }
-
-          break;
-
-        case 'poll.vote_changed':
-          if (event.poll_vote && event.poll) {
-            var _event$message3;
-
-            channelState.updatePollVote(event.poll_vote, event.poll, ((_event$message3 = event.message) === null || _event$message3 === void 0 ? void 0 : _event$message3.id) || '');
-          }
-
-          break;
-
-        case 'poll.vote_removed':
-          if (event.poll_vote && event.poll) {
-            var _event$message4;
-
-            channelState.removePollVote(event.poll_vote, event.poll, ((_event$message4 = event.message) === null || _event$message4 === void 0 ? void 0 : _event$message4.id) || '');
-          }
-
-          break;
-
-        case 'poll.closed':
-          if (event.message) {
-            channelState.addMessageSorted(event.message, false, false);
-          }
-
-          break;
-
         case 'reaction.new':
           if (event.message && event.reaction) {
             event.message = channelState.addReaction(event.reaction, event.message);
@@ -4568,7 +4620,7 @@ var Channel = /*#__PURE__*/function () {
           break;
 
         case 'channel.hidden':
-          channel.data = _objectSpread$9(_objectSpread$9({}, channel.data), {}, {
+          channel.data = _objectSpread$a(_objectSpread$a({}, channel.data), {}, {
             hidden: true
           });
 
@@ -4579,26 +4631,26 @@ var Channel = /*#__PURE__*/function () {
           break;
 
         case 'channel.visible':
-          channel.data = _objectSpread$9(_objectSpread$9({}, channel.data), {}, {
+          channel.data = _objectSpread$a(_objectSpread$a({}, channel.data), {}, {
             hidden: false
           });
           break;
 
         case 'user.banned':
           if (!((_event$user11 = event.user) !== null && _event$user11 !== void 0 && _event$user11.id)) break;
-          channelState.members[event.user.id] = _objectSpread$9(_objectSpread$9({}, channelState.members[event.user.id] || {}), {}, {
+          channelState.members[event.user.id] = _objectSpread$a(_objectSpread$a({}, channelState.members[event.user.id] || {}), {}, {
             shadow_banned: !!event.shadow,
             banned: !event.shadow,
-            user: _objectSpread$9(_objectSpread$9({}, ((_channelState$members = channelState.members[event.user.id]) === null || _channelState$members === void 0 ? void 0 : _channelState$members.user) || {}), event.user)
+            user: _objectSpread$a(_objectSpread$a({}, ((_channelState$members = channelState.members[event.user.id]) === null || _channelState$members === void 0 ? void 0 : _channelState$members.user) || {}), event.user)
           });
           break;
 
         case 'user.unbanned':
           if (!((_event$user12 = event.user) !== null && _event$user12 !== void 0 && _event$user12.id)) break;
-          channelState.members[event.user.id] = _objectSpread$9(_objectSpread$9({}, channelState.members[event.user.id] || {}), {}, {
+          channelState.members[event.user.id] = _objectSpread$a(_objectSpread$a({}, channelState.members[event.user.id] || {}), {}, {
             shadow_banned: false,
             banned: false,
-            user: _objectSpread$9(_objectSpread$9({}, ((_channelState$members2 = channelState.members[event.user.id]) === null || _channelState$members2 === void 0 ? void 0 : _channelState$members2.user) || {}), event.user)
+            user: _objectSpread$a(_objectSpread$a({}, ((_channelState$members2 = channelState.members[event.user.id]) === null || _channelState$members2 === void 0 ? void 0 : _channelState$members2.user) || {}), event.user)
           });
           break;
       } // any event can send over the online count
@@ -4628,7 +4680,7 @@ var Channel = /*#__PURE__*/function () {
 
 
       if (state.members) {
-        var _iterator = _createForOfIteratorHelper$3(state.members),
+        var _iterator = _createForOfIteratorHelper$4(state.members),
             _step;
 
         try {
@@ -4672,7 +4724,7 @@ var Channel = /*#__PURE__*/function () {
 
 
       if (state.watchers) {
-        var _iterator2 = _createForOfIteratorHelper$3(state.watchers),
+        var _iterator2 = _createForOfIteratorHelper$4(state.watchers),
             _step2;
 
         try {
@@ -4708,7 +4760,7 @@ var Channel = /*#__PURE__*/function () {
 
 
       if (state.read) {
-        var _iterator3 = _createForOfIteratorHelper$3(state.read),
+        var _iterator3 = _createForOfIteratorHelper$4(state.read),
             _step3;
 
         try {
@@ -4782,11 +4834,11 @@ var Channel = /*#__PURE__*/function () {
   return Channel;
 }();
 
-function _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(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 _createForOfIteratorHelper$3(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$3(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$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(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$2(o, minLen); }
+function _unsupportedIterableToArray$3(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$3(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$3(o, minLen); }
 
-function _arrayLikeToArray$2(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 _arrayLikeToArray$3(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; }
 
 /**
  * ClientState - A container class for the client state.
@@ -4809,7 +4861,7 @@ var ClientState = /*#__PURE__*/function () {
   _createClass__default['default'](ClientState, [{
     key: "updateUsers",
     value: function updateUsers(users) {
-      var _iterator = _createForOfIteratorHelper$2(users),
+      var _iterator = _createForOfIteratorHelper$3(users),
           _step;
 
       try {
@@ -4857,9 +4909,9 @@ var ClientState = /*#__PURE__*/function () {
   return ClientState;
 }();
 
-function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$8(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$9(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var InsightMetrics = function InsightMetrics() {
   _classCallCheck__default['default'](this, InsightMetrics);
 
@@ -4938,7 +4990,7 @@ var postInsights = /*#__PURE__*/function () {
   };
 }();
 function buildWsFatalInsight(connection, event) {
-  return _objectSpread$8(_objectSpread$8({}, event), buildWsBaseInsight(connection));
+  return _objectSpread$9(_objectSpread$9({}, event), buildWsBaseInsight(connection));
 }
 
 function buildWsBaseInsight(connection) {
@@ -4971,9 +5023,9 @@ function buildWsSuccessAfterFailureInsight(connection) {
   return buildWsBaseInsight(connection);
 }
 
-function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$8(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 // Type guards to check WebSocket error type
 var isCloseEvent = function isCloseEvent(res) {
@@ -5337,7 +5389,7 @@ var StableWSConnection = /*#__PURE__*/function () {
     value: function _log(msg) {
       var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'info';
-      this.client.logger(level, 'connection:' + msg, _objectSpread$7({
+      this.client.logger(level, 'connection:' + msg, _objectSpread$8({
         tags: ['connection']
       }, extra));
     }
@@ -5928,9 +5980,9 @@ var StableWSConnection = /*#__PURE__*/function () {
   return StableWSConnection;
 }();
 
-function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 /**
  * Creates the JWT token that can be used for a UserSession
@@ -5951,7 +6003,7 @@ function JWTUserToken(apiSecret, userId) {
     throw new TypeError('userId should be a string');
   }
 
-  var payload = _objectSpread$6({
+  var payload = _objectSpread$7({
     user_id: userId
   }, extraData); // make sure we return a clear error when jwt is shimmed (ie. browser build)
 
@@ -6361,9 +6413,9 @@ function isErrorResponse(res) {
   return !res.status || res.status < 200 || 300 <= res.status;
 }
 
-function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var ConnectionState;
 
 (function (ConnectionState) {
@@ -6426,7 +6478,7 @@ var WSConnectionFallback = /*#__PURE__*/function () {
                 _context.next = 4;
                 return _this.client.doAxiosRequest('get', _this.client.baseURL.replace(':3030', ':8900') + '/longpoll', // replace port if present for testing with local API
                 undefined, {
-                  config: _objectSpread$5(_objectSpread$5({}, config), {}, {
+                  config: _objectSpread$6(_objectSpread$6({}, config), {}, {
                     cancelToken: (_this$cancelToken2 = _this.cancelToken) === null || _this$cancelToken2 === void 0 ? void 0 : _this$cancelToken2.token
                   }),
                   params: params
@@ -6704,7 +6756,7 @@ var WSConnectionFallback = /*#__PURE__*/function () {
     value: function _log(msg) {
       var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'info';
-      this.client.logger(level, 'WSConnectionFallback:' + msg, _objectSpread$5({
+      this.client.logger(level, 'WSConnectionFallback:' + msg, _objectSpread$6({
         tags: ['connection_fallback', 'connection']
       }, extra));
     }
@@ -6737,53 +6789,45 @@ var WSConnectionFallback = /*#__PURE__*/function () {
   return WSConnectionFallback;
 }();
 
-var Campaign = /*#__PURE__*/function () {
-  function Campaign(client, id, data) {
-    _classCallCheck__default['default'](this, Campaign);
+var Segment = /*#__PURE__*/function () {
+  function Segment(client, type, id, data) {
+    _classCallCheck__default['default'](this, Segment);
 
-    _defineProperty__default['default'](this, "id", void 0);
+    _defineProperty__default['default'](this, "type", void 0);
 
-    _defineProperty__default['default'](this, "data", void 0);
+    _defineProperty__default['default'](this, "id", void 0);
 
     _defineProperty__default['default'](this, "client", void 0);
 
+    _defineProperty__default['default'](this, "data", void 0);
+
     this.client = client;
+    this.type = type;
     this.id = id;
     this.data = data;
   }
 
-  _createClass__default['default'](Campaign, [{
+  _createClass__default['default'](Segment, [{
     key: "create",
     value: function () {
       var _create = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-        var _this$data, _this$data2, _this$data3, _this$data4, _this$data5, _this$data6, _this$data7, _this$data8;
+        var _this$data, _this$data2, _this$data3, _this$data4, _this$data5;
 
-        var body, result;
+        var body;
         return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 body = {
-                  id: this.id,
-                  message_template: (_this$data = this.data) === null || _this$data === void 0 ? void 0 : _this$data.message_template,
-                  segment_ids: (_this$data2 = this.data) === null || _this$data2 === void 0 ? void 0 : _this$data2.segment_ids,
-                  sender_id: (_this$data3 = this.data) === null || _this$data3 === void 0 ? void 0 : _this$data3.sender_id,
-                  channel_template: (_this$data4 = this.data) === null || _this$data4 === void 0 ? void 0 : _this$data4.channel_template,
-                  create_channels: (_this$data5 = this.data) === null || _this$data5 === void 0 ? void 0 : _this$data5.create_channels,
-                  description: (_this$data6 = this.data) === null || _this$data6 === void 0 ? void 0 : _this$data6.description,
-                  name: (_this$data7 = this.data) === null || _this$data7 === void 0 ? void 0 : _this$data7.name,
-                  user_ids: (_this$data8 = this.data) === null || _this$data8 === void 0 ? void 0 : _this$data8.user_ids
+                  name: (_this$data = this.data) === null || _this$data === void 0 ? void 0 : _this$data.name,
+                  filter: (_this$data2 = this.data) === null || _this$data2 === void 0 ? void 0 : _this$data2.filter,
+                  description: (_this$data3 = this.data) === null || _this$data3 === void 0 ? void 0 : _this$data3.description,
+                  all_sender_channels: (_this$data4 = this.data) === null || _this$data4 === void 0 ? void 0 : _this$data4.all_sender_channels,
+                  all_users: (_this$data5 = this.data) === null || _this$data5 === void 0 ? void 0 : _this$data5.all_users
                 };
-                _context.next = 3;
-                return this.client.createCampaign(body);
-
-              case 3:
-                result = _context.sent;
-                this.id = result.campaign.id;
-                this.data = result.campaign;
-                return _context.abrupt("return", result);
+                return _context.abrupt("return", this.client.createSegment(this.type, this.id, body));
 
-              case 7:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -6798,28 +6842,24 @@ var Campaign = /*#__PURE__*/function () {
       return create;
     }()
   }, {
-    key: "verifyCampaignId",
-    value: function verifyCampaignId() {
+    key: "verifySegmentId",
+    value: function verifySegmentId() {
       if (!this.id) {
-        throw new Error('Campaign id is missing. Either create the campaign using campaign.create() or set the id during instantiation - const campaign = client.campaign(id)');
+        throw new Error('Segment id is missing. Either create the segment using segment.create() or set the id during instantiation - const segment = client.segment(id)');
       }
     }
   }, {
-    key: "start",
+    key: "get",
     value: function () {
-      var _start = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(options) {
+      var _get = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
         return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                this.verifyCampaignId();
-                _context2.next = 3;
-                return this.client.startCampaign(this.id, options);
-
-              case 3:
-                return _context2.abrupt("return", _context2.sent);
+                this.verifySegmentId();
+                return _context2.abrupt("return", this.client.getSegment(this.id));
 
-              case 4:
+              case 2:
               case "end":
                 return _context2.stop();
             }
@@ -6827,11 +6867,11 @@ var Campaign = /*#__PURE__*/function () {
         }, _callee2, this);
       }));
 
-      function start(_x) {
-        return _start.apply(this, arguments);
+      function get() {
+        return _get.apply(this, arguments);
       }
 
-      return start;
+      return get;
     }()
   }, {
     key: "update",
@@ -6841,8 +6881,8 @@ var Campaign = /*#__PURE__*/function () {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                this.verifyCampaignId();
-                return _context3.abrupt("return", this.client.updateCampaign(this.id, data));
+                this.verifySegmentId();
+                return _context3.abrupt("return", this.client.updateSegment(this.id, data));
 
               case 2:
               case "end":
@@ -6852,28 +6892,24 @@ var Campaign = /*#__PURE__*/function () {
         }, _callee3, this);
       }));
 
-      function update(_x2) {
+      function update(_x) {
         return _update.apply(this, arguments);
       }
 
       return update;
     }()
   }, {
-    key: "delete",
+    key: "addTargets",
     value: function () {
-      var _delete2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
+      var _addTargets = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(targets) {
         return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                this.verifyCampaignId();
-                _context4.next = 3;
-                return this.client.deleteCampaign(this.id);
-
-              case 3:
-                return _context4.abrupt("return", _context4.sent);
+                this.verifySegmentId();
+                return _context4.abrupt("return", this.client.addSegmentTargets(this.id, targets));
 
-              case 4:
+              case 2:
               case "end":
                 return _context4.stop();
             }
@@ -6881,22 +6917,22 @@ var Campaign = /*#__PURE__*/function () {
         }, _callee4, this);
       }));
 
-      function _delete() {
-        return _delete2.apply(this, arguments);
+      function addTargets(_x2) {
+        return _addTargets.apply(this, arguments);
       }
 
-      return _delete;
+      return addTargets;
     }()
   }, {
-    key: "stop",
+    key: "removeTargets",
     value: function () {
-      var _stop = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5() {
+      var _removeTargets = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(targets) {
         return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                this.verifyCampaignId();
-                return _context5.abrupt("return", this.client.stopCampaign(this.id));
+                this.verifySegmentId();
+                return _context5.abrupt("return", this.client.removeSegmentTargets(this.id, targets));
 
               case 2:
               case "end":
@@ -6906,22 +6942,22 @@ var Campaign = /*#__PURE__*/function () {
         }, _callee5, this);
       }));
 
-      function stop() {
-        return _stop.apply(this, arguments);
+      function removeTargets(_x3) {
+        return _removeTargets.apply(this, arguments);
       }
 
-      return stop;
+      return removeTargets;
     }()
   }, {
-    key: "get",
+    key: "delete",
     value: function () {
-      var _get = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6() {
+      var _delete2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6() {
         return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                this.verifyCampaignId();
-                return _context6.abrupt("return", this.client.getCampaign(this.id));
+                this.verifySegmentId();
+                return _context6.abrupt("return", this.client.deleteSegment(this.id));
 
               case 2:
               case "end":
@@ -6931,200 +6967,11 @@ var Campaign = /*#__PURE__*/function () {
         }, _callee6, this);
       }));
 
-      function get() {
-        return _get.apply(this, arguments);
+      function _delete() {
+        return _delete2.apply(this, arguments);
       }
 
-      return get;
-    }()
-  }]);
-
-  return Campaign;
-}();
-
-var Segment = /*#__PURE__*/function () {
-  function Segment(client, type, id, data) {
-    _classCallCheck__default['default'](this, Segment);
-
-    _defineProperty__default['default'](this, "type", void 0);
-
-    _defineProperty__default['default'](this, "id", void 0);
-
-    _defineProperty__default['default'](this, "client", void 0);
-
-    _defineProperty__default['default'](this, "data", void 0);
-
-    this.client = client;
-    this.type = type;
-    this.id = id;
-    this.data = data;
-  }
-
-  _createClass__default['default'](Segment, [{
-    key: "create",
-    value: function () {
-      var _create = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-        var _this$data, _this$data2, _this$data3, _this$data4, _this$data5;
-
-        var body;
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                body = {
-                  name: (_this$data = this.data) === null || _this$data === void 0 ? void 0 : _this$data.name,
-                  filter: (_this$data2 = this.data) === null || _this$data2 === void 0 ? void 0 : _this$data2.filter,
-                  description: (_this$data3 = this.data) === null || _this$data3 === void 0 ? void 0 : _this$data3.description,
-                  all_sender_channels: (_this$data4 = this.data) === null || _this$data4 === void 0 ? void 0 : _this$data4.all_sender_channels,
-                  all_users: (_this$data5 = this.data) === null || _this$data5 === void 0 ? void 0 : _this$data5.all_users
-                };
-                return _context.abrupt("return", this.client.createSegment(this.type, this.id, body));
-
-              case 2:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function create() {
-        return _create.apply(this, arguments);
-      }
-
-      return create;
-    }()
-  }, {
-    key: "verifySegmentId",
-    value: function verifySegmentId() {
-      if (!this.id) {
-        throw new Error('Segment id is missing. Either create the segment using segment.create() or set the id during instantiation - const segment = client.segment(id)');
-      }
-    }
-  }, {
-    key: "get",
-    value: function () {
-      var _get = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                this.verifySegmentId();
-                return _context2.abrupt("return", this.client.getSegment(this.id));
-
-              case 2:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function get() {
-        return _get.apply(this, arguments);
-      }
-
-      return get;
-    }()
-  }, {
-    key: "update",
-    value: function () {
-      var _update = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(data) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                this.verifySegmentId();
-                return _context3.abrupt("return", this.client.updateSegment(this.id, data));
-
-              case 2:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function update(_x) {
-        return _update.apply(this, arguments);
-      }
-
-      return update;
-    }()
-  }, {
-    key: "addTargets",
-    value: function () {
-      var _addTargets = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(targets) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                this.verifySegmentId();
-                return _context4.abrupt("return", this.client.addSegmentTargets(this.id, targets));
-
-              case 2:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4, this);
-      }));
-
-      function addTargets(_x2) {
-        return _addTargets.apply(this, arguments);
-      }
-
-      return addTargets;
-    }()
-  }, {
-    key: "removeTargets",
-    value: function () {
-      var _removeTargets = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5(targets) {
-        return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                this.verifySegmentId();
-                return _context5.abrupt("return", this.client.removeSegmentTargets(this.id, targets));
-
-              case 2:
-              case "end":
-                return _context5.stop();
-            }
-          }
-        }, _callee5, this);
-      }));
-
-      function removeTargets(_x3) {
-        return _removeTargets.apply(this, arguments);
-      }
-
-      return removeTargets;
-    }()
-  }, {
-    key: "delete",
-    value: function () {
-      var _delete2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                this.verifySegmentId();
-                return _context6.abrupt("return", this.client.deleteSegment(this.id));
-
-              case 2:
-              case "end":
-                return _context6.stop();
-            }
-          }
-        }, _callee6, this);
-      }));
-
-      function _delete() {
-        return _delete2.apply(this, arguments);
-      }
-
-      return _delete;
+      return _delete;
     }()
   }, {
     key: "targetExists",
@@ -7284,9 +7131,9 @@ exports.VotingVisibility = void 0;
   VotingVisibility["public"] = "public";
 })(exports.VotingVisibility || (exports.VotingVisibility = {}));
 
-function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$4(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function isPatch(value) {
   return typeof value === 'function';
@@ -7316,7 +7163,7 @@ var StateStore = function StateStore(value) {
 
   _defineProperty__default['default'](this, "partialNext", function (partial) {
     return _this.next(function (current) {
-      return _objectSpread$4(_objectSpread$4({}, current), partial);
+      return _objectSpread$5(_objectSpread$5({}, current), partial);
     });
   });
 
@@ -7366,11 +7213,11 @@ var StateStore = function StateStore(value) {
 
 _defineProperty__default['default'](StateStore, "logCount", 5);
 
-var _excluded$1 = ["limit", "sort"];
+var _excluded$2 = ["limit", "sort"];
 
-function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$3(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$4(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var DEFAULT_PAGE_LIMIT = 50;
 var DEFAULT_SORT = [{
   created_at: -1
@@ -7599,14 +7446,14 @@ var Thread = /*#__PURE__*/function () {
             if (userId === ((_event$user2 = event.user) === null || _event$user2 === void 0 ? void 0 : _event$user2.id)) {
               // The user who just sent a message to the thread has no unread messages
               // in that thread
-              nextUserRead = _objectSpread$3(_objectSpread$3({}, nextUserRead), {}, {
+              nextUserRead = _objectSpread$4(_objectSpread$4({}, nextUserRead), {}, {
                 lastReadAt: event.created_at ? new Date(event.created_at) : new Date(),
                 user: event.user,
                 unreadMessageCount: 0
               });
             } else if (active && userId === _this.client.userID) ; else {
               // Increment unread count for all users except the author of the new message
-              nextUserRead = _objectSpread$3(_objectSpread$3({}, nextUserRead), {}, {
+              nextUserRead = _objectSpread$4(_objectSpread$4({}, nextUserRead), {}, {
                 unreadMessageCount: userRead.unreadMessageCount + 1
               });
             }
@@ -7630,8 +7477,8 @@ var Thread = /*#__PURE__*/function () {
         var user = event.user;
 
         _this.state.next(function (current) {
-          return _objectSpread$3(_objectSpread$3({}, current), {}, {
-            read: _objectSpread$3(_objectSpread$3({}, current.read), {}, _defineProperty__default['default']({}, userId, {
+          return _objectSpread$4(_objectSpread$4({}, current), {}, {
+            read: _objectSpread$4(_objectSpread$4({}, current.read), {}, _defineProperty__default['default']({}, userId, {
               lastReadAt: new Date(createdAt),
               user: user,
               lastReadMessageId: event.last_read_message_id,
@@ -7742,7 +7589,7 @@ var Thread = /*#__PURE__*/function () {
       }
 
       _this.state.next(function (current) {
-        return _objectSpread$3(_objectSpread$3({}, current), {}, {
+        return _objectSpread$4(_objectSpread$4({}, current), {}, {
           replies: addToMessageList(current.replies, formattedMessage, timestampChanged)
         });
       });
@@ -7759,7 +7606,7 @@ var Thread = /*#__PURE__*/function () {
         var _message$reply_count;
 
         var formattedMessage = formatMessage(message);
-        return _objectSpread$3(_objectSpread$3({}, current), {}, {
+        return _objectSpread$4(_objectSpread$4({}, current), {}, {
           deletedAt: formattedMessage.deleted_at,
           parentMessage: formattedMessage,
           replyCount: (_message$reply_count = message.reply_count) !== null && _message$reply_count !== void 0 ? _message$reply_count : current.replyCount
@@ -7830,9 +7677,9 @@ var Thread = /*#__PURE__*/function () {
           limit = _ref10$limit === void 0 ? DEFAULT_PAGE_LIMIT : _ref10$limit,
           _ref10$sort = _ref10.sort,
           sort = _ref10$sort === void 0 ? DEFAULT_SORT : _ref10$sort,
-          otherOptions = _objectWithoutProperties__default['default'](_ref10, _excluded$1);
+          otherOptions = _objectWithoutProperties__default['default'](_ref10, _excluded$2);
 
-      return _this.channel.getReplies(_this.id, _objectSpread$3({
+      return _this.channel.getReplies(_this.id, _objectSpread$4({
         limit: limit
       }, otherOptions), sort);
     });
@@ -7876,12 +7723,12 @@ var Thread = /*#__PURE__*/function () {
                 limit = Math.abs(count);
 
                 _this.state.partialNext({
-                  pagination: _objectSpread$3(_objectSpread$3({}, pagination), {}, _defineProperty__default['default']({}, loadingKey, true))
+                  pagination: _objectSpread$4(_objectSpread$4({}, pagination), {}, _defineProperty__default['default']({}, loadingKey, true))
                 });
 
                 _context3.prev = 7;
                 _context3.next = 10;
-                return _this.queryReplies(_objectSpread$3(_objectSpread$3({}, queryOptions), {}, {
+                return _this.queryReplies(_objectSpread$4(_objectSpread$4({}, queryOptions), {}, {
                   limit: limit
                 }));
 
@@ -7903,9 +7750,9 @@ var Thread = /*#__PURE__*/function () {
                     (_nextReplies = nextReplies)[insertionMethodKey].apply(_nextReplies, _toConsumableArray__default['default'](replies));
                   }
 
-                  return _objectSpread$3(_objectSpread$3({}, current), {}, {
+                  return _objectSpread$4(_objectSpread$4({}, current), {}, {
                     replies: nextReplies,
-                    pagination: _objectSpread$3(_objectSpread$3({}, current.pagination), {}, (_objectSpread4 = {}, _defineProperty__default['default'](_objectSpread4, cursorKey, data.messages.length < limit ? null : maybeNextCursor), _defineProperty__default['default'](_objectSpread4, loadingKey, false), _objectSpread4))
+                    pagination: _objectSpread$4(_objectSpread$4({}, current.pagination), {}, (_objectSpread4 = {}, _defineProperty__default['default'](_objectSpread4, cursorKey, data.messages.length < limit ? null : maybeNextCursor), _defineProperty__default['default'](_objectSpread4, loadingKey, false), _objectSpread4))
                   });
                 });
 
@@ -7919,8 +7766,8 @@ var Thread = /*#__PURE__*/function () {
                 _this.client.logger('error', _context3.t0.message);
 
                 _this.state.next(function (current) {
-                  return _objectSpread$3(_objectSpread$3({}, current), {}, {
-                    pagination: _objectSpread$3(_objectSpread$3({}, current.pagination), {}, _defineProperty__default['default']({}, loadingKey, false))
+                  return _objectSpread$4(_objectSpread$4({}, current), {}, {
+                    pagination: _objectSpread$4(_objectSpread$4({}, current.pagination), {}, _defineProperty__default['default']({}, loadingKey, false))
                   });
                 });
 
@@ -8025,9 +7872,9 @@ var ownUnreadCountSelector = function ownUnreadCountSelector(currentUserId) {
   };
 };
 
-function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$2(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$3(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var MODERATION_ENTITY_TYPES = {
   user: 'stream:user',
   message: 'stream:chat:v1:message'
@@ -8144,7 +7991,7 @@ var Moderation = /*#__PURE__*/function () {
               case 0:
                 options = _args3.length > 4 && _args3[4] !== undefined ? _args3[4] : {};
                 _context3.next = 3;
-                return this.client.post(this.client.baseURL + '/api/v2/moderation/flag', _objectSpread$2({
+                return this.client.post(this.client.baseURL + '/api/v2/moderation/flag', _objectSpread$3({
                   entity_type: entityType,
                   entity_id: entityId,
                   entity_creator_id: entityCreatorID,
@@ -8189,7 +8036,7 @@ var Moderation = /*#__PURE__*/function () {
               case 0:
                 options = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
                 _context4.next = 3;
-                return this.client.post(this.client.baseURL + '/api/v2/moderation/mute', _objectSpread$2({
+                return this.client.post(this.client.baseURL + '/api/v2/moderation/mute', _objectSpread$3({
                   target_ids: [targetID]
                 }, options));
 
@@ -8227,7 +8074,7 @@ var Moderation = /*#__PURE__*/function () {
             switch (_context5.prev = _context5.next) {
               case 0:
                 _context5.next = 2;
-                return this.client.post(this.client.baseURL + '/api/v2/moderation/unmute', _objectSpread$2({
+                return this.client.post(this.client.baseURL + '/api/v2/moderation/unmute', _objectSpread$3({
                   target_ids: [targetID]
                 }, options));
 
@@ -8269,7 +8116,7 @@ var Moderation = /*#__PURE__*/function () {
               case 0:
                 options = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : {};
                 _context6.next = 3;
-                return this.client.get(this.client.baseURL + "/api/v2/moderation/user_report", _objectSpread$2({
+                return this.client.get(this.client.baseURL + "/api/v2/moderation/user_report", _objectSpread$3({
                   user_id: userID
                 }, options));
 
@@ -8313,7 +8160,7 @@ var Moderation = /*#__PURE__*/function () {
                 sort = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : [];
                 options = _args7.length > 2 && _args7[2] !== undefined ? _args7[2] : {};
                 _context7.next = 5;
-                return this.client.post(this.client.baseURL + '/api/v2/moderation/review_queue', _objectSpread$2({
+                return this.client.post(this.client.baseURL + '/api/v2/moderation/review_queue', _objectSpread$3({
                   filter: filterConditions,
                   sort: normalizeQuerySort(sort)
                 }, options));
@@ -8416,7 +8263,7 @@ var Moderation = /*#__PURE__*/function () {
               case 0:
                 options = _args10.length > 2 && _args10[2] !== undefined ? _args10[2] : {};
                 _context10.next = 3;
-                return this.client.post(this.client.baseURL + '/api/v2/moderation/submit_action', _objectSpread$2({
+                return this.client.post(this.client.baseURL + '/api/v2/moderation/submit_action', _objectSpread$3({
                   action_type: actionType,
                   item_id: itemID
                 }, options));
@@ -8443,15 +8290,15 @@ var Moderation = /*#__PURE__*/function () {
   return Moderation;
 }();
 
-function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$1(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 _createForOfIteratorHelper$2(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(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$1(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(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$1(o, minLen); }
+function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(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$2(o, minLen); }
 
-function _arrayLikeToArray$1(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 _arrayLikeToArray$2(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$2(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 var DEFAULT_CONNECTION_RECOVERY_THROTTLE_DURATION = 1000;
 var MAX_QUERY_THREADS_LIMIT = 25;
 var ThreadManager = /*#__PURE__*/function () {
@@ -8595,7 +8442,7 @@ var ThreadManager = /*#__PURE__*/function () {
       var unsubscribeConnectionDropped = _this.client.on('connection.changed', function (event) {
         if (event.online === false) {
           _this.state.next(function (current) {
-            return current.lastConnectionDropAt ? current : _objectSpread$1(_objectSpread$1({}, current), {}, {
+            return current.lastConnectionDropAt ? current : _objectSpread$2(_objectSpread$2({}, current), {}, {
               lastConnectionDropAt: new Date()
             });
           });
@@ -8682,213 +8529,1219 @@ var ThreadManager = /*#__PURE__*/function () {
               _context.prev = 7;
 
               _this.state.next(function (current) {
-                return _objectSpread$1(_objectSpread$1({}, current), {}, {
-                  pagination: _objectSpread$1(_objectSpread$1({}, current.pagination), {}, {
+                return _objectSpread$2(_objectSpread$2({}, current), {}, {
+                  pagination: _objectSpread$2(_objectSpread$2({}, current.pagination), {}, {
                     isLoading: true
                   })
                 });
               });
 
-              _context.next = 11;
-              return _this.queryThreads({
-                limit: Math.min(limit, MAX_QUERY_THREADS_LIMIT) || MAX_QUERY_THREADS_LIMIT
-              });
+              _context.next = 11;
+              return _this.queryThreads({
+                limit: Math.min(limit, MAX_QUERY_THREADS_LIMIT) || MAX_QUERY_THREADS_LIMIT
+              });
+
+            case 11:
+              response = _context.sent;
+              currentThreads = _this.threadsById;
+              nextThreads = [];
+              _iterator = _createForOfIteratorHelper$2(response.threads);
+
+              try {
+                for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                  incomingThread = _step.value;
+                  existingThread = currentThreads[incomingThread.id];
+
+                  if (existingThread) {
+                    // Reuse thread instances if possible
+                    nextThreads.push(existingThread);
+
+                    if (existingThread.hasStaleState) {
+                      existingThread.hydrateState(incomingThread);
+                    }
+                  } else {
+                    nextThreads.push(incomingThread);
+                  }
+                }
+              } catch (err) {
+                _iterator.e(err);
+              } finally {
+                _iterator.f();
+              }
+
+              _this.state.next(function (current) {
+                var _response$next;
+
+                return _objectSpread$2(_objectSpread$2({}, current), {}, {
+                  threads: nextThreads,
+                  unseenThreadIds: [],
+                  isThreadOrderStale: false,
+                  pagination: _objectSpread$2(_objectSpread$2({}, current.pagination), {}, {
+                    isLoading: false,
+                    nextCursor: (_response$next = response.next) !== null && _response$next !== void 0 ? _response$next : null
+                  }),
+                  ready: true
+                });
+              });
+
+              _context.next = 23;
+              break;
+
+            case 19:
+              _context.prev = 19;
+              _context.t0 = _context["catch"](7);
+
+              _this.client.logger('error', _context.t0.message);
+
+              _this.state.next(function (current) {
+                return _objectSpread$2(_objectSpread$2({}, current), {}, {
+                  pagination: _objectSpread$2(_objectSpread$2({}, current.pagination), {}, {
+                    isLoading: false
+                  })
+                });
+              });
+
+            case 23:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[7, 19]]);
+    })));
+
+    _defineProperty__default['default'](this, "queryThreads", function () {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return _this.client.queryThreads(_objectSpread$2({
+        limit: 25,
+        participant_limit: 10,
+        reply_limit: 10,
+        watch: true
+      }, options));
+    });
+
+    _defineProperty__default['default'](this, "loadNextPage", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+      var options,
+          _this$state$getLatest4,
+          pagination,
+          response,
+          _args2 = arguments;
+
+      return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              options = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+              _this$state$getLatest4 = _this.state.getLatestValue(), pagination = _this$state$getLatest4.pagination;
+
+              if (!(pagination.isLoadingNext || !pagination.nextCursor)) {
+                _context2.next = 4;
+                break;
+              }
+
+              return _context2.abrupt("return");
+
+            case 4:
+              _context2.prev = 4;
+
+              _this.state.partialNext({
+                pagination: _objectSpread$2(_objectSpread$2({}, pagination), {}, {
+                  isLoadingNext: true
+                })
+              });
+
+              _context2.next = 8;
+              return _this.queryThreads(_objectSpread$2(_objectSpread$2({}, options), {}, {
+                next: pagination.nextCursor
+              }));
+
+            case 8:
+              response = _context2.sent;
+
+              _this.state.next(function (current) {
+                var _response$next2;
+
+                return _objectSpread$2(_objectSpread$2({}, current), {}, {
+                  threads: response.threads.length ? current.threads.concat(response.threads) : current.threads,
+                  pagination: _objectSpread$2(_objectSpread$2({}, current.pagination), {}, {
+                    nextCursor: (_response$next2 = response.next) !== null && _response$next2 !== void 0 ? _response$next2 : null,
+                    isLoadingNext: false
+                  })
+                });
+              });
+
+              _context2.next = 16;
+              break;
+
+            case 12:
+              _context2.prev = 12;
+              _context2.t0 = _context2["catch"](4);
+
+              _this.client.logger('error', _context2.t0.message);
+
+              _this.state.next(function (current) {
+                return _objectSpread$2(_objectSpread$2({}, current), {}, {
+                  pagination: _objectSpread$2(_objectSpread$2({}, current.pagination), {}, {
+                    isLoadingNext: false
+                  })
+                });
+              });
+
+            case 16:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, null, [[4, 12]]);
+    })));
+
+    this.client = client;
+    this.state = new StateStore({
+      active: false,
+      isThreadOrderStale: false,
+      threads: [],
+      unreadThreadCount: 0,
+      unseenThreadIds: [],
+      lastConnectionDropAt: null,
+      pagination: {
+        isLoading: false,
+        isLoadingNext: false,
+        nextCursor: null
+      },
+      ready: false
+    });
+    this.threadsByIdGetterCache = {
+      threads: [],
+      threadsById: {}
+    };
+  }
+
+  _createClass__default['default'](ThreadManager, [{
+    key: "threadsById",
+    get: function get() {
+      var _this$state$getLatest5 = this.state.getLatestValue(),
+          threads = _this$state$getLatest5.threads;
+
+      if (threads === this.threadsByIdGetterCache.threads) {
+        return this.threadsByIdGetterCache.threadsById;
+      }
+
+      var threadsById = threads.reduce(function (newThreadsById, thread) {
+        newThreadsById[thread.id] = thread;
+        return newThreadsById;
+      }, {});
+      this.threadsByIdGetterCache.threads = threads;
+      this.threadsByIdGetterCache.threadsById = threadsById;
+      return threadsById;
+    }
+  }]);
+
+  return ThreadManager;
+}();
+
+var _excluded$1 = ["own_votes", "id"],
+    _excluded2$1 = ["id"];
+
+function ownKeys$1(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread$1(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$1(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$1(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+var isPollUpdatedEvent = function isPollUpdatedEvent(e) {
+  return e.type === 'poll.updated';
+};
+
+var isPollClosedEventEvent = function isPollClosedEventEvent(e) {
+  return e.type === 'poll.closed';
+};
+
+var isPollVoteCastedEvent = function isPollVoteCastedEvent(e) {
+  return e.type === 'poll.vote_casted';
+};
+
+var isPollVoteChangedEvent = function isPollVoteChangedEvent(e) {
+  return e.type === 'poll.vote_changed';
+};
+
+var isPollVoteRemovedEvent = function isPollVoteRemovedEvent(e) {
+  return e.type === 'poll.vote_removed';
+};
+
+var isVoteAnswer = function isVoteAnswer(vote) {
+  return !!(vote !== null && vote !== void 0 && vote.answer_text);
+};
+var Poll = /*#__PURE__*/function () {
+  function Poll(_ref) {
+    var _this = this;
+
+    var client = _ref.client,
+        _poll = _ref.poll;
+
+    _classCallCheck__default['default'](this, Poll);
+
+    _defineProperty__default['default'](this, "state", void 0);
+
+    _defineProperty__default['default'](this, "id", void 0);
+
+    _defineProperty__default['default'](this, "client", void 0);
+
+    _defineProperty__default['default'](this, "unsubscribeFunctions", new Set());
+
+    _defineProperty__default['default'](this, "getInitialStateFromPollResponse", function (poll) {
+      var _own_votes$reduce;
+
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      var own_votes = poll.own_votes;
+          poll.id;
+          var pollResponseForState = _objectWithoutProperties__default['default'](poll, _excluded$1);
+
+      var _ref2 = (_own_votes$reduce = own_votes === null || own_votes === void 0 ? void 0 : own_votes.reduce(function (acc, voteOrAnswer) {
+        if (isVoteAnswer(voteOrAnswer)) {
+          acc.ownAnswer = voteOrAnswer;
+        } else {
+          acc.ownVotes.push(voteOrAnswer);
+        }
+
+        return acc;
+      }, {
+        ownVotes: []
+      })) !== null && _own_votes$reduce !== void 0 ? _own_votes$reduce : {
+        ownVotes: []
+      },
+          ownAnswer = _ref2.ownAnswer,
+          ownVotes = _ref2.ownVotes;
+
+      return _objectSpread$1(_objectSpread$1({}, pollResponseForState), {}, {
+        lastActivityAt: new Date(),
+        maxVotedOptionIds: getMaxVotedOptionIds(pollResponseForState.vote_counts_by_option),
+        ownAnswer: ownAnswer,
+        ownVotesByOptionId: getOwnVotesByOptionId(ownVotes)
+      });
+    });
+
+    _defineProperty__default['default'](this, "reinitializeState", function (poll) {
+      _this.state.partialNext(_this.getInitialStateFromPollResponse(poll));
+    });
+
+    _defineProperty__default['default'](this, "handlePollUpdated", function (event) {
+      var _event$poll;
+
+      if ((_event$poll = event.poll) !== null && _event$poll !== void 0 && _event$poll.id && event.poll.id !== _this.id) return;
+      if (!isPollUpdatedEvent(event)) return; // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+      var _extractPollData = extractPollData(event.poll),
+          pollData = _objectWithoutProperties__default['default'](_extractPollData, _excluded2$1); // @ts-ignore
+
+
+      _this.state.partialNext(_objectSpread$1(_objectSpread$1({}, pollData), {}, {
+        lastActivityAt: new Date(event.created_at)
+      }));
+    });
+
+    _defineProperty__default['default'](this, "handlePollClosed", function (event) {
+      var _event$poll2;
+
+      if ((_event$poll2 = event.poll) !== null && _event$poll2 !== void 0 && _event$poll2.id && event.poll.id !== _this.id) return;
+      if (!isPollClosedEventEvent(event)) return; // @ts-ignore
+
+      _this.state.partialNext({
+        is_closed: true,
+        lastActivityAt: new Date(event.created_at)
+      });
+    });
+
+    _defineProperty__default['default'](this, "handleVoteCasted", function (event) {
+      var _event$poll3;
+
+      if ((_event$poll3 = event.poll) !== null && _event$poll3 !== void 0 && _event$poll3.id && event.poll.id !== _this.id) return;
+      if (!isPollVoteCastedEvent(event)) return;
+      var currentState = _this.data;
+      var isOwnVote = event.poll_vote.user_id === _this.client.userID;
+
+      var latestAnswers = _toConsumableArray__default['default'](currentState.latest_answers);
+
+      var ownAnswer = currentState.ownAnswer;
+      var ownVotesByOptionId = currentState.ownVotesByOptionId;
+      var maxVotedOptionIds = currentState.maxVotedOptionIds;
+
+      if (isOwnVote) {
+        if (isVoteAnswer(event.poll_vote)) {
+          ownAnswer = event.poll_vote;
+        } else if (event.poll_vote.option_id) {
+          ownVotesByOptionId[event.poll_vote.option_id] = event.poll_vote;
+        }
+      }
+
+      if (isVoteAnswer(event.poll_vote)) {
+        latestAnswers = [event.poll_vote].concat(_toConsumableArray__default['default'](latestAnswers));
+      } else {
+        maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
+      }
+
+      var pollEnrichData = extractPollEnrichedData(event.poll); // @ts-ignore
+
+      _this.state.partialNext(_objectSpread$1(_objectSpread$1({}, pollEnrichData), {}, {
+        latest_answers: latestAnswers,
+        lastActivityAt: new Date(event.created_at),
+        ownAnswer: ownAnswer,
+        ownVotesByOptionId: ownVotesByOptionId,
+        maxVotedOptionIds: maxVotedOptionIds
+      }));
+    });
+
+    _defineProperty__default['default'](this, "handleVoteChanged", function (event) {
+      var _event$poll4;
+
+      // this event is triggered only when event.poll.enforce_unique_vote === true
+      if ((_event$poll4 = event.poll) !== null && _event$poll4 !== void 0 && _event$poll4.id && event.poll.id !== _this.id) return;
+      if (!isPollVoteChangedEvent(event)) return;
+      var currentState = _this.data;
+      var isOwnVote = event.poll_vote.user_id === _this.client.userID;
+
+      var latestAnswers = _toConsumableArray__default['default'](currentState.latest_answers);
+
+      var ownAnswer = currentState.ownAnswer;
+      var ownVotesByOptionId = currentState.ownVotesByOptionId;
+      var maxVotedOptionIds = currentState.maxVotedOptionIds;
+
+      if (isOwnVote) {
+        if (isVoteAnswer(event.poll_vote)) {
+          latestAnswers = [event.poll_vote].concat(_toConsumableArray__default['default'](latestAnswers.filter(function (answer) {
+            return answer.id !== event.poll_vote.id;
+          })));
+          ownAnswer = event.poll_vote;
+        } else if (event.poll_vote.option_id) {
+          var _ownAnswer;
+
+          if (event.poll.enforce_unique_votes) {
+            ownVotesByOptionId = _defineProperty__default['default']({}, event.poll_vote.option_id, event.poll_vote);
+          } else {
+            ownVotesByOptionId = Object.entries(ownVotesByOptionId).reduce(function (acc, _ref3) {
+              var _ref4 = _slicedToArray__default['default'](_ref3, 2),
+                  optionId = _ref4[0],
+                  vote = _ref4[1];
+
+              if (optionId !== event.poll_vote.option_id && vote.id === event.poll_vote.id) {
+                return acc;
+              }
+
+              acc[optionId] = vote;
+              return acc;
+            }, {});
+            ownVotesByOptionId[event.poll_vote.option_id] = event.poll_vote;
+          }
+
+          if (((_ownAnswer = ownAnswer) === null || _ownAnswer === void 0 ? void 0 : _ownAnswer.id) === event.poll_vote.id) {
+            ownAnswer = undefined;
+          }
+
+          maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
+        }
+      } else if (isVoteAnswer(event.poll_vote)) {
+        latestAnswers = [event.poll_vote].concat(_toConsumableArray__default['default'](latestAnswers));
+      } else {
+        maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
+      }
+
+      var pollEnrichData = extractPollEnrichedData(event.poll); // @ts-ignore
+
+      _this.state.partialNext(_objectSpread$1(_objectSpread$1({}, pollEnrichData), {}, {
+        latest_answers: latestAnswers,
+        lastActivityAt: new Date(event.created_at),
+        ownAnswer: ownAnswer,
+        ownVotesByOptionId: ownVotesByOptionId,
+        maxVotedOptionIds: maxVotedOptionIds
+      }));
+    });
+
+    _defineProperty__default['default'](this, "handleVoteRemoved", function (event) {
+      var _event$poll5;
+
+      if ((_event$poll5 = event.poll) !== null && _event$poll5 !== void 0 && _event$poll5.id && event.poll.id !== _this.id) return;
+      if (!isPollVoteRemovedEvent(event)) return;
+      var currentState = _this.data;
+      var isOwnVote = event.poll_vote.user_id === _this.client.userID;
+
+      var latestAnswers = _toConsumableArray__default['default'](currentState.latest_answers);
+
+      var ownAnswer = currentState.ownAnswer;
+
+      var ownVotesByOptionId = _objectSpread$1({}, currentState.ownVotesByOptionId);
+
+      var maxVotedOptionIds = currentState.maxVotedOptionIds;
+
+      if (isVoteAnswer(event.poll_vote)) {
+        latestAnswers = latestAnswers.filter(function (answer) {
+          return answer.id !== event.poll_vote.id;
+        });
+
+        if (isOwnVote) {
+          ownAnswer = undefined;
+        }
+      } else {
+        maxVotedOptionIds = getMaxVotedOptionIds(event.poll.vote_counts_by_option);
+
+        if (isOwnVote && event.poll_vote.option_id) {
+          delete ownVotesByOptionId[event.poll_vote.option_id];
+        }
+      }
+
+      var pollEnrichData = extractPollEnrichedData(event.poll); // @ts-ignore
+
+      _this.state.partialNext(_objectSpread$1(_objectSpread$1({}, pollEnrichData), {}, {
+        latest_answers: latestAnswers,
+        lastActivityAt: new Date(event.created_at),
+        ownAnswer: ownAnswer,
+        ownVotesByOptionId: ownVotesByOptionId,
+        maxVotedOptionIds: maxVotedOptionIds
+      }));
+    });
+
+    _defineProperty__default['default'](this, "query", /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(id) {
+        var _yield$_this$client$g, poll;
+
+        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this.client.getPoll(id);
+
+              case 2:
+                _yield$_this$client$g = _context.sent;
+                poll = _yield$_this$client$g.poll;
+
+                // @ts-ignore
+                _this.state.partialNext(_objectSpread$1(_objectSpread$1({}, poll), {}, {
+                  lastActivityAt: new Date()
+                }));
+
+                return _context.abrupt("return", poll);
+
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref5.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "update", /*#__PURE__*/function () {
+      var _ref6 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(data) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return _this.client.updatePoll(_objectSpread$1(_objectSpread$1({}, data), {}, {
+                  id: _this.id
+                }));
+
+              case 2:
+                return _context2.abrupt("return", _context2.sent);
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }));
+
+      return function (_x2) {
+        return _ref6.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "partialUpdate", /*#__PURE__*/function () {
+      var _ref7 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(partialPollObject) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return _this.client.partialUpdatePoll(_this.id, partialPollObject);
+
+              case 2:
+                return _context3.abrupt("return", _context3.sent);
+
+              case 3:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }));
+
+      return function (_x3) {
+        return _ref7.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "close", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
+      return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return _this.client.closePoll(_this.id);
+
+            case 2:
+              return _context4.abrupt("return", _context4.sent);
+
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    })));
+
+    _defineProperty__default['default'](this, "delete", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5() {
+      return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
+        while (1) {
+          switch (_context5.prev = _context5.next) {
+            case 0:
+              _context5.next = 2;
+              return _this.client.deletePoll(_this.id);
+
+            case 2:
+              return _context5.abrupt("return", _context5.sent);
+
+            case 3:
+            case "end":
+              return _context5.stop();
+          }
+        }
+      }, _callee5);
+    })));
+
+    _defineProperty__default['default'](this, "createOption", /*#__PURE__*/function () {
+      var _ref10 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee6(option) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
+              case 0:
+                _context6.next = 2;
+                return _this.client.createPollOption(_this.id, option);
+
+              case 2:
+                return _context6.abrupt("return", _context6.sent);
+
+              case 3:
+              case "end":
+                return _context6.stop();
+            }
+          }
+        }, _callee6);
+      }));
+
+      return function (_x4) {
+        return _ref10.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "updateOption", /*#__PURE__*/function () {
+      var _ref11 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee7(option) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee7$(_context7) {
+          while (1) {
+            switch (_context7.prev = _context7.next) {
+              case 0:
+                _context7.next = 2;
+                return _this.client.updatePollOption(_this.id, option);
+
+              case 2:
+                return _context7.abrupt("return", _context7.sent);
+
+              case 3:
+              case "end":
+                return _context7.stop();
+            }
+          }
+        }, _callee7);
+      }));
+
+      return function (_x5) {
+        return _ref11.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "deleteOption", /*#__PURE__*/function () {
+      var _ref12 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee8(optionId) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee8$(_context8) {
+          while (1) {
+            switch (_context8.prev = _context8.next) {
+              case 0:
+                _context8.next = 2;
+                return _this.client.deletePollOption(_this.id, optionId);
+
+              case 2:
+                return _context8.abrupt("return", _context8.sent);
+
+              case 3:
+              case "end":
+                return _context8.stop();
+            }
+          }
+        }, _callee8);
+      }));
+
+      return function (_x6) {
+        return _ref12.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "castVote", /*#__PURE__*/function () {
+      var _ref13 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee9(optionId, messageId) {
+        var _this$data, max_votes_allowed, ownVotesByOptionId, reachedVoteLimit, _oldestVote2, oldestVote;
+
+        return _regeneratorRuntime__default['default'].wrap(function _callee9$(_context9) {
+          while (1) {
+            switch (_context9.prev = _context9.next) {
+              case 0:
+                _this$data = _this.data, max_votes_allowed = _this$data.max_votes_allowed, ownVotesByOptionId = _this$data.ownVotesByOptionId;
+                reachedVoteLimit = max_votes_allowed && max_votes_allowed === Object.keys(ownVotesByOptionId).length;
+
+                if (!reachedVoteLimit) {
+                  _context9.next = 8;
+                  break;
+                }
+
+                oldestVote = Object.values(ownVotesByOptionId)[0];
+                Object.values(ownVotesByOptionId).slice(1).forEach(function (vote) {
+                  var _oldestVote;
+
+                  if (!((_oldestVote = oldestVote) !== null && _oldestVote !== void 0 && _oldestVote.created_at) || new Date(vote.created_at) < new Date(oldestVote.created_at)) {
+                    oldestVote = vote;
+                  }
+                });
+
+                if (!((_oldestVote2 = oldestVote) !== null && _oldestVote2 !== void 0 && _oldestVote2.id)) {
+                  _context9.next = 8;
+                  break;
+                }
+
+                _context9.next = 8;
+                return _this.removeVote(oldestVote.id, messageId);
+
+              case 8:
+                _context9.next = 10;
+                return _this.client.castPollVote(messageId, _this.id, {
+                  option_id: optionId
+                });
+
+              case 10:
+                return _context9.abrupt("return", _context9.sent);
+
+              case 11:
+              case "end":
+                return _context9.stop();
+            }
+          }
+        }, _callee9);
+      }));
+
+      return function (_x7, _x8) {
+        return _ref13.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "removeVote", /*#__PURE__*/function () {
+      var _ref14 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee10(voteId, messageId) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee10$(_context10) {
+          while (1) {
+            switch (_context10.prev = _context10.next) {
+              case 0:
+                _context10.next = 2;
+                return _this.client.removePollVote(messageId, _this.id, voteId);
+
+              case 2:
+                return _context10.abrupt("return", _context10.sent);
+
+              case 3:
+              case "end":
+                return _context10.stop();
+            }
+          }
+        }, _callee10);
+      }));
+
+      return function (_x9, _x10) {
+        return _ref14.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "addAnswer", /*#__PURE__*/function () {
+      var _ref15 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee11(answerText, messageId) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee11$(_context11) {
+          while (1) {
+            switch (_context11.prev = _context11.next) {
+              case 0:
+                _context11.next = 2;
+                return _this.client.addPollAnswer(messageId, _this.id, answerText);
+
+              case 2:
+                return _context11.abrupt("return", _context11.sent);
+
+              case 3:
+              case "end":
+                return _context11.stop();
+            }
+          }
+        }, _callee11);
+      }));
+
+      return function (_x11, _x12) {
+        return _ref15.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "removeAnswer", /*#__PURE__*/function () {
+      var _ref16 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee12(answerId, messageId) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee12$(_context12) {
+          while (1) {
+            switch (_context12.prev = _context12.next) {
+              case 0:
+                _context12.next = 2;
+                return _this.client.removePollVote(messageId, _this.id, answerId);
+
+              case 2:
+                return _context12.abrupt("return", _context12.sent);
+
+              case 3:
+              case "end":
+                return _context12.stop();
+            }
+          }
+        }, _callee12);
+      }));
+
+      return function (_x13, _x14) {
+        return _ref16.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "queryAnswers", /*#__PURE__*/function () {
+      var _ref17 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee13(params) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee13$(_context13) {
+          while (1) {
+            switch (_context13.prev = _context13.next) {
+              case 0:
+                _context13.next = 2;
+                return _this.client.queryPollAnswers(_this.id, params.filter, params.sort, params.options);
+
+              case 2:
+                return _context13.abrupt("return", _context13.sent);
+
+              case 3:
+              case "end":
+                return _context13.stop();
+            }
+          }
+        }, _callee13);
+      }));
+
+      return function (_x15) {
+        return _ref17.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "queryOptionVotes", /*#__PURE__*/function () {
+      var _ref18 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee14(params) {
+        return _regeneratorRuntime__default['default'].wrap(function _callee14$(_context14) {
+          while (1) {
+            switch (_context14.prev = _context14.next) {
+              case 0:
+                _context14.next = 2;
+                return _this.client.queryPollVotes(_this.id, params.filter, params.sort, params.options);
+
+              case 2:
+                return _context14.abrupt("return", _context14.sent);
+
+              case 3:
+              case "end":
+                return _context14.stop();
+            }
+          }
+        }, _callee14);
+      }));
+
+      return function (_x16) {
+        return _ref18.apply(this, arguments);
+      };
+    }());
+
+    this.client = client;
+    this.id = _poll.id;
+    this.state = new StateStore(this.getInitialStateFromPollResponse(_poll));
+  }
+
+  _createClass__default['default'](Poll, [{
+    key: "data",
+    get: function get() {
+      return this.state.getLatestValue();
+    }
+  }]);
+
+  return Poll;
+}();
+
+function getMaxVotedOptionIds(voteCountsByOption) {
+  var maxVotes = 0;
+  var winningOptions = [];
+
+  for (var _i = 0, _Object$entries = Object.entries(voteCountsByOption !== null && voteCountsByOption !== void 0 ? voteCountsByOption : {}); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _slicedToArray__default['default'](_Object$entries[_i], 2),
+        id = _Object$entries$_i[0],
+        count = _Object$entries$_i[1];
+
+    if (count > maxVotes) {
+      winningOptions = [id];
+      maxVotes = count;
+    } else if (count === maxVotes) {
+      winningOptions.push(id);
+    }
+  }
+
+  return winningOptions;
+}
+
+function getOwnVotesByOptionId(ownVotes) {
+  return !ownVotes ? {} : ownVotes.reduce(function (acc, vote) {
+    if (isVoteAnswer(vote) || !vote.option_id) return acc;
+    acc[vote.option_id] = vote;
+    return acc;
+  }, {});
+}
+
+function extractPollData(pollResponse) {
+  return {
+    allow_answers: pollResponse.allow_answers,
+    allow_user_suggested_options: pollResponse.allow_user_suggested_options,
+    description: pollResponse.description,
+    enforce_unique_vote: pollResponse.enforce_unique_vote,
+    id: pollResponse.id,
+    is_closed: pollResponse.is_closed,
+    max_votes_allowed: pollResponse.max_votes_allowed,
+    name: pollResponse.name,
+    options: pollResponse.options,
+    voting_visibility: pollResponse.voting_visibility
+  };
+}
+function extractPollEnrichedData(pollResponse) {
+  return {
+    answers_count: pollResponse.answers_count,
+    latest_votes_by_option: pollResponse.latest_votes_by_option,
+    vote_count: pollResponse.vote_count,
+    vote_counts_by_option: pollResponse.vote_counts_by_option
+  };
+}
+
+function _createForOfIteratorHelper$1(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$1(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$1(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$1(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$1(o, minLen); }
+
+function _arrayLikeToArray$1(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; }
+var PollManager = /*#__PURE__*/function () {
+  // The pollCache contains only polls that have been created and sent as messages
+  // (i.e only polls that are coupled with a message, can be voted on and require a
+  // reactive state). It shall work as a basic look-up table for our SDK to be able
+  // to quickly consume poll state that will be reactive even without the polls being
+  // rendered within the UI.
+  function PollManager(_ref) {
+    var _this = this;
+
+    var client = _ref.client;
+
+    _classCallCheck__default['default'](this, PollManager);
+
+    _defineProperty__default['default'](this, "client", void 0);
+
+    _defineProperty__default['default'](this, "pollCache", new Map());
+
+    _defineProperty__default['default'](this, "unsubscribeFunctions", new Set());
+
+    _defineProperty__default['default'](this, "fromState", function (id) {
+      return _this.pollCache.get(id);
+    });
+
+    _defineProperty__default['default'](this, "registerSubscriptions", function () {
+      if (_this.unsubscribeFunctions.size) {
+        // Already listening for events and changes
+        return;
+      }
+
+      _this.unsubscribeFunctions.add(_this.subscribeMessageNew());
+
+      _this.unsubscribeFunctions.add(_this.subscribePollUpdated());
+
+      _this.unsubscribeFunctions.add(_this.subscribePollClosed());
+
+      _this.unsubscribeFunctions.add(_this.subscribeVoteCasted());
+
+      _this.unsubscribeFunctions.add(_this.subscribeVoteChanged());
+
+      _this.unsubscribeFunctions.add(_this.subscribeVoteRemoved());
+    });
+
+    _defineProperty__default['default'](this, "unregisterSubscriptions", function () {
+      _this.unsubscribeFunctions.forEach(function (cleanupFunction) {
+        return cleanupFunction();
+      });
+
+      _this.unsubscribeFunctions.clear();
+    });
+
+    _defineProperty__default['default'](this, "createPoll", /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(poll) {
+        var _yield$_this$client$c, createdPoll;
+
+        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this.client.createPoll(poll);
+
+              case 2:
+                _yield$_this$client$c = _context.sent;
+                createdPoll = _yield$_this$client$c.poll;
+                return _context.abrupt("return", new Poll({
+                  client: _this.client,
+                  poll: createdPoll
+                }));
+
+              case 5:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "getPoll", /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2(id) {
+        var cachedPoll, _yield$_this$client$g, poll;
+
+        return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                cachedPoll = _this.fromState(id); // optimistically return the cached poll if it exists and update in the background
+
+                if (!cachedPoll) {
+                  _context2.next = 4;
+                  break;
+                }
+
+                _this.client.getPoll(id).then(function (_ref4) {
+                  var poll = _ref4.poll;
+                  return _this.setOrOverwriteInCache(poll, true);
+                });
+
+                return _context2.abrupt("return", cachedPoll);
+
+              case 4:
+                _context2.next = 6;
+                return _this.client.getPoll(id);
+
+              case 6:
+                _yield$_this$client$g = _context2.sent;
+                poll = _yield$_this$client$g.poll;
+
+                _this.setOrOverwriteInCache(poll);
+
+                return _context2.abrupt("return", _this.fromState(id));
+
+              case 10:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }));
+
+      return function (_x2) {
+        return _ref3.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty__default['default'](this, "queryPolls", /*#__PURE__*/function () {
+      var _ref5 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3(filter) {
+        var sort,
+            options,
+            _yield$_this$client$q,
+            polls,
+            next,
+            pollInstances,
+            _args3 = arguments;
+
+        return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                sort = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : [];
+                options = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : {};
+                _context3.next = 4;
+                return _this.client.queryPolls(filter, sort, options);
+
+              case 4:
+                _yield$_this$client$q = _context3.sent;
+                polls = _yield$_this$client$q.polls;
+                next = _yield$_this$client$q.next;
+                pollInstances = polls.map(function (poll) {
+                  _this.setOrOverwriteInCache(poll, true);
+
+                  return _this.fromState(poll.id);
+                });
+                return _context3.abrupt("return", {
+                  polls: pollInstances,
+                  next: next
+                });
+
+              case 9:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }));
+
+      return function (_x3) {
+        return _ref5.apply(this, arguments);
+      };
+    }());
 
-            case 11:
-              response = _context.sent;
-              currentThreads = _this.threadsById;
-              nextThreads = [];
-              _iterator = _createForOfIteratorHelper$1(response.threads);
+    _defineProperty__default['default'](this, "hydratePollCache", function (messages, overwriteState) {
+      var _iterator = _createForOfIteratorHelper$1(messages),
+          _step;
 
-              try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  incomingThread = _step.value;
-                  existingThread = currentThreads[incomingThread.id];
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var message = _step.value;
 
-                  if (existingThread) {
-                    // Reuse thread instances if possible
-                    nextThreads.push(existingThread);
+          if (!message.poll) {
+            continue;
+          }
 
-                    if (existingThread.hasStaleState) {
-                      existingThread.hydrateState(incomingThread);
-                    }
-                  } else {
-                    nextThreads.push(incomingThread);
-                  }
-                }
-              } catch (err) {
-                _iterator.e(err);
-              } finally {
-                _iterator.f();
-              }
+          var pollResponse = message.poll;
 
-              _this.state.next(function (current) {
-                var _response$next;
+          _this.setOrOverwriteInCache(pollResponse, overwriteState);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    });
 
-                return _objectSpread$1(_objectSpread$1({}, current), {}, {
-                  threads: nextThreads,
-                  unseenThreadIds: [],
-                  isThreadOrderStale: false,
-                  pagination: _objectSpread$1(_objectSpread$1({}, current.pagination), {}, {
-                    isLoading: false,
-                    nextCursor: (_response$next = response.next) !== null && _response$next !== void 0 ? _response$next : null
-                  }),
-                  ready: true
-                });
-              });
+    _defineProperty__default['default'](this, "setOrOverwriteInCache", function (pollResponse, overwriteState) {
+      var pollFromCache = _this.fromState(pollResponse.id);
 
-              _context.next = 23;
-              break;
+      if (!pollFromCache) {
+        var poll = new Poll({
+          client: _this.client,
+          poll: pollResponse
+        });
 
-            case 19:
-              _context.prev = 19;
-              _context.t0 = _context["catch"](7);
+        _this.pollCache.set(poll.id, poll);
+      } else if (overwriteState) {
+        pollFromCache.reinitializeState(pollResponse);
+      }
+    });
 
-              _this.client.logger('error', _context.t0.message);
+    _defineProperty__default['default'](this, "subscribePollUpdated", function () {
+      return _this.client.on('poll.updated', function (event) {
+        var _event$poll;
 
-              _this.state.next(function (current) {
-                return _objectSpread$1(_objectSpread$1({}, current), {}, {
-                  pagination: _objectSpread$1(_objectSpread$1({}, current.pagination), {}, {
-                    isLoading: false
-                  })
-                });
-              });
+        if ((_event$poll = event.poll) !== null && _event$poll !== void 0 && _event$poll.id) {
+          var _this$fromState;
 
-            case 23:
-            case "end":
-              return _context.stop();
-          }
+          (_this$fromState = _this.fromState(event.poll.id)) === null || _this$fromState === void 0 ? void 0 : _this$fromState.handlePollUpdated(event);
         }
-      }, _callee, null, [[7, 19]]);
-    })));
-
-    _defineProperty__default['default'](this, "queryThreads", function () {
-      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      return _this.client.queryThreads(_objectSpread$1({
-        limit: 25,
-        participant_limit: 10,
-        reply_limit: 10,
-        watch: true
-      }, options));
+      }).unsubscribe;
     });
 
-    _defineProperty__default['default'](this, "loadNextPage", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-      var options,
-          _this$state$getLatest4,
-          pagination,
-          response,
-          _args2 = arguments;
+    _defineProperty__default['default'](this, "subscribePollClosed", function () {
+      return _this.client.on('poll.closed', function (event) {
+        var _event$poll2;
 
-      return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              options = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
-              _this$state$getLatest4 = _this.state.getLatestValue(), pagination = _this$state$getLatest4.pagination;
+        if ((_event$poll2 = event.poll) !== null && _event$poll2 !== void 0 && _event$poll2.id) {
+          var _this$fromState2;
 
-              if (!(pagination.isLoadingNext || !pagination.nextCursor)) {
-                _context2.next = 4;
-                break;
-              }
+          (_this$fromState2 = _this.fromState(event.poll.id)) === null || _this$fromState2 === void 0 ? void 0 : _this$fromState2.handlePollClosed(event);
+        }
+      }).unsubscribe;
+    });
 
-              return _context2.abrupt("return");
+    _defineProperty__default['default'](this, "subscribeVoteCasted", function () {
+      return _this.client.on('poll.vote_casted', function (event) {
+        var _event$poll3;
 
-            case 4:
-              _context2.prev = 4;
+        if ((_event$poll3 = event.poll) !== null && _event$poll3 !== void 0 && _event$poll3.id) {
+          var _this$fromState3;
 
-              _this.state.partialNext({
-                pagination: _objectSpread$1(_objectSpread$1({}, pagination), {}, {
-                  isLoadingNext: true
-                })
-              });
+          (_this$fromState3 = _this.fromState(event.poll.id)) === null || _this$fromState3 === void 0 ? void 0 : _this$fromState3.handleVoteCasted(event);
+        }
+      }).unsubscribe;
+    });
 
-              _context2.next = 8;
-              return _this.queryThreads(_objectSpread$1(_objectSpread$1({}, options), {}, {
-                next: pagination.nextCursor
-              }));
+    _defineProperty__default['default'](this, "subscribeVoteChanged", function () {
+      return _this.client.on('poll.vote_changed', function (event) {
+        var _event$poll4;
 
-            case 8:
-              response = _context2.sent;
+        if ((_event$poll4 = event.poll) !== null && _event$poll4 !== void 0 && _event$poll4.id) {
+          var _this$fromState4;
 
-              _this.state.next(function (current) {
-                var _response$next2;
+          (_this$fromState4 = _this.fromState(event.poll.id)) === null || _this$fromState4 === void 0 ? void 0 : _this$fromState4.handleVoteChanged(event);
+        }
+      }).unsubscribe;
+    });
 
-                return _objectSpread$1(_objectSpread$1({}, current), {}, {
-                  threads: response.threads.length ? current.threads.concat(response.threads) : current.threads,
-                  pagination: _objectSpread$1(_objectSpread$1({}, current.pagination), {}, {
-                    nextCursor: (_response$next2 = response.next) !== null && _response$next2 !== void 0 ? _response$next2 : null,
-                    isLoadingNext: false
-                  })
-                });
-              });
+    _defineProperty__default['default'](this, "subscribeVoteRemoved", function () {
+      return _this.client.on('poll.vote_removed', function (event) {
+        var _event$poll5;
 
-              _context2.next = 16;
-              break;
+        if ((_event$poll5 = event.poll) !== null && _event$poll5 !== void 0 && _event$poll5.id) {
+          var _this$fromState5;
 
-            case 12:
-              _context2.prev = 12;
-              _context2.t0 = _context2["catch"](4);
+          (_this$fromState5 = _this.fromState(event.poll.id)) === null || _this$fromState5 === void 0 ? void 0 : _this$fromState5.handleVoteRemoved(event);
+        }
+      }).unsubscribe;
+    });
 
-              _this.client.logger('error', _context2.t0.message);
+    _defineProperty__default['default'](this, "subscribeMessageNew", function () {
+      return _this.client.on('message.new', function (event) {
+        var message = event.message;
 
-              _this.state.next(function (current) {
-                return _objectSpread$1(_objectSpread$1({}, current), {}, {
-                  pagination: _objectSpread$1(_objectSpread$1({}, current.pagination), {}, {
-                    isLoadingNext: false
-                  })
-                });
-              });
+        if (message) {
+          var formattedMessage = formatMessage(message);
 
-            case 16:
-            case "end":
-              return _context2.stop();
-          }
+          _this.hydratePollCache([formattedMessage]);
         }
-      }, _callee2, null, [[4, 12]]);
-    })));
+      }).unsubscribe;
+    });
 
     this.client = client;
-    this.state = new StateStore({
-      active: false,
-      isThreadOrderStale: false,
-      threads: [],
-      unreadThreadCount: 0,
-      unseenThreadIds: [],
-      lastConnectionDropAt: null,
-      pagination: {
-        isLoading: false,
-        isLoadingNext: false,
-        nextCursor: null
-      },
-      ready: false
-    });
-    this.threadsByIdGetterCache = {
-      threads: [],
-      threadsById: {}
-    };
   }
 
-  _createClass__default['default'](ThreadManager, [{
-    key: "threadsById",
+  _createClass__default['default'](PollManager, [{
+    key: "data",
     get: function get() {
-      var _this$state$getLatest5 = this.state.getLatestValue(),
-          threads = _this$state$getLatest5.threads;
-
-      if (threads === this.threadsByIdGetterCache.threads) {
-        return this.threadsByIdGetterCache.threadsById;
-      }
-
-      var threadsById = threads.reduce(function (newThreadsById, thread) {
-        newThreadsById[thread.id] = thread;
-        return newThreadsById;
-      }, {});
-      this.threadsByIdGetterCache.threads = threads;
-      this.threadsByIdGetterCache.threadsById = threadsById;
-      return threadsById;
+      return this.pollCache;
     }
   }]);
 
-  return ThreadManager;
+  return PollManager;
 }();
 
 var _excluded = ["created_at", "updated_at", "last_active", "online"],
@@ -8921,6 +9774,8 @@ var StreamChat = /*#__PURE__*/function () {
 
     _defineProperty__default['default'](this, "threads", void 0);
 
+    _defineProperty__default['default'](this, "polls", void 0);
+
     _defineProperty__default['default'](this, "anonymous", void 0);
 
     _defineProperty__default['default'](this, "persistUserOnConnectionFailure", void 0);
@@ -9819,6 +10674,9 @@ var StreamChat = /*#__PURE__*/function () {
     this.threads = new ThreadManager({
       client: this
     });
+    this.polls = new PollManager({
+      client: this
+    });
   }
   /**
    * Get a client instance
@@ -11085,6 +11943,7 @@ var StreamChat = /*#__PURE__*/function () {
               returnedPage: channelState.messages,
               logger: this.logger
             }));
+            this.polls.hydratePollCache(updatedMessagesSet.messages, true);
           }
 
           channels.push(c);
@@ -13386,7 +14245,7 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getUserAgent",
     value: function getUserAgent() {
-      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "8.41.1");
+      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "8.42.0");
     }
   }, {
     key: "setUserAgent",
@@ -14830,7 +15689,7 @@ var StreamChat = /*#__PURE__*/function () {
     }()
     /**
      * Creates a poll
-     * @param params PollData The poll that will be created
+     * @param poll PollData The poll that will be created
      * @param userId string The user id (only serverside)
      * @returns {APIResponse & CreatePollAPIResponse} The poll
      */
@@ -15030,13 +15889,11 @@ var StreamChat = /*#__PURE__*/function () {
           while (1) {
             switch (_context103.prev = _context103.next) {
               case 0:
-                return _context103.abrupt("return", this.partialUpdatePoll(id, _objectSpread({
+                return _context103.abrupt("return", this.partialUpdatePoll(id, {
                   set: {
                     is_closed: true
                   }
-                }, userId ? {
-                  user_id: userId
-                } : {})));
+                }, userId));
 
               case 1:
               case "end":
@@ -15412,6 +16269,60 @@ var StreamChat = /*#__PURE__*/function () {
 
       return queryPollVotes;
     }()
+    /**
+     * Queries poll answers
+     * @param pollId
+     * @param filter
+     * @param sort
+     * @param options Option object, {limit: 10, offset:0}
+     * @param userId string The user id (only serverside)
+     * @returns {APIResponse & PollAnswersAPIResponse} The poll votes
+     */
+
+  }, {
+    key: "queryPollAnswers",
+    value: function () {
+      var _queryPollAnswers = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee113(pollId) {
+        var filter,
+            sort,
+            options,
+            userId,
+            q,
+            _args113 = arguments;
+        return _regeneratorRuntime__default['default'].wrap(function _callee113$(_context113) {
+          while (1) {
+            switch (_context113.prev = _context113.next) {
+              case 0:
+                filter = _args113.length > 1 && _args113[1] !== undefined ? _args113[1] : {};
+                sort = _args113.length > 2 && _args113[2] !== undefined ? _args113[2] : [];
+                options = _args113.length > 3 && _args113[3] !== undefined ? _args113[3] : {};
+                userId = _args113.length > 4 ? _args113[4] : undefined;
+                q = userId ? "?user_id=".concat(userId) : '';
+                _context113.next = 7;
+                return this.post(this.baseURL + "/polls/".concat(encodeURIComponent(pollId), "/votes").concat(q), _objectSpread({
+                  filter: _objectSpread(_objectSpread({}, filter), {}, {
+                    is_answer: true
+                  }),
+                  sort: normalizeQuerySort(sort)
+                }, options));
+
+              case 7:
+                return _context113.abrupt("return", _context113.sent);
+
+              case 8:
+              case "end":
+                return _context113.stop();
+            }
+          }
+        }, _callee113, this);
+      }));
+
+      function queryPollAnswers(_x174) {
+        return _queryPollAnswers.apply(this, arguments);
+      }
+
+      return queryPollAnswers;
+    }()
     /**
      * Query message history
      * @param filter
@@ -15423,33 +16334,33 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "queryMessageHistory",
     value: function () {
-      var _queryMessageHistory = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee113() {
+      var _queryMessageHistory = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee114() {
         var filter,
             sort,
             options,
-            _args113 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee113$(_context113) {
+            _args114 = arguments;
+        return _regeneratorRuntime__default['default'].wrap(function _callee114$(_context114) {
           while (1) {
-            switch (_context113.prev = _context113.next) {
+            switch (_context114.prev = _context114.next) {
               case 0:
-                filter = _args113.length > 0 && _args113[0] !== undefined ? _args113[0] : {};
-                sort = _args113.length > 1 && _args113[1] !== undefined ? _args113[1] : [];
-                options = _args113.length > 2 && _args113[2] !== undefined ? _args113[2] : {};
-                _context113.next = 5;
+                filter = _args114.length > 0 && _args114[0] !== undefined ? _args114[0] : {};
+                sort = _args114.length > 1 && _args114[1] !== undefined ? _args114[1] : [];
+                options = _args114.length > 2 && _args114[2] !== undefined ? _args114[2] : {};
+                _context114.next = 5;
                 return this.post(this.baseURL + '/messages/history', _objectSpread({
                   filter: filter,
                   sort: normalizeQuerySort(sort)
                 }, options));
 
               case 5:
-                return _context113.abrupt("return", _context113.sent);
+                return _context114.abrupt("return", _context114.sent);
 
               case 6:
               case "end":
-                return _context113.stop();
+                return _context114.stop();
             }
           }
-        }, _callee113, this);
+        }, _callee114, this);
       }));
 
       function queryMessageHistory() {
@@ -15470,32 +16381,32 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "updateFlags",
     value: function () {
-      var _updateFlags = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee114(message_ids, reviewed_by) {
+      var _updateFlags = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee115(message_ids, reviewed_by) {
         var options,
-            _args114 = arguments;
-        return _regeneratorRuntime__default['default'].wrap(function _callee114$(_context114) {
+            _args115 = arguments;
+        return _regeneratorRuntime__default['default'].wrap(function _callee115$(_context115) {
           while (1) {
-            switch (_context114.prev = _context114.next) {
+            switch (_context115.prev = _context115.next) {
               case 0:
-                options = _args114.length > 2 && _args114[2] !== undefined ? _args114[2] : {};
-                _context114.next = 3;
+                options = _args115.length > 2 && _args115[2] !== undefined ? _args115[2] : {};
+                _context115.next = 3;
                 return this.post(this.baseURL + '/automod/v1/moderation/update_flags', _objectSpread({
                   message_ids: message_ids,
                   reviewed_by: reviewed_by
                 }, options));
 
               case 3:
-                return _context114.abrupt("return", _context114.sent);
+                return _context115.abrupt("return", _context115.sent);
 
               case 4:
               case "end":
-                return _context114.stop();
+                return _context115.stop();
             }
           }
-        }, _callee114, this);
+        }, _callee115, this);
       }));
 
-      function updateFlags(_x174, _x175) {
+      function updateFlags(_x175, _x176) {
         return _updateFlags.apply(this, arguments);
       }
 
@@ -15677,6 +16588,8 @@ exports.MaxPriority = MaxPriority;
 exports.MinPriority = MinPriority;
 exports.Moderation = Moderation;
 exports.Permission = Permission;
+exports.Poll = Poll;
+exports.PollManager = PollManager;
 exports.Segment = Segment;
 exports.StableWSConnection = StableWSConnection;
 exports.StateStore = StateStore;
@@ -15690,8 +16603,11 @@ exports.buildWsSuccessAfterFailureInsight = buildWsSuccessAfterFailureInsight;
 exports.chatCodes = chatCodes;
 exports.decodeBase64 = decodeBase64;
 exports.encodeBase64 = encodeBase64;
+exports.extractPollData = extractPollData;
+exports.extractPollEnrichedData = extractPollEnrichedData;
 exports.formatMessage = formatMessage;
 exports.isOwnUser = isOwnUser;
+exports.isVoteAnswer = isVoteAnswer;
 exports.logChatPromiseExecution = logChatPromiseExecution;
 exports.postInsights = postInsights;
 //# sourceMappingURL=index.js.map