fix: recognize async moderated shadow blocked messages as blocked

Author: szuperaz

src/components/Message/__tests__/utils.test.ts

@@ -1,7 +1,12 @@
 import { generateMessage, generateReaction, generateUser } from 'mock-builders';
 import { fromPartial } from '@total-typescript/shoehorn';
 import type { TFunction } from 'i18next';
-import type { ChannelConfigWithInfo, MessageResponse, Mute } from 'stream-chat';
+import type {
+  ChannelConfigWithInfo,
+  LocalMessage,
+  MessageResponse,
+  Mute,
+} from 'stream-chat';
 import type { StreamChat } from 'stream-chat';
 import {
   countReactions,
@@ -15,6 +20,7 @@ import {
   getMessageActions,
   getNonImageAttachments,
   getReadByTooltipText,
+  isMessageBlocked,
   isUserMuted,
   mapToUserNameOrId,
   MESSAGE_ACTIONS,
@@ -543,4 +549,31 @@ describe('Message utils', () => {
       );
     });
   });
+
+  describe('isMessageBlocked function', () => {
+    it('returns true when message.shadowed is true', () => {
+      const message = fromPartial<LocalMessage>({
+        shadowed: true,
+        type: 'regular',
+      });
+      expect(isMessageBlocked(message)).toBe(true);
+    });
+
+    it('returns true for moderation remove error messages when not shadowed', () => {
+      const message = fromPartial<LocalMessage>({
+        moderation: { action: 'remove' },
+        shadowed: false,
+        type: 'error',
+      });
+      expect(isMessageBlocked(message)).toBe(true);
+    });
+
+    it('returns false when message is not shadowed and not a moderation remove error', () => {
+      const message = fromPartial<LocalMessage>({
+        shadowed: false,
+        type: 'regular',
+      });
+      expect(isMessageBlocked(message)).toBe(false);
+    });
+  });
 });

src/components/Message/utils.tsx

@@ -399,11 +399,12 @@ export const isMessageBounced = (
     message.moderation?.action === 'bounce');
 
 export const isMessageBlocked = (
-  message: Pick<LocalMessage, 'type' | 'moderation' | 'moderation_details'>,
+  message: Pick<LocalMessage, 'type' | 'moderation' | 'moderation_details' | 'shadowed'>,
 ) =>
-  message.type === 'error' &&
-  (message.moderation_details?.action === 'MESSAGE_RESPONSE_ACTION_REMOVE' ||
-    message.moderation?.action === 'remove');
+  message.shadowed ||
+  (message.type === 'error' &&
+    (message.moderation_details?.action === 'MESSAGE_RESPONSE_ACTION_REMOVE' ||
+      message.moderation?.action === 'remove'));
 
 export const isMessageDeleted = (message: LocalMessage): boolean =>
   Boolean(message.deleted_at || message.type === 'deleted' || message.deleted_for_me);