mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update gmsl to match performjoin refactor

Browse source
This commit is contained in:
Devon Hudson 2023-04-24 17:04:08 -06:00
parent 64da696ca4
commit a246690d5f
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
federationapi/internal/perform.go
View file

@ -150,7 +150,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
return err
}
sendJoinInput := fclient.SendJoinInput{
joinInput := fclient.PerformJoinInput{
UserID: user,
RoomID: roomID,
ServerName: serverName,
@ -161,7 +161,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
KeyRing: r.keyRing,
EventProvider: federatedEventProvider,
}
callbacks := fclient.SendJoinCallbacks{
callbacks := fclient.PerformJoinCallbacks{
FederationFailure: func(server spec.ServerName) {
r.statistics.ForServer(server).Failure()
},
@ -170,7 +170,7 @@ func (r *FederationInternalAPI) performJoinUsingServer(
},
}
event, respState, err := fclient.HandleSendJoin(ctx, r.federation, sendJoinInput, callbacks)
event, respState, err := fclient.PerformJoin(ctx, r.federation, joinInput, callbacks)
if err != nil {
return err
}

2
go.mod
View file

@ -22,7 +22,7 @@ require (
github.com/matrix-org/dugong v0.0.0-20210921133753-66e6b1c67e2e
github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530
github.com/matrix-org/gomatrixserverlib v0.0.0-20230424221449-025f78eb0189
github.com/matrix-org/gomatrixserverlib v0.0.0-20230424230100-52d1bda7a912
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
github.com/mattn/go-sqlite3 v1.14.16

4
go.sum
View file

@ -321,8 +321,8 @@ github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91 h1:s7fexw
github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91/go.mod h1:e+cg2q7C7yE5QnAXgzo512tgFh1RbQLC0+jozuegKgo=
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530 h1:kHKxCOLcHH8r4Fzarl4+Y3K5hjothkVW5z7T1dUM11U=
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230424221449-025f78eb0189 h1:hT+KmN99k6lP+aV4bBy/OUUD0iUUVlUnwXQYFjf+Q/M=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230424221449-025f78eb0189/go.mod h1:7HTbSZe+CIdmeqVyFMekwD5dFU8khWQyngKATvd12FU=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230424230100-52d1bda7a912 h1:kLy7+E8pBLdwtm6UMoTVox2nJOCyFizIxjd3iOo19Rc=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230424230100-52d1bda7a912/go.mod h1:7HTbSZe+CIdmeqVyFMekwD5dFU8khWQyngKATvd12FU=
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a h1:awrPDf9LEFySxTLKYBMCiObelNx/cBuv/wzllvCCH3A=
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a/go.mod h1:HchJX9oKMXaT2xYFs0Ha/6Zs06mxLU8k6F1ODnrGkeQ=
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66 h1:6z4KxomXSIGWqhHcfzExgkH3Z3UkIXry4ibJS4Aqz2Y=