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

Let's try this again

Browse source
This commit is contained in:
Neil Alexander 2020-09-07 16:02:02 +01:00
parent cd6623793f
commit b7fd9b4b5a
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
federationsender/internal/perform.go
View file

@ -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)
}

2
go.mod
View file

@ -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

4
go.sum
View file

@ -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=