From a5c0521c3ff2468ae06fa088deea7404999e3598 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 11 Sep 2020 22:31:56 +0100 Subject: [PATCH] fix build & lint --- federationapi/routing/routing.go | 2 +- federationapi/routing/send.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go index 71a09d421..b41ecadbb 100644 --- a/federationapi/routing/routing.go +++ b/federationapi/routing/routing.go @@ -221,7 +221,7 @@ func Setup( queryVars := httpReq.URL.Query() remoteVersions := []gomatrixserverlib.RoomVersion{} if vers, ok := queryVars["ver"]; ok { - // The remote side supplied a ?=ver so use that to build up the list + // The remote side supplied a ?ver= so use that to build up the list // of supported room versions for _, v := range vers { remoteVersions = append(remoteVersions, gomatrixserverlib.RoomVersion(v)) diff --git a/federationapi/routing/send.go b/federationapi/routing/send.go index 9def7c3c3..ca4473f77 100644 --- a/federationapi/routing/send.go +++ b/federationapi/routing/send.go @@ -458,7 +458,8 @@ func (t *txnReq) processEventWithMissingState(ctx context.Context, e gomatrixser // pass the event along with the state to the roomserver using a background context so we don't // needlessly expire - return api.SendEventWithState(context.Background(), t.rsAPI, resolvedState, e.Headered(roomVersion), t.haveEventIDs()) + headeredEvent := e.Headered(roomVersion) + return api.SendEventWithState(context.Background(), t.rsAPI, resolvedState, &headeredEvent, t.haveEventIDs()) } // lookupStateAfterEvent returns the room state after `eventID`, which is the state before eventID with the state of `eventID` (if it's a state event)