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

Use AuthEvents to retrieve the 3PID invite

Browse source
This commit is contained in:
Brendan Abolivier 2017-09-08 13:56:12 +01:00
parent eb5abbd96a
commit 667408a8a4
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,10 +125,6 @@ func createInviteFrom3PIDInvite(
return nil, nil return nil, nil
} }
if err = fillDisplayName(builder, content, queryRes.StateEvents); err != nil {
return nil, err
}
// Finish building the event // Finish building the event
builder.Depth = queryRes.Depth builder.Depth = queryRes.Depth
builder.PrevEvents = queryRes.LatestEvents builder.PrevEvents = queryRes.LatestEvents
@ -139,6 +135,10 @@ func createInviteFrom3PIDInvite(
authEvents.AddEvent(&queryRes.StateEvents[i]) authEvents.AddEvent(&queryRes.StateEvents[i])
} }
if err = fillDisplayName(builder, content, authEvents); err != nil {
return nil, err
}
refs, err := eventsNeeded.AuthEventReferences(&authEvents) refs, err := eventsNeeded.AuthEventReferences(&authEvents)
if err != nil { if err != nil {
return nil, err return nil, err
@ -167,15 +167,10 @@ func createInviteFrom3PIDInvite(
// rejected by gomatrixserverlib. // rejected by gomatrixserverlib.
func fillDisplayName( func fillDisplayName(
builder *gomatrixserverlib.EventBuilder, content common.MemberContent, builder *gomatrixserverlib.EventBuilder, content common.MemberContent,
stateEvents []gomatrixserverlib.Event, authEvents gomatrixserverlib.AuthEvents,
) error { ) error {
// Look for the m.room.third_party_invite event // Look for the m.room.third_party_invite event
var thirdPartyInviteEvent *gomatrixserverlib.Event thirdPartyInviteEvent, _ := authEvents.ThirdPartyInvite(content.ThirdPartyInvite.Signed.Token)
for _, event := range stateEvents {
if event.Type() == "m.room.third_party_invite" && *(event.StateKey()) == content.ThirdPartyInvite.Signed.Token {
thirdPartyInviteEvent = &event
}
}
if thirdPartyInviteEvent == nil { if thirdPartyInviteEvent == nil {
// If the third party invite event doesn't exist then we can't use it to set the display name. // If the third party invite event doesn't exist then we can't use it to set the display name.