mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded RoomInfo

Browse source
This commit is contained in:
Till Faelligen 2023-03-02 15:01:36 +01:00
parent b8d425165d
commit 6c053d1f45
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roomserver/state/state.go
View file

@ -60,10 +60,10 @@ func NewStateResolution(db StateResolutionStorage, roomInfo *types.RoomInfo) Sta
} }
type PowerLevelResolver interface { type PowerLevelResolver interface {
Resolve(ctx context.Context, roomInfo *types.RoomInfo, eventID string) (*gomatrixserverlib.PowerLevelContent, error) Resolve(ctx context.Context, eventID string) (*gomatrixserverlib.PowerLevelContent, error)
} }
func (p *StateResolution) Resolve(ctx context.Context, roomInfo *types.RoomInfo, eventID string) (*gomatrixserverlib.PowerLevelContent, error) { func (p *StateResolution) Resolve(ctx context.Context, eventID string) (*gomatrixserverlib.PowerLevelContent, error) {
stateEntries, err := p.LoadStateAtEvent(ctx, eventID) stateEntries, err := p.LoadStateAtEvent(ctx, eventID)
if err != nil { if err != nil {
return nil, err return nil, err
@ -85,7 +85,7 @@ func (p *StateResolution) Resolve(ctx context.Context, roomInfo *types.RoomInfo,
return nil, fmt.Errorf("unable to find power level event") return nil, fmt.Errorf("unable to find power level event")
} }
events, err := p.db.Events(ctx, roomInfo, []types.EventNID{plNID}) events, err := p.db.Events(ctx, p.roomInfo, []types.EventNID{plNID})
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
roomserver/storage/shared/storage.go
View file

@ -970,7 +970,7 @@ func (d *EventDatabase) MaybeRedactEvent(
_, sender1, _ := gomatrixserverlib.SplitID('@', redactedEvent.Sender()) _, sender1, _ := gomatrixserverlib.SplitID('@', redactedEvent.Sender())
_, sender2, _ := gomatrixserverlib.SplitID('@', redactionEvent.Sender()) _, sender2, _ := gomatrixserverlib.SplitID('@', redactionEvent.Sender())
var powerlevels *gomatrixserverlib.PowerLevelContent var powerlevels *gomatrixserverlib.PowerLevelContent
powerlevels, err = plResolver.Resolve(ctx, roomInfo, redactionEvent.EventID()) powerlevels, err = plResolver.Resolve(ctx, redactionEvent.EventID())
if err != nil { if err != nil {
return err return err
} }