diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-07-22 14:44:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 14:44:04 +0100 |
| commit | f0c8a03649ab270bb15156a3cc47cae2aee3f36a (patch) | |
| tree | 61ba370970ecead0161a7ab59811d16613e233e9 /federationapi | |
| parent | a201b4400dd4fe99b4c391f94ac31884deccc12c (diff) | |
Membership updater refactoring (#2541)
* Membership updater refactoring
* Pass in membership state
* Use membership check rather than referring to state directly
* Delete irrelevant membership states
* We don't need the leave event after all
* Tweaks
* Put a log entry in that I might stand a chance of finding
* Be less panicky
* Tweak invite handling
* Don't freak if we can't find the event NID
* Use event NID from `types.Event`
* Clean up
* Better invite handling
* Placate the almighty linter
* Blacklist a Sytest which is otherwise fine under Complement for reasons I don't understand
* Fix the sytest after all (thanks @S7evinK for the spot)
Diffstat (limited to 'federationapi')
| -rw-r--r-- | federationapi/routing/invite.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go index cde87a0a..4b795018 100644 --- a/federationapi/routing/invite.go +++ b/federationapi/routing/invite.go @@ -26,7 +26,6 @@ import ( "github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" - "github.com/sirupsen/logrus" ) // InviteV2 implements /_matrix/federation/v2/invite/{roomID}/{eventID} @@ -144,7 +143,6 @@ func processInvite( // Check that the event is signed by the server sending the request. redacted, err := gomatrixserverlib.RedactEventJSON(event.JSON(), event.Version()) if err != nil { - logrus.WithError(err).Errorf("XXX: invite.go") return util.JSONResponse{ Code: http.StatusBadRequest, JSON: jsonerror.BadJSON("The event JSON could not be redacted"), |