2 files changed, 9 insertions, 5 deletions
diff --git a/internal/pushrules/evaluate.go b/internal/pushrules/evaluate.go
index ac760895..28dea97c 100644
--- a/internal/pushrules/evaluate.go
+++ b/internal/pushrules/evaluate.go
@@ -115,7 +115,11 @@ func ruleMatches(rule *Rule, kind Kind, event gomatrixserverlib.PDU, ec Evaluati
 
 	case SenderKind:
 		userID := ""
-		sender, err := userIDForSender(event.RoomID(), event.SenderID())
+		validRoomID, err := spec.NewRoomID(event.RoomID())
+		if err != nil {
+			return false, err
+		}
+		sender, err := userIDForSender(*validRoomID, event.SenderID())
 		if err == nil {
 			userID = sender.String()
 		}
diff --git a/internal/pushrules/evaluate_test.go b/internal/pushrules/evaluate_test.go
index 859d1f8a..a4ccc3d0 100644
--- a/internal/pushrules/evaluate_test.go
+++ b/internal/pushrules/evaluate_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
-func UserIDForSender(roomID string, senderID spec.SenderID) (*spec.UserID, error) {
+func UserIDForSender(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
 	return spec.NewUserID(string(senderID), true)
 }
 
@@ -73,7 +73,7 @@ func TestRuleMatches(t *testing.T) {
 		{"emptyOverride", OverrideKind, emptyRule, `{}`, true},
 		{"emptyContent", ContentKind, emptyRule, `{}`, false},
 		{"emptyRoom", RoomKind, emptyRule, `{}`, true},
-		{"emptySender", SenderKind, emptyRule, `{}`, true},
+		{"emptySender", SenderKind, emptyRule, `{"room_id":"!room:example.com"}`, true},
 		{"emptyUnderride", UnderrideKind, emptyRule, `{}`, true},
 
 		{"disabled", OverrideKind, Rule{}, `{}`, false},
@@ -90,8 +90,8 @@ func TestRuleMatches(t *testing.T) {
 		{"roomMatch", RoomKind, Rule{Enabled: true, RuleID: "!room:example.com"}, `{"room_id":"!room:example.com"}`, true},
 		{"roomNoMatch", RoomKind, Rule{Enabled: true, RuleID: "!room:example.com"}, `{"room_id":"!otherroom:example.com"}`, false},
 
-		{"senderMatch", SenderKind, Rule{Enabled: true, RuleID: "@user:example.com"}, `{"sender":"@user:example.com"}`, true},
-		{"senderNoMatch", SenderKind, Rule{Enabled: true, RuleID: "@user:example.com"}, `{"sender":"@otheruser:example.com"}`, false},
+		{"senderMatch", SenderKind, Rule{Enabled: true, RuleID: "@user:example.com"}, `{"sender":"@user:example.com","room_id":"!room:example.com"}`, true},
+		{"senderNoMatch", SenderKind, Rule{Enabled: true, RuleID: "@user:example.com"}, `{"sender":"@otheruser:example.com","room_id":"!room:example.com"}`, false},
 	}
 	for _, tst := range tsts {
 		t.Run(tst.Name, func(t *testing.T) {