Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Allow admins to proactively block rooms #11228

Merged
merged 15 commits into from
Nov 9, 2021
Merged

Allow admins to proactively block rooms #11228

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7e6e9da
Fix doc typo
Nov 1, 2021
33afbeb
Note that new_room_id may be null
Nov 1, 2021
47fd059
Avoid confusion with other meanings of "event".
Nov 1, 2021
033adb7
Enforce the type of the shutdown_room response
Nov 1, 2021
0ed7a31
Test that you can block an unknown room
Nov 1, 2021
933197b
Allow blocking an unknown room
Nov 1, 2021
3bd4984
Changelog
Nov 1, 2021
92efc62
Update tests/rest/admin/test_room.py
Nov 2, 2021
b820b60
Update changelog.d/11228.feature
Nov 5, 2021
8f9bf40
Update synapse/handlers/room.py
Nov 5, 2021
a2da438
Cast safety comment
Nov 5, 2021
de6aa37
Update docs(trings)
Nov 5, 2021
c5fccfa
Lint
Nov 5, 2021
e397068
Update docs/admin_api/rooms.md
Nov 9, 2021
5402a69
Update docstring to match
Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix doc typo
  • Loading branch information
David Robertson committed Nov 1, 2021
commit 7e6e9dab52b09984b67c5840a8995a70c44abd9e
2 changes: 1 addition & 1 deletion docs/admin_api/rooms.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ This API will remove all trace of the old room from your database after removing
all local users. If `purge` is `true` (the default), all traces of the old room will
be removed from your database after removing all local users. If you do not want
this to happen, set `purge` to `false`.
Depending on the amount of history being purged a call to the API may take
Depending on the amount of history being purged, a call to the API may take
several minutes or longer.

The local server will only have the power to move local user and room aliases to
Expand Down