Address RBAC review feedback

src/app/components/EventMenu.svelte

@@ -17,8 +17,12 @@
   import Report from "@app/components/Report.svelte"
   import EventShare from "@app/components/EventShare.svelte"
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {hasNip29, deriveUserIsSpaceAdmin} from "@app/core/state"
-  import {hasPermission} from "@app/core/roles"
+  import {
+    deriveUserIsSpaceAdmin,
+    deriveHasPermission,
+    ROOM_PERMISSION_DELETE_EVENT,
+  } from "@app/core/roles"
+  import {hasNip29} from "@app/core/state"
   import {pushModal} from "@app/util/modal"
   import {pushToast} from "@app/util/toast"
   import {makeSpaceChatPath} from "@app/util/routes"
@@ -35,7 +39,9 @@
 
   const isRoot = event.kind !== COMMENT
   const h = getTagValue("h", event.tags)
-  const canDelete = h ? hasPermission(url, h, 9005) : deriveUserIsSpaceAdmin(url)
+  const canDelete = h
+    ? deriveHasPermission(url, h, ROOM_PERMISSION_DELETE_EVENT)
+    : deriveUserIsSpaceAdmin(url)
 
   const report = () => pushModal(Report, {url, event})
 

src/app/components/ProfileDetail.svelte

@@ -31,7 +31,12 @@
   import ProfileBadges from "@app/components/ProfileBadges.svelte"
   import RoleBadge from "@app/components/RoleBadge.svelte"
   import {pubkeyLink, deriveSpaceBannedPubkeyItems} from "@app/core/state"
-  import {deriveUserHasSpacePermission, deriveSpaceMemberRoleInfo} from "@app/core/roles"
+  import {
+    deriveUserHasSpacePermission,
+    deriveSpaceMemberRoleInfo,
+    ROOM_PERMISSION_ADD_MEMBER,
+    ROOM_PERMISSION_BAN_USER,
+  } from "@app/core/roles"
   import {addSpaceMembers} from "@app/core/commands"
   import {pushModal} from "@app/util/modal"
   import {pushToast} from "@app/util/toast"
@@ -46,9 +51,11 @@
 
   const profile = deriveProfile(pubkey, removeUndefined([url]))
 
-  const canBan = url ? deriveUserHasSpacePermission(url, 9009) : readable(false)
+  const canBan = url ? deriveUserHasSpacePermission(url, ROOM_PERMISSION_BAN_USER) : readable(false)
 
-  const canRestore = url ? deriveUserHasSpacePermission(url, 9000) : readable(false)
+  const canRestore = url
+    ? deriveUserHasSpacePermission(url, ROOM_PERMISSION_ADD_MEMBER)
+    : readable(false)
 
   const bannedPubkeys = url ? deriveSpaceBannedPubkeyItems(url) : undefined
 

src/app/components/ReactionSummary.svelte

@@ -23,7 +23,8 @@
   import Icon from "@lib/components/Icon.svelte"
   import Reaction from "@app/components/Reaction.svelte"
   import ReportDetails from "@app/components/ReportDetails.svelte"
-  import {REACTION_KINDS, deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
+  import {REACTION_KINDS} from "@app/core/state"
   import {pushModal} from "@app/util/modal"
 
   interface Props {

src/app/components/ReportMenu.svelte

@@ -12,7 +12,7 @@
   import Popover from "@lib/components/Popover.svelte"
   import Button from "@lib/components/Button.svelte"
   import Confirm from "@lib/components/Confirm.svelte"
-  import {deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
   import {publishDelete, canEnforceNip70} from "@app/core/commands"
   import {pushToast} from "@app/util/toast"
   import {pushModal} from "@app/util/modal"

src/app/components/RoomDetail.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import {sortBy} from "@welshman/lib"
   import {goto} from "$app/navigation"
   import type {RoomMeta} from "@welshman/util"
   import {displayRelayUrl, makeRoomMeta} from "@welshman/util"
@@ -33,11 +32,16 @@
   import RoomEdit from "@app/components/RoomEdit.svelte"
   import RoomName from "@app/components/RoomName.svelte"
   import RoomImage from "@app/components/RoomImage.svelte"
-  import {deriveRoomRoles, hasPermission} from "@app/core/roles"
+  import {
+    deriveRoomMembers,
+    deriveRoomRoles,
+    deriveUserIsRoomAdmin,
+    deriveHasPermission,
+    sortRolesDesc,
+    ROOM_PERMISSION_EDIT_META,
+  } from "@app/core/roles"
   import {
     deriveRoom,
-    deriveRoomMembers,
-    deriveUserIsRoomAdmin,
     deriveUserRoomMembershipStatus,
     deriveUserRooms,
     deriveShouldNotify,
@@ -63,7 +67,7 @@
   const members = deriveRoomMembers(url, h)
   const roomRoles = deriveRoomRoles(url, h)
   const userIsAdmin = deriveUserIsRoomAdmin(url, h)
-  const canEditMetadata = hasPermission(url, h, 9002)
+  const canEditMetadata = deriveHasPermission(url, h, ROOM_PERMISSION_EDIT_META)
   const membershipStatus = deriveUserRoomMembershipStatus(url, h)
   const userRooms = deriveUserRooms(url)
 
@@ -71,8 +75,7 @@
   const shouldNotify = deriveShouldNotify(url, h)
 
   const roleRows = $derived.by(() =>
-    sortBy(
-      role => -(role.order ?? -Infinity),
+    sortRolesDesc(
       Array.from($roomRoles.roles.values()).map(role => ({
         name: role.name,
         label: role.label,

src/app/components/RoomItemMenu.svelte

@@ -13,7 +13,7 @@
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
   import {pushModal} from "@app/util/modal"
   import {pushToast} from "@app/util/toast"
-  import {deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
 
   type Props = {
     url: string

src/app/components/RoomMembers.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {first, sortBy} from "@welshman/lib"
+  import {first, removeUndefined, sortBy} from "@welshman/lib"
   import {waitForThunkError, removeRoomMember} from "@welshman/app"
   import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
   import MinusCircle from "@assets/icons/minus-circle.svg?dataurl"
@@ -21,8 +21,15 @@
   import RoomName from "@app/components/RoomName.svelte"
   import RoomMembersAdd from "@app/components/RoomMembersAdd.svelte"
   import type {RoomMember} from "@app/core/roles"
-  import {deriveRoom, deriveRoomMembers} from "@app/core/state"
-  import {deriveRoomRoles, hasPermission} from "@app/core/roles"
+  import {
+    deriveRoomMembers,
+    deriveRoomRoles,
+    deriveHasPermission,
+    sortRolesDesc,
+    ROOM_PERMISSION_ADD_MEMBER,
+    ROOM_PERMISSION_REMOVE_MEMBER,
+  } from "@app/core/roles"
+  import {deriveRoom} from "@app/core/state"
   import {pushModal} from "@app/util/modal"
   import {pushToast} from "@app/util/toast"
 
@@ -36,8 +43,8 @@
   const room = deriveRoom(url, h)
   const members = deriveRoomMembers(url, h)
   const roomRoles = deriveRoomRoles(url, h)
-  const canAddMembers = hasPermission(url, h, 9000)
-  const canRemoveMembers = hasPermission(url, h, 9001)
+  const canAddMembers = deriveHasPermission(url, h, ROOM_PERMISSION_ADD_MEMBER)
+  const canRemoveMembers = deriveHasPermission(url, h, ROOM_PERMISSION_REMOVE_MEMBER)
 
   const back = () => history.back()
 
@@ -52,8 +59,7 @@
   const getResolvedRoles = (member: RoomMember) =>
     removeUndefined(member.roles.map(roleName => $roomRoles.roles.get(roleName)))
 
-  const getPrimaryRole = (member: RoomMember) =>
-    first(sortBy(role => -(role.order ?? -Infinity), getResolvedRoles(member)))
+  const getPrimaryRole = (member: RoomMember) => first(sortRolesDesc(getResolvedRoles(member)))
 
   const memberGroups = $derived.by(() => {
     const byRole = new Map<
@@ -102,9 +108,6 @@
     return groups
   })
 
-  const removeUndefined = <T,>(items: Array<T | undefined>): T[] =>
-    items.filter((item): item is T => item !== undefined)
-
   const addMember = () => pushModal(RoomMembersAdd, {url, h})
 
   const removeMember = (pubkey: string) =>

src/app/components/SpaceDetail.svelte

@@ -18,7 +18,7 @@
   import SpaceRelayStatus from "@app/components/SpaceRelayStatus.svelte"
   import RelayDescription from "@app/components/RelayDescription.svelte"
   import ProfileLatest from "@app/components/ProfileLatest.svelte"
-  import {deriveUserHasSpacePermission} from "@app/core/roles"
+  import {deriveUserHasSpacePermission, ROOM_PERMISSION_EDIT_META} from "@app/core/roles"
   import {pushModal} from "@app/util/modal"
 
   type Props = {
@@ -28,7 +28,7 @@
   const {url}: Props = $props()
   const relay = deriveRelay(url)
   const owner = $derived($relay?.pubkey)
-  const canEdit = deriveUserHasSpacePermission(url, 9002)
+  const canEdit = deriveUserHasSpacePermission(url, ROOM_PERMISSION_EDIT_META)
 
   const back = () => history.back()
 

src/app/components/SpaceMembers.svelte

@@ -29,7 +29,13 @@
     deriveSpaceBannedPubkeyItems,
     deriveSupportedMethods,
   } from "@app/core/state"
-  import {deriveSpaceMemberRoleInfo, deriveUserHasSpacePermission} from "@app/core/roles"
+  import {
+    deriveSpaceMemberRoleInfo,
+    deriveUserHasSpacePermission,
+    ROOM_PERMISSION_ADD_MEMBER,
+    ROOM_PERMISSION_REMOVE_MEMBER,
+    ROOM_PERMISSION_BAN_USER,
+  } from "@app/core/roles"
   import {pushModal} from "@app/util/modal"
   import {pushToast} from "@app/util/toast"
 
@@ -42,9 +48,9 @@
   const members = deriveSpaceMembers(url)
   const bans = deriveSpaceBannedPubkeyItems(url)
   const spaceMemberRoles = deriveSpaceMemberRoleInfo(url)
-  const canAddMember = deriveUserHasSpacePermission(url, 9000)
-  const canBanByPermission = deriveUserHasSpacePermission(url, 9009)
-  const canUnallowByPermission = deriveUserHasSpacePermission(url, 9001)
+  const canAddMember = deriveUserHasSpacePermission(url, ROOM_PERMISSION_ADD_MEMBER)
+  const canBanByPermission = deriveUserHasSpacePermission(url, ROOM_PERMISSION_BAN_USER)
+  const canUnallowByPermission = deriveUserHasSpacePermission(url, ROOM_PERMISSION_REMOVE_MEMBER)
   const supportedMethods = deriveSupportedMethods(url)
   const canBan = $derived(
     $canBanByPermission && $supportedMethods.includes(ManagementMethod.BanPubkey),

src/app/components/SpaceMenu.svelte

@@ -40,6 +40,7 @@
   import SpaceMenuRoomItem from "@app/components/SpaceMenuRoomItem.svelte"
   import VoiceWidget from "@app/components/VoiceWidget.svelte"
   import SocketStatusIndicator from "@app/components/SocketStatusIndicator.svelte"
+  import {deriveUserIsSpaceAdmin} from "@app/core/roles"
   import {
     ENABLE_ZAPS,
     CONTENT_KINDS,
@@ -50,7 +51,6 @@
     userSpaceUrls,
     hasNip29,
     deriveUserCanCreateRoom,
-    deriveUserIsSpaceAdmin,
     deriveEventsForUrl,
     deriveSpaceActionItems,
     notificationSettings,