Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make get_invites return RoomsForUser

This commit is contained in:
Erik Johnston 2016-03-23 10:32:10 +00:00
parent d787e41b20
commit b6507869cd
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/push/__init__.py
View File

@ -317,7 +317,7 @@ class Pusher(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def _get_badge_count(self): def _get_badge_count(self):
invites, joins = yield defer.gatherResults([ 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), self.store.get_rooms_for_user(self.user_id),
], consumeErrors=True) ], consumeErrors=True)

10
synapse/storage/roommember.py
View File

@ -115,19 +115,17 @@ class RoomMemberStore(SQLBaseStore):
).addCallback(self._get_events) ).addCallback(self._get_events)
@cached() @cached()
def get_invites_for_user(self, user_id): def get_invited_rooms_for_user(self, user_id):
""" Get all the invite events for a user """ Get all the rooms the user is invited to
Args: Args:
user_id (str): The user ID. user_id (str): The user ID.
Returns: Returns:
A deferred list of event objects. A deferred list of RoomsForUser.
""" """
return self.get_rooms_for_user_where_membership_is( return self.get_rooms_for_user_where_membership_is(
user_id, [Membership.INVITE] user_id, [Membership.INVITE]
).addCallback(lambda invites: self._get_events([ )
invite.event_id for invite in invites
]))
def get_leave_and_ban_events_for_user(self, user_id): def get_leave_and_ban_events_for_user(self, user_id):
""" Get all the leave events for a user """ Get all the leave events for a user