diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-02 16:16:51 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-03 10:40:48 +0100 |
| commit | da3e04df8bcbb42f383abf406f4d71cf54b77ae2 (patch) | |
| tree | 98ca8467f9c8a79740e27a581f5ebc01abfab891 /synapse | |
| parent | Allow optional non-suppression of exceptions through the Distributor (diff) | |
| download | synapse-da3e04df8bcbb42f383abf406f4d71cf54b77ae2.tar.xz | |
Rename the 'do_users_share_a_room' to something slightly less verb-sounding
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/presence.py | 2 | ||||
| -rw-r--r-- | synapse/storage/roommember.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 8c1c2bf850..48549b03e5 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -155,7 +155,7 @@ class PresenceHandler(BaseHandler): if observer_user == observed_user: defer.returnValue(True) - if (yield self.store.do_users_share_a_room( + if (yield self.store.user_rooms_intersect( [observer_user, observed_user] )): defer.returnValue(True) diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 2746126e85..c380ec0ebd 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -165,7 +165,7 @@ class RoomMemberStore(SQLBaseStore): defer.returnValue(results) @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. """ user_list_clause = " OR ".join(["m.user_id = ?"] * len(user_list)) |