Mirrors/dendrite
2
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-12-14 07:12:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add AddsState helper function

Browse source
This commit is contained in:
Neil Alexander 2022-03-07 16:30:57 +00:00
parent 84a940715f
commit c9fbe45475
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
appservice/consumers/roomserver.go
View file

@ -87,17 +87,12 @@ func (s *OutputRoomEventConsumer) onMessage(ctx context.Context, msg *nats.Msg)
return true
}
events := []*gomatrixserverlib.HeaderedEvent{output.NewRoomEvent.Event}
if len(output.NewRoomEvent.AddsStateEventIDs) > 0 {
eventsReq := &api.QueryEventsByIDRequest{
EventIDs: output.NewRoomEvent.AddsStateEventIDs,
}
eventsRes := &api.QueryEventsByIDResponse{}
if err := s.rsAPI.QueryEventsByID(s.ctx, eventsReq, eventsRes); err != nil {
events, err := output.NewRoomEvent.AddsState(ctx, s.rsAPI)
if err != nil {
log.WithError(err).Errorf("roomserver output log: failed to get state events")
return false
}
events = append(events, eventsRes.Events...)
}
events = append(events, output.NewRoomEvent.Event)
// Send event to any relevant application services
if err := s.filterRoomserverEvents(context.TODO(), events); err != nil {

25
federationapi/consumers/roomserver.go
View file

@ -146,28 +146,13 @@ func (s *OutputRoomEventConsumer) processInboundPeek(orp api.OutputNewInboundPee
// processMessage updates the list of currently joined hosts in the room
// and then sends the event to the hosts that were joined before the event.
func (s *OutputRoomEventConsumer) processMessage(ore api.OutputNewRoomEvent) error {
eventsRes := &api.QueryEventsByIDResponse{}
if len(ore.AddsStateEventIDs) > 0 {
eventsReq := &api.QueryEventsByIDRequest{
EventIDs: ore.AddsStateEventIDs,
}
if err := s.rsAPI.QueryEventsByID(s.ctx, eventsReq, eventsRes); err != nil {
return fmt.Errorf("s.rsAPI.QueryEventsByID: %w", err)
stateEvents, err := ore.AddsState(s.ctx, s.rsAPI)
if err != nil {
return fmt.Errorf("ore.AddsState: %w", err)
}
stateEvents = append(stateEvents, ore.Event)
found := false
for _, event := range eventsRes.Events {
if event.EventID() == ore.Event.EventID() {
found = true
break
}
}
if !found {
eventsRes.Events = append(eventsRes.Events, ore.Event)
}
}
addsJoinedHosts, err := joinedHostsFromEvents(gomatrixserverlib.UnwrapEventHeaders(eventsRes.Events))
addsJoinedHosts, err := joinedHostsFromEvents(gomatrixserverlib.UnwrapEventHeaders(stateEvents))
if err != nil {
return err
}

18
roomserver/api/output.go
View file

@ -15,6 +15,9 @@
package api
import (
"context"
"fmt"
"github.com/matrix-org/gomatrixserverlib"
)
@ -163,6 +166,21 @@ type OutputNewRoomEvent struct {
TransactionID *TransactionID `json:"transaction_id,omitempty"`
}
// AddsState asks the roomserver API for events specified in `adds_state_event_ids`.
// The slice returned contains the output room event itself in all cases.
func (o *OutputNewRoomEvent) AddsState(ctx context.Context, rsAPI RoomserverInternalAPI) ([]*gomatrixserverlib.HeaderedEvent, error) {
events := make([]*gomatrixserverlib.HeaderedEvent, 0, len(o.AddsStateEventIDs))
eventsReq := &QueryEventsByIDRequest{
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...)
return events, nil
}
// An OutputOldRoomEvent is written when the roomserver receives an old event.
// This will typically happen as a result of getting either missing events
// or backfilling. Downstream components may wish to send these events to