Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-06 08:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into babolivier/mark_unread

Browse source
This commit is contained in:
Brendan Abolivier 2020-06-15 16:37:52 +01:00
commit 6efb2b0ad4
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
57 changed files with 363 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

14
synapse/push/bulk_push_rule_evaluator.py
View file

@ -17,8 +17,6 @@
import logging
from collections import namedtuple
from six import iteritems, itervalues
from prometheus_client import Counter
from twisted.internet import defer
@ -130,7 +128,7 @@ class BulkPushRuleEvaluator(object):
event, prev_state_ids, for_verification=False
)
auth_events = yield self.store.get_events(auth_events_ids)
auth_events = {(e.type, e.state_key): e for e in itervalues(auth_events)}
auth_events = {(e.type, e.state_key): e for e in auth_events.values()}
sender_level = get_user_power_level(event.sender, auth_events)
@ -162,7 +160,7 @@ class BulkPushRuleEvaluator(object):
condition_cache = {}
for uid, rules in iteritems(rules_by_user):
for uid, rules in rules_by_user.items():
if event.sender == uid:
continue
@ -398,7 +396,7 @@ class RulesForRoom(object):
# If the event is a join event then it will be in current state evnts
# map but not in the DB, so we have to explicitly insert it.
if event.type == EventTypes.Member:
for event_id in itervalues(member_event_ids):
for event_id in member_event_ids.values():
if event_id == event.event_id:
members[event_id] = (event.state_key, event.membership)
@ -407,7 +405,7 @@ class RulesForRoom(object):
interested_in_user_ids = {
user_id
for user_id, membership in itervalues(members)
for user_id, membership in members.values()
if membership == Membership.JOIN
}
@ -418,7 +416,7 @@ class RulesForRoom(object):
)
user_ids = {
uid for uid, have_pusher in iteritems(if_users_with_pushers) if have_pusher
uid for uid, have_pusher in if_users_with_pushers.items() if have_pusher
}
logger.debug("With pushers: %r", user_ids)
@ -439,7 +437,7 @@ class RulesForRoom(object):
)
ret_rules_by_user.update(
item for item in iteritems(rules_by_user) if item[0] is not None
item for item in rules_by_user.items() if item[0] is not None
)
self.update_cache(sequence, members, ret_rules_by_user, state_group)