coracle/flotilla
1
6
Fork 24
Code Issues 42 Pull Requests 2 Actions Packages Projects 5 Releases Wiki Activity

Refactor: use relay-provided member lists as source of truth #191

Merged
hodlbod merged 8 commits from nayan9617/flotilla:dev into dev 2026-04-13 21:12:51 +00:00
Conversation 6 Commits 8 Files Changed 9
+215 -156
nayan9617 commented 2026-04-11 16:24:43 +00:00
Contributor
Copy Link
Copy Source

Fixes #85

Changes:

  1. Replace deriveSpaceMembers / deriveRoomMembers with relay-based lists
  2. Remove global ADD/REMOVE sync from syncSpace
  3. Fallback to user-specific add/remove history when member list is unavailable
  4. Add explicit UI state when member list is missing

This simplifies membership handling and avoids inconsistencies caused by replaying global join/leave events.

Fixes #85 ## Changes: 1. Replace deriveSpaceMembers / deriveRoomMembers with relay-based lists 2. Remove global ADD/REMOVE sync from syncSpace 3. Fallback to user-specific add/remove history when member list is unavailable 4. Add explicit UI state when member list is missing This simplifies membership handling and avoids inconsistencies caused by replaying global join/leave events.
nayan9617 added 2 commits 2026-04-11 16:24:44 +00:00
Use relay member lists directly 667e170351
Trim room member sync 1bac21ba2a
userAdityaa commented 2026-04-11 17:24:45 +00:00
Collaborator
Copy Link
Copy Source

Hey @nayan9617, could you please update the PR? It currently has merge conflicts.

Hey [@nayan9617](https://gitea.coracle.social/nayan9617), could you please update the PR? It currently has merge conflicts.
nayan9617 added 1 commit 2026-04-11 17:33:41 +00:00
Merge upstream and keep member-list sync clean 7500b48806
nayan9617 commented 2026-04-11 17:34:42 +00:00
Author
Contributor
Copy Link
Copy Source

@userAdityaa yupp, resolved!

@userAdityaa yupp, resolved!
👍 1
hodlbod reviewed 2026-04-11 17:43:28 +00:00
hodlbod left a comment
Owner
Copy Link
Copy Source

I have a few comments to start with, can you also try to avoid re-ordering the stuff in core/state? It makes it quite hard to review in detail. Also make sure to rebase on dev and fix conflicts.

I have a few comments to start with, can you also try to avoid re-ordering the stuff in core/state? It makes it quite hard to review in detail. Also make sure to rebase on dev and fix conflicts.
src/app/components/RoomMembersAdd.svelte Outdated
@@ -59,0 +63,4 @@
message: "Cannot add members: space member list not available from this relay",
})
return
}
hodlbod commented 2026-04-11 17:31:43 +00:00
Owner
Copy Link
Copy Source

Don't fail here, just skip the space membership step if there's no member list.

Don't fail here, just skip the space membership step if there's no member list.
hodlbod marked this conversation as resolved
src/app/components/SpaceMembers.svelte Outdated
@@ -152,1 +115,3 @@
</div>
{#if $members === undefined}
<div class="card2 bg-base-200 p-4">
<span class="text-error">Member list not available from this relay</span>
hodlbod commented 2026-04-11 17:32:01 +00:00
Owner
Copy Link
Copy Source

Use "space" instead of "relay"

Use "space" instead of "relay"
hodlbod marked this conversation as resolved
src/app/components/SpaceMenu.svelte Outdated
@@ -183,2 +183,3 @@
<Icon icon={UserRounded} />
View Members ({$members.length})
{#if $members === undefined}
View Members (unavailable)
hodlbod commented 2026-04-11 17:32:31 +00:00
Owner
Copy Link
Copy Source

Remove (unavailable)

Remove `(unavailable)`
src/app/core/commands.ts Outdated
@@ -769,0 +770,4 @@
// Cannot add members without access to the member list
if (spaceMembers === undefined) {
return "Member list not available from this relay"
}
hodlbod commented 2026-04-11 17:33:41 +00:00
Owner
Copy Link
Copy Source

Don't fail hard, just send all pubkeys (change the filter line to .filter(pubkey => spaceMembers && !spaceMembers.includes(pubkey)))

Don't fail hard, just send all pubkeys (change the filter line to `.filter(pubkey => spaceMembers && !spaceMembers.includes(pubkey))`)
hodlbod marked this conversation as resolved
src/app/core/state.ts Outdated
@@ -808,36 +809,51 @@ export const deriveOtherRooms = (url: string) =>
// Space/room memberships
hodlbod commented 2026-04-11 17:42:53 +00:00
Owner
Copy Link
Copy Source

Let's just keep calling this getSpaceMembers. I was thinking of using the list directly, but it's more convenient to return the uniqe list of pubkeys. However, you might change the body to:

([event]) => uniq(getTagValues("member", event?.tags ?? []))

Same thing in deriveRoomMemberList (which should be deriveRoomMembers).

Let's just keep calling this `getSpaceMembers`. I was thinking of using the list directly, but it's more convenient to return the uniqe list of pubkeys. However, you might change the body to: ```typescript ([event]) => uniq(getTagValues("member", event?.tags ?? [])) ``` Same thing in deriveRoomMemberList (which should be deriveRoomMembers).
hodlbod marked this conversation as resolved
src/app/core/sync.ts Outdated
@@ -178,1 +177,3 @@
{kinds: [RELAY_REMOVE_MEMBER], "#p": [$pubkey], limit: 1},
// Keep current-user membership history so status replay stays deterministic.
{kinds: [RELAY_ADD_MEMBER], "#p": [$pubkey]},
{kinds: [RELAY_REMOVE_MEMBER], "#p": [$pubkey]},
hodlbod commented 2026-04-11 17:39:40 +00:00
Owner
Copy Link
Copy Source

Keep the limit, we want that

Keep the limit, we want that
src/app/core/sync.ts Outdated
@@ -197,1 +197,3 @@
{kinds: [ROOM_REMOVE_MEMBER], "#p": [$pubkey], "#h": [h], limit: 1},
// Keep current-user membership history so status replay stays deterministic.
{kinds: [ROOM_ADD_MEMBER], "#p": [$pubkey], "#h": [h]},
{kinds: [ROOM_REMOVE_MEMBER], "#p": [$pubkey], "#h": [h]},
hodlbod commented 2026-04-11 17:39:55 +00:00
Owner
Copy Link
Copy Source

Keep the limit, remove the comment

Keep the limit, remove the comment
src/app/core/sync.ts Outdated
@@ -298,3 +300,3 @@
const roomMemberKinds = [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER]
const roomDeleteKinds = [ROOM_DELETE, ROOM_JOIN, ROOM_LEAVE]
pullAndListen({
hodlbod commented 2026-04-11 17:40:08 +00:00
Owner
Copy Link
Copy Source

Remove the comment

Remove the comment
hodlbod marked this conversation as resolved
src/app/editor/index.ts Outdated
@@ -65,3 +65,3 @@
throttled(800, profiles),
throttled(800, handlesByNip05),
throttled(800, deriveSpaceMembers(url || "")),
throttled(800, deriveRelayMemberList(url || "")),
hodlbod commented 2026-04-11 17:40:39 +00:00
Owner
Copy Link
Copy Source

Remove the comment

Remove the comment
src/routes/spaces/[relay]/chat/+page.svelte Outdated
@@ -259,3 +259,3 @@
at: at || now(),
element: element!,
filters: [{kinds: [MESSAGE, RELAY_ADD_MEMBER]}],
filters: [{kinds: [...CONTENT_KINDS, MESSAGE]}],
hodlbod commented 2026-04-11 17:41:03 +00:00
Owner
Copy Link
Copy Source

This is incorrect, it should be the way it was before.

This is incorrect, it should be the way it was before.
nayan9617 added 1 commit 2026-04-11 18:03:02 +00:00
updated changes based on review 8d1e4e3235
nayan9617 added 1 commit 2026-04-11 18:13:19 +00:00
Allow member adds without list 3800439a40
hodlbod reviewed 2026-04-13 17:05:47 +00:00
hodlbod left a comment
Owner
Copy Link
Copy Source

Looks good, just one nitpick

Looks good, just one nitpick
src/app/core/state.ts Outdated
@@ -810,3 +810,2 @@
const getSpaceMembers = (_url: string, events: TrustedEvent[]) => {
const members = new Set<string>()
export const getSpaceMembers = (url: string) =>
hodlbod commented 2026-04-13 17:03:57 +00:00
Owner
Copy Link
Copy Source

This should be renamed to deriveSpaceMembers since it returns a svelte store, not the value itself.

This should be renamed to deriveSpaceMembers since it returns a svelte store, not the value itself.
hodlbod marked this conversation as resolved
nayan9617 added 1 commit 2026-04-13 17:54:26 +00:00
merge upstream 846c43ef2d
nayan9617 added 1 commit 2026-04-13 18:20:42 +00:00
Rename space members store helper 3e41ad469f
nayan9617 commented 2026-04-13 18:32:25 +00:00
Author
Contributor
Copy Link
Copy Source

@hodlbod Rebased and renamed to deriveSpaceMembers across all call sites. Ready for final review.

@hodlbod Rebased and renamed to deriveSpaceMembers across all call sites. Ready for final review.
nayan9617 added 1 commit 2026-04-13 20:06:20 +00:00
merge upstream 8e9bd53606
hodlbod merged commit b46fd94578 into dev 2026-04-13 21:12:51 +00:00
hodlbod commented 2026-04-13 21:12:58 +00:00
Owner
Copy Link
Copy Source

Thanks, looks good!

Thanks, looks good!
Sign in to join this conversation.
Reviewers
No Reviewers
hodlbod
Labels
Clear labels
design
For issues related to design work. Development should be done in another issue and refer back to this one.
 dev
Issues related to development work
 easy
Issues that can be executed on by new contributors
 idea
For issues that aren't yet actionable
 priority
For issues related to high priority features and bugs
 usability
Issues that have to be validated with real live human beings.
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
hodlbod (hodlbod) mplorentz (Matt Lorentz) sakshamjain (Saksham Jain) sondreb triesap userAdityaa (Aditya Chaudhary)
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: coracle/flotilla#191
Delete Branch "nayan9617/flotilla:dev"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?