stream-chat 6.0.0 → 6.3.0

package/dist/index.es.js

@@ -103,6 +103,13 @@ var ChannelState = /*#__PURE__*/function () {
    * When false, any new message (received by websocket event - message.new) will not
    * be pushed on to message list.
    */
+
+  /**
+   * Disjoint lists of messages
+   * Users can jump in the message list (with searching) and this can result in disjoint lists of messages
+   * The state manages these lists and merges them when lists overlap
+   * The messages array contains the currently active set
+   */
   function ChannelState(channel) {
     var _this = this,
         _channel$state;
@@ -117,8 +124,6 @@ var ChannelState = /*#__PURE__*/function () {
 
     _defineProperty(this, "read", void 0);
 
-    _defineProperty(this, "messages", void 0);
-
     _defineProperty(this, "pinnedMessages", void 0);
 
     _defineProperty(this, "threads", void 0);
@@ -137,6 +142,8 @@ var ChannelState = /*#__PURE__*/function () {
 
     _defineProperty(this, "isUpToDate", void 0);
 
+    _defineProperty(this, "messageSets", []);
+
     _defineProperty(this, "setIsUpToDate", function (isUpToDate) {
       _this.isUpToDate = isUpToDate;
     });
@@ -166,7 +173,9 @@ var ChannelState = /*#__PURE__*/function () {
         }
       };
 
-      _updateUserMessages(_this.messages, user);
+      _this.messageSets.forEach(function (set) {
+        return _updateUserMessages(set.messages, user);
+      });
 
       for (var parentId in _this.threads) {
         _updateUserMessages(_this.threads[parentId], user);
@@ -220,7 +229,9 @@ var ChannelState = /*#__PURE__*/function () {
         }
       };
 
-      _deleteUserMessages(_this.messages, user, hardDelete);
+      _this.messageSets.forEach(function (set) {
+        return _deleteUserMessages(set.messages, user, hardDelete);
+      });
 
       for (var parentId in _this.threads) {
         _deleteUserMessages(_this.threads[parentId], user, hardDelete);
@@ -233,7 +244,7 @@ var ChannelState = /*#__PURE__*/function () {
     this.watcher_count = 0;
     this.typing = {};
     this.read = {};
-    this.messages = [];
+    this.initMessages();
     this.pinnedMessages = [];
     this.threads = {}; // a list of users to hide messages from
 
@@ -252,22 +263,58 @@ var ChannelState = /*#__PURE__*/function () {
     this.isUpToDate = true;
     this.last_message_at = (channel === null || channel === void 0 ? void 0 : (_channel$state = channel.state) === null || _channel$state === void 0 ? void 0 : _channel$state.last_message_at) != null ? new Date(channel.state.last_message_at) : null;
   }
-  /**
-   * addMessageSorted - Add a message to the state
-   *
-   * @param {MessageResponse<StreamChatGenerics>} newMessage A new message
-   * @param {boolean} timestampChanged Whether updating a message with changed created_at value.
-   * @param {boolean} addIfDoesNotExist Add message if it is not in the list, used to prevent out of order updated messages from being added.
-   *
-   */
-
 
   _createClass(ChannelState, [{
+    key: "messages",
+    get: function get() {
+      var _this$messageSets$fin;
+
+      return ((_this$messageSets$fin = this.messageSets.find(function (s) {
+        return s.isCurrent;
+      })) === null || _this$messageSets$fin === void 0 ? void 0 : _this$messageSets$fin.messages) || [];
+    },
+    set: function set(messages) {
+      var index = this.messageSets.findIndex(function (s) {
+        return s.isCurrent;
+      });
+      this.messageSets[index].messages = messages;
+    }
+    /**
+     * The list of latest messages
+     * The messages array not always contains the latest messages (for example if a user searched for an earlier message, that is in a different message set)
+     */
+
+  }, {
+    key: "latestMessages",
+    get: function get() {
+      var _this$messageSets$fin2;
+
+      return ((_this$messageSets$fin2 = this.messageSets.find(function (s) {
+        return s.isLatest;
+      })) === null || _this$messageSets$fin2 === void 0 ? void 0 : _this$messageSets$fin2.messages) || [];
+    },
+    set: function set(messages) {
+      var index = this.messageSets.findIndex(function (s) {
+        return s.isLatest;
+      });
+      this.messageSets[index].messages = messages;
+    }
+    /**
+     * addMessageSorted - Add a message to the state
+     *
+     * @param {MessageResponse<StreamChatGenerics>} newMessage A new message
+     * @param {boolean} timestampChanged Whether updating a message with changed created_at value.
+     * @param {boolean} addIfDoesNotExist Add message if it is not in the list, used to prevent out of order updated messages from being added.
+     * @param {MessageSetType} messageSetToAddToIfDoesNotExist Which message set to add to if message is not in the list (only used if addIfDoesNotExist is true)
+     */
+
+  }, {
     key: "addMessageSorted",
     value: function addMessageSorted(newMessage) {
       var timestampChanged = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var addIfDoesNotExist = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-      return this.addMessagesSorted([newMessage], timestampChanged, false, addIfDoesNotExist);
+      var messageSetToAddToIfDoesNotExist = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'latest';
+      return this.addMessagesSorted([newMessage], timestampChanged, false, addIfDoesNotExist, messageSetToAddToIfDoesNotExist);
     }
     /**
      * formatMessage - Takes the message object. Parses the dates, sets __html
@@ -299,6 +346,7 @@ var ChannelState = /*#__PURE__*/function () {
      * @param {boolean} timestampChanged Whether updating messages with changed created_at value.
      * @param {boolean} initializing Whether channel is being initialized.
      * @param {boolean} addIfDoesNotExist Add message if it is not in the list, used to prevent out of order updated messages from being added.
+     * @param {MessageSetType} messageSetToAddToIfDoesNotExist Which message set to add to if messages are not in the list (only used if addIfDoesNotExist is true)
      *
      */
 
@@ -308,48 +356,60 @@ var ChannelState = /*#__PURE__*/function () {
       var timestampChanged = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var initializing = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var addIfDoesNotExist = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+      var messageSetToAddToIfDoesNotExist = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'current';
 
-      for (var i = 0; i < newMessages.length; i += 1) {
-        var _this$_channel;
+      var _this$findTargetMessa = this.findTargetMessageSet(newMessages, addIfDoesNotExist, messageSetToAddToIfDoesNotExist),
+          messagesToAdd = _this$findTargetMessa.messagesToAdd,
+          targetMessageSetIndex = _this$findTargetMessa.targetMessageSetIndex;
 
-        var isFromShadowBannedUser = newMessages[i].shadowed;
+      for (var i = 0; i < messagesToAdd.length; i += 1) {
+        var isFromShadowBannedUser = messagesToAdd[i].shadowed;
 
         if (isFromShadowBannedUser) {
           continue;
         }
 
-        var message = this.formatMessage(newMessages[i]);
+        var isMerging = messagesToAdd[i].created_at instanceof Date;
+        var message = void 0;
 
-        if (message.user && (_this$_channel = this._channel) !== null && _this$_channel !== void 0 && _this$_channel.cid) {
-          /**
-           * Store the reference to user for this channel, so that when we have to
-           * handle updates to user, we can use the reference map, to determine which
-           * channels need to be updated with updated user object.
-           */
-          this._channel.getClient().state.updateUserReference(message.user, this._channel.cid);
-        }
+        if (isMerging) {
+          message = messagesToAdd[i];
+        } else {
+          var _this$_channel;
 
-        if (initializing && message.id && this.threads[message.id]) {
-          // If we are initializing the state of channel (e.g., in case of connection recovery),
-          // then in that case we remove thread related to this message from threads object.
-          // This way we can ensure that we don't have any stale data in thread object
-          // and consumer can refetch the replies.
-          delete this.threads[message.id];
-        }
+          message = this.formatMessage(messagesToAdd[i]);
 
-        if (!this.last_message_at) {
-          this.last_message_at = new Date(message.created_at.getTime());
-        }
+          if (message.user && (_this$_channel = this._channel) !== null && _this$_channel !== void 0 && _this$_channel.cid) {
+            /**
+             * Store the reference to user for this channel, so that when we have to
+             * handle updates to user, we can use the reference map, to determine which
+             * channels need to be updated with updated user object.
+             */
+            this._channel.getClient().state.updateUserReference(message.user, this._channel.cid);
+          }
+
+          if (initializing && message.id && this.threads[message.id]) {
+            // If we are initializing the state of channel (e.g., in case of connection recovery),
+            // then in that case we remove thread related to this message from threads object.
+            // This way we can ensure that we don't have any stale data in thread object
+            // and consumer can refetch the replies.
+            delete this.threads[message.id];
+          }
+
+          if (!this.last_message_at) {
+            this.last_message_at = new Date(message.created_at.getTime());
+          }
 
-        if (message.created_at.getTime() > this.last_message_at.getTime()) {
-          this.last_message_at = new Date(message.created_at.getTime());
+          if (message.created_at.getTime() > this.last_message_at.getTime()) {
+            this.last_message_at = new Date(message.created_at.getTime());
+          }
         } // update or append the messages...
 
 
-        var parentID = message.parent_id; // add to the main message list
+        var parentID = message.parent_id; // add to the given message set
 
-        if (!parentID || message.show_in_channel) {
-          this.messages = this._addToMessageList(this.messages, message, timestampChanged, 'created_at', addIfDoesNotExist);
+        if ((!parentID || message.show_in_channel) && targetMessageSetIndex !== -1) {
+          this.messageSets[targetMessageSetIndex].messages = this._addToMessageList(this.messageSets[targetMessageSetIndex].messages, message, timestampChanged, 'created_at', addIfDoesNotExist);
         }
         /**
          * Add message to thread if applicable and the message
@@ -362,7 +422,7 @@ var ChannelState = /*#__PURE__*/function () {
          */
 
 
-        if (parentID && !initializing) {
+        if (parentID && !initializing && !isMerging) {
           var thread = this.threads[parentID] || [];
 
           var threadMessages = this._addToMessageList(thread, message, timestampChanged, 'created_at', addIfDoesNotExist);
@@ -473,6 +533,8 @@ var ChannelState = /*#__PURE__*/function () {
   }, {
     key: "removeQuotedMessageReferences",
     value: function removeQuotedMessageReferences(message) {
+      var _this4 = this;
+
       var parseMessage = function parseMessage(m) {
         var _m$pinned_at, _m$updated_at;
 
@@ -483,16 +545,19 @@ var ChannelState = /*#__PURE__*/function () {
         });
       };
 
-      var updatedMessages = this.messages.filter(function (msg) {
-        return msg.quoted_message_id === message.id;
-      }).map(parseMessage).map(function (msg) {
-        return _objectSpread$7(_objectSpread$7({}, msg), {}, {
-          quoted_message: _objectSpread$7(_objectSpread$7({}, message), {}, {
-            attachments: []
-          })
+      this.messageSets.forEach(function (set) {
+        var updatedMessages = set.messages.filter(function (msg) {
+          return msg.quoted_message_id === message.id;
+        }).map(parseMessage).map(function (msg) {
+          return _objectSpread$7(_objectSpread$7({}, msg), {}, {
+            quoted_message: _objectSpread$7(_objectSpread$7({}, message), {}, {
+              attachments: []
+            })
+          });
         });
+
+        _this4.addMessagesSorted(updatedMessages, true);
       });
-      this.addMessagesSorted(updatedMessages, true);
     }
     /**
      * Updates all instances of given message in channel state
@@ -520,12 +585,16 @@ var ChannelState = /*#__PURE__*/function () {
       }
 
       if (!show_in_channel && !parent_id || show_in_channel) {
-        var _msgIndex = this.messages.findIndex(function (msg) {
-          return msg.id === message.id;
-        });
+        var messageSetIndex = this.findMessageSetIndex(message);
+
+        if (messageSetIndex !== -1) {
+          var _msgIndex = this.messageSets[messageSetIndex].messages.findIndex(function (msg) {
+            return msg.id === message.id;
+          });
 
-        if (_msgIndex !== -1) {
-          this.messages[_msgIndex] = updateFunc(this.messages[_msgIndex]);
+          if (_msgIndex !== -1) {
+            this.messageSets[messageSetIndex].messages[_msgIndex] = updateFunc(this.messageSets[messageSetIndex].messages[_msgIndex]);
+          }
         }
       }
 
@@ -644,12 +713,16 @@ var ChannelState = /*#__PURE__*/function () {
         this.threads[messageToRemove.parent_id] = threadMessages;
         isRemoved = removed;
       } else {
-        var _this$removeMessageFr3 = this.removeMessageFromArray(this.messages, messageToRemove),
-            _removed = _this$removeMessageFr3.removed,
-            messages = _this$removeMessageFr3.result;
+        var messageSetIndex = this.findMessageSetIndex(messageToRemove);
+
+        if (messageSetIndex !== -1) {
+          var _this$removeMessageFr3 = this.removeMessageFromArray(this.messageSets[messageSetIndex].messages, messageToRemove),
+              _removed = _this$removeMessageFr3.removed,
+              messages = _this$removeMessageFr3.result;
 
-        this.messages = messages;
-        isRemoved = _removed;
+          this.messageSets[messageSetIndex].messages = messages;
+          isRemoved = _removed;
+        }
       }
 
       return isRemoved;
@@ -662,10 +735,10 @@ var ChannelState = /*#__PURE__*/function () {
      *
      */
     function filterErrorMessages() {
-      var filteredMessages = this.messages.filter(function (message) {
+      var filteredMessages = this.latestMessages.filter(function (message) {
         return message.type !== 'error';
       });
-      this.messages = filteredMessages;
+      this.latestMessages = filteredMessages;
     }
     /**
      * clean - Remove stale data such as users that stayed in typing state for more than 5 seconds
@@ -699,9 +772,250 @@ var ChannelState = /*#__PURE__*/function () {
   }, {
     key: "clearMessages",
     value: function clearMessages() {
-      this.messages = [];
+      this.initMessages();
       this.pinnedMessages = [];
     }
+  }, {
+    key: "initMessages",
+    value: function initMessages() {
+      this.messageSets = [{
+        messages: [],
+        isLatest: true,
+        isCurrent: true
+      }];
+    }
+    /**
+     * loadMessageIntoState - Loads a given message (and messages around it) into the state
+     *
+     * @param {string} messageId The id of the message, or 'latest' to indicate switching to the latest messages
+     * @param {string} parentMessageId The id of the parent message, if we want load a thread reply
+     */
+
+  }, {
+    key: "loadMessageIntoState",
+    value: function () {
+      var _loadMessageIntoState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(messageId, parentMessageId) {
+        var _this$threads$parentM;
+
+        var messageSetIndex, switchedToMessageSet, loadedMessageThread, messageIdToFind;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                switchedToMessageSet = false;
+                loadedMessageThread = false;
+                messageIdToFind = parentMessageId || messageId;
+
+                if (!(messageId === 'latest')) {
+                  _context.next = 9;
+                  break;
+                }
+
+                if (!(this.messages === this.latestMessages)) {
+                  _context.next = 6;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 6:
+                messageSetIndex = this.messageSets.findIndex(function (s) {
+                  return s.isLatest;
+                });
+                _context.next = 10;
+                break;
+
+              case 9:
+                messageSetIndex = this.findMessageSetIndex({
+                  id: messageIdToFind
+                });
+
+              case 10:
+                if (messageSetIndex !== -1) {
+                  this.switchToMessageSet(messageSetIndex);
+                  switchedToMessageSet = true;
+                }
+
+                loadedMessageThread = !parentMessageId || !!((_this$threads$parentM = this.threads[parentMessageId]) !== null && _this$threads$parentM !== void 0 && _this$threads$parentM.find(function (m) {
+                  return m.id === messageId;
+                }));
+
+                if (!(switchedToMessageSet && loadedMessageThread)) {
+                  _context.next = 14;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 14:
+                if (switchedToMessageSet) {
+                  _context.next = 17;
+                  break;
+                }
+
+                _context.next = 17;
+                return this._channel.query({
+                  messages: {
+                    id_around: messageIdToFind,
+                    limit: 25
+                  }
+                }, 'new');
+
+              case 17:
+                if (!(!loadedMessageThread && parentMessageId)) {
+                  _context.next = 20;
+                  break;
+                }
+
+                _context.next = 20;
+                return this._channel.getReplies(parentMessageId, {
+                  id_around: messageId,
+                  limit: 25
+                });
+
+              case 20:
+                messageSetIndex = this.findMessageSetIndex({
+                  id: messageIdToFind
+                });
+
+                if (messageSetIndex !== -1) {
+                  this.switchToMessageSet(messageSetIndex);
+                }
+
+              case 22:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function loadMessageIntoState(_x, _x2) {
+        return _loadMessageIntoState.apply(this, arguments);
+      }
+
+      return loadMessageIntoState;
+    }()
+  }, {
+    key: "switchToMessageSet",
+    value: function switchToMessageSet(index) {
+      var currentMessages = this.messageSets.find(function (s) {
+        return s.isCurrent;
+      });
+
+      if (!currentMessages) {
+        return;
+      }
+
+      currentMessages.isCurrent = false;
+      this.messageSets[index].isCurrent = true;
+    }
+  }, {
+    key: "areMessageSetsOverlap",
+    value: function areMessageSetsOverlap(messages1, messages2) {
+      return messages1.some(function (m1) {
+        return messages2.find(function (m2) {
+          return m1.id === m2.id;
+        });
+      });
+    }
+  }, {
+    key: "findMessageSetIndex",
+    value: function findMessageSetIndex(message) {
+      return this.messageSets.findIndex(function (set) {
+        return !!set.messages.find(function (m) {
+          return m.id === message.id;
+        });
+      });
+    }
+  }, {
+    key: "findTargetMessageSet",
+    value: function findTargetMessageSet(newMessages) {
+      var _this5 = this;
+
+      var addIfDoesNotExist = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var messageSetToAddToIfDoesNotExist = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'current';
+      var messagesToAdd = newMessages;
+      var targetMessageSetIndex;
+
+      if (addIfDoesNotExist) {
+        var overlappingMessageSetIndices = this.messageSets.map(function (_, i) {
+          return i;
+        }).filter(function (i) {
+          return _this5.areMessageSetsOverlap(_this5.messageSets[i].messages, newMessages);
+        });
+
+        switch (messageSetToAddToIfDoesNotExist) {
+          case 'new':
+            if (overlappingMessageSetIndices.length > 0) {
+              targetMessageSetIndex = overlappingMessageSetIndices[0]; // No new message set is created if newMessages only contains thread replies
+            } else if (newMessages.some(function (m) {
+              return !m.parent_id;
+            })) {
+              this.messageSets.push({
+                messages: [],
+                isCurrent: false,
+                isLatest: false
+              });
+              targetMessageSetIndex = this.messageSets.length - 1;
+            }
+
+            break;
+
+          case 'current':
+            targetMessageSetIndex = this.messageSets.findIndex(function (s) {
+              return s.isCurrent;
+            });
+            break;
+
+          case 'latest':
+            targetMessageSetIndex = this.messageSets.findIndex(function (s) {
+              return s.isLatest;
+            });
+            break;
+
+          default:
+            targetMessageSetIndex = -1;
+        } // when merging the target set will be the first one from the overlapping message sets
+
+
+        var mergeTargetMessageSetIndex = overlappingMessageSetIndices.splice(0, 1)[0];
+
+        var mergeSourceMessageSetIndices = _toConsumableArray(overlappingMessageSetIndices);
+
+        if (mergeTargetMessageSetIndex !== undefined && mergeTargetMessageSetIndex !== targetMessageSetIndex) {
+          mergeSourceMessageSetIndices.push(targetMessageSetIndex);
+        } // merge message sets
+
+
+        if (mergeSourceMessageSetIndices.length > 0) {
+          var target = this.messageSets[mergeTargetMessageSetIndex];
+          var sources = this.messageSets.filter(function (_, i) {
+            return mergeSourceMessageSetIndices.indexOf(i) !== -1;
+          });
+          sources.forEach(function (messageSet) {
+            target.isLatest = target.isLatest || messageSet.isLatest;
+            target.isCurrent = target.isCurrent || messageSet.isCurrent;
+            messagesToAdd = [].concat(_toConsumableArray(messagesToAdd), _toConsumableArray(messageSet.messages));
+          });
+          sources.forEach(function (s) {
+            return _this5.messageSets.splice(_this5.messageSets.indexOf(s), 1);
+          });
+          var overlappingMessageSetIndex = this.messageSets.findIndex(function (s) {
+            return _this5.areMessageSetsOverlap(s.messages, newMessages);
+          });
+          targetMessageSetIndex = overlappingMessageSetIndex;
+        }
+      } else {
+        // assumes that all new messages belong to the same set
+        targetMessageSetIndex = this.findMessageSetIndex(newMessages[0]);
+      }
+
+      return {
+        targetMessageSetIndex: targetMessageSetIndex,
+        messagesToAdd: messagesToAdd
+      };
+    }
   }]);
 
   return ChannelState;
@@ -1064,7 +1378,7 @@ var Channel = /*#__PURE__*/function () {
                 presence: false
               };
               _context.next = 3;
-              return _this.query(options);
+              return _this.query(options, 'latest');
 
             case 3:
               return _context.abrupt("return", _context.sent);
@@ -2362,14 +2676,14 @@ var Channel = /*#__PURE__*/function () {
     value: function lastMessage() {
       // get last 5 messages, sort, return the latest
       // get a slice of the last 5
-      var min = this.state.messages.length - 5;
+      var min = this.state.latestMessages.length - 5;
 
       if (min < 0) {
         min = 0;
       }
 
-      var max = this.state.messages.length + 1;
-      var messageSlice = this.state.messages.slice(min, max); // sort by pk desc
+      var max = this.state.latestMessages.length + 1;
+      var messageSlice = this.state.latestMessages.slice(min, max); // sort by pk desc
 
       messageSlice.sort(function (a, b) {
         return b.created_at.getTime() - a.created_at.getTime();
@@ -2478,7 +2792,7 @@ var Channel = /*#__PURE__*/function () {
 
                 combined = _objectSpread$5(_objectSpread$5({}, defaultOptions), options);
                 _context27.next = 7;
-                return this.query(combined);
+                return this.query(combined, 'latest');
 
               case 7:
                 state = _context27.sent;
@@ -2552,7 +2866,7 @@ var Channel = /*#__PURE__*/function () {
      * getReplies - List the message replies for a parent message
      *
      * @param {string} parent_id The message parent id, ie the top of the thread
-     * @param {PaginationOptions & { user?: UserResponse<StreamChatGenerics>; user_id?: string }} options Pagination params, ie {limit:10, id_lte: 10}
+     * @param {MessagePaginationOptions & { user?: UserResponse<StreamChatGenerics>; user_id?: string }} options Pagination params, ie {limit:10, id_lte: 10}
      *
      * @return {Promise<GetRepliesAPIResponse<StreamChatGenerics>>} A response with a list of messages
      */
@@ -2686,14 +3000,16 @@ var Channel = /*#__PURE__*/function () {
   }, {
     key: "_countMessageAsUnread",
     value: function _countMessageAsUnread(message) {
-      var _message$user, _message$user2;
+      var _message$user, _message$user2, _this$data2, _this$data3;
 
       if (message.shadowed) return false;
       if (message.silent) return false;
       if (message.parent_id && !message.show_in_channel) return false;
       if (((_message$user = message.user) === null || _message$user === void 0 ? void 0 : _message$user.id) === this.getClient().userID) return false;
       if ((_message$user2 = message.user) !== null && _message$user2 !== void 0 && _message$user2.id && this.getClient().userMuteStatus(message.user.id)) return false;
-      if (message.type === 'system') return false;
+      if (message.type === 'system') return false; // Return false if channel doesn't allow read events.
+
+      if (Array.isArray((_this$data2 = this.data) === null || _this$data2 === void 0 ? void 0 : _this$data2.own_capabilities) && !((_this$data3 = this.data) !== null && _this$data3 !== void 0 && _this$data3.own_capabilities.includes('read-events'))) return false;
       if (this.muteStatus().muted) return false;
       return true;
     }
@@ -2711,8 +3027,8 @@ var Channel = /*#__PURE__*/function () {
       if (!lastRead) return this.state.unreadCount;
       var count = 0;
 
-      for (var i = 0; i < this.state.messages.length; i += 1) {
-        var message = this.state.messages[i];
+      for (var i = 0; i < this.state.latestMessages.length; i += 1) {
+        var message = this.state.latestMessages[i];
 
         if (message.created_at > lastRead && this._countMessageAsUnread(message)) {
           count++;
@@ -2722,7 +3038,7 @@ var Channel = /*#__PURE__*/function () {
       return count;
     }
     /**
-     * countUnread - Count the number of unread messages mentioning the current user
+     * countUnreadMentions - Count the number of unread messages mentioning the current user
      *
      * @return {number} Unread mentions count
      */
@@ -2734,10 +3050,10 @@ var Channel = /*#__PURE__*/function () {
       var userID = this.getClient().userID;
       var count = 0;
 
-      for (var i = 0; i < this.state.messages.length; i += 1) {
+      for (var i = 0; i < this.state.latestMessages.length; i += 1) {
         var _message$mentioned_us;
 
-        var message = this.state.messages[i];
+        var message = this.state.latestMessages[i];
 
         if (this._countMessageAsUnread(message) && (!lastRead || message.created_at > lastRead) && (_message$mentioned_us = message.mentioned_users) !== null && _message$mentioned_us !== void 0 && _message$mentioned_us.some(function (user) {
           return user.id === userID;
@@ -2761,33 +3077,40 @@ var Channel = /*#__PURE__*/function () {
      * query - Query the API, get messages, members or other channel fields
      *
      * @param {ChannelQueryOptions<StreamChatGenerics>} options The query options
+     * @param {MessageSetType} messageSetToAddToIfDoesNotExist It's possible to load disjunct sets of a channel's messages into state, use `current` to load the initial channel state or if you want to extend the currently displayed messages, use `latest` if you want to load/extend the latest messages, `new` is used for loading a specific message and it's surroundings
      *
      * @return {Promise<ChannelAPIResponse<StreamChatGenerics>>} Returns a query response
      */
     function () {
       var _query = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee31(options) {
-        var queryURL, state, membersStr, tempChannelCid;
+        var messageSetToAddToIfDoesNotExist,
+            queryURL,
+            state,
+            membersStr,
+            tempChannelCid,
+            _args31 = arguments;
         return _regeneratorRuntime.wrap(function _callee31$(_context31) {
           while (1) {
             switch (_context31.prev = _context31.next) {
               case 0:
-                _context31.next = 2;
+                messageSetToAddToIfDoesNotExist = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : 'current';
+                _context31.next = 3;
                 return this.getClient().wsPromise;
 
-              case 2:
+              case 3:
                 queryURL = "".concat(this.getClient().baseURL, "/channels/").concat(this.type);
 
                 if (this.id) {
                   queryURL += "/".concat(this.id);
                 }
 
-                _context31.next = 6;
+                _context31.next = 7;
                 return this.getClient().post(queryURL + '/query', _objectSpread$5({
                   data: this._data,
                   state: true
                 }, options));
 
-              case 6:
+              case 7:
                 state = _context31.sent;
 
                 // update the channel id if it was missing
@@ -2816,11 +3139,11 @@ var Channel = /*#__PURE__*/function () {
                 this.getClient()._addChannelConfig(state); // add any messages to our channel state
 
 
-                this._initializeState(state);
+                this._initializeState(state, messageSetToAddToIfDoesNotExist);
 
                 return _context31.abrupt("return", state);
 
-              case 11:
+              case 12:
               case "end":
                 return _context31.stop();
             }
@@ -3370,6 +3693,8 @@ var Channel = /*#__PURE__*/function () {
   }, {
     key: "_initializeState",
     value: function _initializeState(state) {
+      var messageSetToAddToIfDoesNotExist = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'latest';
+
       var _this$getClient2 = this.getClient(),
           clientState = _this$getClient2.state,
           user = _this$getClient2.user,
@@ -3399,10 +3724,10 @@ var Channel = /*#__PURE__*/function () {
       var messages = state.messages || [];
 
       if (!this.state.messages) {
-        this.state.messages = [];
+        this.state.initMessages();
       }
 
-      this.state.addMessagesSorted(messages, false, true);
+      this.state.addMessagesSorted(messages, false, true, true, messageSetToAddToIfDoesNotExist);
 
       if (!this.state.pinnedMessages) {
         this.state.pinnedMessages = [];
@@ -7000,6 +7325,13 @@ var StreamChat = /*#__PURE__*/function () {
         this.mutedUsers = event.me.mutes;
       }
 
+      if (event.type === 'notification.mark_read') {
+        var activeChannelKeys = Object.keys(this.activeChannels);
+        activeChannelKeys.forEach(function (activeChannelKey) {
+          return _this3.activeChannels[activeChannelKey].state.unreadCount = 0;
+        });
+      }
+
       if ((event.type === 'channel.deleted' || event.type === 'notification.channel_deleted') && event.cid) {
         var _this$activeChannels$;
 
@@ -7435,11 +7767,11 @@ var StreamChat = /*#__PURE__*/function () {
                     c.initialized = true;
 
                     if (skipInitialization === undefined) {
-                      c._initializeState(_channelState);
+                      c._initializeState(_channelState, 'latest');
                     } else if (!skipInitialization.includes(_channelState.channel.id)) {
                       c.state.clearMessages();
 
-                      c._initializeState(_channelState);
+                      c._initializeState(_channelState, 'latest');
                     }
 
                     channels.push(c);
@@ -8553,23 +8885,23 @@ var StreamChat = /*#__PURE__*/function () {
       return unflagUser;
     }()
     /**
-     * _queryFlagReports - Query flag reports.
+     * _queryFlags - Query flags.
      *
      * Note: Do not use this.
      * It is present for internal usage only.
      * This function can, and will, break and/or be removed at any point in time.
      *
      * @private
-     * @param {FlagReportsFilters} filterConditions MongoDB style filter conditions
-     * @param {FlagReportsPaginationOptions} options Option object, {limit: 10, offset:0}
+     * @param {FlagsFilters} filterConditions MongoDB style filter conditions
+     * @param {FlagsPaginationOptions} options Option object, {limit: 10, offset:0}
      *
-     * @return {Promise<FlagReportsResponse<StreamChatGenerics>>} Flag Reports Response
+     * @return {Promise<FlagsResponse<StreamChatGenerics>>} Flags Response
      */
 
   }, {
-    key: "_queryFlagReports",
+    key: "_queryFlags",
     value: function () {
-      var _queryFlagReports2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee42() {
+      var _queryFlags2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee42() {
         var filterConditions,
             options,
             _args42 = arguments;
@@ -8580,7 +8912,7 @@ var StreamChat = /*#__PURE__*/function () {
                 filterConditions = _args42.length > 0 && _args42[0] !== undefined ? _args42[0] : {};
                 options = _args42.length > 1 && _args42[1] !== undefined ? _args42[1] : {};
                 _context42.next = 4;
-                return this.post(this.baseURL + '/moderation/reports', _objectSpread({
+                return this.post(this.baseURL + '/moderation/flags', _objectSpread({
                   filter_conditions: filterConditions
                 }, options));
 
@@ -8595,6 +8927,55 @@ var StreamChat = /*#__PURE__*/function () {
         }, _callee42, this);
       }));
 
+      function _queryFlags() {
+        return _queryFlags2.apply(this, arguments);
+      }
+
+      return _queryFlags;
+    }()
+    /**
+     * _queryFlagReports - Query flag reports.
+     *
+     * Note: Do not use this.
+     * It is present for internal usage only.
+     * This function can, and will, break and/or be removed at any point in time.
+     *
+     * @private
+     * @param {FlagReportsFilters} filterConditions MongoDB style filter conditions
+     * @param {FlagReportsPaginationOptions} options Option object, {limit: 10, offset:0}
+     *
+     * @return {Promise<FlagReportsResponse<StreamChatGenerics>>} Flag Reports Response
+     */
+
+  }, {
+    key: "_queryFlagReports",
+    value: function () {
+      var _queryFlagReports2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee43() {
+        var filterConditions,
+            options,
+            _args43 = arguments;
+        return _regeneratorRuntime.wrap(function _callee43$(_context43) {
+          while (1) {
+            switch (_context43.prev = _context43.next) {
+              case 0:
+                filterConditions = _args43.length > 0 && _args43[0] !== undefined ? _args43[0] : {};
+                options = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : {};
+                _context43.next = 4;
+                return this.post(this.baseURL + '/moderation/reports', _objectSpread({
+                  filter_conditions: filterConditions
+                }, options));
+
+              case 4:
+                return _context43.abrupt("return", _context43.sent);
+
+              case 5:
+              case "end":
+                return _context43.stop();
+            }
+          }
+        }, _callee43, this);
+      }));
+
       function _queryFlagReports() {
         return _queryFlagReports2.apply(this, arguments);
       }
@@ -8619,28 +9000,28 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "_reviewFlagReport",
     value: function () {
-      var _reviewFlagReport2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee43(id, reviewResult) {
+      var _reviewFlagReport2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee44(id, reviewResult) {
         var options,
-            _args43 = arguments;
-        return _regeneratorRuntime.wrap(function _callee43$(_context43) {
+            _args44 = arguments;
+        return _regeneratorRuntime.wrap(function _callee44$(_context44) {
           while (1) {
-            switch (_context43.prev = _context43.next) {
+            switch (_context44.prev = _context44.next) {
               case 0:
-                options = _args43.length > 2 && _args43[2] !== undefined ? _args43[2] : {};
-                _context43.next = 3;
+                options = _args44.length > 2 && _args44[2] !== undefined ? _args44[2] : {};
+                _context44.next = 3;
                 return this.patch(this.baseURL + "/moderation/reports/".concat(id), _objectSpread({
                   review_result: reviewResult
                 }, options));
 
               case 3:
-                return _context43.abrupt("return", _context43.sent);
+                return _context44.abrupt("return", _context44.sent);
 
               case 4:
               case "end":
-                return _context43.stop();
+                return _context44.stop();
             }
           }
-        }, _callee43, this);
+        }, _callee44, this);
       }));
 
       function _reviewFlagReport(_x54, _x55) {
@@ -8665,28 +9046,28 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "_unblockMessage",
     value: function () {
-      var _unblockMessage2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee44(targetMessageID) {
+      var _unblockMessage2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee45(targetMessageID) {
         var options,
-            _args44 = arguments;
-        return _regeneratorRuntime.wrap(function _callee44$(_context44) {
+            _args45 = arguments;
+        return _regeneratorRuntime.wrap(function _callee45$(_context45) {
           while (1) {
-            switch (_context44.prev = _context44.next) {
+            switch (_context45.prev = _context45.next) {
               case 0:
-                options = _args44.length > 1 && _args44[1] !== undefined ? _args44[1] : {};
-                _context44.next = 3;
+                options = _args45.length > 1 && _args45[1] !== undefined ? _args45[1] : {};
+                _context45.next = 3;
                 return this.post(this.baseURL + '/moderation/unblock_message', _objectSpread({
                   target_message_id: targetMessageID
                 }, options));
 
               case 3:
-                return _context44.abrupt("return", _context44.sent);
+                return _context45.abrupt("return", _context45.sent);
 
               case 4:
               case "end":
-                return _context44.stop();
+                return _context45.stop();
             }
           }
-        }, _callee44, this);
+        }, _callee45, this);
       }));
 
       function _unblockMessage(_x56) {
@@ -8716,23 +9097,23 @@ var StreamChat = /*#__PURE__*/function () {
      * @return {Promise<APIResponse>}
      */
     function () {
-      var _markChannelsRead = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee45() {
+      var _markChannelsRead = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee46() {
         var data,
-            _args45 = arguments;
-        return _regeneratorRuntime.wrap(function _callee45$(_context45) {
+            _args46 = arguments;
+        return _regeneratorRuntime.wrap(function _callee46$(_context46) {
           while (1) {
-            switch (_context45.prev = _context45.next) {
+            switch (_context46.prev = _context46.next) {
               case 0:
-                data = _args45.length > 0 && _args45[0] !== undefined ? _args45[0] : {};
-                _context45.next = 3;
+                data = _args46.length > 0 && _args46[0] !== undefined ? _args46[0] : {};
+                _context46.next = 3;
                 return this.post(this.baseURL + '/channels/read', _objectSpread({}, data));
 
               case 3:
               case "end":
-                return _context45.stop();
+                return _context46.stop();
             }
           }
-        }, _callee45, this);
+        }, _callee46, this);
       }));
 
       function markChannelsRead() {
@@ -8807,25 +9188,25 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "translateMessage",
     value: function () {
-      var _translateMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee46(messageId, language) {
-        return _regeneratorRuntime.wrap(function _callee46$(_context46) {
+      var _translateMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee47(messageId, language) {
+        return _regeneratorRuntime.wrap(function _callee47$(_context47) {
           while (1) {
-            switch (_context46.prev = _context46.next) {
+            switch (_context47.prev = _context47.next) {
               case 0:
-                _context46.next = 2;
+                _context47.next = 2;
                 return this.post(this.baseURL + "/messages/".concat(messageId, "/translate"), {
                   language: language
                 });
 
               case 2:
-                return _context46.abrupt("return", _context46.sent);
+                return _context47.abrupt("return", _context47.sent);
 
               case 3:
               case "end":
-                return _context46.stop();
+                return _context47.stop();
             }
           }
-        }, _callee46, this);
+        }, _callee47, this);
       }));
 
       function translateMessage(_x57, _x58) {
@@ -8930,14 +9311,14 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "updateMessage",
     value: function () {
-      var _updateMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee47(message, userId, options) {
+      var _updateMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee48(message, userId, options) {
         var clonedMessage, reservedMessageFields;
-        return _regeneratorRuntime.wrap(function _callee47$(_context47) {
+        return _regeneratorRuntime.wrap(function _callee48$(_context48) {
           while (1) {
-            switch (_context47.prev = _context47.next) {
+            switch (_context48.prev = _context48.next) {
               case 0:
                 if (message.id) {
-                  _context47.next = 2;
+                  _context48.next = 2;
                   break;
                 }
 
@@ -8974,20 +9355,20 @@ var StreamChat = /*#__PURE__*/function () {
                   });
                 }
 
-                _context47.next = 10;
+                _context48.next = 10;
                 return this.post(this.baseURL + "/messages/".concat(message.id), _objectSpread({
                   message: clonedMessage
                 }, options));
 
               case 10:
-                return _context47.abrupt("return", _context47.sent);
+                return _context48.abrupt("return", _context48.sent);
 
               case 11:
               case "end":
-                return _context47.stop();
+                return _context48.stop();
             }
           }
-        }, _callee47, this);
+        }, _callee48, this);
       }));
 
       function updateMessage(_x59, _x60, _x61) {
@@ -9013,14 +9394,14 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "partialUpdateMessage",
     value: function () {
-      var _partialUpdateMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee48(id, partialMessageObject, userId, options) {
+      var _partialUpdateMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee49(id, partialMessageObject, userId, options) {
         var user;
-        return _regeneratorRuntime.wrap(function _callee48$(_context48) {
+        return _regeneratorRuntime.wrap(function _callee49$(_context49) {
           while (1) {
-            switch (_context48.prev = _context48.next) {
+            switch (_context49.prev = _context49.next) {
               case 0:
                 if (id) {
-                  _context48.next = 2;
+                  _context49.next = 2;
                   break;
                 }
 
@@ -9035,20 +9416,20 @@ var StreamChat = /*#__PURE__*/function () {
                   };
                 }
 
-                _context48.next = 6;
+                _context49.next = 6;
                 return this.put(this.baseURL + "/messages/".concat(id), _objectSpread(_objectSpread(_objectSpread({}, partialMessageObject), options), {}, {
                   user: user
                 }));
 
               case 6:
-                return _context48.abrupt("return", _context48.sent);
+                return _context49.abrupt("return", _context49.sent);
 
               case 7:
               case "end":
-                return _context48.stop();
+                return _context49.stop();
             }
           }
-        }, _callee48, this);
+        }, _callee49, this);
       }));
 
       function partialUpdateMessage(_x62, _x63, _x64, _x65) {
@@ -9060,11 +9441,11 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "deleteMessage",
     value: function () {
-      var _deleteMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee49(messageID, hardDelete) {
+      var _deleteMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee50(messageID, hardDelete) {
         var params;
-        return _regeneratorRuntime.wrap(function _callee49$(_context49) {
+        return _regeneratorRuntime.wrap(function _callee50$(_context50) {
           while (1) {
-            switch (_context49.prev = _context49.next) {
+            switch (_context50.prev = _context50.next) {
               case 0:
                 params = {};
 
@@ -9074,18 +9455,18 @@ var StreamChat = /*#__PURE__*/function () {
                   };
                 }
 
-                _context49.next = 4;
+                _context50.next = 4;
                 return this.delete(this.baseURL + "/messages/".concat(messageID), params);
 
               case 4:
-                return _context49.abrupt("return", _context49.sent);
+                return _context50.abrupt("return", _context50.sent);
 
               case 5:
               case "end":
-                return _context49.stop();
+                return _context50.stop();
             }
           }
-        }, _callee49, this);
+        }, _callee50, this);
       }));
 
       function deleteMessage(_x66, _x67) {
@@ -9097,23 +9478,23 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getMessage",
     value: function () {
-      var _getMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee50(messageID) {
-        return _regeneratorRuntime.wrap(function _callee50$(_context50) {
+      var _getMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee51(messageID) {
+        return _regeneratorRuntime.wrap(function _callee51$(_context51) {
           while (1) {
-            switch (_context50.prev = _context50.next) {
+            switch (_context51.prev = _context51.next) {
               case 0:
-                _context50.next = 2;
+                _context51.next = 2;
                 return this.get(this.baseURL + "/messages/".concat(messageID));
 
               case 2:
-                return _context50.abrupt("return", _context50.sent);
+                return _context51.abrupt("return", _context51.sent);
 
               case 3:
               case "end":
-                return _context50.stop();
+                return _context51.stop();
             }
           }
-        }, _callee50, this);
+        }, _callee51, this);
       }));
 
       function getMessage(_x68) {
@@ -9125,7 +9506,7 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getUserAgent",
     value: function getUserAgent() {
-      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "6.0.0");
+      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "6.3.0");
     }
   }, {
     key: "setUserAgent",
@@ -9320,25 +9701,25 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "sendUserCustomEvent",
     value: function () {
-      var _sendUserCustomEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee51(targetUserID, event) {
-        return _regeneratorRuntime.wrap(function _callee51$(_context51) {
+      var _sendUserCustomEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee52(targetUserID, event) {
+        return _regeneratorRuntime.wrap(function _callee52$(_context52) {
           while (1) {
-            switch (_context51.prev = _context51.next) {
+            switch (_context52.prev = _context52.next) {
               case 0:
-                _context51.next = 2;
+                _context52.next = 2;
                 return this.post("".concat(this.baseURL, "/users/").concat(targetUserID, "/event"), {
                   event: event
                 });
 
               case 2:
-                return _context51.abrupt("return", _context51.sent);
+                return _context52.abrupt("return", _context52.sent);
 
               case 3:
               case "end":
-                return _context51.stop();
+                return _context52.stop();
             }
           }
-        }, _callee51, this);
+        }, _callee52, this);
       }));
 
       function sendUserCustomEvent(_x69, _x70) {
@@ -9409,29 +9790,29 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "createSegment",
     value: function () {
-      var _createSegment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee52(params) {
+      var _createSegment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee53(params) {
         var _yield$this$post, segment;
 
-        return _regeneratorRuntime.wrap(function _callee52$(_context52) {
+        return _regeneratorRuntime.wrap(function _callee53$(_context53) {
           while (1) {
-            switch (_context52.prev = _context52.next) {
+            switch (_context53.prev = _context53.next) {
               case 0:
-                _context52.next = 2;
+                _context53.next = 2;
                 return this.post(this.baseURL + "/segments", {
                   segment: params
                 });
 
               case 2:
-                _yield$this$post = _context52.sent;
+                _yield$this$post = _context53.sent;
                 segment = _yield$this$post.segment;
-                return _context52.abrupt("return", segment);
+                return _context53.abrupt("return", segment);
 
               case 5:
               case "end":
-                return _context52.stop();
+                return _context53.stop();
             }
           }
-        }, _callee52, this);
+        }, _callee53, this);
       }));
 
       function createSegment(_x71) {
@@ -9451,27 +9832,27 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getSegment",
     value: function () {
-      var _getSegment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee53(id) {
+      var _getSegment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee54(id) {
         var _yield$this$get, segment;
 
-        return _regeneratorRuntime.wrap(function _callee53$(_context53) {
+        return _regeneratorRuntime.wrap(function _callee54$(_context54) {
           while (1) {
-            switch (_context53.prev = _context53.next) {
+            switch (_context54.prev = _context54.next) {
               case 0:
-                _context53.next = 2;
+                _context54.next = 2;
                 return this.get(this.baseURL + "/segments/".concat(id));
 
               case 2:
-                _yield$this$get = _context53.sent;
+                _yield$this$get = _context54.sent;
                 segment = _yield$this$get.segment;
-                return _context53.abrupt("return", segment);
+                return _context54.abrupt("return", segment);
 
               case 5:
               case "end":
-                return _context53.stop();
+                return _context54.stop();
             }
           }
-        }, _callee53, this);
+        }, _callee54, this);
       }));
 
       function getSegment(_x72) {
@@ -9490,27 +9871,27 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "listSegments",
     value: function () {
-      var _listSegments = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee54(options) {
+      var _listSegments = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee55(options) {
         var _yield$this$get2, segments;
 
-        return _regeneratorRuntime.wrap(function _callee54$(_context54) {
+        return _regeneratorRuntime.wrap(function _callee55$(_context55) {
           while (1) {
-            switch (_context54.prev = _context54.next) {
+            switch (_context55.prev = _context55.next) {
               case 0:
-                _context54.next = 2;
+                _context55.next = 2;
                 return this.get(this.baseURL + "/segments", options);
 
               case 2:
-                _yield$this$get2 = _context54.sent;
+                _yield$this$get2 = _context55.sent;
                 segments = _yield$this$get2.segments;
-                return _context54.abrupt("return", segments);
+                return _context55.abrupt("return", segments);
 
               case 5:
               case "end":
-                return _context54.stop();
+                return _context55.stop();
             }
           }
-        }, _callee54, this);
+        }, _callee55, this);
       }));
 
       function listSegments(_x73) {
@@ -9531,29 +9912,29 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "updateSegment",
     value: function () {
-      var _updateSegment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee55(id, params) {
+      var _updateSegment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee56(id, params) {
         var _yield$this$put, segment;
 
-        return _regeneratorRuntime.wrap(function _callee55$(_context55) {
+        return _regeneratorRuntime.wrap(function _callee56$(_context56) {
           while (1) {
-            switch (_context55.prev = _context55.next) {
+            switch (_context56.prev = _context56.next) {
               case 0:
-                _context55.next = 2;
+                _context56.next = 2;
                 return this.put(this.baseURL + "/segments/".concat(id), {
                   segment: params
                 });
 
               case 2:
-                _yield$this$put = _context55.sent;
+                _yield$this$put = _context56.sent;
                 segment = _yield$this$put.segment;
-                return _context55.abrupt("return", segment);
+                return _context56.abrupt("return", segment);
 
               case 5:
               case "end":
-                return _context55.stop();
+                return _context56.stop();
             }
           }
-        }, _callee55, this);
+        }, _callee56, this);
       }));
 
       function updateSegment(_x74, _x75) {
@@ -9573,19 +9954,19 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "deleteSegment",
     value: function () {
-      var _deleteSegment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee56(id) {
-        return _regeneratorRuntime.wrap(function _callee56$(_context56) {
+      var _deleteSegment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee57(id) {
+        return _regeneratorRuntime.wrap(function _callee57$(_context57) {
           while (1) {
-            switch (_context56.prev = _context56.next) {
+            switch (_context57.prev = _context57.next) {
               case 0:
-                return _context56.abrupt("return", this.delete(this.baseURL + "/segments/".concat(id)));
+                return _context57.abrupt("return", this.delete(this.baseURL + "/segments/".concat(id)));
 
               case 1:
               case "end":
-                return _context56.stop();
+                return _context57.stop();
             }
           }
-        }, _callee56, this);
+        }, _callee57, this);
       }));
 
       function deleteSegment(_x76) {
@@ -9605,29 +9986,29 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "createCampaign",
     value: function () {
-      var _createCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee57(params) {
+      var _createCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee58(params) {
         var _yield$this$post2, campaign;
 
-        return _regeneratorRuntime.wrap(function _callee57$(_context57) {
+        return _regeneratorRuntime.wrap(function _callee58$(_context58) {
           while (1) {
-            switch (_context57.prev = _context57.next) {
+            switch (_context58.prev = _context58.next) {
               case 0:
-                _context57.next = 2;
+                _context58.next = 2;
                 return this.post(this.baseURL + "/campaigns", {
                   campaign: params
                 });
 
               case 2:
-                _yield$this$post2 = _context57.sent;
+                _yield$this$post2 = _context58.sent;
                 campaign = _yield$this$post2.campaign;
-                return _context57.abrupt("return", campaign);
+                return _context58.abrupt("return", campaign);
 
               case 5:
               case "end":
-                return _context57.stop();
+                return _context58.stop();
             }
           }
-        }, _callee57, this);
+        }, _callee58, this);
       }));
 
       function createCampaign(_x77) {
@@ -9647,27 +10028,27 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getCampaign",
     value: function () {
-      var _getCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee58(id) {
+      var _getCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee59(id) {
         var _yield$this$get3, campaign;
 
-        return _regeneratorRuntime.wrap(function _callee58$(_context58) {
+        return _regeneratorRuntime.wrap(function _callee59$(_context59) {
           while (1) {
-            switch (_context58.prev = _context58.next) {
+            switch (_context59.prev = _context59.next) {
               case 0:
-                _context58.next = 2;
+                _context59.next = 2;
                 return this.get(this.baseURL + "/campaigns/".concat(id));
 
               case 2:
-                _yield$this$get3 = _context58.sent;
+                _yield$this$get3 = _context59.sent;
                 campaign = _yield$this$get3.campaign;
-                return _context58.abrupt("return", campaign);
+                return _context59.abrupt("return", campaign);
 
               case 5:
               case "end":
-                return _context58.stop();
+                return _context59.stop();
             }
           }
-        }, _callee58, this);
+        }, _callee59, this);
       }));
 
       function getCampaign(_x78) {
@@ -9686,27 +10067,27 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "listCampaigns",
     value: function () {
-      var _listCampaigns = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee59(options) {
+      var _listCampaigns = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee60(options) {
         var _yield$this$get4, campaigns;
 
-        return _regeneratorRuntime.wrap(function _callee59$(_context59) {
+        return _regeneratorRuntime.wrap(function _callee60$(_context60) {
           while (1) {
-            switch (_context59.prev = _context59.next) {
+            switch (_context60.prev = _context60.next) {
               case 0:
-                _context59.next = 2;
+                _context60.next = 2;
                 return this.get(this.baseURL + "/campaigns", options);
 
               case 2:
-                _yield$this$get4 = _context59.sent;
+                _yield$this$get4 = _context60.sent;
                 campaigns = _yield$this$get4.campaigns;
-                return _context59.abrupt("return", campaigns);
+                return _context60.abrupt("return", campaigns);
 
               case 5:
               case "end":
-                return _context59.stop();
+                return _context60.stop();
             }
           }
-        }, _callee59, this);
+        }, _callee60, this);
       }));
 
       function listCampaigns(_x79) {
@@ -9727,29 +10108,29 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "updateCampaign",
     value: function () {
-      var _updateCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee60(id, params) {
+      var _updateCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee61(id, params) {
         var _yield$this$put2, campaign;
 
-        return _regeneratorRuntime.wrap(function _callee60$(_context60) {
+        return _regeneratorRuntime.wrap(function _callee61$(_context61) {
           while (1) {
-            switch (_context60.prev = _context60.next) {
+            switch (_context61.prev = _context61.next) {
               case 0:
-                _context60.next = 2;
+                _context61.next = 2;
                 return this.put(this.baseURL + "/campaigns/".concat(id), {
                   campaign: params
                 });
 
               case 2:
-                _yield$this$put2 = _context60.sent;
+                _yield$this$put2 = _context61.sent;
                 campaign = _yield$this$put2.campaign;
-                return _context60.abrupt("return", campaign);
+                return _context61.abrupt("return", campaign);
 
               case 5:
               case "end":
-                return _context60.stop();
+                return _context61.stop();
             }
           }
-        }, _callee60, this);
+        }, _callee61, this);
       }));
 
       function updateCampaign(_x80, _x81) {
@@ -9769,19 +10150,19 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "deleteCampaign",
     value: function () {
-      var _deleteCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee61(id) {
-        return _regeneratorRuntime.wrap(function _callee61$(_context61) {
+      var _deleteCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee62(id) {
+        return _regeneratorRuntime.wrap(function _callee62$(_context62) {
           while (1) {
-            switch (_context61.prev = _context61.next) {
+            switch (_context62.prev = _context62.next) {
               case 0:
-                return _context61.abrupt("return", this.delete(this.baseURL + "/campaigns/".concat(id)));
+                return _context62.abrupt("return", this.delete(this.baseURL + "/campaigns/".concat(id)));
 
               case 1:
               case "end":
-                return _context61.stop();
+                return _context62.stop();
             }
           }
-        }, _callee61, this);
+        }, _callee62, this);
       }));
 
       function deleteCampaign(_x82) {
@@ -9802,30 +10183,30 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "scheduleCampaign",
     value: function () {
-      var _scheduleCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee62(id, params) {
+      var _scheduleCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee63(id, params) {
         var sendAt, _yield$this$patch, campaign;
 
-        return _regeneratorRuntime.wrap(function _callee62$(_context62) {
+        return _regeneratorRuntime.wrap(function _callee63$(_context63) {
           while (1) {
-            switch (_context62.prev = _context62.next) {
+            switch (_context63.prev = _context63.next) {
               case 0:
                 sendAt = params.sendAt;
-                _context62.next = 3;
+                _context63.next = 3;
                 return this.patch(this.baseURL + "/campaigns/".concat(id, "/schedule"), {
                   send_at: sendAt
                 });
 
               case 3:
-                _yield$this$patch = _context62.sent;
+                _yield$this$patch = _context63.sent;
                 campaign = _yield$this$patch.campaign;
-                return _context62.abrupt("return", campaign);
+                return _context63.abrupt("return", campaign);
 
               case 6:
               case "end":
-                return _context62.stop();
+                return _context63.stop();
             }
           }
-        }, _callee62, this);
+        }, _callee63, this);
       }));
 
       function scheduleCampaign(_x83, _x84) {
@@ -9845,27 +10226,27 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "stopCampaign",
     value: function () {
-      var _stopCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee63(id) {
+      var _stopCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee64(id) {
         var _yield$this$patch2, campaign;
 
-        return _regeneratorRuntime.wrap(function _callee63$(_context63) {
+        return _regeneratorRuntime.wrap(function _callee64$(_context64) {
           while (1) {
-            switch (_context63.prev = _context63.next) {
+            switch (_context64.prev = _context64.next) {
               case 0:
-                _context63.next = 2;
+                _context64.next = 2;
                 return this.patch(this.baseURL + "/campaigns/".concat(id, "/stop"));
 
               case 2:
-                _yield$this$patch2 = _context63.sent;
+                _yield$this$patch2 = _context64.sent;
                 campaign = _yield$this$patch2.campaign;
-                return _context63.abrupt("return", campaign);
+                return _context64.abrupt("return", campaign);
 
               case 5:
               case "end":
-                return _context63.stop();
+                return _context64.stop();
             }
           }
-        }, _callee63, this);
+        }, _callee64, this);
       }));
 
       function stopCampaign(_x85) {
@@ -9885,27 +10266,27 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "resumeCampaign",
     value: function () {
-      var _resumeCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee64(id) {
+      var _resumeCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee65(id) {
         var _yield$this$patch3, campaign;
 
-        return _regeneratorRuntime.wrap(function _callee64$(_context64) {
+        return _regeneratorRuntime.wrap(function _callee65$(_context65) {
           while (1) {
-            switch (_context64.prev = _context64.next) {
+            switch (_context65.prev = _context65.next) {
               case 0:
-                _context64.next = 2;
+                _context65.next = 2;
                 return this.patch(this.baseURL + "/campaigns/".concat(id, "/resume"));
 
               case 2:
-                _yield$this$patch3 = _context64.sent;
+                _yield$this$patch3 = _context65.sent;
                 campaign = _yield$this$patch3.campaign;
-                return _context64.abrupt("return", campaign);
+                return _context65.abrupt("return", campaign);
 
               case 5:
               case "end":
-                return _context64.stop();
+                return _context65.stop();
             }
           }
-        }, _callee64, this);
+        }, _callee65, this);
       }));
 
       function resumeCampaign(_x86) {
@@ -9925,30 +10306,30 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "testCampaign",
     value: function () {
-      var _testCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee65(id, params) {
+      var _testCampaign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee66(id, params) {
         var users, _yield$this$post3, campaign;
 
-        return _regeneratorRuntime.wrap(function _callee65$(_context65) {
+        return _regeneratorRuntime.wrap(function _callee66$(_context66) {
           while (1) {
-            switch (_context65.prev = _context65.next) {
+            switch (_context66.prev = _context66.next) {
               case 0:
                 users = params.users;
-                _context65.next = 3;
+                _context66.next = 3;
                 return this.post(this.baseURL + "/campaigns/".concat(id, "/test"), {
                   users: users
                 });
 
               case 3:
-                _yield$this$post3 = _context65.sent;
+                _yield$this$post3 = _context66.sent;
                 campaign = _yield$this$post3.campaign;
-                return _context65.abrupt("return", campaign);
+                return _context66.abrupt("return", campaign);
 
               case 6:
               case "end":
-                return _context65.stop();
+                return _context66.stop();
             }
           }
-        }, _callee65, this);
+        }, _callee66, this);
       }));
 
       function testCampaign(_x87, _x88) {
@@ -9967,21 +10348,21 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "enrichURL",
     value: function () {
-      var _enrichURL = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee66(url) {
-        return _regeneratorRuntime.wrap(function _callee66$(_context66) {
+      var _enrichURL = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee67(url) {
+        return _regeneratorRuntime.wrap(function _callee67$(_context67) {
           while (1) {
-            switch (_context66.prev = _context66.next) {
+            switch (_context67.prev = _context67.next) {
               case 0:
-                return _context66.abrupt("return", this.get(this.baseURL + "/og", {
+                return _context67.abrupt("return", this.get(this.baseURL + "/og", {
                   url: url
                 }));
 
               case 1:
               case "end":
-                return _context66.stop();
+                return _context67.stop();
             }
           }
-        }, _callee66, this);
+        }, _callee67, this);
       }));
 
       function enrichURL(_x89) {
@@ -10001,19 +10382,19 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getTask",
     value: function () {
-      var _getTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee67(id) {
-        return _regeneratorRuntime.wrap(function _callee67$(_context67) {
+      var _getTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee68(id) {
+        return _regeneratorRuntime.wrap(function _callee68$(_context68) {
           while (1) {
-            switch (_context67.prev = _context67.next) {
+            switch (_context68.prev = _context68.next) {
               case 0:
-                return _context67.abrupt("return", this.get("".concat(this.baseURL, "/tasks/").concat(id)));
+                return _context68.abrupt("return", this.get("".concat(this.baseURL, "/tasks/").concat(id)));
 
               case 1:
               case "end":
-                return _context67.stop();
+                return _context68.stop();
             }
           }
-        }, _callee67, this);
+        }, _callee68, this);
       }));
 
       function getTask(_x90) {
@@ -10034,28 +10415,28 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "deleteChannels",
     value: function () {
-      var _deleteChannels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee68(cids) {
+      var _deleteChannels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee69(cids) {
         var options,
-            _args68 = arguments;
-        return _regeneratorRuntime.wrap(function _callee68$(_context68) {
+            _args69 = arguments;
+        return _regeneratorRuntime.wrap(function _callee69$(_context69) {
           while (1) {
-            switch (_context68.prev = _context68.next) {
+            switch (_context69.prev = _context69.next) {
               case 0:
-                options = _args68.length > 1 && _args68[1] !== undefined ? _args68[1] : {};
-                _context68.next = 3;
+                options = _args69.length > 1 && _args69[1] !== undefined ? _args69[1] : {};
+                _context69.next = 3;
                 return this.post(this.baseURL + "/channels/delete", _objectSpread({
                   cids: cids
                 }, options));
 
               case 3:
-                return _context68.abrupt("return", _context68.sent);
+                return _context69.abrupt("return", _context69.sent);
 
               case 4:
               case "end":
-                return _context68.stop();
+                return _context69.stop();
             }
           }
-        }, _callee68, this);
+        }, _callee69, this);
       }));
 
       function deleteChannels(_x91) {
@@ -10076,13 +10457,13 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "deleteUsers",
     value: function () {
-      var _deleteUsers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee69(user_ids, options) {
-        return _regeneratorRuntime.wrap(function _callee69$(_context69) {
+      var _deleteUsers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee70(user_ids, options) {
+        return _regeneratorRuntime.wrap(function _callee70$(_context70) {
           while (1) {
-            switch (_context69.prev = _context69.next) {
+            switch (_context70.prev = _context70.next) {
               case 0:
                 if (!((options === null || options === void 0 ? void 0 : options.user) !== 'soft' && (options === null || options === void 0 ? void 0 : options.user) !== 'hard')) {
-                  _context69.next = 2;
+                  _context70.next = 2;
                   break;
                 }
 
@@ -10090,7 +10471,7 @@ var StreamChat = /*#__PURE__*/function () {
 
               case 2:
                 if (!(options.messages !== undefined && options.messages !== 'soft' && options.messages !== 'hard')) {
-                  _context69.next = 4;
+                  _context70.next = 4;
                   break;
                 }
 
@@ -10098,27 +10479,27 @@ var StreamChat = /*#__PURE__*/function () {
 
               case 4:
                 if (!(options.conversations !== undefined && options.conversations !== 'soft' && options.conversations !== 'hard')) {
-                  _context69.next = 6;
+                  _context70.next = 6;
                   break;
                 }
 
                 throw new Error('Invalid delete user options. conversations must be one of [soft hard]');
 
               case 6:
-                _context69.next = 8;
+                _context70.next = 8;
                 return this.post(this.baseURL + "/users/delete", _objectSpread({
                   user_ids: user_ids
                 }, options));
 
               case 8:
-                return _context69.abrupt("return", _context69.sent);
+                return _context70.abrupt("return", _context70.sent);
 
               case 9:
               case "end":
-                return _context69.stop();
+                return _context70.stop();
             }
           }
-        }, _callee69, this);
+        }, _callee70, this);
       }));
 
       function deleteUsers(_x92, _x93) {
@@ -10128,7 +10509,7 @@ var StreamChat = /*#__PURE__*/function () {
       return deleteUsers;
     }()
     /**
-     * _createImport - Create an Import Task.
+     * _createImportURL - Create an Import upload url.
      *
      * Note: Do not use this.
      * It is present for internal usage only.
@@ -10140,31 +10521,74 @@ var StreamChat = /*#__PURE__*/function () {
      * @return {APIResponse & CreateImportResponse} An ImportTask
      */
 
+  }, {
+    key: "_createImportURL",
+    value: function () {
+      var _createImportURL2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee71(filename) {
+        return _regeneratorRuntime.wrap(function _callee71$(_context71) {
+          while (1) {
+            switch (_context71.prev = _context71.next) {
+              case 0:
+                _context71.next = 2;
+                return this.post(this.baseURL + "/import_urls", {
+                  filename: filename
+                });
+
+              case 2:
+                return _context71.abrupt("return", _context71.sent);
+
+              case 3:
+              case "end":
+                return _context71.stop();
+            }
+          }
+        }, _callee71, this);
+      }));
+
+      function _createImportURL(_x94) {
+        return _createImportURL2.apply(this, arguments);
+      }
+
+      return _createImportURL;
+    }()
+    /**
+     * _createImport - Create an Import Task.
+     *
+     * Note: Do not use this.
+     * It is present for internal usage only.
+     * This function can, and will, break and/or be removed at any point in time.
+     *
+     * @private
+     * @param {string} path path of uploaded data
+     *
+     * @return {APIResponse & CreateImportResponse} An ImportTask
+     */
+
   }, {
     key: "_createImport",
     value: function () {
-      var _createImport2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee70(filename) {
-        return _regeneratorRuntime.wrap(function _callee70$(_context70) {
+      var _createImport2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee72(path) {
+        return _regeneratorRuntime.wrap(function _callee72$(_context72) {
           while (1) {
-            switch (_context70.prev = _context70.next) {
+            switch (_context72.prev = _context72.next) {
               case 0:
-                _context70.next = 2;
+                _context72.next = 2;
                 return this.post(this.baseURL + "/imports", {
-                  filename: filename
+                  path: path
                 });
 
               case 2:
-                return _context70.abrupt("return", _context70.sent);
+                return _context72.abrupt("return", _context72.sent);
 
               case 3:
               case "end":
-                return _context70.stop();
+                return _context72.stop();
             }
           }
-        }, _callee70, this);
+        }, _callee72, this);
       }));
 
-      function _createImport(_x94) {
+      function _createImport(_x95) {
         return _createImport2.apply(this, arguments);
       }
 
@@ -10186,26 +10610,26 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "_getImport",
     value: function () {
-      var _getImport2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee71(id) {
-        return _regeneratorRuntime.wrap(function _callee71$(_context71) {
+      var _getImport2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee73(id) {
+        return _regeneratorRuntime.wrap(function _callee73$(_context73) {
           while (1) {
-            switch (_context71.prev = _context71.next) {
+            switch (_context73.prev = _context73.next) {
               case 0:
-                _context71.next = 2;
+                _context73.next = 2;
                 return this.get(this.baseURL + "/imports/".concat(id));
 
               case 2:
-                return _context71.abrupt("return", _context71.sent);
+                return _context73.abrupt("return", _context73.sent);
 
               case 3:
               case "end":
-                return _context71.stop();
+                return _context73.stop();
             }
           }
-        }, _callee71, this);
+        }, _callee73, this);
       }));
 
-      function _getImport(_x95) {
+      function _getImport(_x96) {
         return _getImport2.apply(this, arguments);
       }
 
@@ -10227,31 +10651,147 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "_listImports",
     value: function () {
-      var _listImports2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee72(options) {
-        return _regeneratorRuntime.wrap(function _callee72$(_context72) {
+      var _listImports2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee74(options) {
+        return _regeneratorRuntime.wrap(function _callee74$(_context74) {
           while (1) {
-            switch (_context72.prev = _context72.next) {
+            switch (_context74.prev = _context74.next) {
               case 0:
-                _context72.next = 2;
+                _context74.next = 2;
                 return this.get(this.baseURL + "/imports", options);
 
               case 2:
-                return _context72.abrupt("return", _context72.sent);
+                return _context74.abrupt("return", _context74.sent);
 
               case 3:
               case "end":
-                return _context72.stop();
+                return _context74.stop();
             }
           }
-        }, _callee72, this);
+        }, _callee74, this);
       }));
 
-      function _listImports(_x96) {
+      function _listImports(_x97) {
         return _listImports2.apply(this, arguments);
       }
 
       return _listImports;
     }()
+    /**
+     * upsertPushProvider - Create or Update a push provider
+     *
+     * Note: Works only for v2 push version is enabled on app settings.
+     *
+     * @param {PushProviderConfig} configuration of the provider you want to create or update
+     *
+     * @return {APIResponse & PushProviderUpsertResponse} A push provider
+     */
+
+  }, {
+    key: "upsertPushProvider",
+    value: function () {
+      var _upsertPushProvider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee75(pushProvider) {
+        return _regeneratorRuntime.wrap(function _callee75$(_context75) {
+          while (1) {
+            switch (_context75.prev = _context75.next) {
+              case 0:
+                _context75.next = 2;
+                return this.post(this.baseURL + "/push_providers", {
+                  push_provider: pushProvider
+                });
+
+              case 2:
+                return _context75.abrupt("return", _context75.sent);
+
+              case 3:
+              case "end":
+                return _context75.stop();
+            }
+          }
+        }, _callee75, this);
+      }));
+
+      function upsertPushProvider(_x98) {
+        return _upsertPushProvider.apply(this, arguments);
+      }
+
+      return upsertPushProvider;
+    }()
+    /**
+     * deletePushProvider - Delete a push provider
+     *
+     * Note: Works only for v2 push version is enabled on app settings.
+     *
+     * @param {PushProviderID} type and foreign id of the push provider to be deleted
+     *
+     * @return {APIResponse} An API response
+     */
+
+  }, {
+    key: "deletePushProvider",
+    value: function () {
+      var _deletePushProvider = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee76(_ref8) {
+        var type, name;
+        return _regeneratorRuntime.wrap(function _callee76$(_context76) {
+          while (1) {
+            switch (_context76.prev = _context76.next) {
+              case 0:
+                type = _ref8.type, name = _ref8.name;
+                _context76.next = 3;
+                return this.delete(this.baseURL + "/push_providers/".concat(type, "/").concat(name));
+
+              case 3:
+                return _context76.abrupt("return", _context76.sent);
+
+              case 4:
+              case "end":
+                return _context76.stop();
+            }
+          }
+        }, _callee76, this);
+      }));
+
+      function deletePushProvider(_x99) {
+        return _deletePushProvider.apply(this, arguments);
+      }
+
+      return deletePushProvider;
+    }()
+    /**
+     * listPushProviders - Get all push providers in the app
+     *
+     * Note: Works only for v2 push version is enabled on app settings.
+     *
+     * @return {APIResponse & PushProviderListResponse} A push provider
+     */
+
+  }, {
+    key: "listPushProviders",
+    value: function () {
+      var _listPushProviders = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee77() {
+        return _regeneratorRuntime.wrap(function _callee77$(_context77) {
+          while (1) {
+            switch (_context77.prev = _context77.next) {
+              case 0:
+                _context77.next = 2;
+                return this.get(this.baseURL + "/push_providers");
+
+              case 2:
+                return _context77.abrupt("return", _context77.sent);
+
+              case 3:
+              case "end":
+                return _context77.stop();
+            }
+          }
+        }, _callee77, this);
+      }));
+
+      function listPushProviders() {
+        return _listPushProviders.apply(this, arguments);
+      }
+
+      return listPushProviders;
+    }()
   }], [{
     key: "getInstance",
     value: function getInstance(key, secretOrOptions, options) {