@sendbird/uikit-chat-hooks 3.0.4-rc.1 → 3.1.0

package/src/channel/useGroupChannelMessages/useGroupChannelMessagesWithCollection.ts

@@ -1,12 +1,15 @@
 import { useEffect, useRef } from 'react';
 
-import { MessageCollectionInitPolicy, MessageEventSource, MessageFilter } from '@sendbird/chat/groupChannel';
+import { CollectionEventSource } from '@sendbird/chat';
+import { MessageCollectionInitPolicy, MessageFilter } from '@sendbird/chat/groupChannel';
 import type { SendbirdFileMessage, SendbirdGroupChannel, SendbirdMessageCollection } from '@sendbird/uikit-utils';
 import {
   Logger,
+  SendbirdBaseMessage,
   confirmAndMarkAsRead,
   isDifferentChannel,
   isMyMessage,
+  isSendableMessage,
   useForceUpdate,
   useFreshCallback,
   useUniqHandlerId,
@@ -39,9 +42,13 @@ function isNotEmpty(arr?: unknown[]): arr is unknown[] {
   return arr.length !== 0;
 }
 
+function shouldUseSearchLimit(startingPoint: number) {
+  return startingPoint < Date.now();
+}
+
 export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (sdk, channel, userId, options) => {
   const initialStartingPoint = options?.startingPoint ?? Number.MAX_SAFE_INTEGER;
-  const initialLimit = typeof options?.startingPoint === 'number' ? MESSAGE_LIMIT.SEARCH : MESSAGE_LIMIT.DEFAULT;
+  const initialLimit = shouldUseSearchLimit(initialStartingPoint) ? MESSAGE_LIMIT.SEARCH : MESSAGE_LIMIT.DEFAULT;
 
   const forceUpdate = useForceUpdate();
   const collectionRef = useRef<SendbirdMessageCollection>();
@@ -61,12 +68,12 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
     updateRefreshing,
   } = useChannelMessagesReducer(options?.sortComparator);
 
-  const channelMarkAsRead = async (source?: MessageEventSource) => {
+  const channelMarkAsRead = async (source?: CollectionEventSource) => {
     try {
       switch (source) {
-        case MessageEventSource.EVENT_MESSAGE_RECEIVED:
-        case MessageEventSource.EVENT_MESSAGE_SENT_SUCCESS:
-        case MessageEventSource.SYNC_MESSAGE_FILL:
+        case CollectionEventSource.EVENT_MESSAGE_RECEIVED:
+        case CollectionEventSource.EVENT_MESSAGE_SENT_SUCCESS:
+        case CollectionEventSource.SYNC_MESSAGE_FILL:
         case undefined:
           await confirmAndMarkAsRead([channel]);
           break;
@@ -75,18 +82,31 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
       Logger.warn('[useGroupChannelMessagesWithCollection/channelMarkAsRead]', e);
     }
   };
+  const updateNewMessagesReceived = (source: CollectionEventSource, messages: SendbirdBaseMessage[]) => {
+    const incomingMessages = messages.filter((it) => !isMyMessage(it, sdk.currentUser?.userId));
+    if (incomingMessages.length > 0) {
+      switch (source) {
+        case CollectionEventSource.EVENT_MESSAGE_RECEIVED:
+        case CollectionEventSource.SYNC_MESSAGE_FILL: {
+          if (options?.shouldCountNewMessages?.()) updateNewMessages(incomingMessages, false, sdk.currentUser?.userId);
+          options?.onMessagesReceived?.(incomingMessages);
+          break;
+        }
+      }
+    }
+  };
 
-  const updateUnsendMessages = () => {
+  const updateUnsentMessages = () => {
     const { pendingMessages, failedMessages } = collectionRef.current ?? {};
-    if (isNotEmpty(pendingMessages)) updateMessages(pendingMessages, false, sdk.currentUser.userId);
-    if (isNotEmpty(failedMessages)) updateMessages(failedMessages, false, sdk.currentUser.userId);
+    if (isNotEmpty(pendingMessages)) updateMessages(pendingMessages, false, sdk.currentUser?.userId);
+    if (isNotEmpty(failedMessages)) updateMessages(failedMessages, false, sdk.currentUser?.userId);
   };
 
   const init = useFreshCallback(async (startingPoint: number, limit: number, callback?: () => void) => {
     if (collectionRef.current) collectionRef.current?.dispose();
 
     channelMarkAsRead();
-    updateNewMessages([], true, sdk.currentUser.userId);
+    updateNewMessages([], true, sdk.currentUser?.userId);
 
     collectionInitializedRef.current = false;
     collectionRef.current = createMessageCollection(channel, limit, {
@@ -95,61 +115,27 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
     });
 
     collectionRef.current?.setMessageCollectionHandler({
-      onMessagesAdded: (_, __, messages) => {
-        channelMarkAsRead(_.source);
-
-        const incomingMessages = messages.filter((it) => {
-          switch (_.source) {
-            case MessageEventSource.EVENT_MESSAGE_SENT_PENDING:
-            case MessageEventSource.EVENT_MESSAGE_SENT_SUCCESS:
-            case MessageEventSource.EVENT_MESSAGE_SENT_FAILED:
-              return !isMyMessage(it, sdk.currentUser.userId);
-            default:
-              return true;
-          }
-        });
-
-        if (incomingMessages.length > 0) {
-          updateMessages(incomingMessages, false, sdk.currentUser.userId);
-
-          if (options?.shouldCountNewMessages?.()) {
-            updateNewMessages(incomingMessages, false, sdk.currentUser.userId);
-          }
-
-          switch (_.source) {
-            case MessageEventSource.EVENT_MESSAGE_RECEIVED:
-            case MessageEventSource.SYNC_MESSAGE_FILL: {
-              options?.onMessagesReceived?.(incomingMessages);
-            }
-          }
-        }
+      onMessagesAdded: (ctx, __, messages) => {
+        channelMarkAsRead(ctx.source);
+        updateNewMessagesReceived(ctx.source, messages);
+
+        updateMessages(messages, false, sdk.currentUser?.userId);
       },
-      onMessagesUpdated: (_, __, messages) => {
-        channelMarkAsRead(_.source);
-
-        const incomingMessages = messages.filter((it) => {
-          switch (_.source) {
-            case MessageEventSource.EVENT_MESSAGE_UPDATED:
-              return !isMyMessage(it, sdk.currentUser.userId);
-            default:
-              return true;
-          }
-        });
-
-        if (incomingMessages.length > 0) {
-          // NOTE: admin message is not added via onMessagesAdded handler, not checked yet is this a bug.
-          updateMessages(messages, false, sdk.currentUser.userId);
-
-          if (options?.shouldCountNewMessages?.()) {
-            if (_.source === MessageEventSource.EVENT_MESSAGE_RECEIVED) {
-              updateNewMessages(messages, false, sdk.currentUser.userId);
-            }
-          }
+      onMessagesUpdated: (ctx, __, messages) => {
+        channelMarkAsRead(ctx.source);
+        updateNewMessagesReceived(ctx.source, messages); // NOTE: admin message is not added via onMessagesAdded handler, not checked yet is this a bug.
+
+        updateMessages(messages, false, sdk.currentUser?.userId);
+
+        if (ctx.source === CollectionEventSource.EVENT_MESSAGE_UPDATED) {
+          options?.onMessagesUpdated?.(messages);
         }
       },
-      onMessagesDeleted: (_, __, messageIds) => {
-        deleteMessages(messageIds, []);
-        deleteNewMessages(messageIds, []);
+      onMessagesDeleted: (_, __, ___, messages) => {
+        const msgIds = messages.map((it) => it.messageId);
+        const reqIds = messages.filter(isSendableMessage).map((it) => it.reqId);
+        deleteMessages(msgIds, reqIds);
+        deleteNewMessages(msgIds, reqIds);
       },
       onChannelDeleted: () => {
         options?.onChannelDeleted?.();
@@ -168,23 +154,23 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
       .initialize(MessageCollectionInitPolicy.CACHE_AND_REPLACE_BY_API)
       .onCacheResult((err, messages) => {
         if (err) sdk.isCacheEnabled && Logger.error('[useGroupChannelMessagesWithCollection/onCacheResult]', err);
-        else {
+        else if (messages) {
           Logger.debug('[useGroupChannelMessagesWithCollection/onCacheResult]', 'message length:', messages.length);
 
-          updateMessages(messages, true, sdk.currentUser.userId);
-          updateUnsendMessages();
+          updateMessages(messages, true, sdk.currentUser?.userId);
+          updateUnsentMessages();
         }
 
         callback?.();
       })
       .onApiResult((err, messages) => {
         if (err) Logger.warn('[useGroupChannelMessagesWithCollection/onApiResult]', err);
-        else {
+        else if (messages) {
           Logger.debug('[useGroupChannelMessagesWithCollection/onApiResult]', 'message length:', messages.length);
 
-          updateMessages(messages, true, sdk.currentUser.userId);
+          updateMessages(messages, true, sdk.currentUser?.userId);
           if (!options?.startingPoint) options?.onMessagesReceived?.(messages);
-          if (sdk.isCacheEnabled) updateUnsendMessages();
+          if (sdk.isCacheEnabled) updateUnsentMessages();
         }
 
         collectionInitializedRef.current = true;
@@ -195,7 +181,7 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
   useChannelHandler(sdk, handlerId, {
     onUserBanned(channel, bannedUser) {
       if (channel.isGroupChannel() && !isDifferentChannel(channel, channel)) {
-        if (bannedUser.userId === sdk.currentUser.userId) {
+        if (bannedUser.userId === sdk.currentUser?.userId) {
           options?.onChannelDeleted?.();
         } else {
           forceUpdate();
@@ -210,7 +196,7 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
       updateLoading(true);
       init(initialStartingPoint, initialLimit, () => updateLoading(false));
     }, 0);
-  }, [channel.url, userId]);
+  }, [channel.url, userId, options?.replyType]);
 
   useEffect(() => {
     return () => {
@@ -227,7 +213,7 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
     if (collectionRef.current && collectionRef.current?.hasPrevious) {
       try {
         const list = await collectionRef.current?.loadPrevious();
-        updateMessages(list, false, sdk.currentUser.userId);
+        updateMessages(list, false, sdk.currentUser?.userId);
       } catch {}
     }
   });
@@ -244,7 +230,7 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
     if (collectionRef.current && collectionRef.current?.hasNext) {
       try {
         const fetchedList = await collectionRef.current?.loadNext();
-        updateMessages(fetchedList, false, sdk.currentUser.userId);
+        updateMessages(fetchedList, false, sdk.currentUser?.userId);
       } catch {}
     }
   });
@@ -265,17 +251,19 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
           .onPending((pendingMessage) => {
             if (pendingMessage.isUserMessage()) {
               onPending?.(pendingMessage);
-              updateMessages([pendingMessage], false, sdk.currentUser.userId);
+              updateMessages([pendingMessage], false, sdk.currentUser?.userId);
             }
           })
           .onSucceeded((sentMessage) => {
             if (sentMessage.isUserMessage()) {
-              updateMessages([sentMessage], false, sdk.currentUser.userId);
+              updateMessages([sentMessage], false, sdk.currentUser?.userId);
               resolve(sentMessage);
             }
           })
           .onFailed((err, failedMessage) => {
-            updateMessages([failedMessage], false, sdk.currentUser.userId);
+            if (failedMessage) {
+              updateMessages([failedMessage], false, sdk.currentUser?.userId);
+            }
             reject(err);
           });
       });
@@ -288,18 +276,20 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
           .sendFileMessage(params)
           .onPending((pendingMessage) => {
             if (pendingMessage.isFileMessage()) {
-              updateMessages([pendingMessage], false, sdk.currentUser.userId);
+              updateMessages([pendingMessage], false, sdk.currentUser?.userId);
               onPending?.(pendingMessage);
             }
           })
           .onSucceeded((sentMessage) => {
             if (sentMessage.isFileMessage()) {
-              updateMessages([sentMessage], false, sdk.currentUser.userId);
+              updateMessages([sentMessage], false, sdk.currentUser?.userId);
               resolve(sentMessage as SendbirdFileMessage);
             }
           })
           .onFailed((err, failedMessage) => {
-            updateMessages([failedMessage], false, sdk.currentUser.userId);
+            if (failedMessage) {
+              updateMessages([failedMessage], false, sdk.currentUser?.userId);
+            }
             reject(err);
           });
       });
@@ -308,14 +298,14 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
   const updateUserMessage: ReturnType<UseGroupChannelMessages>['updateUserMessage'] = useFreshCallback(
     async (messageId, params) => {
       const updatedMessage = await channel.updateUserMessage(messageId, params);
-      updateMessages([updatedMessage], false, sdk.currentUser.userId);
+      updateMessages([updatedMessage], false, sdk.currentUser?.userId);
       return updatedMessage;
     },
   );
   const updateFileMessage: ReturnType<UseGroupChannelMessages>['updateFileMessage'] = useFreshCallback(
     async (messageId, params) => {
       const updatedMessage = await channel.updateFileMessage(messageId, params);
-      updateMessages([updatedMessage], false, sdk.currentUser.userId);
+      updateMessages([updatedMessage], false, sdk.currentUser?.userId);
       return updatedMessage;
     },
   );
@@ -327,7 +317,7 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
         return null;
       })();
 
-      if (resentMessage) updateMessages([resentMessage], false, sdk.currentUser.userId);
+      if (resentMessage) updateMessages([resentMessage], false, sdk.currentUser?.userId);
     },
   );
   const deleteMessage: ReturnType<UseGroupChannelMessages>['deleteMessage'] = useFreshCallback(async (message) => {
@@ -343,13 +333,14 @@ export const useGroupChannelMessagesWithCollection: UseGroupChannelMessages = (s
     }
   });
   const resetNewMessages: ReturnType<UseGroupChannelMessages>['resetNewMessages'] = useFreshCallback(() => {
-    updateNewMessages([], true, sdk.currentUser.userId);
+    updateNewMessages([], true, sdk.currentUser?.userId);
   });
   const resetWithStartingPoint: ReturnType<UseGroupChannelMessages>['resetWithStartingPoint'] = useFreshCallback(
     (startingPoint, callback) => {
+      const limit = shouldUseSearchLimit(startingPoint) ? MESSAGE_LIMIT.SEARCH : MESSAGE_LIMIT.DEFAULT;
       updateLoading(true);
-      updateMessages([], true, sdk.currentUser.userId);
-      init(startingPoint, MESSAGE_LIMIT.DEFAULT, () => {
+      updateMessages([], true, sdk.currentUser?.userId);
+      init(startingPoint, limit, () => {
         updateLoading(false);
         callback?.();
       });

package/src/channel/useGroupChannelMessages/useGroupChannelMessagesWithQuery.ts

@@ -61,12 +61,12 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
   const init = useFreshCallback(async (uid?: string) => {
     if (uid) {
       channelMarkAsRead();
-      updateNewMessages([], true, sdk.currentUser.userId);
+      updateNewMessages([], true, sdk.currentUser?.userId);
 
       queryRef.current = createMessageQuery(channel, options);
       if (queryRef.current?.hasNext) {
         const list = await queryRef.current?.load();
-        updateMessages(list, true, sdk.currentUser.userId);
+        updateMessages(list, true, sdk.currentUser?.userId);
       }
     }
   });
@@ -81,13 +81,13 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
     // Messages
     onMessageReceived(eventChannel, message) {
       if (isDifferentChannel(channel, eventChannel)) return;
-      if (isMyMessage(message, sdk.currentUser.userId)) return;
+      if (isMyMessage(message, sdk.currentUser?.userId)) return;
 
       channelMarkAsRead();
 
-      updateMessages([message], false, sdk.currentUser.userId);
+      updateMessages([message], false, sdk.currentUser?.userId);
       if (options?.shouldCountNewMessages?.()) {
-        updateNewMessages([message], false, sdk.currentUser.userId);
+        updateNewMessages([message], false, sdk.currentUser?.userId);
       }
       if (options?.onMessagesReceived) {
         options.onMessagesReceived([message]);
@@ -95,9 +95,9 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
     },
     onMessageUpdated(eventChannel, message) {
       if (isDifferentChannel(channel, eventChannel)) return;
-      if (isMyMessage(message, sdk.currentUser.userId)) return;
+      if (isMyMessage(message, sdk.currentUser?.userId)) return;
 
-      updateMessages([message], false, sdk.currentUser.userId);
+      updateMessages([message], false, sdk.currentUser?.userId);
     },
     onMessageDeleted(eventChannel, messageId) {
       if (isDifferentChannel(channel, eventChannel)) return;
@@ -116,7 +116,7 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
         channelUrl: channel.url,
         channelType: channel.channelType,
       });
-      updateMessages([message], false, sdk.currentUser.userId);
+      if (message) updateMessages([message], false, sdk.currentUser?.userId);
     },
     // Channels
     onChannelChanged: channelUpdater,
@@ -142,7 +142,7 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
     onUserBanned(eventChannel, bannedUser) {
       if (isDifferentChannel(channel, eventChannel)) return;
 
-      if (bannedUser.userId === sdk.currentUser.userId) {
+      if (bannedUser.userId === sdk.currentUser?.userId) {
         options?.onChannelDeleted?.();
       } else {
         channelUpdater(eventChannel);
@@ -165,7 +165,7 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
   const prev: ReturnType<UseGroupChannelMessages>['prev'] = useFreshCallback(async () => {
     if (queryRef.current && queryRef.current?.hasNext) {
       const list = await queryRef.current?.load();
-      updateMessages(list, false, sdk.currentUser.userId);
+      updateMessages(list, false, sdk.currentUser?.userId);
     }
   });
   const hasPrev: ReturnType<UseGroupChannelMessages>['hasPrev'] = useFreshCallback(
@@ -182,18 +182,20 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
           .sendUserMessage(params)
           .onPending((pendingMessage) => {
             if (pendingMessage.isUserMessage()) {
-              updateMessages([pendingMessage], false, sdk.currentUser.userId);
+              updateMessages([pendingMessage], false, sdk.currentUser?.userId);
               onPending?.(pendingMessage);
             }
           })
           .onSucceeded((sentMessage) => {
             if (sentMessage.isUserMessage()) {
-              updateMessages([sentMessage], false, sdk.currentUser.userId);
+              updateMessages([sentMessage], false, sdk.currentUser?.userId);
               resolve(sentMessage);
             }
           })
-          .onFailed((err, sentMessage) => {
-            updateMessages([sentMessage], false, sdk.currentUser.userId);
+          .onFailed((err, failedMessage) => {
+            if (failedMessage) {
+              updateMessages([failedMessage], false, sdk.currentUser?.userId);
+            }
             reject(err);
           });
       });
@@ -206,18 +208,20 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
           .sendFileMessage(params)
           .onPending((pendingMessage) => {
             if (pendingMessage.isFileMessage()) {
-              updateMessages([pendingMessage], false, sdk.currentUser.userId);
+              updateMessages([pendingMessage], false, sdk.currentUser?.userId);
               onPending?.(pendingMessage);
             }
           })
           .onSucceeded((sentMessage) => {
             if (sentMessage.isFileMessage()) {
-              updateMessages([sentMessage], false, sdk.currentUser.userId);
+              updateMessages([sentMessage], false, sdk.currentUser?.userId);
               resolve(sentMessage);
             }
           })
-          .onFailed((err, sentMessage) => {
-            updateMessages([sentMessage], false, sdk.currentUser.userId);
+          .onFailed((err, failedMessage) => {
+            if (failedMessage) {
+              updateMessages([failedMessage], false, sdk.currentUser?.userId);
+            }
             reject(err);
           });
       });
@@ -226,14 +230,14 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
   const updateUserMessage: ReturnType<UseGroupChannelMessages>['updateUserMessage'] = useFreshCallback(
     async (messageId, params) => {
       const updatedMessage = await channel.updateUserMessage(messageId, params);
-      updateMessages([updatedMessage], false, sdk.currentUser.userId);
+      updateMessages([updatedMessage], false, sdk.currentUser?.userId);
       return updatedMessage;
     },
   );
   const updateFileMessage: ReturnType<UseGroupChannelMessages>['updateFileMessage'] = useFreshCallback(
     async (messageId, params) => {
       const updatedMessage = await channel.updateFileMessage(messageId, params);
-      updateMessages([updatedMessage], false, sdk.currentUser.userId);
+      updateMessages([updatedMessage], false, sdk.currentUser?.userId);
       return updatedMessage;
     },
   );
@@ -245,7 +249,7 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
         return null;
       })();
 
-      if (message) updateMessages([message], false, sdk.currentUser.userId);
+      if (message) updateMessages([message], false, sdk.currentUser?.userId);
     },
   );
   const deleteMessage: ReturnType<UseGroupChannelMessages>['deleteMessage'] = useFreshCallback(async (message) => {
@@ -257,7 +261,7 @@ export const useGroupChannelMessagesWithQuery: UseGroupChannelMessages = (sdk, c
     }
   });
   const resetNewMessages: ReturnType<UseGroupChannelMessages>['resetNewMessages'] = useFreshCallback(() => {
-    updateNewMessages([], true, sdk.currentUser.userId);
+    updateNewMessages([], true, sdk.currentUser?.userId);
   });
 
   return {

package/src/channel/useOpenChannelMessages/useOpenChannelMessagesWithQuery.ts

@@ -1,5 +1,6 @@
 import { useRef } from 'react';
 
+import { MessageListParams } from '@sendbird/chat/message';
 import type {
   SendbirdBaseChannel,
   SendbirdBaseMessage,
@@ -54,9 +55,9 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
       if (queryRef.current?.hasNext) {
         const list = await queryRef.current?.load();
 
-        updateMessages(list, true, sdk.currentUser.userId);
+        updateMessages(list, true, sdk.currentUser?.userId);
       }
-      updateNewMessages([], true, sdk.currentUser.userId);
+      updateNewMessages([], true, sdk.currentUser?.userId);
     }
   });
 
@@ -109,7 +110,7 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
       }
 
       // Added messages
-      const messageQueryParams = {
+      const messageQueryParams: MessageListParams = {
         prevResultSize: 0,
         nextResultSize: queryRef.current?.limit ?? 100,
         reverse: queryRef.current?.reverse,
@@ -118,9 +119,9 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
         includeReactions: queryRef.current?.includeReactions,
         includeMetaArray: queryRef.current?.includeMetaArray,
         replyType: queryRef.current?.replyType,
-        customTypesFilter: queryRef.current?.customTypesFilter,
+        customTypesFilter: queryRef.current?.customTypesFilter as never,
         messageTypeFilter: queryRef.current?.messageTypeFilter,
-        senderUserIdsFilter: queryRef.current?.senderUserIdsFilter,
+        senderUserIdsFilter: queryRef.current?.senderUserIdsFilter as never,
         showSubchannelMessagesOnly: queryRef.current?.showSubchannelMessagesOnly,
       };
 
@@ -144,13 +145,13 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
       updateMessages(
         [...messageContext.addedMessages, ...messageContext.updatedMessages],
         false,
-        sdk.currentUser.userId,
+        sdk.currentUser?.userId,
       );
       deleteMessages(messageContext.deletedMessageIds, []);
 
       if (messageContext.addedMessages.length > 0) {
         if (options?.shouldCountNewMessages?.()) {
-          updateNewMessages(messageContext.addedMessages, false, sdk.currentUser.userId);
+          updateNewMessages(messageContext.addedMessages, false, sdk.currentUser?.userId);
         }
         if (options?.onMessagesReceived) {
           options.onMessagesReceived(messageContext.addedMessages);
@@ -166,11 +167,11 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
       // Messages
       onMessageReceived(eventChannel, message) {
         if (isDifferentChannel(channel, eventChannel)) return;
-        if (isMyMessage(message, sdk.currentUser.userId)) return;
+        if (isMyMessage(message, sdk.currentUser?.userId)) return;
 
-        updateMessages([message], false, sdk.currentUser.userId);
+        updateMessages([message], false, sdk.currentUser?.userId);
         if (options?.shouldCountNewMessages?.()) {
-          updateNewMessages([message], false, sdk.currentUser.userId);
+          updateNewMessages([message], false, sdk.currentUser?.userId);
         }
         if (options?.onMessagesReceived) {
           options.onMessagesReceived([message]);
@@ -178,9 +179,9 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
       },
       onMessageUpdated(eventChannel, message) {
         if (isDifferentChannel(channel, eventChannel)) return;
-        if (isMyMessage(message, sdk.currentUser.userId)) return;
+        if (isMyMessage(message, sdk.currentUser?.userId)) return;
 
-        updateMessages([message], false, sdk.currentUser.userId);
+        updateMessages([message], false, sdk.currentUser?.userId);
       },
       onMessageDeleted(eventChannel, messageId) {
         if (isDifferentChannel(channel, eventChannel)) return;
@@ -208,7 +209,7 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
       onUserBanned(eventChannel, bannedUser) {
         if (isDifferentChannel(channel, eventChannel)) return;
 
-        if (bannedUser.userId === sdk.currentUser.userId) {
+        if (bannedUser.userId === sdk.currentUser?.userId) {
           options?.onChannelDeleted?.();
         } else {
           channelUpdater(eventChannel);
@@ -245,7 +246,7 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
   const prev: ReturnType<UseOpenChannelMessages>['prev'] = useFreshCallback(async () => {
     if (queryRef.current && queryRef.current?.hasNext) {
       const list = await queryRef.current?.load();
-      updateMessages(list, false, sdk.currentUser.userId);
+      updateMessages(list, false, sdk.currentUser?.userId);
     }
   });
   const hasPrev: ReturnType<UseOpenChannelMessages>['hasPrev'] = useFreshCallback(
@@ -262,18 +263,20 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
           .sendUserMessage(params)
           .onPending((pendingMessage) => {
             if (pendingMessage.isUserMessage()) {
-              updateMessages([pendingMessage], false, sdk.currentUser.userId);
+              updateMessages([pendingMessage], false, sdk.currentUser?.userId);
               onPending?.(pendingMessage);
             }
           })
           .onSucceeded((sentMessage) => {
             if (sentMessage.isUserMessage()) {
-              updateMessages([sentMessage], false, sdk.currentUser.userId);
+              updateMessages([sentMessage], false, sdk.currentUser?.userId);
               resolve(sentMessage);
             }
           })
-          .onFailed((err, sentMessage) => {
-            updateMessages([sentMessage], false, sdk.currentUser.userId);
+          .onFailed((err, failedMessage) => {
+            if (failedMessage) {
+              updateMessages([failedMessage], false, sdk.currentUser?.userId);
+            }
             reject(err);
           });
       });
@@ -287,18 +290,20 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
           .sendFileMessage(params)
           .onPending((pendingMessage) => {
             if (pendingMessage.isFileMessage()) {
-              updateMessages([pendingMessage], false, sdk.currentUser.userId);
+              updateMessages([pendingMessage], false, sdk.currentUser?.userId);
               onPending?.(pendingMessage);
             }
           })
           .onSucceeded((sentMessage) => {
             if (sentMessage.isFileMessage()) {
-              updateMessages([sentMessage], false, sdk.currentUser.userId);
+              updateMessages([sentMessage], false, sdk.currentUser?.userId);
               resolve(sentMessage);
             }
           })
-          .onFailed((err, sentMessage) => {
-            updateMessages([sentMessage], false, sdk.currentUser.userId);
+          .onFailed((err, failedMessage) => {
+            if (failedMessage) {
+              updateMessages([failedMessage], false, sdk.currentUser?.userId);
+            }
             reject(err);
           });
       });
@@ -308,14 +313,14 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
   const updateUserMessage: ReturnType<UseOpenChannelMessages>['updateUserMessage'] = useFreshCallback(
     async (messageId, params) => {
       const updatedMessage = await channel.updateUserMessage(messageId, params);
-      updateMessages([updatedMessage], false, sdk.currentUser.userId);
+      updateMessages([updatedMessage], false, sdk.currentUser?.userId);
       return updatedMessage;
     },
   );
   const updateFileMessage: ReturnType<UseOpenChannelMessages>['updateFileMessage'] = useFreshCallback(
     async (messageId, params) => {
       const updatedMessage = await channel.updateFileMessage(messageId, params);
-      updateMessages([updatedMessage], false, sdk.currentUser.userId);
+      updateMessages([updatedMessage], false, sdk.currentUser?.userId);
       return updatedMessage;
     },
   );
@@ -326,7 +331,7 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
       return null;
     })();
 
-    if (message) updateMessages([message], false, sdk.currentUser.userId);
+    if (message) updateMessages([message], false, sdk.currentUser?.userId);
   });
   const deleteMessage: ReturnType<UseOpenChannelMessages>['deleteMessage'] = useFreshCallback(async (message) => {
     if (message.sendingStatus === 'succeeded') {
@@ -337,7 +342,7 @@ export const useOpenChannelMessagesWithQuery: UseOpenChannelMessages = (sdk, cha
     }
   });
   const resetNewMessages: ReturnType<UseOpenChannelMessages>['resetNewMessages'] = useFreshCallback(() => {
-    updateNewMessages([], true, sdk.currentUser.userId);
+    updateNewMessages([], true, sdk.currentUser?.userId);
   });
 
   return {

package/src/types.ts

@@ -211,6 +211,7 @@ export type UseGroupChannelMessagesOptions = {
   shouldCountNewMessages?: () => boolean;
   startingPoint?: number;
   onMessagesReceived?: (messages: SendbirdMessage[]) => void;
+  onMessagesUpdated?: (messages: SendbirdMessage[]) => void;
 };
 
 /**