diff --git a/src/app/components/EventMenu.svelte b/src/app/components/EventMenu.svelte index 0527c34e..262ce96d 100644 --- a/src/app/components/EventMenu.svelte +++ b/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}) diff --git a/src/app/components/ProfileDetail.svelte b/src/app/components/ProfileDetail.svelte index 50f214bd..5cf4a61d 100644 --- a/src/app/components/ProfileDetail.svelte +++ b/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 diff --git a/src/app/components/ReactionSummary.svelte b/src/app/components/ReactionSummary.svelte index 812dc3d8..79e391c9 100644 --- a/src/app/components/ReactionSummary.svelte +++ b/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 { diff --git a/src/app/components/ReportMenu.svelte b/src/app/components/ReportMenu.svelte index 912aba64..261b8cd8 100644 --- a/src/app/components/ReportMenu.svelte +++ b/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" diff --git a/src/app/components/RoomDetail.svelte b/src/app/components/RoomDetail.svelte index 784f144d..889d4bf1 100644 --- a/src/app/components/RoomDetail.svelte +++ b/src/app/components/RoomDetail.svelte @@ -1,5 +1,4 @@