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

Check support room has only two users before sending a notice #8728

Merged
merged 3 commits into from
Nov 11, 2020
Merged

Check support room has only two users before sending a notice #8728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08152b3
Check support room has only two users
Half-Shot Nov 6, 2020
9413e7f
Create 8728.bugfix
Half-Shot Nov 6, 2020
9411078
Update synapse/server_notices/server_notices_manager.py
Half-Shot Nov 6, 2020
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
1 change: 1 addition & 0 deletions changelog.d/8728.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix bug where the `/_synapse/admin/v1/send_server_notice` API could send notices to non-notice rooms.
2 changes: 1 addition & 1 deletion synapse/server_notices/server_notices_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ async def get_or_create_notice_room_for_user(self, user_id: str) -> str:
# manages to invite the system user to a room, that doesn't make it
# the server notices room.
user_ids = await self._store.get_users_in_room(room.room_id)
if self.server_notices_mxid in user_ids:
if len(user_ids) <= 2 and self.server_notices_mxid in user_ids:
# we found a room which our user shares with the system notice
# user
logger.info(
Expand Down