stream-chat-react-native-core 6.6.7 → 7.0.0-rc.1

package/src/utils/ACITriggerSettings.ts

@@ -15,13 +15,8 @@ import type {
   SuggestionUser,
 } from '../contexts/suggestionsContext/SuggestionsContext';
 import { Emoji } from '../emoji-data';
-import type { DefaultStreamChatGenerics } from '../types/types';
 
-const getCommands = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-) => channel.getConfig()?.commands || [];
+const getCommands = (channel: Channel) => channel.getConfig()?.commands || [];
 
 export type TriggerSettingsOutputType = {
   caretPosition: string;
@@ -29,22 +24,17 @@ export type TriggerSettingsOutputType = {
   text: string;
 };
 
-export type TriggerSettings<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type TriggerSettings = {
   '/'?: {
     dataProvider: (
-      query: CommandResponse<StreamChatGenerics>['name'],
+      query: CommandResponse['name'],
       text: string,
-      onReady?: (
-        data: CommandResponse<StreamChatGenerics>[],
-        q: CommandResponse<StreamChatGenerics>['name'],
-      ) => void,
+      onReady?: (data: CommandResponse[], q: CommandResponse['name']) => void,
       options?: {
         limit?: number;
       },
-    ) => SuggestionCommand<StreamChatGenerics>[];
-    output: (entity: CommandResponse<StreamChatGenerics>) => TriggerSettingsOutputType;
+    ) => SuggestionCommand[];
+    output: (entity: CommandResponse) => TriggerSettingsOutputType;
     type: SuggestionComponentType;
   };
   ':'?: {
@@ -57,31 +47,26 @@ export type TriggerSettings<
     type: SuggestionComponentType;
   };
   '@'?: {
-    callback: (item: SuggestionUser<StreamChatGenerics>) => void;
+    callback: (item: SuggestionUser) => void;
     dataProvider: (
-      query: SuggestionUser<StreamChatGenerics>['name'],
+      query: SuggestionUser['name'],
       _: string,
-      onReady?: (
-        data: SuggestionUser<StreamChatGenerics>[],
-        q: SuggestionUser<StreamChatGenerics>['name'],
-      ) => void,
+      onReady?: (data: SuggestionUser[], q: SuggestionUser['name']) => void,
       options?: {
         limit?: number;
         mentionAllAppUsersEnabled?: boolean;
-        mentionAllAppUsersQuery?: MentionAllAppUsersQuery<StreamChatGenerics>;
+        mentionAllAppUsersQuery?: MentionAllAppUsersQuery;
       },
-    ) => SuggestionUser<StreamChatGenerics>[] | Promise<void> | void;
-    output: (entity: SuggestionUser<StreamChatGenerics>) => TriggerSettingsOutputType;
+    ) => SuggestionUser[] | Promise<void> | void;
+    output: (entity: SuggestionUser) => TriggerSettingsOutputType;
     type: SuggestionComponentType;
   };
 };
 
-export type ACITriggerSettingsParams<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  channel: Channel<StreamChatGenerics>;
-  client: StreamChat<StreamChatGenerics>;
-  onMentionSelectItem: (item: SuggestionUser<StreamChatGenerics>) => void;
+export type ACITriggerSettingsParams = {
+  channel: Channel;
+  client: StreamChat;
+  onMentionSelectItem: (item: SuggestionUser) => void;
   emojiSearchIndex?: EmojiSearchIndex;
 };
 
@@ -104,14 +89,12 @@ export type Trigger = '/' | '@' | ':';
  * previous call without waiting for a1. So in this case, we want to execute onReady, when trailing
  * end of debounce executes.
  */
-export const ACITriggerSettings = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const ACITriggerSettings = ({
   channel,
   client,
   emojiSearchIndex,
   onMentionSelectItem,
-}: ACITriggerSettingsParams<StreamChatGenerics>): TriggerSettings<StreamChatGenerics> => ({
+}: ACITriggerSettingsParams): TriggerSettings => ({
   '/': {
     dataProvider: (query, text, onReady, options = {}) => {
       try {
@@ -208,7 +191,7 @@ export const ACITriggerSettings = <
           return [];
         }
         if (options?.mentionAllAppUsersEnabled) {
-          return (queryUsersDebounced as DebouncedFunc<QueryUsersFunction<StreamChatGenerics>>)(
+          return (queryUsersDebounced as DebouncedFunc<QueryUsersFunction>)(
             client,
             query,
             (data) => {
@@ -257,7 +240,7 @@ export const ACITriggerSettings = <
           return data;
         }
 
-        return (queryMembersDebounced as DebouncedFunc<QueryMembersFunction<StreamChatGenerics>>)(
+        return (queryMembersDebounced as DebouncedFunc<QueryMembersFunction>)(
           client,
           channel,
           query,

package/src/utils/DBSyncManager.ts

@@ -11,7 +11,6 @@ import { deletePendingTask } from '../store/apis/deletePendingTask';
 import { getPendingTasks } from '../store/apis/getPendingTasks';
 import { SqliteClient } from '../store/SqliteClient';
 import type { PendingTask } from '../store/types';
-import type { DefaultStreamChatGenerics } from '../types/types';
 
 /**
  * DBSyncManager has the responsibility to sync the channel states
@@ -104,11 +103,7 @@ export class DBSyncManager {
     };
   };
 
-  static sync = async <
-    StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-  >(
-    client: StreamChat<StreamChatGenerics>,
-  ) => {
+  static sync = async (client: StreamChat) => {
     if (!this.client?.user) {
       return;
     }
@@ -165,20 +160,12 @@ export class DBSyncManager {
     await this.sync(this.client);
   };
 
-  static queueTask = async <
-    StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-  >({
-    client,
-    task,
-  }: {
-    client: StreamChat<StreamChatGenerics>;
-    task: PendingTask;
-  }) => {
+  static queueTask = async ({ client, task }: { client: StreamChat; task: PendingTask }) => {
     const removeFromApi = await addPendingTask(task);
 
     let response;
     try {
-      response = await this.executeTask<StreamChatGenerics>({ client, task });
+      response = await this.executeTask({ client, task });
     } catch (e) {
       if ((e as AxiosError<APIErrorResponse>)?.response?.data?.code === 4) {
         // Error code 16 - message already exists
@@ -193,15 +180,7 @@ export class DBSyncManager {
     return response;
   };
 
-  static executeTask = async <
-    StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-  >({
-    client,
-    task,
-  }: {
-    client: StreamChat<StreamChatGenerics>;
-    task: PendingTask;
-  }) => {
+  static executeTask = async ({ client, task }: { client: StreamChat; task: PendingTask }) => {
     const channel = client.channel(task.channelType, task.channelId);
 
     if (task.type === 'send-reaction') {
@@ -219,11 +198,7 @@ export class DBSyncManager {
     throw new Error('Invalid task type');
   };
 
-  static executePendingTasks = async <
-    StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-  >(
-    client: StreamChat<StreamChatGenerics>,
-  ) => {
+  static executePendingTasks = async (client: StreamChat) => {
     const queue = await getPendingTasks();
     for (const task of queue) {
       if (!task.id) {
@@ -231,7 +206,7 @@ export class DBSyncManager {
       }
 
       try {
-        await this.executeTask<StreamChatGenerics>({
+        await this.executeTask({
           client,
           task,
         });

package/src/utils/addReactionToLocalState.ts

@@ -3,22 +3,18 @@ import type { Channel, ReactionResponse, UserResponse } from 'stream-chat';
 import { updateReaction } from '../store/apis';
 import { insertReaction } from '../store/apis/insertReaction';
 
-import type { DefaultStreamChatGenerics } from '../types/types';
-
-export const addReactionToLocalState = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const addReactionToLocalState = ({
   channel,
   enforceUniqueReaction,
   messageId,
   reactionType,
   user,
 }: {
-  channel: Channel<StreamChatGenerics>;
+  channel: Channel;
   enforceUniqueReaction: boolean;
   messageId: string;
   reactionType: string;
-  user: UserResponse<StreamChatGenerics>;
+  user: UserResponse;
 }) => {
   const message = channel.state.messages.find(({ id }) => id === messageId);
 

package/src/utils/i18n/Streami18n.ts

@@ -49,8 +49,6 @@ import 'dayjs/locale/tr';
  */
 import 'dayjs/locale/en';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 const defaultNS = 'translation';
 const defaultLng = 'en';
 
@@ -383,7 +381,7 @@ export class Streami18n {
 
   translations: {
     [key: string]: {
-      [key: string]: Partial<typeof enTranslations> | DefaultStreamChatGenerics;
+      [key: string]: Partial<typeof enTranslations>;
     };
   } = {
     en: { [defaultNS]: enTranslations },
@@ -643,7 +641,7 @@ export class Streami18n {
    */
   registerTranslation(
     language: string,
-    translation: Partial<typeof enTranslations> | DefaultStreamChatGenerics,
+    translation: Partial<typeof enTranslations>,
     customDayjsLocale?: Partial<ILocale>,
   ) {
     if (!translation) {

package/src/utils/queryMembers.ts

@@ -4,31 +4,18 @@ import type { Channel, ChannelMemberAPIResponse, StreamChat, User } from 'stream
 import { defaultAutoCompleteSuggestionsLimit } from './constants';
 
 import type { SuggestionUser } from '../contexts/suggestionsContext/SuggestionsContext';
-import type { DefaultStreamChatGenerics } from '../types/types';
 
-const getMembers = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-) => {
+const getMembers = (channel: Channel) => {
   const members = channel.state.members;
   return members ? Object.values(members).map(({ user }) => user) : [];
 };
 
-const getWatchers = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-) => {
+const getWatchers = (channel: Channel) => {
   const watchers = channel.state.watchers;
   return watchers ? Object.values(watchers) : [];
 };
 
-export const getMembersAndWatchers = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-) => {
+export const getMembersAndWatchers = (channel: Channel) => {
   const members = getMembers(channel);
   const watchers = getWatchers(channel);
   const users = [...members, ...watchers];
@@ -47,32 +34,24 @@ export const getMembersAndWatchers = <
   return uniqueUsers;
 };
 
-const isUserResponse = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  user: SuggestionUser<StreamChatGenerics> | undefined,
-): user is SuggestionUser<StreamChatGenerics> =>
-  (user as SuggestionUser<StreamChatGenerics>) !== undefined;
+const isUserResponse = (user: SuggestionUser | undefined): user is SuggestionUser =>
+  (user as SuggestionUser) !== undefined;
 
-export type QueryMembersFunction<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = (
-  client: StreamChat<StreamChatGenerics>,
-  channel: Channel<StreamChatGenerics>,
-  query: SuggestionUser<StreamChatGenerics>['name'],
-  onReady?: (users: SuggestionUser<StreamChatGenerics>[]) => void,
+export type QueryMembersFunction = (
+  client: StreamChat,
+  channel: Channel,
+  query: SuggestionUser['name'],
+  onReady?: (users: SuggestionUser[]) => void,
   options?: {
     limit?: number;
   },
 ) => Promise<void>;
 
-const queryMembers = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  client: StreamChat<StreamChatGenerics>,
-  channel: Channel<StreamChatGenerics>,
-  query: SuggestionUser<StreamChatGenerics>['name'],
-  onReady?: (users: SuggestionUser<StreamChatGenerics>[]) => void,
+const queryMembers = async (
+  client: StreamChat,
+  channel: Channel,
+  query: SuggestionUser['name'],
+  onReady?: (users: SuggestionUser[]) => void,
   options: {
     limit?: number;
   } = {},
@@ -89,9 +68,9 @@ const queryMembers = async <
       },
       {},
       { limit },
-    )) as ChannelMemberAPIResponse<StreamChatGenerics>;
+    )) as ChannelMemberAPIResponse;
 
-    const users: SuggestionUser<StreamChatGenerics>[] = [];
+    const users: SuggestionUser[] = [];
     members
       .filter((member) => member.user?.id !== client.userID)
       .forEach((member) => isUserResponse(member.user) && users.push(member.user));

package/src/utils/queryUsers.ts

@@ -5,29 +5,24 @@ import { defaultAutoCompleteSuggestionsLimit, defaultMentionAllAppUsersQuery } f
 
 import type { MentionAllAppUsersQuery } from '../contexts/messageInputContext/MessageInputContext';
 import type { SuggestionUser } from '../contexts/suggestionsContext/SuggestionsContext';
-import type { DefaultStreamChatGenerics } from '../types/types';
 
-export type QueryUsersFunction<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = (
-  client: StreamChat<StreamChatGenerics>,
-  query: SuggestionUser<StreamChatGenerics>['name'],
-  onReady?: (users: SuggestionUser<StreamChatGenerics>[]) => void,
+export type QueryUsersFunction = (
+  client: StreamChat,
+  query: SuggestionUser['name'],
+  onReady?: (users: SuggestionUser[]) => void,
   options?: {
     limit?: number;
-    mentionAllAppUsersQuery?: MentionAllAppUsersQuery<StreamChatGenerics>;
+    mentionAllAppUsersQuery?: MentionAllAppUsersQuery;
   },
 ) => Promise<void>;
 
-const queryUsers = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  client: StreamChat<StreamChatGenerics>,
-  query: SuggestionUser<StreamChatGenerics>['name'],
-  onReady?: (users: SuggestionUser<StreamChatGenerics>[]) => void,
+const queryUsers = async (
+  client: StreamChat,
+  query: SuggestionUser['name'],
+  onReady?: (users: SuggestionUser[]) => void,
   options: {
     limit?: number;
-    mentionAllAppUsersQuery?: MentionAllAppUsersQuery<StreamChatGenerics>;
+    mentionAllAppUsersQuery?: MentionAllAppUsersQuery;
   } = {},
 ): Promise<void> => {
   if (!query) {

package/src/utils/removeReactionFromLocalState.ts

@@ -2,20 +2,16 @@ import type { Channel, UserResponse } from 'stream-chat';
 
 import { deleteReaction } from '../store/apis/deleteReaction';
 
-import type { DefaultStreamChatGenerics } from '../types/types';
-
-export const removeReactionFromLocalState = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const removeReactionFromLocalState = ({
   channel,
   messageId,
   reactionType,
   user,
 }: {
-  channel: Channel<StreamChatGenerics>;
+  channel: Channel;
   messageId: string;
   reactionType: string;
-  user: UserResponse<StreamChatGenerics>;
+  user: UserResponse;
 }) => {
   const message = channel.state.messages.find(({ id }) => id === messageId);
   if (!message || !channel?.id || !user?.id) {

package/src/utils/removeReservedFields.ts

@@ -1,13 +1,10 @@
 import type { MessageResponse } from 'stream-chat';
 
 import type { MessageType } from '../components/MessageList/hooks/useMessageList';
-import type { DefaultStreamChatGenerics } from '../types/types';
 
-export const removeReservedFields = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  message: MessageType<StreamChatGenerics> | MessageResponse<StreamChatGenerics>,
-): MessageType<StreamChatGenerics> | MessageResponse<StreamChatGenerics> => {
+export const removeReservedFields = (
+  message: MessageType | MessageResponse,
+): MessageType | MessageResponse => {
   const retryMessage = { ...message };
   const reserved = [
     'cid',
@@ -26,7 +23,8 @@ export const removeReservedFields = <
     'type',
     'updated_at',
     'reply_count',
-  ];
+  ] as (keyof typeof message)[];
+
   reserved.forEach((key) => {
     delete retryMessage[key];
   });

package/src/utils/utils.ts

@@ -5,11 +5,14 @@ import EmojiRegex from 'emoji-regex';
 import type { ChannelState, FormatMessageResponse, MessageResponse } from 'stream-chat';
 
 import { IconProps } from '../../src/icons/utils/base';
-import { MessageType } from '../components/MessageList/hooks/useMessageList';
+import {
+  MessagesWithStylesReadByAndDateSeparator,
+  MessageType,
+} from '../components/MessageList/hooks/useMessageList';
 import type { EmojiSearchIndex } from '../contexts/messageInputContext/MessageInputContext';
 import { compiledEmojis } from '../emoji-data';
 import type { TableRowJoinedUser } from '../store/types';
-import type { DefaultStreamChatGenerics, ValueOf } from '../types/types';
+import type { ValueOf } from '../types/types';
 
 export type ReactionData = {
   Icon: React.ComponentType<IconProps>;
@@ -75,11 +78,7 @@ export const getIndicatorTypeForFileState = (
  * @param message
  * @returns boolean
  */
-export const isBlockedMessage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  message: MessageType<StreamChatGenerics> | TableRowJoinedUser<'messages'>,
-) => {
+export const isBlockedMessage = (message: MessageType | TableRowJoinedUser<'messages'>) => {
   // The only indicator for the blocked message is its message type is error and that the message text contains "Message was blocked by moderation policies".
   const pattern = /\bMessage was blocked by moderation policies\b/;
   return message.type === 'error' && message.text && pattern.test(message.text);
@@ -90,11 +89,7 @@ export const isBlockedMessage = <
  * @param message
  * @returns boolean
  */
-export const isBouncedMessage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  message: MessageType<StreamChatGenerics>,
-) =>
+export const isBouncedMessage = (message: MessageType) =>
   (message.type === 'error' &&
     message?.moderation_details?.action === 'MESSAGE_RESPONSE_ACTION_BOUNCE') ||
   message?.moderation?.action === 'bounce';
@@ -104,11 +99,7 @@ export const isBouncedMessage = <
  * @param message
  * @returns boolean
  */
-export const isEditedMessage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  message: MessageType<StreamChatGenerics>,
-) => !!message.message_text_updated_at && !message.ai_generated;
+export const isEditedMessage = (message: MessageType) => !!message.message_text_updated_at;
 
 /**
  * Default emoji search index for auto complete text input
@@ -196,27 +187,25 @@ export const hasOnlyEmojis = (text: string) => {
 
 /**
  * Stringifies a message object
- * @param {FormatMessageResponse<StreamChatGenerics>} message - the message object to be stringified
+ * @param {FormatMessageResponse} message - the message object to be stringified
  * @returns {string} The stringified message
  */
-export const stringifyMessage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
-  deleted_at,
-  i18n,
-  latest_reactions,
-  reaction_groups,
-  readBy,
-  reply_count,
-  status,
-  text,
-  type,
-  updated_at,
-}:
-  | MessageResponse<StreamChatGenerics>
-  | FormatMessageResponse<StreamChatGenerics>
-  | MessageType<StreamChatGenerics>): string =>
-  `${
+export const stringifyMessage = (
+  message: MessageResponse | FormatMessageResponse | MessageType,
+): string => {
+  const {
+    deleted_at,
+    i18n,
+    latest_reactions,
+    reaction_groups,
+    reply_count,
+    status,
+    text,
+    type,
+    updated_at,
+  } = message;
+  const readBy = (message as MessagesWithStylesReadByAndDateSeparator)?.readBy ?? '';
+  return `${
     latest_reactions ? latest_reactions.map(({ type, user }) => `${type}${user?.id}`).join() : ''
   }${
     reaction_groups
@@ -228,17 +217,15 @@ export const stringifyMessage = <
           .join()
       : ''
   }${type}${deleted_at}${text}${readBy}${reply_count}${status}${updated_at}${JSON.stringify(i18n)}`;
+};
 
 /**
  * Reduces a list of messages to strings that are used in useEffect & useMemo
  * @param {messages} messages - the array of messages to be compared
  * @returns {string} The mapped message string
  */
-export const reduceMessagesToString = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  messages: FormatMessageResponse<StreamChatGenerics>[],
-): string => messages.map(stringifyMessage).join();
+export const reduceMessagesToString = (messages: FormatMessageResponse[]): string =>
+  messages.map(stringifyMessage).join();
 
 /**
  * Utility to get the file name from the path using regex.
@@ -288,12 +275,7 @@ export function escapeRegExp(text: string) {
  * @param targetId
  * @returns number
  */
-export const findInMessagesById = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  messages: ChannelState<StreamChatGenerics>['messages'],
-  targetId: string,
-) => {
+export const findInMessagesById = (messages: ChannelState['messages'], targetId: string) => {
   const idx = messages.findIndex((message) => message.id === targetId);
   return idx;
 };
@@ -304,10 +286,8 @@ export const findInMessagesById = <
  * @param targetDate
  * @returns an object with the index and the message object
  */
-export const findInMessagesByDate = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  messages: MessageResponse<StreamChatGenerics>[] | ChannelState<StreamChatGenerics>['messages'],
+export const findInMessagesByDate = (
+  messages: MessageResponse[] | ChannelState['messages'],
   targetDate: Date,
 ) => {
   // Binary search

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "6.6.7"
+  "version": "7.0.0-rc.1"
 }