Skip to content

Commit 2bd8400

Browse files
committed
Also add msc4190 support for mautrix-discord
1 parent 18fb054 commit 2bd8400

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ matrix_mautrix_discord_homeserver_address: ""
3939
matrix_mautrix_discord_homeserver_domain: "{{ matrix_domain }}"
4040
matrix_mautrix_discord_appservice_address: "http://matrix-mautrix-discord:8080"
4141

42+
matrix_mautrix_discord_msc4190_enabled: "{{ matrix_bridges_msc4190_enabled }}"
43+
4244
matrix_mautrix_discord_bridge_command_prefix: "!discord"
4345

4446
# Publicly accessible base URL that Discord can use to reach the bridge, used for avatars in relay mode.
@@ -224,6 +226,7 @@ matrix_mautrix_discord_registration_yaml: |
224226
- exclusive: true
225227
regex: '^@{{ matrix_mautrix_discord_appservice_bot_username | regex_escape }}:{{ matrix_mautrix_discord_homeserver_domain | regex_escape }}$'
226228
de.sorunome.msc2409.push_ephemeral: true
229+
io.element.msc4190: {{ matrix_mautrix_discord_msc4190_enabled | to_json }}
227230

228231
matrix_mautrix_discord_registration: "{{ matrix_mautrix_discord_registration_yaml | from_yaml }}"
229232

roles/custom/matrix-bridge-mautrix-discord/templates/config.yaml.j2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,11 @@ bridge:
266266
default: {{ matrix_mautrix_discord_bridge_encryption_default | to_json }}
267267
# Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data.
268268
appservice: {{ matrix_mautrix_discord_bridge_encryption_appservice | to_json}}
269+
# Whether to use MSC4190 instead of appservice login to create the bridge bot device.
270+
# Requires the homeserver to support MSC4190 and the device masquerading parts of MSC3202.
271+
# Only relevant when using end-to-bridge encryption, required when using encryption with next-gen auth (MSC3861).
272+
# Changing this option requires updating the appservice registration file.
273+
msc4190: {{ matrix_mautrix_discord_msc4190_enabled | to_json }}
269274
# Require encryption, drop any unencrypted messages.
270275
require: {{ matrix_mautrix_discord_bridge_encryption_require | to_json }}
271276
# Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.

0 commit comments

Comments
 (0)