Merge pull request #140 from callmeehko/main

fixed issue where server members could edit roles even without permission
Nerimity · Feb 2, 2025 · 856180a · 856180a
2 parents 543ba17 + 624af22
commit 856180a
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/components/floating-profile/FloatingProfile.tsx b/src/components/floating-profile/FloatingProfile.tsx
@@ -55,6 +55,7 @@ import Button from "../ui/Button";
 import { FlexRow } from "../ui/Flexbox";
 import { emitDrawerGoToMain } from "@/common/GlobalEvents";
 import { emojiToUrl } from "@/common/emojiToUrl";
+import { ROLE_PERMISSIONS } from "@/chat-api/Bitwise";
 
 interface Props {
   dmPane?: boolean;
@@ -198,6 +199,11 @@ const DesktopProfileFlyout = (props: {
       ? serverMembers.get(props.serverId, props.userId)
       : undefined;
 
+  const accountMember = () =>
+    props.serverId
+      ? serverMembers.get(props.serverId, account.user()?.id!)
+      : undefined;
+
   createEffect(
     on(
       () => props.userId,
@@ -437,12 +443,14 @@ const DesktopProfileFlyout = (props: {
               </div>
             )}
           </For>
-          <div
-            class={classNames(styles.roleContainer, styles.selectable)}
-            onClick={showRoleModal}
-          >
-            <Icon name="add" size={14} />
-          </div>
+          <Show when={accountMember()?.hasPermission(ROLE_PERMISSIONS.MANAGE_ROLES)}>
+            <div
+              class={classNames(styles.roleContainer, styles.selectable)}
+              onClick={showRoleModal}
+            >
+              <Icon name="add" size={14} />
+            </div>
+          </Show>
         </div>
       </Show>