From e02fa9060816cd985676f2bb1dc70b550c7cbebc Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 21 Jan 2022 13:44:27 +0000 Subject: [PATCH] Send create room events as new --- clientapi/routing/createroom.go | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/clientapi/routing/createroom.go b/clientapi/routing/createroom.go index 85331192b..f27716940 100644 --- a/clientapi/routing/createroom.go +++ b/clientapi/routing/createroom.go @@ -452,20 +452,17 @@ func createRoom( return jsonerror.InternalServerError() } - accumulated := gomatrixserverlib.UnwrapEventHeaders(builtEvents) - if err = roomserverAPI.SendEventWithState( - req.Context(), - rsAPI, - roomserverAPI.KindNew, - &gomatrixserverlib.RespState{ - StateEvents: accumulated, - AuthEvents: accumulated, - }, - ev.Headered(roomVersion), - nil, - false, - ); err != nil { - util.GetLogger(req.Context()).WithError(err).Error("SendEventWithState failed") + inputs := make([]roomserverAPI.InputRoomEvent, 0, len(builtEvents)) + for _, event := range builtEvents { + inputs = append(inputs, roomserverAPI.InputRoomEvent{ + Kind: roomserverAPI.KindNew, + Event: event, + AuthEventIDs: event.AuthEventIDs(), + SendAsServer: roomserverAPI.DoNotSendToOtherServers, + }) + } + if err = roomserverAPI.SendInputRoomEvents(req.Context(), rsAPI, inputs, false); err != nil { + util.GetLogger(req.Context()).WithError(err).Error("roomserverAPI.SendInputRoomEvents failed") return jsonerror.InternalServerError() } }