Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-27 18:20:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/release-v1.26.0'

Browse source
This commit is contained in:
Tulir Asokan 2021-01-20 18:06:27 +02:00
commit d3547df958
183 changed files with 8528 additions and 2668 deletions
Download patch file Download diff file Expand all files Collapse all files

12
synapse/push/bulk_push_rule_evaluator.py
View file

@ -203,14 +203,18 @@ class BulkPushRuleEvaluator:
condition_cache = {} # type: Dict[str, bool]
# If the event is not a state event check if any users ignore the sender.
if not event.is_state():
ignorers = await self.store.ignored_by(event.sender)
else:
ignorers = set()
for uid, rules in rules_by_user.items():
if event.sender == uid:
continue
if not event.is_state():
is_ignored = await self.store.is_ignored_by(event.sender, uid)
if is_ignored:
continue
if uid in ignorers:
continue
display_name = None
profile_info = room_members.get(uid)