fix: avoid storing shared_location in drafts

Author: MartinCupela

src/messageComposer/middleware/messageComposer/MessageComposerMiddlewareExecutor.ts

@@ -32,10 +32,7 @@ import {
 } from './customData';
 import { createUserDataInjectionMiddleware } from './userDataInjection';
 import { createPollOnlyCompositionMiddleware } from './pollOnly';
-import {
-  createDraftSharedLocationCompositionMiddleware,
-  createSharedLocationCompositionMiddleware,
-} from './sharedLocation';
+import { createSharedLocationCompositionMiddleware } from './sharedLocation';
 
 export class MessageComposerMiddlewareExecutor extends MiddlewareExecutor<
   MessageComposerMiddlewareState,
@@ -72,7 +69,6 @@ export class MessageDraftComposerMiddlewareExecutor extends MiddlewareExecutor<
       createDraftTextComposerCompositionMiddleware(composer),
       createDraftAttachmentsCompositionMiddleware(composer),
       createDraftLinkPreviewsCompositionMiddleware(composer),
-      createDraftSharedLocationCompositionMiddleware(composer),
       createDraftMessageComposerStateCompositionMiddleware(composer),
       createDraftCustomDataCompositionMiddleware(composer),
       createDraftCompositionValidationMiddleware(composer),

src/messageComposer/middleware/messageComposer/sharedLocation.ts

@@ -42,28 +42,3 @@ export const createSharedLocationCompositionMiddleware = (
     },
   },
 });
-
-export const createDraftSharedLocationCompositionMiddleware = (
-  composer: MessageComposer,
-): MessageDraftCompositionMiddleware => ({
-  id: 'stream-io/message-composer-middleware/draft-shared-location',
-  handlers: {
-    compose: ({
-      state,
-      next,
-      forward,
-    }: MiddlewareHandlerParams<MessageDraftComposerMiddlewareValueState>) => {
-      const { locationComposer } = composer;
-      const location = locationComposer.validLocation;
-      if (!locationComposer || !location) return forward();
-
-      return next({
-        ...state,
-        draft: {
-          ...state.draft,
-          shared_location: location,
-        },
-      });
-    },
-  },
-});

test/unit/LiveLocationManager.test.ts

@@ -547,7 +547,9 @@ describe('LiveLocationManager', () => {
         });
 
         await manager.init();
-        expect(manager.messages).toHaveLength(1);
+        vi.waitFor(() => {
+          expect(manager.messages).toHaveLength(1);
+        });
         client.dispatchEvent({
           message: {
             id: liveLocation.message_id,

test/unit/MessageComposer/middleware/messageComposer/sharedLocation.test.ts

@@ -1,13 +1,10 @@
 import { describe, expect, it, vi } from 'vitest';
 import {
-  createDraftSharedLocationCompositionMiddleware,
   createSharedLocationCompositionMiddleware,
   DraftResponse,
   LocalMessage,
   MessageComposer,
   MessageComposerMiddlewareState,
-  type MessageCompositionMiddleware,
-  MessageDraftComposerMiddlewareValueState,
   MiddlewareStatus,
   StreamChat,
 } from '../../../../../src';
@@ -139,65 +136,3 @@ describe('stream-io/message-composer-middleware/shared-location', () => {
     });
   });
 });
-
-const setupDraftMiddlewareHandlerParams = (
-  initialState: MessageDraftComposerMiddlewareValueState = {},
-) => {
-  return {
-    state: initialState,
-    next: async (state: MessageDraftComposerMiddlewareValueState) => ({ state }),
-    complete: async (state: MessageDraftComposerMiddlewareValueState) => ({
-      state,
-      status: 'complete' as MiddlewareStatus,
-    }),
-    discard: async () => ({ state: initialState, status: 'discard' as MiddlewareStatus }),
-    forward: async () => ({ state: initialState }),
-  };
-};
-
-describe('stream-io/message-composer-middleware/draft-shared-location', () => {
-  it('injects shared_location to localMessage and message payloads', async () => {
-    const { messageComposer } = setup();
-    const middleware = createDraftSharedLocationCompositionMiddleware(messageComposer);
-    const coords = { latitude: 1, longitude: 1 };
-    messageComposer.locationComposer.setData(coords);
-    const result = await middleware.handlers.compose(setupDraftMiddlewareHandlerParams());
-    expect(result).toEqual({
-      state: {
-        draft: {
-          shared_location: {
-            created_by_device_id: messageComposer.locationComposer.deviceId,
-            message_id: messageComposer.id,
-            ...coords,
-          },
-        },
-      },
-    });
-  });
-
-  it('does not inject shared_location to localMessage and message payloads if none is set', async () => {
-    const { messageComposer } = setup();
-    const middleware = createDraftSharedLocationCompositionMiddleware(messageComposer);
-    const result = await middleware.handlers.compose(setupDraftMiddlewareHandlerParams());
-    expect(result).toEqual({
-      state: {},
-    });
-  });
-
-  it('does not inject shared_location to localMessage and message payloads if the location state is corrupted', async () => {
-    const { messageComposer } = setup();
-    const middleware = createDraftSharedLocationCompositionMiddleware(messageComposer);
-    // @ts-expect-error invalid location payload
-    messageComposer.locationComposer.state.next({
-      location: {
-        latitude: 1,
-        created_by_device_id: 'da',
-        message_id: messageComposer.id,
-      },
-    });
-    const result = await middleware.handlers.compose(setupDraftMiddlewareHandlerParams());
-    expect(result).toEqual({
-      state: {},
-    });
-  });
-});