From e0e403200206faac5fadd9d849826c7509d1bb65 Mon Sep 17 00:00:00 2001
From: Benjamin Blacher <privat@benjaminblacher.com>
Date: Wed, 29 Oct 2025 15:43:53 +0100
Subject: [PATCH] Bump synapse, remove some recently stabilized features

---
 roles/custom/matrix-base/defaults/main.yml       |  4 ++--
 roles/custom/matrix-synapse/defaults/main.yml    | 16 +---------------
 .../templates/synapse/homeserver.yaml.j2         |  6 ------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml
index f54e1e201..5c6723926 100644
--- a/roles/custom/matrix-base/defaults/main.yml
+++ b/roles/custom/matrix-base/defaults/main.yml
@@ -48,8 +48,8 @@ matrix_bridges_encryption_enabled: false
 # Global var to make encryption default/optional across all bridges with encryption support
 matrix_bridges_encryption_default: "{{ matrix_bridges_encryption_enabled }}"
 
-# Global var for enabling msc4190 ( On supported bridges)
-matrix_bridges_msc4190_enabled: "{{ matrix_authentication_service_enabled and matrix_bridges_encryption_enabled and matrix_synapse_experimental_features_msc3202_device_masquerading_enabled }}"
+# Global var for enabling msc4190 (On supported bridges)
+matrix_bridges_msc4190_enabled: "{{ matrix_authentication_service_enabled and matrix_bridges_encryption_enabled }}"
 
 # Global var for enabling bridge self-signing ( On supported bridges)
 matrix_bridges_self_sign_enabled: "{{ matrix_bridges_msc4190_enabled }}"
diff --git a/roles/custom/matrix-synapse/defaults/main.yml b/roles/custom/matrix-synapse/defaults/main.yml
index a11bfe5b3..0d03d8ca1 100644
--- a/roles/custom/matrix-synapse/defaults/main.yml
+++ b/roles/custom/matrix-synapse/defaults/main.yml
@@ -16,7 +16,7 @@ matrix_synapse_enabled: true
 matrix_synapse_github_org_and_repo: element-hq/synapse
 
 # renovate: datasource=docker depName=ghcr.io/element-hq/synapse
-matrix_synapse_version: v1.140.0
+matrix_synapse_version: v1.141.0
 
 matrix_synapse_username: ''
 matrix_synapse_uid: ''
@@ -1245,13 +1245,6 @@ matrix_synapse_email_invite_client_location: "https://app.element.io"
 # - https://matrix-org.github.io/matrix-hookshot/latest/advanced/encryption.html#running-with-synapse
 matrix_synapse_experimental_features_msc2409_to_device_messages_enabled: false
 
-# Controls whether to enable the "device masquerading" for encrypted appservices experimental feature.
-#
-# See:
-# - https://github.com/matrix-org/matrix-spec-proposals/pull/3202
-# - https://matrix-org.github.io/matrix-hookshot/latest/advanced/encryption.html#running-with-synapse
-matrix_synapse_experimental_features_msc3202_device_masquerading_enabled: false
-
 # Controls whether to enable the "transaction extensions" for encrypted appservices experimental feature.
 #
 # See:
@@ -1316,13 +1309,6 @@ matrix_synapse_experimental_features_msc4140_enabled: false
 # See `matrix_synapse_experimental_features_msc4140_enabled`.
 matrix_synapse_max_event_delay_duration: 24h
 
-# Controls whether to enable the MSC4133 experimental feature (Custom profile fields).
-#
-# This allows clients to set custom profile fields (e.g. User Time Zone in Element Web)
-#
-# See https://github.com/matrix-org/matrix-spec-proposals/pull/4133
-matrix_synapse_experimental_features_msc4133_enabled: false
-
 # Controls whether to enable the MSC4222 experimental feature (adding `state_after` to sync v2).
 #
 # Allow clients to opt-in to a change of the sync v2 API that allows them to correctly track the state of the room.
diff --git a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 265052569..ff6f7b724 100644
--- a/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/custom/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -2998,9 +2998,6 @@ experimental_features:
   {% if matrix_synapse_experimental_features_msc2409_to_device_messages_enabled %}
   msc2409_to_device_messages_enabled: true
   {% endif %}
-  {% if matrix_synapse_experimental_features_msc3202_device_masquerading_enabled %}
-  msc3202_device_masquerading: true
-  {% endif %}
   {% if matrix_synapse_experimental_features_msc3202_transaction_extensions_enabled %}
   msc3202_transaction_extensions: true
   {% endif %}
@@ -3010,9 +3007,6 @@ experimental_features:
   {% if matrix_synapse_experimental_features_msc4108_enabled %}
   msc4108_enabled: true
   {% endif %}
-  {% if matrix_synapse_experimental_features_msc4133_enabled %}
-  msc4133_enabled: true
-  {% endif %}
   {% if matrix_synapse_experimental_features_msc4140_enabled %}
   msc4140_enabled: true
   {% endif %}