1 files changed, 22 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py
index 9f0d64a325..bcf25f298e 100644
--- a/synapse/storage/databases/main/room.py
+++ b/synapse/storage/databases/main/room.py
@@ -12,7 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import collections
 import logging
 from abc import abstractmethod
@@ -358,6 +357,23 @@ class RoomWorkerStore(SQLBaseStore):
             desc="is_room_blocked",
         )
 
+    async def is_room_published(self, room_id: str) -> bool:
+        """Check whether a room has been published in the local public room
+        directory.
+
+        Args:
+            room_id
+        Returns:
+            Whether the room is currently published in the room directory
+        """
+        # Get room information
+        room_info = await self.get_room(room_id)
+        if not room_info:
+            return False
+
+        # Check the is_public value
+        return room_info.get("is_public", False)
+
     async def get_rooms_paginate(
         self,
         start: int,
@@ -621,6 +637,11 @@ class RoomWorkerStore(SQLBaseStore):
         Returns:
             dict[int, int]: "min_lifetime" and "max_lifetime" for this room.
         """
+        # If the room retention feature is disabled, return a policy with no minimum nor
+        # maximum, in order not to filter out events we should filter out when sending to
+        # the client.
+        if not self.config.retention_enabled:
+            return {"min_lifetime": None, "max_lifetime": None}
 
         def get_retention_policy_for_room_txn(txn):
             txn.execute(