Initial commit

Author: arnautov-anton

src/channel.ts

@@ -29,14 +29,14 @@ import type {
   CreateDraftResponse,
   DeleteMessageOptions,
   Event,
-  EventAPIResponse,
   EventHandler,
   EventPayload,
   EventType,
   GetRepliesAPIResponse,
   GetRepliesRequest,
   LocalMessage,
   MarkReadRequest,
+  MarkReadResponseEvent,
   MarkUnreadRequest,
   MessagePaginationOptions,
   MessageRequest,
@@ -130,7 +130,7 @@ export type CustomDeleteMessageRequestFn = (
 export type CustomMarkReadRequestFn = (params: {
   channel: Channel;
   options?: MarkReadRequest;
-}) => Promise<EventAPIResponse | null>;
+}) => Promise<{ event: MarkReadResponseEvent } | null>;
 
 export type ChannelInstanceConfig = {
   requestHandlers?: {

src/messageDelivery/MessageDeliveryReporter.ts

@@ -3,16 +3,15 @@ import { Channel } from '../channel';
 import type { ThreadUserReadState } from '../thread';
 import { Thread } from '../thread';
 import type {
-  EventAPIResponse,
   LocalMessage,
   MarkDeliveredRequest,
   MarkReadRequest,
+  MarkReadResponse,
   StreamAPIError,
   StreamResponse,
 } from '../types';
 import { throttle, userHasReadReceipts } from '../utils';
 import { isAPIError, isErrorRetryable } from '../errors';
-import type { MarkReadResponse as Gen_MarkReadResponse } from '../gen/models';
 
 const MAX_DELIVERED_MESSAGE_COUNT_IN_PAYLOAD = 100 as const;
 const MARK_AS_DELIVERED_BUFFER_TIMEOUT = 1000 as const;
@@ -306,30 +305,20 @@ export class MessageDeliveryReporter {
       ? { ...options, thread_id: collection.id }
       : options;
 
-    let result: EventAPIResponse | StreamResponse<Gen_MarkReadResponse> | null = null;
+    let result: Partial<StreamResponse<MarkReadResponse>> | null = null;
 
     if (isThreadCollection) {
-      const markReadRequestHandler = collection.configState.getLatestValue()
-        .requestHandlers?.markReadRequest as
-        | ((params: {
-            thread: Thread;
-            options?: MarkReadRequest;
-          }) => Promise<EventAPIResponse | null> | void)
-        | undefined;
+      const markReadRequestHandler =
+        collection.configState.getLatestValue().requestHandlers?.markReadRequest;
       result = markReadRequestHandler
         ? ((await markReadRequestHandler({
             options: requestOptions,
             thread: collection,
           })) ?? null)
         : await channel.markRead(requestOptions);
     } else {
-      const markReadRequestHandler = channel.configState.getLatestValue().requestHandlers
-        ?.markReadRequest as
-        | ((params: {
-            channel: Channel;
-            options?: MarkReadRequest;
-          }) => Promise<EventAPIResponse | null> | void)
-        | undefined;
+      const markReadRequestHandler =
+        channel.configState.getLatestValue().requestHandlers?.markReadRequest;
       result = markReadRequestHandler
         ? ((await markReadRequestHandler({ channel, options: requestOptions })) ?? null)
         : await channel.markRead(requestOptions);

src/thread.ts

@@ -2,10 +2,10 @@ import { StateStore } from './store';
 import { formatMessage, localMessageToNewMessagePayload } from './utils';
 import type {
   DraftResponse,
-  EventAPIResponse,
   EventType,
   LocalMessage,
   MarkReadRequest,
+  MarkReadResponseEvent,
   MessageResponse,
   ReadStateResponse,
   SortParamRequest,
@@ -67,7 +67,7 @@ const DEFAULT_ITEM_ORDER: SortParamRequest[] = [{ field: 'created_at', direction
 export type CustomThreadMarkReadRequestFn = (params: {
   thread: Thread;
   options?: MarkReadRequest;
-}) => Promise<EventAPIResponse | null> | void;
+}) => Promise<{ event: MarkReadResponseEvent } | null> | void;
 
 export type ThreadInstanceConfig = {
   requestHandlers?: {
@@ -131,7 +131,7 @@ export class Thread extends WithSubscriptions {
         participants: threadData.thread_participants,
         read: formatReadState(
           !threadData.read || threadData.read.length === 0
-            ? getPlaceholderReadResponse(client.userID)
+            ? getPlaceholderReadResponse(client.userId)
             : threadData.read,
         ),
         // Use the parent message's reply_count, not the top-level threadData.reply_count. The
@@ -172,7 +172,7 @@ export class Thread extends WithSubscriptions {
         isStateStale: false,
         parentMessage: formattedParentMessage,
         participants: [],
-        read: formatReadState(getPlaceholderReadResponse(client.userID)),
+        read: formatReadState(getPlaceholderReadResponse(client.userId)),
         replyCount: parentMessage.reply_count ?? 0,
         title: '',
         updatedAt: parentMessage.updated_at ? new Date(parentMessage.updated_at) : null,
@@ -294,7 +294,7 @@ export class Thread extends WithSubscriptions {
   }
 
   get ownUnreadCount() {
-    return ownUnreadCountSelector(this.client.userID)(this.state.getLatestValue());
+    return ownUnreadCountSelector(this.client.userId)(this.state.getLatestValue());
   }
 
   public activate = () => {
@@ -411,7 +411,7 @@ export class Thread extends WithSubscriptions {
     this.state.subscribeWithSelector(
       (nextValue) => ({
         active: nextValue.active,
-        unreadMessageCount: ownUnreadCountSelector(this.client.userID)(nextValue),
+        unreadMessageCount: ownUnreadCountSelector(this.client.userId)(nextValue),
       }),
       ({ active, unreadMessageCount }) => {
         if (!active || !unreadMessageCount) return;
@@ -434,8 +434,8 @@ export class Thread extends WithSubscriptions {
       const { channel } = this.state.getLatestValue();
 
       if (
-        !this.client.userID ||
-        this.client.userID !== event.user?.id ||
+        !this.client.userId ||
+        this.client.userId !== event.user?.id ||
         event.channel?.cid !== channel.cid
       ) {
         return;
@@ -473,11 +473,11 @@ export class Thread extends WithSubscriptions {
 
   private subscribeNewReplies = () =>
     this.client.on('message.new', (event) => {
-      if (!this.client.userID || event.message?.parent_id !== this.id) {
+      if (!this.client.userId || event.message?.parent_id !== this.id) {
         return;
       }
 
-      const isOwnMessage = event.message.user?.id === this.client.userID;
+      const isOwnMessage = event.message.user?.id === this.client.userId;
       const { active, read } = this.state.getLatestValue();
 
       this.upsertReplyLocally({
@@ -508,7 +508,7 @@ export class Thread extends WithSubscriptions {
               user: event.user,
               unreadMessageCount: 0,
             };
-          } else if (active && userId === this.client.userID) {
+          } else if (active && userId === this.client.userId) {
             // Do not increment unread count for the current user in an active thread
           } else {
             // Increment unread count for all users except the author of the new message

src/types.ts

@@ -1119,35 +1119,3 @@ export type GiphyVersions = keyof Images;
 export type TranslationLanguage = TranslateMessageRequest['language'];
 
 export * from './gen/models';
-
-export type EventAPIResponse = APIResponse & {
-  event: Event;
-};
-
-export type PartializeKeys<T, K extends keyof T> = Partial<Pick<T, K>> & Omit<T, K>;
-
-type ErrorResponseDetails = {
-  code: number;
-  messages: string[];
-};
-
-export type APIErrorResponse = {
-  duration: string;
-  message: string;
-  more_info: string;
-  StatusCode: number;
-  code?: number;
-  details?: ErrorResponseDetails;
-};
-
-export type DraftMessagePayload = PartializeKeys<
-  Omit<DraftMessage, 'mentioned_groups'>,
-  'id'
-> & {
-  user_id?: string;
-};
-
-export type QueryRemindersOptions = Pager & {
-  filter?: ReminderFilters;
-  sort?: ReminderSort;
-};

src/utils.ts

@@ -957,7 +957,7 @@ export const promoteChannel = ({
 export const isDate = (value: unknown): value is Date => !!(value as Date).getTime;
 
 export const isLocalMessage = (message: unknown): message is LocalMessage =>
-  isDate((message as LocalMessage).created_at);
+  typeof (message as LocalMessage | undefined)?.status === 'string';
 
 export const runDetached = <T>(
   callback: Promise<void | T>,