mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "No-op if no added state event IDs"

Browse source 
This reverts commit 71a0ef3df1.
This commit is contained in:
Neil Alexander 2022-03-07 16:58:59 +00:00
parent 71a0ef3df1
commit e8764e59e9
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
roomserver/api/output.go
View file

@ -170,16 +170,14 @@ type OutputNewRoomEvent struct {
// The slice returned contains the output room event itself in all cases. // The slice returned contains the output room event itself in all cases.
func (o *OutputNewRoomEvent) AddsState(ctx context.Context, rsAPI RoomserverInternalAPI) ([]*gomatrixserverlib.HeaderedEvent, error) { func (o *OutputNewRoomEvent) AddsState(ctx context.Context, rsAPI RoomserverInternalAPI) ([]*gomatrixserverlib.HeaderedEvent, error) {
events := make([]*gomatrixserverlib.HeaderedEvent, 0, len(o.AddsStateEventIDs)) events := make([]*gomatrixserverlib.HeaderedEvent, 0, len(o.AddsStateEventIDs))
if len(o.AddsStateEventIDs) > 0 { eventsReq := &QueryEventsByIDRequest{
eventsReq := &QueryEventsByIDRequest{ EventIDs: o.AddsStateEventIDs,
EventIDs: o.AddsStateEventIDs,
}
eventsRes := &QueryEventsByIDResponse{}
if err := rsAPI.QueryEventsByID(ctx, eventsReq, eventsRes); err != nil {
return nil, fmt.Errorf("s.rsAPI.QueryEventsByID: %w", err)
}
events = append(events, eventsRes.Events...)
} }
eventsRes := &QueryEventsByIDResponse{}
if err := rsAPI.QueryEventsByID(ctx, eventsReq, eventsRes); err != nil {
return nil, fmt.Errorf("s.rsAPI.QueryEventsByID: %w", err)
}
events = append(events, eventsRes.Events...)
return events, nil return events, nil
} }