From 310175c71c725ecf6f4b25552c515acd9d0b2102 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 5 Sep 2017 16:40:07 +0100 Subject: [PATCH] Use reference for third party invite data --- .../matrix-org/dendrite/common/eventcontent.go | 10 +++++----- .../dendrite/federationapi/writers/threepid.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/common/eventcontent.go b/src/github.com/matrix-org/dendrite/common/eventcontent.go index 01a29d321..971c4f0a7 100644 --- a/src/github.com/matrix-org/dendrite/common/eventcontent.go +++ b/src/github.com/matrix-org/dendrite/common/eventcontent.go @@ -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 diff --git a/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go b/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go index f57cd415c..90bc4390e 100644 --- a/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go +++ b/src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go @@ -113,7 +113,7 @@ func createInviteFrom3PIDInvite( content := common.MemberContent{ // TODO: Load the profile Membership: "invite", - ThirdPartyInvite: common.TPInvite{ + ThirdPartyInvite: &common.TPInvite{ Signed: inv.Signed, }, }