Make get_invites return RoomsForUser
This commit is contained in:
parent
d787e41b20
commit
b6507869cd
2 changed files with 5 additions and 7 deletions
|
@ -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)
|
||||
|
||||
|
|
|
@ -115,19 +115,17 @@ class RoomMemberStore(SQLBaseStore):
|
|||
).addCallback(self._get_events)
|
||||
|
||||
@cached()
|
||||
def get_invites_for_user(self, user_id):
|
||||
""" Get all the invite events for a user
|
||||
def get_invited_rooms_for_user(self, user_id):
|
||||
""" Get all the rooms the user is invited to
|
||||
Args:
|
||||
user_id (str): The user ID.
|
||||
Returns:
|
||||
A deferred list of event objects.
|
||||
A deferred list of RoomsForUser.
|
||||
"""
|
||||
|
||||
return self.get_rooms_for_user_where_membership_is(
|
||||
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):
|
||||
""" Get all the leave events for a user
|
||||
|
|
Loading…
Reference in a new issue