From b7fd9b4b5a2ec4ac201bd71df6c7946436377b19 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 7 Sep 2020 16:02:02 +0100 Subject: [PATCH] Let's try this again --- federationsender/internal/perform.go | 13 +------------ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/federationsender/internal/perform.go b/federationsender/internal/perform.go index 504845f70..90abae236 100644 --- a/federationsender/internal/perform.go +++ b/federationsender/internal/perform.go @@ -192,17 +192,6 @@ func (r *FederationSenderInternalAPI) performJoinUsingServer( return fmt.Errorf("joinCtx.CheckSendJoinResponse: %w", err) } - // Work out which events were not returned from checking the - // send_join response. We'll include these in a map so that we - // don't generate input events for them. - var invalidEventIDs map[string]bool - if invalid := respState.InvalidEventIDs(); len(invalid) > 0 { - invalidEventIDs = make(map[string]bool) - for _, eventID := range invalid { - invalidEventIDs[eventID] = true - } - } - // If we successfully performed a send_join above then the other // server now thinks we're a part of the room. Send the newly // returned state to the roomserver to update our local view. @@ -210,7 +199,7 @@ func (r *FederationSenderInternalAPI) performJoinUsingServer( ctx, r.rsAPI, respState, event.Headered(respMakeJoin.RoomVersion), - invalidEventIDs, + nil, ); err != nil { return fmt.Errorf("r.producer.SendEventWithState: %w", err) } diff --git a/go.mod b/go.mod index d25fdf4f0..8fde59833 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,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-20200522092705-bc8506ccbcf3 github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd - github.com/matrix-org/gomatrixserverlib v0.0.0-20200907143659-4b5669b82c8d + github.com/matrix-org/gomatrixserverlib v0.0.0-20200907150041-ff7f57818c81 github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91 github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4 github.com/mattn/go-sqlite3 v1.14.2 diff --git a/go.sum b/go.sum index fa51f058a..d08075a67 100644 --- a/go.sum +++ b/go.sum @@ -567,8 +567,8 @@ github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 h1:Hr3zjRsq2bh github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26/go.mod h1:3fxX6gUjWyI/2Bt7J1OLhpCzOfO/bB3AiX0cJtEKud0= github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd h1:xVrqJK3xHREMNjwjljkAUaadalWc0rRbmVuQatzmgwg= github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s= -github.com/matrix-org/gomatrixserverlib v0.0.0-20200907143659-4b5669b82c8d h1:nHCJnv2QxP1eQzVhIl9Iwkc5wGaWTzOhcT7wfSpmRl8= -github.com/matrix-org/gomatrixserverlib v0.0.0-20200907143659-4b5669b82c8d/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200907150041-ff7f57818c81 h1:UGjwRtWVmc13iWOPCIJDJ8e5DxUGBsIrZ1p2LDKMEhM= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200907150041-ff7f57818c81/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91 h1:HJ6U3S3ljJqNffYMcIeAncp5qT/i+ZMiJ2JC2F0aXP4= github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91/go.mod h1:sjyPyRxKM5uw1nD2cJ6O2OxI6GOqyVBfNXqKjBZTBZE= github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 h1:ntrLa/8xVzeSs8vHFHK25k0C+NV74sYMJnNSg5NoSRo=