Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-15 12:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore remote device displaynames if MSC3480 enabled

Browse source
This commit is contained in:
Andrew Morgan 2023-01-28 17:52:14 +01:00
parent c601f796fc
commit 813bab78ce
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
synapse/handlers/e2e_keys.py
View file

@ -204,8 +204,15 @@ class E2eKeysHandler:
for user_id, devices in remote_results.items():
user_devices = results.setdefault(user_id, {})
for device_id, device in devices.items():
keys = device.get("keys", None)
device_display_name = device.get("device_display_name", None)
keys = device.get("keys")
# Extract the displayname of the remote device
device_display_name = None
if self.config.experimental.msc3480_enabled is not True:
# Ignore remote device names if experimental MSC3480 support
# is enabled.
device_display_name = device.get("device_display_name")
if keys:
result = dict(keys)
unsigned = result.setdefault("unsigned", {})