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

Don't return eventID for SendEventWithState

Browse source
This commit is contained in:
Anant Prakash 2018-05-24 20:35:39 +05:30
parent 53fd836ca7
commit ac6a91020b
No known key found for this signature in database
GPG key ID: C5D399F626523045
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/github.com/matrix-org/dendrite/clientapi/producers/roomserver.go
View file

@ -55,10 +55,10 @@ func (c *RoomserverProducer) SendEvents(
// with the state at the event as KindOutlier before it.
func (c *RoomserverProducer) SendEventWithState(
ctx context.Context, state gomatrixserverlib.RespState, event gomatrixserverlib.Event,
) (string, error) {
) error {
outliers, err := state.Events()
if err != nil {
return "", err
return err
}
ires := make([]api.InputRoomEvent, len(outliers)+1)
@ -83,7 +83,8 @@ func (c *RoomserverProducer) SendEventWithState(
StateEventIDs: stateEventIDs,
}
return c.SendInputRoomEvents(ctx, ires)
_, err = c.SendInputRoomEvents(ctx, ires)
return err
}
// SendInputRoomEvents writes the given input room events to the roomserver input API.

2
src/github.com/matrix-org/dendrite/clientapi/routing/joinroom.go
View file

@ -304,7 +304,7 @@ func (r joinRoomReq) joinRoomUsingServer(roomID string, server gomatrixserverlib
return nil, err
}
if _, err = r.producer.SendEventWithState(
if err = r.producer.SendEventWithState(
r.req.Context(), gomatrixserverlib.RespState(respSendJoin), event,
); err != nil {
res := httputil.LogThenError(r.req, err)

7
src/github.com/matrix-org/dendrite/federationapi/routing/send.go
View file

@ -207,14 +207,13 @@ func (t *txnReq) processEventWithMissingState(e gomatrixserverlib.Event) error {
return err
}
// Check that the returned state is valid.
if err = state.Check(t.context, t.keys); err != nil {
if err := state.Check(t.context, t.keys); err != nil {
return err
}
// Check that the event is allowed by the state.
if err = checkAllowedByState(e, state.StateEvents); err != nil {
if err := checkAllowedByState(e, state.StateEvents); err != nil {
return err
}
// pass the event along with the state to the roomserver
_, err = t.producer.SendEventWithState(t.context, state, e)
return err
return t.producer.SendEventWithState(t.context, state, e)
}