From 6c053d1f45026433f6563cdbb40234e205fc9294 Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Thu, 2 Mar 2023 15:01:36 +0100 Subject: [PATCH] Remove unneeded RoomInfo --- roomserver/state/state.go | 6 +++--- roomserver/storage/shared/storage.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roomserver/state/state.go b/roomserver/state/state.go index 0c279e31c..47e1488df 100644 --- a/roomserver/state/state.go +++ b/roomserver/state/state.go @@ -60,10 +60,10 @@ func NewStateResolution(db StateResolutionStorage, roomInfo *types.RoomInfo) Sta } 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) if err != nil { 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") } - events, err := p.db.Events(ctx, roomInfo, []types.EventNID{plNID}) + events, err := p.db.Events(ctx, p.roomInfo, []types.EventNID{plNID}) if err != nil { return nil, err } diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go index e881b8704..ff8a5ce47 100644 --- a/roomserver/storage/shared/storage.go +++ b/roomserver/storage/shared/storage.go @@ -970,7 +970,7 @@ func (d *EventDatabase) MaybeRedactEvent( _, sender1, _ := gomatrixserverlib.SplitID('@', redactedEvent.Sender()) _, sender2, _ := gomatrixserverlib.SplitID('@', redactionEvent.Sender()) var powerlevels *gomatrixserverlib.PowerLevelContent - powerlevels, err = plResolver.Resolve(ctx, roomInfo, redactionEvent.EventID()) + powerlevels, err = plResolver.Resolve(ctx, redactionEvent.EventID()) if err != nil { return err }