summary refs log tree commit diff
path: root/synapse/push/httppusher.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-06-25 09:39:01 +0100
committerErik Johnston <erik@matrix.org>2020-06-25 09:39:01 +0100
commitc16bb06d25d69b03e72921e28bc21671c8c1285a (patch)
tree7b4bb329a35d298d40a48cdab1558084be6e085b /synapse/push/httppusher.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentYield during large v2 state res. (#7735) (diff)
downloadsynapse-c16bb06d25d69b03e72921e28bc21671c8c1285a.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/push/httppusher.py')
-rw-r--r--synapse/push/httppusher.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py

index 3efc825d15..af7e365e90 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py
@@ -133,6 +133,8 @@ class HttpPusher(object): @defer.inlineCallbacks def _update_badge(self): + # XXX as per https://github.com/matrix-org/matrix-doc/issues/2627, this seems + # to be largely redundant. perhaps we can remove it. badge = yield push_tools.get_badge_count(self.hs.get_datastore(), self.user_id) yield self._send_badge(badge)