Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

There was already a constant for this

Browse Source 
also update copyright
This commit is contained in:
David Baker 2017-10-10 11:47:10 +01:00
parent a9f9d68631
commit c9f034b4ac
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/push/bulk_push_rule_evaluator.py
View File

@ -1,5 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2015 OpenMarket Ltd # Copyright 2015 OpenMarket Ltd
# Copyright 2017 New Vector Ltd
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -25,6 +26,7 @@ from synapse.metrics import get_metrics_for
from synapse.util.caches import metrics as cache_metrics from synapse.util.caches import metrics as cache_metrics
from synapse.util.caches.descriptors import cached from synapse.util.caches.descriptors import cached
from synapse.util.async import Linearizer from synapse.util.async import Linearizer
from synapse.state import POWER_KEY
from collections import namedtuple from collections import namedtuple
@ -112,13 +114,12 @@ class BulkPushRuleEvaluator(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_sender_power_level(self, event, context): def _get_sender_power_level(self, event, context):
pl_event_key = (EventTypes.PowerLevels, "", ) pl_event_id = context.prev_state_ids.get(POWER_KEY)
pl_event_id = context.prev_state_ids.get(pl_event_key)
if pl_event_id: if pl_event_id:
# fastpath: if there's a power level event, that's all we need, and # fastpath: if there's a power level event, that's all we need, and
# not having a power level event is an extreme edge case # not having a power level event is an extreme edge case
pl_event = yield self.store.get_event(pl_event_id) pl_event = yield self.store.get_event(pl_event_id)
auth_events = { pl_event_key: pl_event } auth_events = { POWER_KEY: pl_event }
else: else:
auth_events_ids = yield self.auth.compute_auth_events( auth_events_ids = yield self.auth.compute_auth_events(
event, context.prev_state_ids, for_verification=False, event, context.prev_state_ids, for_verification=False,