Skip to content

Commit c1a8607

Browse files
Allow user blocking only in DM-type channels
1 parent 16af18d commit c1a8607

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

src/components/ChannelListItem/ChannelListItemActionButtons.defaults.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,11 @@ export const useBaseChannelActionSetFilter = (channelActionSet: ChannelActionIte
472472
const membership = useChannelMembershipState(channel);
473473
const memberCount = channel.data?.member_count ?? 0;
474474
const connectedUserIsMember = typeof membership.user !== 'undefined';
475+
const isDirectMessageChannel =
476+
connectedUserIsMember &&
477+
memberCount === 2 &&
478+
channel.type === 'messaging' &&
479+
channel.id?.startsWith('!members-');
475480

476481
const ownCapabilities = channel.data?.own_capabilities;
477482

@@ -486,9 +491,7 @@ export const useBaseChannelActionSetFilter = (channelActionSet: ChannelActionIte
486491
return ownCapabilities?.includes('mute-channel');
487492
case 'ban':
488493
return (
489-
memberCount > 0 &&
490-
memberCount <= 2 &&
491-
ownCapabilities?.includes('ban-channel-members')
494+
isDirectMessageChannel && ownCapabilities?.includes('ban-channel-members')
492495
);
493496
case 'leave':
494497
return ownCapabilities?.includes('leave-channel');
@@ -500,5 +503,5 @@ export const useBaseChannelActionSetFilter = (channelActionSet: ChannelActionIte
500503
});
501504

502505
return filtered;
503-
}, [channelActionSet, memberCount, ownCapabilities, connectedUserIsMember]);
506+
}, [channelActionSet, connectedUserIsMember, ownCapabilities, isDirectMessageChannel]);
504507
};

0 commit comments

Comments
 (0)