butter/dendrite
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix /createRoom and /invite containing displayname/avatarURL of inviter (#3326)

Browse source 
Fixes #3324
This commit is contained in:
Till 2024-02-13 19:28:52 +01:00 • committed by GitHub
parent be0c27e688
commit e9deb5244e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 100 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

18
roomserver/internal/perform/perform_create_room.go
View file

@ -503,16 +503,14 @@ func (c *Creator) PerformCreateRoom(ctx context.Context, userID spec.UserID, roo
err = c.RSAPI.PerformInvite(ctx, &api.PerformInviteRequest{
InviteInput: api.InviteInput{
RoomID: roomID,
Inviter: userID,
Invitee: *inviteeUserID,
DisplayName: createRequest.UserDisplayName,
AvatarURL: createRequest.UserAvatarURL,
Reason: "",
IsDirect: createRequest.IsDirect,
KeyID: createRequest.KeyID,
PrivateKey: createRequest.PrivateKey,
EventTime: createRequest.EventTime,
RoomID: roomID,
Inviter: userID,
Invitee: *inviteeUserID,
Reason: "",
IsDirect: createRequest.IsDirect,
KeyID: createRequest.KeyID,
PrivateKey: createRequest.PrivateKey,
EventTime: createRequest.EventTime,
},
InviteRoomState: globalStrippedState,
SendAsServer: string(userID.Domain()),

8
roomserver/internal/perform/perform_invite.go
View file

@ -144,11 +144,9 @@ func (r *Inviter) PerformInvite(
}
content := gomatrixserverlib.MemberContent{
Membership: spec.Invite,
DisplayName: req.InviteInput.DisplayName,
AvatarURL: req.InviteInput.AvatarURL,
Reason: req.InviteInput.Reason,
IsDirect: req.InviteInput.IsDirect,
Membership: spec.Invite,
Reason: req.InviteInput.Reason,
IsDirect: req.InviteInput.IsDirect,
}
if err = proto.SetContent(content); err != nil {