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

Refine SenderID/UserID usage for push rules

Browse source
This commit is contained in:
Devon Hudson 2023-06-02 15:01:58 -06:00
parent d81b63f556
commit 26ef0246e8
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/pushrules/evaluate.go
View file

@ -113,7 +113,11 @@ func ruleMatches(rule *Rule, kind Kind, event gomatrixserverlib.PDU, ec Evaluati
return rule.RuleID == event.RoomID(), nil return rule.RuleID == event.RoomID(), nil
case SenderKind: case SenderKind:
return rule.RuleID == event.SenderID(), nil sender, err := event.UserID()
if err != nil {
return false, nil
}
return rule.RuleID == sender.String(), nil
default: default:
return false, nil return false, nil

4
userapi/consumers/roomserver.go
View file

@ -682,7 +682,7 @@ func (rse *ruleSetEvalContext) UserDisplayName() string { return rse.mem.Display
func (rse *ruleSetEvalContext) RoomMemberCount() (int, error) { return rse.roomSize, nil } func (rse *ruleSetEvalContext) RoomMemberCount() (int, error) { return rse.roomSize, nil }
func (rse *ruleSetEvalContext) HasPowerLevel(userID, levelKey string) (bool, error) { func (rse *ruleSetEvalContext) HasPowerLevel(senderID, levelKey string) (bool, error) {
req := &rsapi.QueryLatestEventsAndStateRequest{ req := &rsapi.QueryLatestEventsAndStateRequest{
RoomID: rse.roomID, RoomID: rse.roomID,
StateToFetch: []gomatrixserverlib.StateKeyTuple{ StateToFetch: []gomatrixserverlib.StateKeyTuple{
@ -702,7 +702,7 @@ func (rse *ruleSetEvalContext) HasPowerLevel(userID, levelKey string) (bool, err
if err != nil { if err != nil {
return false, err return false, err
} }
return plc.UserLevel(userID) >= plc.NotificationLevel(levelKey), nil return plc.UserLevel(senderID) >= plc.NotificationLevel(levelKey), nil
} }
return true, nil return true, nil
} }