hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-07-30 21:12:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement gomatrixserverlib.HeaderedEvent in roomserver Kafka output (#914)

Browse source 
* Use Event.Headered

* Use HeaderedEvent in roomserver kafka output

* Fix syncserver-integration-tests

* Update producers to roomserver inputs

* Update gomatrixserverlib

* Update gomatrixserverlib

* Update gomatrixserverlib

* Update gomatrixserverlib

* Update gomatrixserverlib

* Update gomatrixserverlib
This commit is contained in:
Neil Alexander 2020-03-17 11:01:25 +00:00 • committed by GitHub
parent 9f74a8798e
commit aebf347a79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 289 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

49
roomserver/query/query.go
View file

@ -147,12 +147,7 @@ func (r *RoomserverQueryAPI) QueryLatestEventsAndState(
}
for _, event := range stateEvents {
response.StateEvents = append(response.StateEvents, gomatrixserverlib.HeaderedEvent{
EventHeader: gomatrixserverlib.EventHeader{
RoomVersion: roomVersion,
},
Event: event,
})
response.StateEvents = append(response.StateEvents, event.Headered(roomVersion))
}
return nil
@ -209,12 +204,7 @@ func (r *RoomserverQueryAPI) QueryStateAfterEvents(
}
for _, event := range stateEvents {
response.StateEvents = append(response.StateEvents, gomatrixserverlib.HeaderedEvent{
EventHeader: gomatrixserverlib.EventHeader{
RoomVersion: roomVersion,
},
Event: event,
})
response.StateEvents = append(response.StateEvents, event.Headered(roomVersion))
}
return nil
@ -247,12 +237,7 @@ func (r *RoomserverQueryAPI) QueryEventsByID(
// TODO: Room version here
roomVersion := gomatrixserverlib.RoomVersionV1
response.Events = append(response.Events, gomatrixserverlib.HeaderedEvent{
EventHeader: gomatrixserverlib.EventHeader{
RoomVersion: roomVersion,
},
Event: event,
})
response.Events = append(response.Events, event.Headered(roomVersion))
}
return nil
@ -534,12 +519,7 @@ func (r *RoomserverQueryAPI) QueryMissingEvents(
// TODO: Room version here
roomVersion := gomatrixserverlib.RoomVersionV1
response.Events = append(response.Events, gomatrixserverlib.HeaderedEvent{
EventHeader: gomatrixserverlib.EventHeader{
RoomVersion: roomVersion,
},
Event: event,
})
response.Events = append(response.Events, event.Headered(roomVersion))
}
}
@ -585,12 +565,7 @@ func (r *RoomserverQueryAPI) QueryBackfill(
// TODO: Room version here
roomVersion := gomatrixserverlib.RoomVersionV1
response.Events = append(response.Events, gomatrixserverlib.HeaderedEvent{
EventHeader: gomatrixserverlib.EventHeader{
RoomVersion: roomVersion,
},
Event: event,
})
response.Events = append(response.Events, event.Headered(roomVersion))
}
return err
@ -711,24 +686,14 @@ func (r *RoomserverQueryAPI) QueryStateAndAuthChain(
// TODO: Room version here
roomVersion := gomatrixserverlib.RoomVersionV1
response.StateEvents = append(response.StateEvents, gomatrixserverlib.HeaderedEvent{
EventHeader: gomatrixserverlib.EventHeader{
RoomVersion: roomVersion,
},
Event: event,
})
response.StateEvents = append(response.StateEvents, event.Headered(roomVersion))
}
for _, event := range authEvents {
// TODO: Room version here
roomVersion := gomatrixserverlib.RoomVersionV1
response.AuthChainEvents = append(response.AuthChainEvents, gomatrixserverlib.HeaderedEvent{
EventHeader: gomatrixserverlib.EventHeader{
RoomVersion: roomVersion,
},
Event: event,
})
response.AuthChainEvents = append(response.AuthChainEvents, event.Headered(roomVersion))
}
return err