Merge pull request #625 from GetStream/isModerator-bug-fix

add-isModerator-role-check

Author: DanC5

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.3.1](https://github.com/GetStream/stream-chat-react/releases/tag/v3.3.1) 2020-12-9
+
+## Fix
+
+- Add additional user role check for `isModerator` boolean [#625](https://github.com/GetStream/stream-chat-react/pull/625)
+
 ## [3.3.0](https://github.com/GetStream/stream-chat-react/releases/tag/v3.3.0) 2020-12-3
 
 ## Feature

src/components/Message/__tests__/Message.test.js

@@ -513,6 +513,19 @@ describe('<Message /> component', () => {
     expect(getMessageActions()).toContain(MESSAGE_ACTIONS.delete);
   });
 
+  it('should allow user to edit and delete message when moderator role is set on client', async () => {
+    const amin = generateUser({
+      name: 'amin',
+      role: 'channel_moderator',
+    });
+    const client = await getTestClientWithUser(amin);
+    const message = generateMessage({ user: bob });
+    await renderComponent(message, {}, { client });
+    const { getMessageActions } = getRenderedProps();
+    expect(getMessageActions()).toContain(MESSAGE_ACTIONS.edit);
+    expect(getMessageActions()).toContain(MESSAGE_ACTIONS.delete);
+  });
+
   it('should allow user to edit and delete message when user is admin', async () => {
     const message = generateMessage({ user: bob });
     await renderComponent(

src/components/Message/hooks/useUserRole.js

@@ -16,6 +16,7 @@ export const useUserRole = (message) => {
     channel?.state?.membership?.role === 'admin';
   const isOwner = channel?.state?.membership?.role === 'owner';
   const isModerator =
+    client?.user?.role === 'channel_moderator' ||
     channel?.state?.membership?.role === 'channel_moderator' ||
     channel?.state?.membership?.role === 'moderator';
   const canEditMessage = isMyMessage || isModerator || isOwner || isAdmin;