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

Only loopback invite event if we know the room

Browse source
This commit is contained in:
Neil Alexander 2020-05-06 15:59:31 +01:00
parent 0100f65f57
commit c744cf052f
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
roomserver/internal/input.go
View file

@ -54,14 +54,17 @@ func (r *RoomserverInternalAPI) InputRoomEvents(
ctx context.Context,
request *api.InputRoomEventsRequest,
response *api.InputRoomEventsResponse,
) (err error) {
) error {
// We lock as processRoomEvent can only be called once at a time
r.mutex.Lock()
defer r.mutex.Unlock()
for i := range request.InputInviteEvents {
if event, e := processInviteEvent(ctx, r.DB, r, request.InputInviteEvents[i]); e != nil {
return e
if event, err := processInviteEvent(ctx, r.DB, r, request.InputInviteEvents[i]); err != nil {
return err
} else {
// If the room is one that we know about then append the invite
// event to the list of room events to process.
if nid, err := r.DB.RoomNIDExcludingStubs(ctx, event.RoomID()); err == nil && nid > 0 {
request.InputRoomEvents = append(request.InputRoomEvents, api.InputRoomEvent{
Kind: api.KindNew,
Event: *event,
@ -69,6 +72,8 @@ func (r *RoomserverInternalAPI) InputRoomEvents(
})
}
}
}
var err error
for i := range request.InputRoomEvents {
if response.EventID, err = processRoomEvent(ctx, r.DB, r, request.InputRoomEvents[i]); err != nil {
return err