Skip to content

Commit e341b09

Browse files
wesbillmannpub1cl47vfhsqpqy9pwndphpm36vcp7vvz5h2js4qpqm5yewzj7nutkq7xyw8c
andauthored
fix: expose community icon control on open relays (#2640)
Signed-off-by: npub1cl47vfhsqpqy9pwndphpm36vcp7vvz5h2js4qpqm5yewzj7nutkq7xyw8c <c7ebe626f000404285d3686e1dc74cc07cc60a9754a150041ba132e14bd3e2ec@buzz.block.builderlab.xyz> Co-authored-by: npub1cl47vfhsqpqy9pwndphpm36vcp7vvz5h2js4qpqm5yewzj7nutkq7xyw8c <c7ebe626f000404285d3686e1dc74cc07cc60a9754a150041ba132e14bd3e2ec@buzz.block.builderlab.xyz>
1 parent 710ed9f commit e341b09

4 files changed

Lines changed: 82 additions & 12 deletions

File tree

‎desktop/src/features/community-members/ui/CommunityMembersSettingsCard.tsx‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ import { nip19 } from "nostr-tools";
1212
import * as React from "react";
1313
import { toast } from "sonner";
1414

15+
import { canEditCommunityProfile } from "@/shared/api/relayMembers";
1516
import { useUsersBatchQuery } from "@/features/profile/hooks";
1617
import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
1718
import {
1819
useAddRelayMemberMutation,
1920
useChangeRelayMemberRoleMutation,
20-
useMyRelayMembershipQuery,
21+
useMyRelayMembershipLookupQuery,
2122
useRelayMembersQuery,
2223
useRemoveRelayMemberMutation,
2324
} from "@/features/community-members/hooks";
@@ -275,9 +276,13 @@ export function CommunityMembersSettingsCard({
275276
}: {
276277
currentPubkey?: string;
277278
}) {
278-
const myMembershipQuery = useMyRelayMembershipQuery();
279-
const currentRole = myMembershipQuery.data?.role ?? null;
279+
const myMembershipQuery = useMyRelayMembershipLookupQuery();
280+
const currentRole = myMembershipQuery.data?.membership?.role ?? null;
280281
const canManageRelay = currentRole === "owner" || currentRole === "admin";
282+
// Open relays do not advertise NIP-43, so they cannot expose an admin role
283+
// snapshot. Keep the icon editor available there and let the relay enforce
284+
// the authoritative owner/admin check on kind 9033.
285+
const canEditIcon = canEditCommunityProfile(myMembershipQuery.data);
281286
const membersQuery = useRelayMembersQuery(canManageRelay);
282287
const members = React.useMemo(
283288
() => membersQuery.data ?? [],
@@ -323,10 +328,22 @@ export function CommunityMembersSettingsCard({
323328
);
324329
}
325330

326-
if (!canManageRelay || !currentRole) {
331+
if (!canEditIcon) {
327332
return null;
328333
}
329334

335+
if (!canManageRelay || !currentRole) {
336+
return (
337+
<section className="min-w-0" data-testid="settings-community-members">
338+
<SettingsSectionHeader
339+
title="Community access"
340+
description="Manage how this community appears to members."
341+
/>
342+
<CommunityIconSettingsCard />
343+
</section>
344+
);
345+
}
346+
330347
const normalizedInput = normalizeRelayPubkeyInput(pubkeyInput);
331348
const canGrantAdmin = currentRole === "owner";
332349
const canAdd =

‎desktop/src/features/settings/ui/SettingsView.tsx‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import { getVersion } from "@tauri-apps/api/app";
33
import { AlertCircle, ArrowLeft, LoaderCircle, RefreshCw } from "lucide-react";
44

55
import { useMyRelayMembershipLookupQuery } from "@/features/community-members/hooks";
6-
import { shouldWarnMissingMembershipSnapshot } from "@/shared/api/relayMembers";
6+
import {
7+
canEditCommunityProfile,
8+
shouldWarnMissingMembershipSnapshot,
9+
} from "@/shared/api/relayMembers";
710
import { getFeature } from "@/shared/features/manifest";
811
import {
912
resolveEnabled,
@@ -126,8 +129,6 @@ export function SettingsView({
126129
const myMembershipQuery = useMyRelayMembershipLookupQuery();
127130
const featureState = useFeatureSnapshot();
128131
const visibleSections = React.useMemo(() => {
129-
const membership = myMembershipQuery.data?.membership;
130-
131132
return settingsSections.filter((s) => {
132133
// Feature gate check. Manifest is preview-only — if the gate id is in
133134
// the manifest, it's preview and needs an opt-in; if it's not, it's
@@ -138,12 +139,10 @@ export function SettingsView({
138139
return false;
139140
}
140141
}
141-
// Community members requires admin/owner role
142+
// Closed relays require a discovered admin/owner role. Open relays have
143+
// no NIP-43 snapshot, so expose only the relay-authorized profile editor.
142144
if (s.value === "community-members") {
143-
return (
144-
membership != null &&
145-
(membership.role === "owner" || membership.role === "admin")
146-
);
145+
return canEditCommunityProfile(myMembershipQuery.data);
147146
}
148147
return true;
149148
});

‎desktop/src/shared/api/relayMembers.test.mjs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import assert from "node:assert/strict";
22
import test from "node:test";
33

44
import {
5+
canEditCommunityProfile,
56
loadRelayMembershipLookup,
67
shouldWarnMissingMembershipSnapshot,
78
} from "./relayMembers.ts";
@@ -35,6 +36,50 @@ test("membership relays request their membership snapshot", async () => {
3536
assert.equal(lookup.membership?.role, "admin");
3637
});
3738

39+
test("community profile editing is visible on open relays", () => {
40+
assert.equal(
41+
canEditCommunityProfile({
42+
snapshotFound: false,
43+
membershipRequired: false,
44+
membership: null,
45+
}),
46+
true,
47+
);
48+
});
49+
50+
test("community profile editing is visible to closed-relay admins and owners", () => {
51+
for (const role of ["admin", "owner"]) {
52+
assert.equal(
53+
canEditCommunityProfile({
54+
snapshotFound: true,
55+
membershipRequired: true,
56+
membership: { pubkey: "a".repeat(64), role },
57+
}),
58+
true,
59+
);
60+
}
61+
});
62+
63+
test("community profile editing stays hidden while loading and from closed-relay non-admins", () => {
64+
assert.equal(canEditCommunityProfile(undefined), false);
65+
assert.equal(
66+
canEditCommunityProfile({
67+
snapshotFound: true,
68+
membershipRequired: true,
69+
membership: { pubkey: "a".repeat(64), role: "member" },
70+
}),
71+
false,
72+
);
73+
assert.equal(
74+
canEditCommunityProfile({
75+
snapshotFound: true,
76+
membershipRequired: true,
77+
membership: null,
78+
}),
79+
false,
80+
);
81+
});
82+
3883
test("missing snapshot warns when the relay requires membership", () => {
3984
assert.equal(
4085
shouldWarnMissingMembershipSnapshot({

‎desktop/src/shared/api/relayMembers.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ export type RelayMembershipLookup = {
3838
membership: RelayMember | null;
3939
};
4040

41+
export function canEditCommunityProfile(
42+
lookup: RelayMembershipLookup | undefined,
43+
): boolean {
44+
const role = lookup?.membership?.role;
45+
return (
46+
lookup?.membershipRequired === false || role === "owner" || role === "admin"
47+
);
48+
}
49+
4150
export function shouldWarnMissingMembershipSnapshot(
4251
lookup: RelayMembershipLookup | undefined,
4352
): boolean {

0 commit comments

Comments
 (0)