From f85c94108f96283e38950abc357c6ea5d59938d4 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Tue, 16 May 2023 15:29:12 -0600 Subject: [PATCH] Remove request destination from gmsl HandleMakeJoin input --- federationapi/routing/join.go | 1 - go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go index bd4eb24b5..cc22690a9 100644 --- a/federationapi/routing/join.go +++ b/federationapi/routing/join.go @@ -154,7 +154,6 @@ func MakeJoin( RoomVersion: roomVersion, RemoteVersions: remoteVersions, RequestOrigin: request.Origin(), - RequestDestination: request.Destination(), LocalServerName: cfg.Matrix.ServerName, LocalServerInRoom: res.RoomExists && res.IsInRoom, RoomQuerier: &roomQuerier, diff --git a/go.mod b/go.mod index 0a095c501..021e29a81 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-20230516171129-bc4d64a7c071 + github.com/matrix-org/gomatrixserverlib v0.0.0-20230516212015-4d855ecc2f59 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 ea838d77e..bd6843153 100644 --- a/go.sum +++ b/go.sum @@ -323,8 +323,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-20230516171129-bc4d64a7c071 h1:W6O4VhHp7t0+GrP1MTX6Lc2trSJ8orHgZH0/j+b3lRU= -github.com/matrix-org/gomatrixserverlib v0.0.0-20230516171129-bc4d64a7c071/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20230516212015-4d855ecc2f59 h1:CjCKz46s/JQnrG0fPbFRSUjFLJxY7HO9DwX4ojuwM0o= +github.com/matrix-org/gomatrixserverlib v0.0.0-20230516212015-4d855ecc2f59/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU= 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=