mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 01:13:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use reference for third party invite data

Browse source
This commit is contained in:
Brendan Abolivier 2017-09-05 16:40:07 +01:00
parent b3c9f6469d
commit 310175c71c
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/common/eventcontent.go
View file

@ -22,11 +22,11 @@ type CreateContent struct {
// MemberContent is the event content for http://matrix.org/docs/spec/client_server/r0.2.0.html#m-room-member
type MemberContent struct {
Membership string `json:"membership"`
DisplayName string `json:"displayname,omitempty"`
AvatarURL string `json:"avatar_url,omitempty"`
Reason string `json:"reason,omitempty"`
ThirdPartyInvite TPInvite `json:"third_party_invite,omitempty"`
Membership string `json:"membership"`
DisplayName string `json:"displayname,omitempty"`
AvatarURL string `json:"avatar_url,omitempty"`
Reason string `json:"reason,omitempty"`
ThirdPartyInvite *TPInvite `json:"third_party_invite,omitempty"`
}
// TPInvite is the "Invite" structure defined at http://matrix.org/docs/spec/client_server/r0.2.0.html#m-room-member

2
src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go
View file

@ -113,7 +113,7 @@ func createInviteFrom3PIDInvite(
content := common.MemberContent{
// TODO: Load the profile
Membership: "invite",
ThirdPartyInvite: common.TPInvite{
ThirdPartyInvite: &common.TPInvite{
Signed: inv.Signed,
},
}