stream-chat-react-native-core 5.31.2-beta.2 → 5.32.0-beta.1

package/src/utils/addReactionToLocalState.ts

@@ -49,30 +49,45 @@ export const addReactionToLocalState = <
       message.latest_reactions = [];
     }
     message.latest_reactions = message.latest_reactions.filter((r) => r.user_id !== user.id);
+
     if (
       currentReaction &&
-      message.reaction_counts &&
-      message.reaction_counts[currentReaction.type] &&
-      message.reaction_counts[currentReaction.type] > 0
+      message.reaction_groups &&
+      message.reaction_groups[currentReaction.type] &&
+      message.reaction_groups[currentReaction.type].count > 0 &&
+      message.reaction_groups[currentReaction.type].sum_scores > 0
     ) {
-      message.reaction_counts[currentReaction.type] =
-        message.reaction_counts[currentReaction.type] - 1;
+      message.reaction_groups[currentReaction.type].count =
+        message.reaction_groups[currentReaction.type].count - 1;
+      message.reaction_groups[currentReaction.type].sum_scores =
+        message.reaction_groups[currentReaction.type].sum_scores - 1;
     }
 
-    if (!message.reaction_counts) {
-      message.reaction_counts = {
-        [reactionType]: 1,
-      };
-    } else {
-      message.reaction_counts[reactionType] = (message.reaction_counts?.[reactionType] || 0) + 1;
-    }
-  } else {
-    if (!message.reaction_counts) {
-      message.reaction_counts = {
-        [reactionType]: 1,
+    if (!message.reaction_groups) {
+      message.reaction_groups = {
+        [reactionType]: {
+          count: 1,
+          first_reaction_at: new Date().toISOString(),
+          last_reaction_at: new Date().toISOString(),
+          sum_scores: 1,
+        },
       };
     } else {
-      message.reaction_counts[reactionType] = (message.reaction_counts?.[reactionType] || 0) + 1;
+      if (!message.reaction_groups[reactionType]) {
+        message.reaction_groups[reactionType] = {
+          count: 1,
+          first_reaction_at: new Date().toISOString(),
+          last_reaction_at: new Date().toISOString(),
+          sum_scores: 1,
+        };
+      } else {
+        message.reaction_groups[reactionType] = {
+          ...message.reaction_groups[reactionType],
+          count: message.reaction_groups[reactionType].count + 1,
+          last_reaction_at: new Date().toISOString(),
+          sum_scores: message.reaction_groups[reactionType].sum_scores + 1,
+        };
+      }
     }
   }
 
@@ -86,6 +101,7 @@ export const addReactionToLocalState = <
     });
   } else {
     insertReaction({
+      message,
       reaction,
     });
   }

package/src/utils/removeReactionFromLocalState.ts

@@ -27,8 +27,28 @@ export const removeReactionFromLocalState = <
     (r) => !(r.user_id === user?.id && r.type === reactionType),
   );
 
-  if (message.reaction_counts?.[reactionType] && message.reaction_counts?.[reactionType] > 0) {
-    message.reaction_counts[reactionType] = message.reaction_counts[reactionType] - 1;
+  if (message.reaction_groups?.[reactionType]) {
+    if (
+      message.reaction_groups[reactionType].count > 0 ||
+      message.reaction_groups[reactionType].sum_scores > 0
+    ) {
+      message.reaction_groups[reactionType].count = Math.max(
+        0,
+        message.reaction_groups[reactionType].count - 1,
+      );
+      message.reaction_groups[reactionType].sum_scores = Math.max(
+        0,
+        message.reaction_groups[reactionType].sum_scores - 1,
+      );
+      if (
+        message.reaction_groups[reactionType].count === 0 ||
+        message.reaction_groups[reactionType].sum_scores === 0
+      ) {
+        delete message.reaction_groups[reactionType];
+      }
+    } else {
+      delete message.reaction_groups[reactionType];
+    }
   }
 
   deleteReaction({

package/src/utils/removeReservedFields.ts

@@ -19,8 +19,10 @@ export const removeReservedFields = <
     'latest_reactions',
     'own_reactions',
     'reaction_counts',
+    'reaction_groups',
     'last_message_at',
     'member_count',
+    'message_text_updated_at',
     'type',
     'updated_at',
     'reply_count',

package/src/utils/utils.ts

@@ -13,7 +13,8 @@ import type {
   UserResponse,
 } from 'stream-chat';
 
-import type { MessageType } from '../components/MessageList/hooks/useMessageList';
+import { IconProps } from '../../src/icons/utils/base';
+import { MessageType } from '../components/MessageList/hooks/useMessageList';
 import type {
   EmojiSearchIndex,
   MentionAllAppUsersQuery,
@@ -24,7 +25,6 @@ import type {
   SuggestionUser,
 } from '../contexts/suggestionsContext/SuggestionsContext';
 import { compiledEmojis, Emoji } from '../emoji-data';
-import type { IconProps } from '../icons/utils/base';
 import type { TableRowJoinedUser } from '../store/types';
 import type { DefaultStreamChatGenerics, ValueOf } from '../types/types';
 
@@ -602,19 +602,31 @@ export const hasOnlyEmojis = (text: string) => {
  * @param {FormatMessageResponse<StreamChatGenerics>} message - the message object to be stringified
  * @returns {string} The stringified message
  */
-const stringifyMessage = <
+export const stringifyMessage = <
   StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
 >({
   deleted_at,
   latest_reactions,
+  reaction_groups,
+  readBy,
   reply_count,
   status,
+  text,
   type,
   updated_at,
-}: FormatMessageResponse<StreamChatGenerics>): string =>
-  `${type}${deleted_at}${
-    latest_reactions ? latest_reactions.map(({ type }) => type).join() : ''
-  }${reply_count}${status}${updated_at?.toISOString?.() || updated_at}`;
+}: FormatMessageResponse<StreamChatGenerics> | MessageType<StreamChatGenerics>): string =>
+  `${
+    latest_reactions ? latest_reactions.map(({ type, user }) => `${type}${user?.id}`).join() : ''
+  }${
+    reaction_groups
+      ? Object.entries(reaction_groups)
+          .flatMap(
+            ([type, { count, first_reaction_at, last_reaction_at }]) =>
+              `${type}${count}${first_reaction_at}${last_reaction_at}`,
+          )
+          .join()
+      : ''
+  }${type}${deleted_at}${text}${readBy}${reply_count}${status}${updated_at}`;
 
 /**
  * Reduces a list of messages to strings that are used in useEffect & useMemo

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.31.2-beta.2"
+  "version": "5.32.0-beta.1"
 }