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

Clean up a bit

Browse source
This commit is contained in:
Neil Alexander 2022-02-07 14:28:28 +00:00
parent 29aa75b727
commit ab20cb0134
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/internal/input/input_events.go
View file

@ -221,7 +221,7 @@ func (r *Inputer) processRoomEvent(
// typical federated room join) then we won't bother trying to fetch prev events // typical federated room join) then we won't bother trying to fetch prev events
// because we may not be allowed to see them and we have no choice but to trust // because we may not be allowed to see them and we have no choice but to trust
// the state event IDs provided to us in the join instead. // the state event IDs provided to us in the join instead.
if !input.HasState && missingPrev && input.Kind == api.KindNew { if missingPrev && input.Kind == api.KindNew {
// Don't do this for KindOld events, otherwise old events that we fetch // Don't do this for KindOld events, otherwise old events that we fetch
// to satisfy missing prev events/state will end up recursively calling // to satisfy missing prev events/state will end up recursively calling
// processRoomEvent. // processRoomEvent.

3
roomserver/internal/query/query.go
View file

@ -150,9 +150,6 @@ func (r *Queryer) QueryMissingAuthPrevEvents(
for _, prevEventID := range request.PrevEventIDs { for _, prevEventID := range request.PrevEventIDs {
state, err := r.DB.StateAtEventIDs(ctx, []string{prevEventID}) state, err := r.DB.StateAtEventIDs(ctx, []string{prevEventID})
if len(state) == 1 && state[0].IsRejected {
continue
}
if err != nil || len(state) == 0 { if err != nil || len(state) == 0 {
response.MissingPrevEventIDs = append(response.MissingPrevEventIDs, prevEventID) response.MissingPrevEventIDs = append(response.MissingPrevEventIDs, prevEventID)
} }