Merge branch 'master' into babolivier/federation-3pid-invite

This commit is contained in:
Brendan Abolivier 2017-09-11 15:53:21 +01:00
commit f06a162268

View file

@ -73,7 +73,7 @@ func Invite(
// Check that the event is signed by the server sending the request. // Check that the event is signed by the server sending the request.
verifyRequests := []gomatrixserverlib.VerifyJSONRequest{{ verifyRequests := []gomatrixserverlib.VerifyJSONRequest{{
ServerName: event.Origin(), ServerName: event.Origin(),
Message: event.JSON(), Message: event.Redact().JSON(),
AtTS: event.OriginServerTS(), AtTS: event.OriginServerTS(),
}} }}
verifyResults, err := keys.VerifyJSONs(verifyRequests) verifyResults, err := keys.VerifyJSONs(verifyRequests)