tmp8

Author: arnautov-anton

src/LiveLocationManager.ts

@@ -123,7 +123,7 @@ export class LiveLocationManager extends WithSubscriptions {
     const { active_live_locations } = await this.client.getSharedLocations();
     this.state.next({
       messages: new Map(
-        active_live_locations
+        (active_live_locations as SharedLiveLocationResponse[])
           .filter((location) => !isExpiredLocation(location))
           .map((location) => [
             location.message_id,
@@ -189,7 +189,8 @@ export class LiveLocationManager extends WithSubscriptions {
           if (location.latitude === latitude && location.longitude === longitude)
             continue;
           const promise = this.client.updateLocation({
-            created_by_device_id: location.created_by_device_id,
+            // TODO: this is missing from the OAPI spec
+            // created_by_device_id: location.created_by_device_id,
             message_id: messageId,
             latitude,
             longitude,

src/channel.ts

@@ -51,6 +51,7 @@ import type {
   QueryMembersOptions,
   Reaction,
   ReactionAPIResponse,
+  ReactionResponse,
   SearchMessageSortBase,
   SearchOptions,
   SearchPayload,
@@ -523,11 +524,9 @@ export class Channel {
       if (offlineDb) {
         const message = this.state.messages.find(({ id }) => id === messageId);
         const reaction = {
-          created_at: '',
-          updated_at: '',
           message_id: messageId,
           type: reactionType,
-        };
+        } as ReactionResponse;
 
         if (message) {
           await offlineDb.deleteReaction({

src/channel_manager.ts

@@ -163,7 +163,8 @@ const mapPredefinedFilterSortToChannelSort = (
   sort: NonNullable<QueryChannelsAPIResponse['predefined_filter']>['sort'],
 ): ChannelSort =>
   (sort ?? []).map(({ direction = 1, field }) => ({
-    [field]: direction,
+    // TODO: OAPI discrepancy, should not be optional (both direction and field)
+    [field as string]: direction,
   })) as ChannelSort;
 
 const getResponsePaginationParams = ({

src/client.ts

@@ -152,6 +152,7 @@ import type {
   PushProviderID,
   PushProviderListResponse,
   PushProviderUpsertResponse,
+  QueryChannelsAPIResponse,
   QueryFutureChannelBansOptions,
   QueryMessageHistoryFilters,
   QueryMessageHistoryOptions,
@@ -240,14 +241,14 @@ import type { MessageComposer } from './messageComposer';
 import type { AbstractOfflineDB } from './offline-support';
 import { getPendingTaskChannelData } from './offline-support/util';
 import type {
-  PushPreferenceInput,
-  TranslateMessageRequest,
-  UpdateMessageRequest,
+  GetApplicationResponse as Gen_GetApplicationResponse,
+  PushPreferenceInput as Gen_PushPreferenceInput,
+  TranslateMessageRequest as Gen_TranslateMessageRequest,
+  UpdateMessageRequest as Gen_UpdateMessageRequest,
   WSEvent,
 } from './gen/models';
 import { ChatApi } from './gen-imports';
 import type { StreamResponse } from './types';
-import type { GetApplicationResponse } from './gen/models';
 
 function isString(value: unknown): value is string {
   return typeof value === 'string' || value instanceof String;
@@ -296,7 +297,7 @@ export class StreamChat {
    */
   uploadManager: UploadManager;
   _user?: ClientUser;
-  appSettingsPromise?: Promise<StreamResponse<GetApplicationResponse>>;
+  appSettingsPromise?: Promise<StreamResponse<Gen_GetApplicationResponse>>;
   activeChannels: {
     [key: string]: Channel;
   };
@@ -2054,7 +2055,7 @@ export class StreamChat {
    *
    * @return {<UpsertPushPreferencesResponse>}
    */
-  async setPushPreferences(preferences: PushPreferenceInput[]) {
+  async setPushPreferences(preferences: Gen_PushPreferenceInput[]) {
     return await this.chatApi.updatePushNotificationPreferences({
       preferences,
     });
@@ -2814,7 +2815,7 @@ export class StreamChat {
    */
   async translateMessage(
     messageId: string,
-    language: TranslateMessageRequest['language'],
+    language: Gen_TranslateMessageRequest['language'],
   ) {
     return await this.chatApi.translateMessage({
       id: messageId,
@@ -2942,7 +2943,7 @@ export class StreamChat {
    * @return {{ message: LocalMessage | MessageResponse }} Response that includes the message
    */
   async updateMessage(
-    message: UpdateMessageRequest['message'] & { cid?: string },
+    message: Gen_UpdateMessageRequest['message'] & { cid?: string; status?: string },
     options?: UpdateMessageOptions,
   ) {
     if (!message.id) {
@@ -2973,7 +2974,7 @@ export class StreamChat {
   }
 
   async _updateMessage(
-    message: UpdateMessageRequest['message'],
+    message: Gen_UpdateMessageRequest['message'],
     options?: UpdateMessageOptions,
   ) {
     if (!message.id) {

src/connection_fallback.ts

@@ -8,7 +8,8 @@ import {
   sleep,
 } from './utils';
 import { isAPIError, isConnectionIDError, isErrorRetryable } from './errors';
-import type { ConnectionOpen, Event, LogLevel, UR } from './types';
+import type { ConnectionOpen, LogLevel, UR } from './types';
+import type { WSEvent } from './gen/models';
 
 export enum ConnectionState {
   Closed = 'CLOSED',
@@ -85,14 +86,11 @@ export class WSConnectionFallback {
     }
 
     try {
-      const res = await this.client.doAxiosRequest<T>(
+      const res = await this.client.api.doAxiosRequest<T>(
         'get',
         (this.client.baseURL as string).replace(':3030', ':8900') + '/longpoll', // replace port if present for testing with local API
         undefined,
-        {
-          config: { ...config, cancelToken: this.cancelToken?.token },
-          params,
-        },
+        { ...config, cancelToken: this.cancelToken?.token, params },
       );
 
       this.consecutiveFailures = 0; // always reset in case of no error
@@ -115,7 +113,7 @@ export class WSConnectionFallback {
     while (this.state === ConnectionState.Connected) {
       try {
         const data = await this._req<{
-          events: Event[];
+          events: WSEvent[];
         }>({}, { timeout: 30000 }, true); // 30s => API responds in 20s if there is no event
 
         if (data.events?.length) {
@@ -173,7 +171,6 @@ export class WSConnectionFallback {
 
       this._setState(ConnectionState.Connected);
       this.connectionID = event.connection_id;
-      // @ts-expect-error type mismatch
       this.client.dispatchEvent(event);
       this._poll();
       if (reconnect) {

src/events.ts

@@ -373,7 +373,7 @@ export type QueryThreadsRequestFilter = {
 };
 
 export type QueryUsersPayloadFilterConditions = {
-  banned: { type: boolean; operators: '$eq' };
+  banned: { type: boolean; operators: '$eq' | '$ne' };
   bypass_moderation: { type: boolean; operators: '$eq' | '$ne' };
   created_at: {
     type: Date;
@@ -667,6 +667,7 @@ export type SearchPayloadMessageFilterConditions = {
       | '$ne'
       | '$nin';
   };
+
   id: {
     type: string;
     operators:

src/gen/models/filter-conditions.ts

@@ -7,7 +7,6 @@ export * from './channel';
 export * from './channel_state';
 export * from './connection';
 export { type CooldownTimerState } from './CooldownTimer';
-export * from './events';
 export * from './insights';
 export * from './messageComposer';
 export * from './messageDelivery';

src/index.ts

@@ -14,10 +14,13 @@ export type LocationComposerOptions = {
   message?: DraftMessage | LocalMessage;
 };
 
-export type StaticLocationPreview = StaticLocationPayload;
+export type StaticLocationPreview = StaticLocationPayload & {
+  message_id?: string;
+};
 
 export type LiveLocationPreview = Omit<LiveLocationPayload, 'end_at'> & {
   durationMs?: number;
+  message_id?: string;
 };
 
 export type LocationComposerState = {

src/messageComposer/LocationComposer.ts

@@ -33,8 +33,10 @@ export const isFileAttachment = (
 ): attachment is FileAttachment =>
   attachment.type === 'file' ||
   !!(
-    attachment.mime_type &&
-    supportedVideoFormat.indexOf(attachment.mime_type) === -1 &&
+    (attachment as FileAttachment).custom.mime_type &&
+    supportedVideoFormat.indexOf(
+      (attachment as FileAttachment).custom.mime_type as string,
+    ) === -1 &&
     attachment.type !== 'video'
   );
 
@@ -76,7 +78,12 @@ export const isVideoAttachment = (
   supportedVideoFormat: string[] = [],
 ): attachment is VideoAttachment =>
   attachment.type === 'video' ||
-  !!(attachment.mime_type && supportedVideoFormat.indexOf(attachment.mime_type) !== -1);
+  !!(
+    (attachment as VideoAttachment).custom.mime_type &&
+    supportedVideoFormat.indexOf(
+      (attachment as VideoAttachment).custom.mime_type as string,
+    ) !== -1
+  );
 
 export const isLocalVideoAttachment = (
   attachment: Attachment | LocalAttachment,