diff options
| author | reivilibre <oliverw@matrix.org> | 2022-01-05 11:41:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-05 11:41:49 +0000 |
| commit | 84bfe47b01402cf037417f0026ed4077223ed259 (patch) | |
| tree | 91459a8f2f39807559e364e40bd1c17958ea8321 /synapse/push | |
| parent | Clarify SSO mapping provider documentation by writing `def` or `async def` be... (diff) | |
| download | synapse-84bfe47b01402cf037417f0026ed4077223ed259.tar.xz | |
Re-apply: Move glob_to_regex and re_word_boundary to matrix-python-common #11505 (#11687)
Co-authored-by: Sean Quah <seanq@element.io>
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/push_rule_evaluator.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py index 7f68092ec5..659a53805d 100644 --- a/synapse/push/push_rule_evaluator.py +++ b/synapse/push/push_rule_evaluator.py @@ -17,9 +17,10 @@ import logging import re from typing import Any, Dict, List, Optional, Pattern, Tuple, Union +from matrix_common.regex import glob_to_regex, to_word_pattern + from synapse.events import EventBase from synapse.types import JsonDict, UserID -from synapse.util import glob_to_regex, re_word_boundary from synapse.util.caches.lrucache import LruCache logger = logging.getLogger(__name__) @@ -184,7 +185,7 @@ class PushRuleEvaluatorForEvent: r = regex_cache.get((display_name, False, True), None) if not r: r1 = re.escape(display_name) - r1 = re_word_boundary(r1) + r1 = to_word_pattern(r1) r = re.compile(r1, flags=re.IGNORECASE) regex_cache[(display_name, False, True)] = r @@ -213,7 +214,7 @@ def _glob_matches(glob: str, value: str, word_boundary: bool = False) -> bool: try: r = regex_cache.get((glob, True, word_boundary), None) if not r: - r = glob_to_regex(glob, word_boundary) + r = glob_to_regex(glob, word_boundary=word_boundary) regex_cache[(glob, True, word_boundary)] = r return bool(r.search(value)) except re.error: |