summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Velten <matmaul@gmail.com>2024-04-09 15:06:46 +0200
committerGitHub <noreply@github.com>2024-04-09 14:06:46 +0100
commite363881592840709d7a9a770897d230b8b086036 (patch)
tree3eacd63da0e8acb8b15d0511675b0324792c10bb
parentAdd forgotten schema delta (#17054) (diff)
downloadsynapse-e363881592840709d7a9a770897d230b8b086036.tar.xz
Fix PR #16677, a parameter was missing in a function call (#17033)
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
-rw-r--r--changelog.d/17033.bugfix1
-rw-r--r--synapse/handlers/room.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/17033.bugfix b/changelog.d/17033.bugfix
new file mode 100644
index 0000000000..407ec83b33
--- /dev/null
+++ b/changelog.d/17033.bugfix
@@ -0,0 +1 @@
+Fix server notice rooms not always being created as unencrypted rooms, even when `encryption_enabled_by_default_for_room_type` is in use (server notices are always unencrypted).
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8b5ffb135e..5e81a51638 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -956,6 +956,7 @@ class RoomCreationHandler:
             room_alias=room_alias,
             power_level_content_override=power_level_content_override,
             creator_join_profile=creator_join_profile,
+            ignore_forced_encryption=ignore_forced_encryption,
         )
 
         # we avoid dropping the lock between invites, as otherwise joins can