mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-22 14:21:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Always try to get a roomInfo, avoid empty roomVersion?

Browse source
This commit is contained in:
Till Faelligen 2023-03-08 13:42:55 +01:00
parent baef523cb0
commit 4a868f1687
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -333,12 +333,10 @@ func (r *Inputer) processRoomEvent(
} }
} }
if roomInfo == nil {
roomInfo, err = r.DB.GetOrCreateRoomInfo(ctx, event) roomInfo, err = r.DB.GetOrCreateRoomInfo(ctx, event)
if err != nil { if err != nil {
return fmt.Errorf("r.DB.GetOrCreateRoomInfo: %w", err) return fmt.Errorf("r.DB.GetOrCreateRoomInfo: %w", err)
} }
}
eventTypeNID, err := r.DB.GetOrCreateEventTypeNID(ctx, event.Type()) eventTypeNID, err := r.DB.GetOrCreateEventTypeNID(ctx, event.Type())
if err != nil { if err != nil {
@ -704,12 +702,10 @@ nextAuthEvent:
logger.WithError(err).Warnf("Auth event %s rejected", authEvent.EventID()) logger.WithError(err).Warnf("Auth event %s rejected", authEvent.EventID())
} }
if roomInfo == nil {
roomInfo, err = r.DB.GetOrCreateRoomInfo(ctx, authEvent) roomInfo, err = r.DB.GetOrCreateRoomInfo(ctx, authEvent)
if err != nil { if err != nil {
return fmt.Errorf("r.DB.GetOrCreateRoomInfo: %w", err) return fmt.Errorf("r.DB.GetOrCreateRoomInfo: %w", err)
} }
}
eventTypeNID, err := r.DB.GetOrCreateEventTypeNID(ctx, authEvent.Type()) eventTypeNID, err := r.DB.GetOrCreateEventTypeNID(ctx, authEvent.Type())
if err != nil { if err != nil {