fix: modernize global server ban/unban

Author: Bilb

.woodpecker/build-linux.yaml

@@ -47,13 +47,14 @@ import { WithMessageId } from '../../../../session/types/with';
 import { DeleteItem } from '../../../menu/items/DeleteMessage/DeleteMessageMenuItem';
 import { RetryItem } from '../../../menu/items/RetrySend/RetrySendMenuItem';
 import { useBanUserCb } from '../../../menuAndSettingsHooks/useBanUser';
-import { useUnbanUserCb } from '../../../menuAndSettingsHooks/useUnbanUser';
 import { tr } from '../../../../localization/localeTools';
 import { sectionActions } from '../../../../state/ducks/section';
 import { useRemoveSenderFromCommunityAdmin } from '../../../menuAndSettingsHooks/useRemoveSenderFromCommunityAdmin';
 import { useAddSenderAsCommunityAdmin } from '../../../menuAndSettingsHooks/useAddSenderAsCommunityAdmin';
-import { useServerBanUserCb } from '../../../menuAndSettingsHooks/useServerBanUser';
-import { useServerUnbanUserCb } from '../../../menuAndSettingsHooks/useServerUnbanUser';
+import {
+  useAddUserPermissions,
+  useClearUserPermissions,
+} from '../../../menuAndSettingsHooks/useAddUserPermissions';
 
 export type MessageContextMenuSelectorProps = Pick<
   MessageRenderingProps,
@@ -98,10 +99,27 @@ const CommunityAdminActionItems = ({ messageId }: WithMessageId) => {
   const sender = useMessageSender(messageId);
   const isSenderAdmin = useMessageSenderIsAdmin(messageId);
 
-  const banUserCb = useBanUserCb(convoId, sender);
-  const unbanUserCb = useUnbanUserCb(convoId, sender);
-  const serverBanUser = useServerBanUserCb(convoId, sender);
-  const serverUnbanUser = useServerUnbanUserCb(convoId, sender);
+  const sharedBanUnbanProps = {
+    conversationId: convoId,
+    pubkey: sender,
+  };
+
+  const banUserCb = useBanUserCb({
+    banType: 'ban',
+    ...sharedBanUnbanProps,
+  });
+  const unbanUserCb = useBanUserCb({
+    banType: 'unban',
+    ...sharedBanUnbanProps,
+  });
+  const serverBanUser = useBanUserCb({
+    banType: 'server-ban',
+    ...sharedBanUnbanProps,
+  });
+  const serverUnbanUser = useBanUserCb({
+    banType: 'server-unban',
+    ...sharedBanUnbanProps,
+  });
 
   const removeSenderFromCommunityAdminCb = useRemoveSenderFromCommunityAdmin({
     conversationId: convoId,
@@ -113,22 +131,16 @@ const CommunityAdminActionItems = ({ messageId }: WithMessageId) => {
     senderId: sender,
   });
 
-  const addUploadPermission = () => {
-    void MessageInteraction.addUserPermissions(sender, convoId, ['upload']);
-  };
-
-  const clearUploadPermission = () => {
-    void MessageInteraction.clearUserPermissions(sender, convoId, ['upload']);
-  };
+  const addUploadPermissionCb = useAddUserPermissions(sender, convoId, ['upload']);
+  const clearUploadPermissionCb = useClearUserPermissions(sender, convoId, ['upload']);
 
-  // TODO: This codebase is a pain.
-  // Fixed to `true`.
+  // Fixed to `true` as not currently exposed by the backend/tracked in session-desktop
   const isRoomUploadRestricted = true;
   const canSenderUpload = true;
   const canSenderNotUpload = true;
 
   // Note: add/removeSenderFromCommunityAdminCb can be null if we are a moderator only, see below
-  if (!convoId || !sender || !banUserCb || !unbanUserCb || !serverBanUser || !serverUnbanUser) {
+  if (!convoId || !sender || !banUserCb || !unbanUserCb) {
     return null;
   }
 
@@ -148,24 +160,25 @@ const CommunityAdminActionItems = ({ messageId }: WithMessageId) => {
           {tr('adminPromoteToAdmin')}
         </ItemWithDataTestId>
       ) : null}
-      <ItemWithDataTestId onClick={serverBanUser}>
-        {tr('serverBanUser').toString()}
-      </ItemWithDataTestId>
-      <ItemWithDataTestId onClick={serverUnbanUser}>
-        {tr('serverUnbanUser').toString()}
-      </ItemWithDataTestId>
+
+      {serverBanUser ? (
+        <ItemWithDataTestId onClick={serverBanUser}>{tr('serverBanUser')}</ItemWithDataTestId>
+      ) : null}
+      {serverUnbanUser ? (
+        <ItemWithDataTestId onClick={serverUnbanUser}>{tr('serverUnbanUser')}</ItemWithDataTestId>
+      ) : null}
       {!isSenderAdmin && isRoomUploadRestricted && (
         <>
-          {canSenderUpload && (
-            <ItemWithDataTestId onClick={addUploadPermission}>
-              {tr('addUploadPermission').toString()}
+          {canSenderUpload && addUploadPermissionCb ? (
+            <ItemWithDataTestId onClick={addUploadPermissionCb}>
+              {tr('addUploadPermission')}
             </ItemWithDataTestId>
-          )}
-          {canSenderNotUpload && (
-            <ItemWithDataTestId onClick={clearUploadPermission}>
-              {tr('clearUploadPermission').toString()}
+          ) : null}
+          {canSenderNotUpload && clearUploadPermissionCb ? (
+            <ItemWithDataTestId onClick={clearUploadPermissionCb}>
+              {tr('clearUploadPermission')}
             </ItemWithDataTestId>
-          )}
+          ) : null}
         </>
       )}
     </>