fix: 🐛 Hide "settings" from server context menu when you don't have p…

…ermissions to access it.
Nerimity · Jan 7, 2023 · 929d4ce · 929d4ce
1 parent 7c900ae
commit 929d4ce
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/chat-api/Bitwise.ts b/src/chat-api/Bitwise.ts
@@ -4,6 +4,7 @@ export interface Bitwise {
   description?: string;
   bit: number;
   icon?: string
+  showSettings?: boolean; // determine should this permission reveal the "settings" option context menu
 }
 
 export const USER_BADGES = {
@@ -31,12 +32,14 @@ export const CHANNEL_PERMISSIONS = {
     icon: 'mail'
   }
 }
+
 export const ROLE_PERMISSIONS = {
   ADMIN: {
     name: 'servers.rolePermissions.admin',
     description: 'servers.rolePermissions.adminDescription',
     bit: 1,
     // icon: 'mail'
+    showSettings: true,
   },
   SEND_MESSAGE: {
     name: 'servers.rolePermissions.sendMessage',
@@ -49,23 +52,27 @@ export const ROLE_PERMISSIONS = {
     description: 'servers.rolePermissions.manageRolesDescription',
     // icon: 'mail',
     bit: 4,
+    showSettings: true,
   },
   MANAGE_CHANNELS: {
     name: 'servers.rolePermissions.manageChannels',
     description: 'servers.rolePermissions.manageChannelsDescription',
     // icon: 'mail',
     bit: 8,
+    showSettings: true,
   },
   KICK: {
     name: 'servers.rolePermissions.kick',
     description: 'servers.rolePermissions.kickDescription',
     bit: 16,
     // icon: 'mail'
+    showSettings: true,
   },
   BAN: {
     name: 'servers.rolePermissions.ban',
     description: 'servers.rolePermissions.banDescription',
     bit: 32,
+    showSettings: true,
     // icon: 'mail'
   }
 }

diff --git a/src/common/ServerSettings.ts b/src/common/ServerSettings.ts
@@ -7,7 +7,7 @@ export interface ServerSetting {
     icon: string;
     requiredRolePermission?: Bitwise,
     hideDrawer?: boolean
-    element: any
+    element: any,
 }
 
 const serverSettings: ServerSetting[] =  [

diff --git a/src/components/servers/context-menu/ContextMenuServer.tsx b/src/components/servers/context-menu/ContextMenuServer.tsx
@@ -3,6 +3,7 @@ import RouterEndpoints from "@/common/RouterEndpoints";
 import ContextMenu, { ContextMenuProps } from "@/components/ui/context-menu/ContextMenu";
 import useStore from "@/chat-api/store/useStore";
 import { useNavigate } from "@nerimity/solid-router";
+import { Bitwise, ROLE_PERMISSIONS } from "@/chat-api/Bitwise";
 
 type Props = Omit<ContextMenuProps, 'items'> & {
   serverId?: string
@@ -11,7 +12,7 @@ type Props = Omit<ContextMenuProps, 'items'> & {
 export default function ContextMenuServer (props: Props) {
 
   const navigate = useNavigate();
-  const {account, servers} = useStore();
+  const {account, servers, serverMembers} = useStore();
 
   const server = () => servers.get(props.serverId!);
 
@@ -22,12 +23,24 @@ export default function ContextMenuServer (props: Props) {
     await server()?.leave();
   }
 
+  const member = () => serverMembers.get(props.serverId!, account.user()?.id!);
+
+  const showSettings = () => {
+    if (isServerCreator()) return true;
+    return Object.values(ROLE_PERMISSIONS).find((p: Bitwise) => {
+      if (!member()?.hasPermission(p)) return false;
+      if (p.showSettings) return true;
+      return false;
+    })
+
+  };
+
   return (
     <ContextMenu {...props} items={[
       {icon: 'markunread_mailbox', label: "Mark As Read", disabled: true},
       {separator: true},
       {icon: 'mail', label: "Invites", onClick: () => navigate(RouterEndpoints.SERVER_SETTINGS_INVITES(props.serverId!))},
-      {icon: 'settings', label: "Settings", onClick: () => navigate(RouterEndpoints.SERVER_SETTINGS_GENERAL(props.serverId!))},
+      ...(showSettings() ? [{icon: 'settings', label: "Settings", onClick: () => navigate(RouterEndpoints.SERVER_SETTINGS_GENERAL(props.serverId!))}] : []),
       {separator: true},
       {icon: 'copy', label: "Copy ID", onClick: () => copyToClipboard(props.serverId!)},
       {separator: true, show: !isServerCreator()},