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

Replace returnValue with return (#5736)

Browse source
This commit is contained in:
Amber Brown 2019-07-23 23:00:55 +10:00 • committed by GitHub
parent 18a466b84e
commit 4806651744
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 1359 additions and 1513 deletions
Download patch file Download diff file Expand all files Collapse all files

18
synapse/push/httppusher.py
View file

@ -258,17 +258,17 @@ class HttpPusher(object):
@defer.inlineCallbacks
def _process_one(self, push_action):
if "notify" not in push_action["actions"]:
defer.returnValue(True)
return True
tweaks = push_rule_evaluator.tweaks_for_actions(push_action["actions"])
badge = yield push_tools.get_badge_count(self.hs.get_datastore(), self.user_id)
event = yield self.store.get_event(push_action["event_id"], allow_none=True)
if event is None:
defer.returnValue(True) # It's been redacted
return True # It's been redacted
rejected = yield self.dispatch_push(event, tweaks, badge)
if rejected is False:
defer.returnValue(False)
return False
if isinstance(rejected, list) or isinstance(rejected, tuple):
for pk in rejected:
@ -282,7 +282,7 @@ class HttpPusher(object):
else:
logger.info("Pushkey %s was rejected: removing", pk)
yield self.hs.remove_pusher(self.app_id, pk, self.user_id)
defer.returnValue(True)
return True
@defer.inlineCallbacks
def _build_notification_dict(self, event, tweaks, badge):
@ -302,7 +302,7 @@ class HttpPusher(object):
],
}
}
defer.returnValue(d)
return d
ctx = yield push_tools.get_context_for_event(
self.store, self.state_handler, event, self.user_id
@ -345,13 +345,13 @@ class HttpPusher(object):
if "name" in ctx and len(ctx["name"]) > 0:
d["notification"]["room_name"] = ctx["name"]
defer.returnValue(d)
return d
@defer.inlineCallbacks
def dispatch_push(self, event, tweaks, badge):
notification_dict = yield self._build_notification_dict(event, tweaks, badge)
if not notification_dict:
defer.returnValue([])
return []
try:
resp = yield self.http_client.post_json_get_json(
self.url, notification_dict
@ -364,11 +364,11 @@ class HttpPusher(object):
type(e),
e,
)
defer.returnValue(False)
return False
rejected = []
if "rejected" in resp:
rejected = resp["rejected"]
defer.returnValue(rejected)
return rejected
@defer.inlineCallbacks
def _send_badge(self, badge):