mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Client API ddoesn't need to send invite room state, the roomserver will work it out

Browse source
This commit is contained in:
Neil Alexander 2020-04-23 16:37:38 +01:00
parent 48e3088e90
commit a82bce9b7b
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/producers/roomserver.go
View file

@ -105,12 +105,10 @@ func (c *RoomserverProducer) SendInputRoomEvents(
// If we are in the room then the event should be sent using the SendEvents method. // If we are in the room then the event should be sent using the SendEvents method.
func (c *RoomserverProducer) SendInvite( func (c *RoomserverProducer) SendInvite(
ctx context.Context, inviteEvent gomatrixserverlib.HeaderedEvent, ctx context.Context, inviteEvent gomatrixserverlib.HeaderedEvent,
inviteRoomState []gomatrixserverlib.InviteV2StrippedState,
) error { ) error {
request := api.InputRoomEventsRequest{ request := api.InputRoomEventsRequest{
InputInviteEvents: []api.InputInviteEvent{{ InputInviteEvents: []api.InputInviteEvent{{
Event: inviteEvent, Event: inviteEvent,
InviteRoomState: inviteRoomState,
RoomVersion: inviteEvent.RoomVersion, RoomVersion: inviteEvent.RoomVersion,
}}, }},
} }

1
federationapi/routing/invite.go
View file

@ -127,7 +127,6 @@ func Invite(
if err = producer.SendInvite( if err = producer.SendInvite(
httpReq.Context(), httpReq.Context(),
signedEvent.Headered(intermediate.RoomVersion), signedEvent.Headered(intermediate.RoomVersion),
inviteStates,
); err != nil { ); err != nil {
util.GetLogger(httpReq.Context()).WithError(err).Error("producer.SendInvite failed") util.GetLogger(httpReq.Context()).WithError(err).Error("producer.SendInvite failed")
return jsonerror.InternalServerError() return jsonerror.InternalServerError()