Skip to content

Commit e4dab00

Browse files
morgmartMorgaritaclaude
committed
fix(members): leave out anyone archived during a batch's roster read
Each batch write now rechecks archives after the awaited roster read, matching the single addition, so someone archived meanwhile isn't named. Co-authored-by: Morgarita <6e967af659416160ab4f2fd56d74c8c6f273791ee7bfc9468a1be37c387947be@buzz.block.builderlab.xyz> Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: morgmart <[email protected]>
1 parent a9706d5 commit e4dab00

2 files changed

Lines changed: 42 additions & 3 deletions

File tree

‎src/features/channel-members/members.test.ts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,3 +1027,39 @@ it("reads the roster again after a write that couldn't be sent", async () => {
10271027
expect(send).toHaveBeenCalledOnce();
10281028
expect(added.size).toBe(0);
10291029
});
1030+
1031+
it("leaves out someone archived while the roster is read", async () => {
1032+
const t = batchSetup();
1033+
await t.ready();
1034+
const [first = "", second = "", archived = ""] = people(3);
1035+
let hidden: readonly string[] = [];
1036+
const channelWrites = t.session.channelWrites;
1037+
const session = Object.create(t.session, {
1038+
archives: {
1039+
value: { ...t.session.archives, snapshot: () => ({ archived: hidden }) },
1040+
},
1041+
channelWrites: {
1042+
value: Object.create(channelWrites, {
1043+
refreshMembership: {
1044+
value: async (id: string) => {
1045+
const roster = await channelWrites.refreshMembership(id);
1046+
hidden = [archived];
1047+
return roster;
1048+
},
1049+
},
1050+
}),
1051+
},
1052+
}) as RelaySession;
1053+
await addChannelMembersAtOnce(
1054+
session,
1055+
t.id,
1056+
[first, second, archived],
1057+
new Map(),
1058+
new AbortController().signal,
1059+
);
1060+
expect(
1061+
t.published.map((event) =>
1062+
event.tags.flatMap(([tag, value]) => (tag === "p" ? [value] : [])),
1063+
),
1064+
).toEqual([[first, second]]);
1065+
});

‎src/features/channel-members/members.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,12 @@ export async function addChannelMembersAtOnce(
412412
session.channelWrites.refreshMembership(channelId),
413413
);
414414
if (!roster || !allowed()) break;
415-
const recipients = keys
416-
.slice(start, start + batchLimit)
417-
.filter((key) => !roster?.members?.includes(key));
415+
const recipients = keys.slice(start, start + batchLimit).filter(
416+
(key) =>
417+
!roster?.members?.includes(key) &&
418+
// Archives may refresh during any read, as the single addition rechecks.
419+
!archiveHides(session.archives, key, session.viewer),
420+
);
418421
if (!recipients.length) continue;
419422
dispatched = true;
420423
beforeDispatch?.();

0 commit comments

Comments
 (0)