Handle pre-shared invite keys #271
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Andrew Ferrazzutti <[email protected]>
turt2live
requested changes
Nov 18, 2022
FWIW this is the behaviour Element Web uses. If you've invited a user with an encryption-enabled device to an encrypted room, EW will send the room key to that user (via a to-device message) even before they've joined the room. In fact, it sends the key even before you post a message -- it sends it as soon as you starting typing a message! |
Treat an error in looking up room members of a particular membership type as there being no members of that type. Return early if no members are found.
AndrewFerr
added a commit
to element-hq/matrix-bot-sdk
that referenced
this pull request
Dec 8, 2022
* Handle pre-shared invite keys Signed-off-by: Andrew Ferrazzutti <[email protected]> * Use assignment for changes to membership array * Catch member lookup errors in prepareEncrypt Treat an error in looking up room members of a particular membership type as there being no members of that type. Return early if no members are found. * Resolve conflict on `members` variable Signed-off-by: Andrew Ferrazzutti <[email protected]>
AndrewFerr
added a commit
to element-hq/matrix-bot-sdk
that referenced
this pull request
Dec 8, 2022
* Handle pre-shared invite keys Signed-off-by: Andrew Ferrazzutti <[email protected]> * Use assignment for changes to membership array * Catch member lookup errors in prepareEncrypt Treat an error in looking up room members of a particular membership type as there being no members of that type. Return early if no members are found. * Resolve conflict on `members` variable Signed-off-by: Andrew Ferrazzutti <[email protected]>
AndrewFerr
added a commit
to element-hq/matrix-bot-sdk
that referenced
this pull request
Dec 9, 2022
* Handle pre-shared invite keys Signed-off-by: Andrew Ferrazzutti <[email protected]> * Use assignment for changes to membership array * Catch member lookup errors in prepareEncrypt Treat an error in looking up room members of a particular membership type as there being no members of that type. Return early if no members are found. * Resolve conflict on `members` variable Signed-off-by: Andrew Ferrazzutti <[email protected]>
AndrewFerr
added a commit
to element-hq/matrix-bot-sdk
that referenced
this pull request
Dec 9, 2022
* Handle pre-shared invite keys Signed-off-by: Andrew Ferrazzutti <[email protected]> * Use assignment for changes to membership array * Catch member lookup errors in prepareEncrypt Treat an error in looking up room members of a particular membership type as there being no members of that type. Return early if no members are found. * Resolve conflict on `members` variable Signed-off-by: Andrew Ferrazzutti <[email protected]>
AndrewFerr
added a commit
to element-hq/matrix-bot-sdk
that referenced
this pull request
Dec 9, 2022
* Handle pre-shared invite keys Signed-off-by: Andrew Ferrazzutti <[email protected]> * Use assignment for changes to membership array * Catch member lookup errors in prepareEncrypt Treat an error in looking up room members of a particular membership type as there being no members of that type. Return early if no members are found. * Resolve conflict on `members` variable Signed-off-by: Andrew Ferrazzutti <[email protected]>
turt2live
reviewed
Dec 19, 2022
| .map(u => new UserId(u.membershipFor)) | ||
| .forEach(u => void members.add(u)); | ||
| } catch (err) { | ||
| LogService.warn("RustEngine", `Failed to get room members for membership type "${membership}" in ${roomId}`, extractRequestError(err)); |
There was a problem hiding this comment.
I'm not sure we should be consuming this error tbh
| try { | ||
| (await this.client.getRoomMembersByMembership(roomId, membership)) | ||
| .map(u => new UserId(u.membershipFor)) | ||
| .forEach(u => void members.add(u)); |
There was a problem hiding this comment.
preferably we use a real for loop for this, as one-liners mixed in with try/catch is a bit confusing imo
There was a problem hiding this comment.
also, we shouldn't need a Set here as someone can't exist in two states. Appending to an array (using push(...userIds)) should be fine?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Andrew Ferrazzutti [email protected]
Checklist