From 4909cd02028aa6b5b5ccc580a3ee0e22f2c34b37 Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Thu, 18 Jun 2015 14:07:41 +0100
Subject: [PATCH] Rename get_public_room_ids() to get_published_room_ids()

---
 synapse/handlers/message.py | 5 +++--
 synapse/storage/room.py     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 867fdbefb0..b1835dfa9e 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -278,7 +278,7 @@ class MessageHandler(BaseHandler):
             user, pagination_config.get_source_config("presence"), None
         )
 
-        public_room_ids = yield self.store.get_public_room_ids()
+        published_room_ids = yield self.store.get_published_room_ids()
 
         limit = pagin_config.limit
         if limit is None:
@@ -290,7 +290,8 @@ class MessageHandler(BaseHandler):
                 "room_id": event.room_id,
                 "membership": event.membership,
                 "visibility": (
-                    "public" if event.room_id in public_room_ids
+                    # TODO(paul): This should be specified as "published"
+                    "public" if event.room_id in published_room_ids
                     else "private"
                 ),
             }
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 4612a8aa83..c64cb9bbd1 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -75,14 +75,14 @@ class RoomStore(SQLBaseStore):
             allow_none=True,
         )
 
-    def get_public_room_ids(self):
+    def get_published_room_ids(self):
         return self._simple_select_onecol(
             table="rooms",
             keyvalues={
                 "is_public": True,
             },
             retcol="room_id",
-            desc="get_public_room_ids",
+            desc="get_published_room_ids",
         )
 
     @defer.inlineCallbacks