aboutsummaryrefslogtreecommitdiff
path: root/userapi
diff options
context:
space:
mode:
Diffstat (limited to 'userapi')
-rw-r--r--userapi/consumers/roomserver.go4
-rw-r--r--userapi/consumers/roomserver_test.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/userapi/consumers/roomserver.go b/userapi/consumers/roomserver.go
index 6201aa81..3cfdc0ce 100644
--- a/userapi/consumers/roomserver.go
+++ b/userapi/consumers/roomserver.go
@@ -650,7 +650,7 @@ func (s *OutputRoomEventConsumer) evaluatePushRules(ctx context.Context, event *
roomSize: roomSize,
}
eval := pushrules.NewRuleSetEvaluator(ec, &ruleSets.Global)
- rule, err := eval.MatchEvent(event.Event)
+ rule, err := eval.MatchEvent(event.PDU)
if err != nil {
return nil, err
}
@@ -698,7 +698,7 @@ func (rse *ruleSetEvalContext) HasPowerLevel(userID, levelKey string) (bool, err
continue
}
- plc, err := gomatrixserverlib.NewPowerLevelContentFromEvent(ev.Event)
+ plc, err := gomatrixserverlib.NewPowerLevelContentFromEvent(ev.PDU)
if err != nil {
return false, err
}
diff --git a/userapi/consumers/roomserver_test.go b/userapi/consumers/roomserver_test.go
index 0a24c4f4..53977206 100644
--- a/userapi/consumers/roomserver_test.go
+++ b/userapi/consumers/roomserver_test.go
@@ -41,7 +41,7 @@ func mustCreateEvent(t *testing.T, content string) *types.HeaderedEvent {
if err != nil {
t.Fatalf("failed to create event: %v", err)
}
- return &types.HeaderedEvent{Event: ev}
+ return &types.HeaderedEvent{PDU: ev}
}
func Test_evaluatePushRules(t *testing.T) {