diff --git a/federationapi/internal/perform.go b/federationapi/internal/perform.go index 129973a34..c51ecf146 100644 --- a/federationapi/internal/perform.go +++ b/federationapi/internal/perform.go @@ -552,12 +552,13 @@ func (r *FederationInternalAPI) PerformInvite( inviteRes, err := r.federation.SendInviteV2(ctx, destination, inviteReq) if err != nil { - return fmt.Errorf("r.federation.SendInviteV2: %w", err) + return fmt.Errorf("r.federation.SendInviteV2: failed to send invite: %w", err) } + logrus.Infof("GOT INVITE RESPONSE %s", string(inviteRes.Event)) inviteEvent, err := inviteRes.Event.UntrustedEvent(request.RoomVersion) if err != nil { - return fmt.Errorf("r.federation.SendInviteV2: %w", err) + return fmt.Errorf("r.federation.SendInviteV2 failed to decode event response: %w", err) } response.Event = inviteEvent.Headered(request.RoomVersion) return nil diff --git a/go.mod b/go.mod index 7bbdd6e6c..239b69b60 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/matrix-org/go-http-js-libp2p v0.0.0-20200518170932-783164aeeda4 github.com/matrix-org/go-sqlite3-js v0.0.0-20210709140738-b0d1ba599a6d github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 - github.com/matrix-org/gomatrixserverlib v0.0.0-20220209174237-b9d0d78e1c4a + github.com/matrix-org/gomatrixserverlib v0.0.0-20220209190603-259422bc28b7 github.com/matrix-org/pinecone v0.0.0-20220121094951-351265543ddf github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4 github.com/mattn/go-sqlite3 v1.14.10 diff --git a/go.sum b/go.sum index a2b9abde5..fdef6420a 100644 --- a/go.sum +++ b/go.sum @@ -991,6 +991,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20220209110615-4766445cc479 h1:FB github.com/matrix-org/gomatrixserverlib v0.0.0-20220209110615-4766445cc479/go.mod h1:qFvhfbQ5orQxlH9vCiFnP4dW27xxnWHdNUBKyj/fbiY= github.com/matrix-org/gomatrixserverlib v0.0.0-20220209174237-b9d0d78e1c4a h1:owex6ZqNhI8nBtscKKtBup8jetR287BL9s87XtX7jw0= github.com/matrix-org/gomatrixserverlib v0.0.0-20220209174237-b9d0d78e1c4a/go.mod h1:qFvhfbQ5orQxlH9vCiFnP4dW27xxnWHdNUBKyj/fbiY= +github.com/matrix-org/gomatrixserverlib v0.0.0-20220209190603-259422bc28b7 h1:2CePBroo+q/U8ZThqRGCa7YLmv4dmUanW1e73nVOFRg= +github.com/matrix-org/gomatrixserverlib v0.0.0-20220209190603-259422bc28b7/go.mod h1:qFvhfbQ5orQxlH9vCiFnP4dW27xxnWHdNUBKyj/fbiY= github.com/matrix-org/pinecone v0.0.0-20220121094951-351265543ddf h1:/nqfHUdQHr3WVdbZieaYFvHF1rin5pvDTa/NOZ/qCyE= github.com/matrix-org/pinecone v0.0.0-20220121094951-351265543ddf/go.mod h1:r6dsL+ylE0yXe/7zh8y/Bdh6aBYI1r+u4yZni9A4iyk= github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7/go.mod h1:vVQlW/emklohkZnOPwD3LrZUBqdfsbiyO3p1lNV8F6U=