Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-13 20:10:46 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler

Browse source
This commit is contained in:
Mark Haines 2016-05-17 10:43:58 +01:00
commit 523d5bcd0b
7 changed files with 61 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
synapse/handlers/room_member.py
View file

@ -397,21 +397,6 @@ class RoomMemberHandler(BaseHandler):
if invite:
defer.returnValue(UserID.from_string(invite.sender))
@defer.inlineCallbacks
def get_joined_rooms_for_user(self, user):
"""Returns a list of roomids that the user has any of the given
membership states in."""
rooms = yield self.store.get_rooms_for_user(
user.to_string(),
)
# For some reason the list of events contains duplicates
# TODO(paul): work out why because I really don't think it should
room_ids = set(r.room_id for r in rooms)
defer.returnValue(room_ids)
@defer.inlineCallbacks
def do_3pid_invite(
self,