WIP: expose room avatars in room subscriptions #203
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
added 7 commits
July 13, 2023 11:52
kegsay
approved these changes
Jul 14, 2023
internal/roomname.go
Outdated
| // SameRoomAvatar checks if the fields relevant for room names have changed between the two metadatas. | ||
| // Returns true if there are no changes. | ||
| func (m *RoomMetadata) SameRoomAvatar(other *RoomMetadata) bool { | ||
| return m.AvatarURL == other.AvatarURL |
There was a problem hiding this comment.
This probably needs to check the Heroes too like we do with room names?
sync3/caches/user.go
Outdated
| @@ -572,6 +584,10 @@ func (c *UserCache) OnInvite(ctx context.Context, roomID string, inviteStateEven | |||
| urd.HasLeft = false | |||
| urd.HighlightCount = InvitesAreHighlightsValue | |||
| urd.IsDM = inviteData.IsDM | |||
| urd.ResolvedAvatarURL = inviteData.AvatarURL | |||
| if urd.ResolvedAvatarURL == "" && urd.IsDM && len(inviteData.Heroes) == 1 { | |||
| urd.ResolvedAvatarURL = inviteData.Heroes[0].Avatar | |||
There was a problem hiding this comment.
Has the Heroes array dropped the user of the UserCache by this point? Else len(inviteData.Heroes) would be 2 not 1.
sync3/room.go
Outdated
| Name string `json:"name,omitempty"` | ||
| // Avatar is set to the MXC url of the room if it has changed, or to "none" if | ||
| // it has been removed. An empty string represents no change to the avatar. | ||
| Avatar string `json:"avatar,omitempty"` |
There was a problem hiding this comment.
Should be *string where literal null means deleted.
tests-e2e/lists_test.go
Outdated
| res = alice.SlidingSyncUntilMembership(t, res.Pos, dmChris, chris, "leave") | ||
|
|
||
| t.Log("Alice sees no change in the room's avatar.") | ||
| m.MatchResponse(t, res, m.MatchRoomSubscription(dmChris, m.MatchRoomAvatar(""))) |
There was a problem hiding this comment.
This relies on the atomicity of Chris leaving and the avatar being updated in one single response, which I think we do which is good but is a noteworthy comment.
tests-e2e/lists_test.go
Outdated
| alice.SlidingSyncUntil(t, res.Pos, sync3.Request{}, m.MatchRoomSubscription(dmChris, m.MatchRoomAvatar(dmAvatar))) | ||
|
|
||
| t.Log("Chris changes his global avatar.") | ||
| chrisAvatar2 := chris.UploadContent(t, smallPNG, "chris2.png", "image/png") |
There was a problem hiding this comment.
Maybe globalChrisAvatar would be a better name?
added 22 commits
July 14, 2023 11:51
|
SITREP:
|
DMRobertson
commented
Jul 17, 2023
Comment on lines
+592
to
+596
| logger.Warn().Msgf("TODO set avatar on invite") | ||
| //urd.ResolvedAvatarURL = inviteData.AvatarEvent | ||
| //if urd.ResolvedAvatarURL == "" && urd.IsDM && len(inviteData.Heroes) == 1 { | ||
| // urd.ResolvedAvatarURL = inviteData.Heroes[0].Avatar | ||
| //} |
There was a problem hiding this comment.
Confusingly I didn't seem to have to do this---SetRoom did it for me?
|
Superseded by #208 |
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.
very wip do not judge me