mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-23 03:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

No-op action:join if the user is already invited for scalar (#7334)

Browse source 
* No-op action:join if the user is already invited for scalar

* Improve words
This commit is contained in:
Will Hunt 2021-12-10 14:26:38 +00:00 committed by GitHub
parent c21895b5b4
commit 785eb5fa15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ScalarMessaging.ts
View file

@ -53,7 +53,7 @@ All actions can return an error response instead of the response outlined below.
invite invite
------ ------
Invites a user into a room. Invites a user into a room. The request will no-op if the user is already joined OR invited to the room.
Request: Request:
- room_id is the room to invite the user into. - room_id is the room to invite the user into.
@ -295,9 +295,9 @@ function inviteUser(event: MessageEvent<any>, roomId: string, userId: string): v
} }
const room = client.getRoom(roomId); const room = client.getRoom(roomId);
if (room) { if (room) {
// if they are already invited we can resolve immediately. // if they are already invited or joined we can resolve immediately.
const member = room.getMember(userId); const member = room.getMember(userId);
if (member && member.membership === "invite") { if (member && ["join", "invite"].includes(member.membership)) {
sendResponse(event, { sendResponse(event, {
success: true, success: true,
}); });