diff options
| author | David Robertson <davidr@element.io> | 2021-11-09 13:11:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 13:11:47 +0000 |
| commit | b6f4d122efb86e3fc44e358cf573dc2caa6ff634 (patch) | |
| tree | 26e56db81f73285036fe75a251d585c04365125b /synapse/storage/databases/main/room.py | |
| parent | Support filtering by relations per MSC3440 (#11236) (diff) | |
| download | synapse-b6f4d122efb86e3fc44e358cf573dc2caa6ff634.tar.xz | |
Allow admins to proactively block rooms (#11228)
Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Diffstat (limited to 'synapse/storage/databases/main/room.py')
| -rw-r--r-- | synapse/storage/databases/main/room.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py index cefc77fa0f..17b398bb69 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -1751,7 +1751,12 @@ class RoomStore(RoomBackgroundUpdateStore, RoomWorkerStore, SearchStore): ) async def block_room(self, room_id: str, user_id: str) -> None: - """Marks the room as blocked. Can be called multiple times. + """Marks the room as blocked. + + Can be called multiple times (though we'll only track the last user to + block this room). + + Can be called on a room unknown to this homeserver. Args: room_id: Room to block |