dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-07-03 09:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

support bot: fix double invite when joining a customer chat

Browse Source 
addOrFindTeamMember added the team member as Member and then immediately
called apiSetMembersRole(Owner). For a not-yet-accepted (GSMemInvited)
member the core re-sends the group invitation on a role change, so every
/join and /team produced two invitations. Add the member directly as
Owner in a single apiAddMember call; onMemberConnected still re-asserts
Owner idempotently as a fallback.
This commit is contained in:
Narasimha-sc
2026-06-23 19:20:58 +00:00
parent 15ea3f83ba
commit 27fca16612
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/simplex-support-bot/bot.test.ts
+14 -12
View File
@@ -1068,24 +1068,26 @@ describe("Team Member Lifecycle", () => {
expect(chat.roleChanges.some(r => r.groupId === CUSTOMER_GROUP_ID && r.memberIds.includes(5000 + TEAM_MEMBER_1_ID) && r.role === GroupMemberRole.Owner)).toBe(true)
})
test("/team invites team member → apiSetMembersRole(Owner) called at invite time", async () => {
test("/team invites team member → added directly as Owner, single invitation", async () => {
await bot.onNewChatItems(customerMessage("/team"))
expectMemberAdded(CUSTOMER_GROUP_ID, TEAM_MEMBER_1_ID)
expect(chat.roleChanges.some(r =>
r.groupId === CUSTOMER_GROUP_ID
&& r.memberIds.includes(5000 + TEAM_MEMBER_1_ID)
&& r.role === GroupMemberRole.Owner
expect(chat.added.some(a =>
a.groupId === CUSTOMER_GROUP_ID
&& a.contactId === TEAM_MEMBER_1_ID
&& a.role === GroupMemberRole.Owner
)).toBe(true)
// No role change — that would send a second invitation.
expect(chat.roleChanges.length).toBe(0)
})
test("/join invites team member → apiSetMembersRole(Owner) called at invite time", async () => {
test("/join invites team member → added directly as Owner, single invitation", async () => {
await bot.onNewChatItems(teamGroupMessage(`/join ${CUSTOMER_GROUP_ID}`))
expectMemberAdded(CUSTOMER_GROUP_ID, TEAM_MEMBER_1_ID)
expect(chat.roleChanges.some(r =>
r.groupId === CUSTOMER_GROUP_ID
&& r.memberIds.includes(5000 + TEAM_MEMBER_1_ID)
&& r.role === GroupMemberRole.Owner
expect(chat.added.some(a =>
a.groupId === CUSTOMER_GROUP_ID
&& a.contactId === TEAM_MEMBER_1_ID
&& a.role === GroupMemberRole.Owner
)).toBe(true)
// No role change — that would send a second invitation.
expect(chat.roleChanges.length).toBe(0)
})
test("/team when team member already in group (any non-terminal status) → apiSetMembersRole NOT re-called", async () => {
apps/simplex-support-bot/src/bot.ts
+5 -10
View File
@@ -853,17 +853,12 @@ export class SupportBot {
const members = await this.withMainProfile(() => this.chat.apiListMembers(groupId))
const existing = members.find(m => m.memberContactId === teamContactId && isInGroup(m))
if (existing) return existing
const member = await this.withMainProfile(() =>
this.chat.apiAddMember(groupId, teamContactId, T.GroupMemberRole.Member)
// Invite directly as Owner in one call. Adding as Member then promoting
// sent a second invitation, since the API re-sends it when a pending
// (GSMemInvited) member's role changes. onMemberConnected re-asserts Owner.
return this.withMainProfile(() =>
this.chat.apiAddMember(groupId, teamContactId, T.GroupMemberRole.Owner)
)
try {
await this.withMainProfile(() =>
this.chat.apiSetMembersRole(groupId, [member.groupMemberId], T.GroupMemberRole.Owner)
)
} catch {
// Not yet connected — will be promoted in onMemberConnected
}
return member
}
async sendToGroup(groupId: number, text: string): Promise<void> {