From a246690d5ff79de7e791dd446c0723f7d6a503fc Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Mon, 24 Apr 2023 17:04:08 -0600 Subject: [PATCH] Update gmsl to match performjoin refactor --- federationapi/internal/perform.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/federationapi/internal/perform.go b/federationapi/internal/perform.go index f573d63f7..941244efc 100644 --- a/federationapi/internal/perform.go +++ b/federationapi/internal/perform.go @@ -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 } diff --git a/go.mod b/go.mod index c850f491d..4c112cf3c 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 1816af16a..396c8f70b 100644 --- a/go.sum +++ b/go.sum @@ -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=