stream-chat 9.41.0 → 9.41.1

package/dist/types/channel.d.ts

@@ -748,6 +748,7 @@ export declare class Channel {
     _checkInitialized(): void;
     _initializeState(state: ChannelAPIResponse, messageSetToAddToIfDoesNotExist?: MessageSetType): {
         messageSet: import("./types").MessageSet;
+        filteredMessageIds: string[];
     };
     _extendEventWithOwnReactions(event: Event): void;
     _hydrateMembers({ members, overrideCurrentState, }: {

package/dist/types/channel_state.d.ts

@@ -67,6 +67,7 @@ export declare class ChannelState {
      */
     addMessageSorted(newMessage: MessageResponse | LocalMessage, timestampChanged?: boolean, addIfDoesNotExist?: boolean, messageSetToAddToIfDoesNotExist?: MessageSetType): {
         messageSet: MessageSet;
+        filteredMessageIds: string[];
     };
     /**
      * Takes the message object, parses the dates, sets `__html`
@@ -87,6 +88,7 @@ export declare class ChannelState {
      */
     addMessagesSorted(newMessages: (MessageResponse | LocalMessage)[], timestampChanged?: boolean, initializing?: boolean, addIfDoesNotExist?: boolean, messageSetToAddToIfDoesNotExist?: MessageSetType): {
         messageSet: MessageSet;
+        filteredMessageIds: string[];
     };
     /**
      * addPinnedMessages - adds messages in pinnedMessages property

package/dist/types/utils.d.ts

@@ -223,6 +223,7 @@ type MessagePaginationUpdatedParams = {
     parentSet: MessageSet;
     requestedPageSize: number;
     returnedPage: MessageResponse[];
+    filteredReturnedPage: MessageResponse[];
     logger?: Logger;
     messagePaginationOptions?: MessagePaginationOptions;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stream-chat",
-  "version": "9.41.0",
+  "version": "9.41.1",
   "description": "JS SDK for the Stream Chat API",
   "homepage": "https://getstream.io/chat/",
   "author": {

package/src/channel.ts

@@ -1581,7 +1581,10 @@ export class Channel {
     }
 
     // add any messages to our channel state
-    const { messageSet } = this._initializeState(state, messageSetToAddToIfDoesNotExist);
+    const { messageSet, filteredMessageIds } = this._initializeState(
+      state,
+      messageSetToAddToIfDoesNotExist,
+    );
     messageSet.pagination = {
       ...messageSet.pagination,
       ...messageSetPagination({
@@ -1590,6 +1593,9 @@ export class Channel {
         requestedPageSize:
           options?.messages?.limit ?? DEFAULT_QUERY_CHANNEL_MESSAGE_LIST_PAGE_SIZE,
         returnedPage: state.messages,
+        filteredReturnedPage: state.messages.filter(
+          (m) => !filteredMessageIds.includes(m.id),
+        ),
         logger: this.getClient().logger,
       }),
     };
@@ -2368,7 +2374,7 @@ export class Channel {
     if (!this.state.messages) {
       this.state.initMessages();
     }
-    const { messageSet } = this.state.addMessagesSorted(
+    const { messageSet, filteredMessageIds } = this.state.addMessagesSorted(
       messages,
       false,
       true,
@@ -2434,6 +2440,7 @@ export class Channel {
 
     return {
       messageSet,
+      filteredMessageIds,
     };
   }
 

package/src/channel_state.ts

@@ -217,9 +217,12 @@ export class ChannelState {
       messageSetToAddToIfDoesNotExist,
     );
 
+    const filteredMessageIds: string[] = [];
+
     for (let i = 0; i < messagesToAdd.length; i += 1) {
       const isFromShadowBannedUser = messagesToAdd[i].shadowed;
-      if (isFromShadowBannedUser) {
+      if (isFromShadowBannedUser && addIfDoesNotExist) {
+        filteredMessageIds.push(messagesToAdd[i].id);
         continue;
       }
       // If message is already formatted we can skip the tasks below
@@ -306,6 +309,7 @@ export class ChannelState {
 
     return {
       messageSet: this.messageSets[targetMessageSetIndex],
+      filteredMessageIds,
     };
   }
 

package/src/client.ts

@@ -2040,12 +2040,17 @@ export class StreamChat {
       c.push_preferences = channelState.push_preferences;
 
       let updatedMessagesSet;
+      let filteredMessageIds: string[] = [];
       if (skipInitialization === undefined) {
-        const { messageSet } = c._initializeState(channelState, 'latest');
+        const { messageSet, filteredMessageIds: _filteredMessageIds } =
+          c._initializeState(channelState, 'latest');
+        filteredMessageIds = _filteredMessageIds;
         updatedMessagesSet = messageSet;
       } else if (!skipInitialization.includes(channelState.channel.id)) {
         c.state.clearMessages();
-        const { messageSet } = c._initializeState(channelState, 'latest');
+        const { messageSet, filteredMessageIds: _filteredMessageIds } =
+          c._initializeState(channelState, 'latest');
+        filteredMessageIds = _filteredMessageIds;
         updatedMessagesSet = messageSet;
       }
 
@@ -2058,6 +2063,9 @@ export class StreamChat {
               queryChannelsOptions?.message_limit ||
               DEFAULT_QUERY_CHANNELS_MESSAGE_LIST_PAGE_SIZE,
             returnedPage: channelState.messages,
+            filteredReturnedPage: channelState.messages.filter(
+              (m) => !filteredMessageIds.includes(m.id),
+            ),
             logger: this.logger,
           }),
         };

package/src/utils.ts

@@ -811,6 +811,7 @@ type MessagePaginationUpdatedParams = {
   parentSet: MessageSet;
   requestedPageSize: number;
   returnedPage: MessageResponse[];
+  filteredReturnedPage: MessageResponse[];
   logger?: Logger;
   messagePaginationOptions?: MessagePaginationOptions;
 };
@@ -849,6 +850,7 @@ const messagePaginationCreatedAtAround = ({
   parentSet,
   requestedPageSize,
   returnedPage,
+  filteredReturnedPage,
   messagePaginationOptions,
 }: MessagePaginationUpdatedParams) => {
   const newPagination = { ...parentSet.pagination };
@@ -892,9 +894,14 @@ const messagePaginationCreatedAtAround = ({
     hasNext = hasPrev = false;
     updateHasPrev = updateHasNext = true;
   } else {
+    const [firstFilteredPageMsg, lastFilteredPageMsg] = [
+      filteredReturnedPage[0],
+      filteredReturnedPage.slice(-1)[0],
+    ];
     const [firstPageMsgIsFirstInSet, lastPageMsgIsLastInSet] = [
-      firstPageMsg?.id && firstPageMsg.id === parentSet.messages[0]?.id,
-      lastPageMsg?.id && lastPageMsg.id === parentSet.messages.slice(-1)[0]?.id,
+      firstFilteredPageMsg?.id && firstFilteredPageMsg.id === parentSet.messages[0]?.id,
+      lastFilteredPageMsg?.id &&
+        lastFilteredPageMsg.id === parentSet.messages.slice(-1)[0]?.id,
     ];
     updateHasPrev = firstPageMsgIsFirstInSet;
     updateHasNext = lastPageMsgIsLastInSet;
@@ -920,6 +927,7 @@ const messagePaginationIdAround = ({
   parentSet,
   requestedPageSize,
   returnedPage,
+  filteredReturnedPage,
   messagePaginationOptions,
 }: MessagePaginationUpdatedParams) => {
   const newPagination = { ...parentSet.pagination };
@@ -928,10 +936,13 @@ const messagePaginationIdAround = ({
   let hasPrev;
   let hasNext;
 
-  const [firstPageMsg, lastPageMsg] = [returnedPage[0], returnedPage.slice(-1)[0]];
+  const [firstFilteredPageMsg, lastFilteredPageMsg] = [
+    filteredReturnedPage[0],
+    filteredReturnedPage.slice(-1)[0],
+  ];
   const [firstPageMsgIsFirstInSet, lastPageMsgIsLastInSet] = [
-    firstPageMsg?.id === parentSet.messages[0]?.id,
-    lastPageMsg?.id === parentSet.messages.slice(-1)[0]?.id,
+    firstFilteredPageMsg?.id === parentSet.messages[0]?.id,
+    lastFilteredPageMsg?.id === parentSet.messages.slice(-1)[0]?.id,
   ];
   let updateHasPrev = firstPageMsgIsFirstInSet;
   let updateHasNext = lastPageMsgIsLastInSet;
@@ -974,6 +985,7 @@ const messagePaginationLinear = ({
   parentSet,
   requestedPageSize,
   returnedPage,
+  filteredReturnedPage,
   messagePaginationOptions,
 }: MessagePaginationUpdatedParams) => {
   const newPagination = { ...parentSet.pagination };
@@ -981,10 +993,14 @@ const messagePaginationLinear = ({
   let hasPrev;
   let hasNext;
 
-  const [firstPageMsg, lastPageMsg] = [returnedPage[0], returnedPage.slice(-1)[0]];
+  const [firstFilteredPageMsg, lastFilteredPageMsg] = [
+    filteredReturnedPage[0],
+    filteredReturnedPage.slice(-1)[0],
+  ];
   const [firstPageMsgIsFirstInSet, lastPageMsgIsLastInSet] = [
-    firstPageMsg?.id && firstPageMsg.id === parentSet.messages[0]?.id,
-    lastPageMsg?.id && lastPageMsg.id === parentSet.messages.slice(-1)[0]?.id,
+    firstFilteredPageMsg?.id && firstFilteredPageMsg.id === parentSet.messages[0]?.id,
+    lastFilteredPageMsg?.id &&
+      lastFilteredPageMsg.id === parentSet.messages.slice(-1)[0]?.id,
   ];
 
   const queriedNextMessages =
@@ -1028,9 +1044,9 @@ const messagePaginationLinear = ({
 };
 
 export const messageSetPagination = (params: MessagePaginationUpdatedParams) => {
-  const messagesFilteredLocally = params.returnedPage.filter(({ shadowed }) => shadowed);
   if (
-    params.parentSet.messages.length + messagesFilteredLocally.length <
+    params.parentSet.messages.length +
+      (params.returnedPage.length - params.filteredReturnedPage.length) <
     params.returnedPage.length
   ) {
     params.logger?.(