diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-03-29 01:20:25 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-03-29 01:20:25 +0100 |
| commit | e0c2490a145550310edb3ad0a414aa1840ef3ce4 (patch) | |
| tree | 3d9ba7834e859171397ac7136ccb82123b4cd8ce /synapse/push/__init__.py | |
| parent | Merge branch 'develop' into matthew/preview_urls (diff) | |
| parent | typo (diff) | |
| download | synapse-e0c2490a145550310edb3ad0a414aa1840ef3ce4.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
Diffstat (limited to 'synapse/push/__init__.py')
| -rw-r--r-- | synapse/push/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 65ef1b68a3..296c4447ec 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -317,7 +317,7 @@ class Pusher(object): @defer.inlineCallbacks def _get_badge_count(self): invites, joins = yield defer.gatherResults([ - self.store.get_invites_for_user(self.user_id), + self.store.get_invited_rooms_for_user(self.user_id), self.store.get_rooms_for_user(self.user_id), ], consumeErrors=True) |