Add posibility to request room heroes #304
Merged
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
kegsay
reviewed
Sep 15, 2023
kegsay
reviewed
Sep 18, 2023
sync3/handler/connstate_live.go
Outdated
| // subscription which should return heroes. | ||
| func (s *connStateLive) shouldIncludeHeroes(roomID string) bool { | ||
| roomIDsToLists := s.lists.ListsByVisibleRoomIDs(s.muxedReq.Lists) | ||
| subscriptionInclude := s.roomSubscriptions[roomID].IncludeHeroes() |
There was a problem hiding this comment.
Rejig this so it's faster. Checking the lists is expensive.
if s.roomSubscriptions[roomID].IncludeHeroes() {
return true
}
// rest of list checksThere was a problem hiding this comment.
Right, that's easier.
| @@ -263,7 +263,7 @@ func (s *connStateLive) processLiveUpdate(ctx context.Context, up caches.Update, | |||
|
|
|||
| thisRoom.Name = roomName | |||
|
|
|||
| if s.roomSubscriptions[roomUpdate.RoomID()].IncludeHeroes() && calculated { | |||
| if calculated && s.shouldIncludeHeroes(roomUpdate.RoomID()) { | |||
There was a problem hiding this comment.
Looks better, but where's the tests?! :D
kegsay
approved these changes
Sep 19, 2023
| if !ok { | ||
| return fmt.Errorf("room %q not in response", listRoomID) | ||
| } | ||
| // wait for bob to be joined |
There was a problem hiding this comment.
Can't you just use res := alice.SlidingSyncUntilMembership(t, "", listRoomID, bob, "join")?
There was a problem hiding this comment.
For the previous test yes, but this test should use a list instead of a room subscription (used in SlidingSyncUntilMembership)
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.
Fixes #241
This adds a
heroesflag toRoomSubscriptions. If the room name was calculated using room heroes, the response for the room also contains an array ofheroes, containing theuser_id, and optionally the fieldsdisplaynameandavatar_url.