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

Rename the 'do_users_share_a_room' to something slightly less verb-sounding

This commit is contained in:
Paul "LeoNerd" Evans 2014-09-02 16:16:51 +01:00
parent 967b45bc1a
commit da3e04df8b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/presence.py
View File

@ -155,7 +155,7 @@ class PresenceHandler(BaseHandler):
if observer_user == observed_user: if observer_user == observed_user:
defer.returnValue(True) defer.returnValue(True)
if (yield self.store.do_users_share_a_room( if (yield self.store.user_rooms_intersect(
[observer_user, observed_user] [observer_user, observed_user]
)): )):
defer.returnValue(True) defer.returnValue(True)

2
synapse/storage/roommember.py
View File

@ -165,7 +165,7 @@ class RoomMemberStore(SQLBaseStore):
defer.returnValue(results) defer.returnValue(results)
@defer.inlineCallbacks @defer.inlineCallbacks
def do_users_share_a_room(self, user_list): def user_rooms_intersect(self, user_list):
""" Checks whether a list of users share a room. """ Checks whether a list of users share a room.
""" """
user_list_clause = " OR ".join(["m.user_id = ?"] * len(user_list)) user_list_clause = " OR ".join(["m.user_id = ?"] * len(user_list))

4
tests/handlers/test_presence.py
View File

@ -117,10 +117,10 @@ class PresenceStateTestCase(unittest.TestCase):
return defer.succeed([]) return defer.succeed([])
room_member_handler.get_room_members = get_room_members room_member_handler.get_room_members = get_room_members
def do_users_share_a_room(userlist): def user_rooms_intersect(userlist):
shared = all(map(lambda u: u in self.room_members, userlist)) shared = all(map(lambda u: u in self.room_members, userlist))
return defer.succeed(shared) return defer.succeed(shared)
self.datastore.do_users_share_a_room = do_users_share_a_room self.datastore.user_rooms_intersect = user_rooms_intersect
self.mock_start = Mock() self.mock_start = Mock()
self.mock_stop = Mock() self.mock_stop = Mock()

4
tests/handlers/test_presencelike.py
View File

@ -107,9 +107,9 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase):
return defer.succeed(self.presence_list) return defer.succeed(self.presence_list)
self.datastore.get_presence_list = get_presence_list self.datastore.get_presence_list = get_presence_list
def do_users_share_a_room(userlist): def user_rooms_intersect(userlist):
return defer.succeed(False) return defer.succeed(False)
self.datastore.do_users_share_a_room = do_users_share_a_room self.datastore.user_rooms_intersect = user_rooms_intersect
self.handlers = hs.get_handlers() self.handlers = hs.get_handlers()