From 39545d5000132dfb7775d94325e54a4c2bffc6c5 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Mon, 5 Jun 2023 20:55:53 -0600 Subject: [PATCH] Fix unpopulated struct fields --- federationapi/routing/invite.go | 3 +++ federationapi/routing/join.go | 3 +++ federationapi/routing/leave.go | 3 +++ 3 files changed, 9 insertions(+) diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go index 78a09d949..81dbf26a7 100644 --- a/federationapi/routing/invite.go +++ b/federationapi/routing/invite.go @@ -95,6 +95,9 @@ func InviteV2( StateQuerier: rsAPI.StateQuerier(), InviteEvent: inviteReq.Event(), StrippedState: inviteReq.InviteRoomState(), + UserIDQuerier: func(roomAliasOrID, senderID string) (*spec.UserID, error) { + return rsAPI.QueryUserIDForSender(httpReq.Context(), roomAliasOrID, senderID) + }, } event, jsonErr := handleInvite(httpReq.Context(), input, rsAPI) if jsonErr != nil { diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go index f00830e50..f09c5aff3 100644 --- a/federationapi/routing/join.go +++ b/federationapi/routing/join.go @@ -253,6 +253,9 @@ func SendJoin( PrivateKey: cfg.Matrix.PrivateKey, Verifier: keys, MembershipQuerier: &api.MembershipQuerier{Roomserver: rsAPI}, + UserIDQuerier: func(roomAliasOrID, senderID string) (*spec.UserID, error) { + return rsAPI.QueryUserIDForSender(httpReq.Context(), roomAliasOrID, senderID) + }, } response, joinErr := gomatrixserverlib.HandleSendJoin(input) switch e := joinErr.(type) { diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go index 25365b4ec..de95330b4 100644 --- a/federationapi/routing/leave.go +++ b/federationapi/routing/leave.go @@ -95,6 +95,9 @@ func MakeLeave( LocalServerName: cfg.Matrix.ServerName, LocalServerInRoom: res.RoomExists && res.IsInRoom, BuildEventTemplate: createLeaveTemplate, + UserIDQuerier: func(roomAliasOrID, senderID string) (*spec.UserID, error) { + return rsAPI.QueryUserIDForSender(httpReq.Context(), roomAliasOrID, senderID) + }, } response, internalErr := gomatrixserverlib.HandleMakeLeave(input)