diff options
| author | Aaron Raimist <aaron@raim.ist> | 2022-10-18 14:54:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-18 20:54:27 +0000 |
| commit | 2a76a7369fc54477185f53f6e81897fa84e24de5 (patch) | |
| tree | f9471f41c2f8005840565e36947b4f6af21ff58d /synapse/storage/databases | |
| parent | Fix docstring in EventContext (#14145) (diff) | |
| download | synapse-2a76a7369fc54477185f53f6e81897fa84e24de5.tar.xz | |
Fix hiding devices names over federation (#10015)
And don't include blank opentracing stuff in device list updates. Signed-off-by: Aaron Raimist <aaron@raim.ist>
Diffstat (limited to 'synapse/storage/databases')
| -rw-r--r-- | synapse/storage/databases/main/devices.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py index 18358eca46..830b076a32 100644 --- a/synapse/storage/databases/main/devices.py +++ b/synapse/storage/databases/main/devices.py @@ -539,9 +539,11 @@ class DeviceWorkerStore(RoomMemberWorkerStore, EndToEndKeyWorkerStore): "device_id": device_id, "prev_id": [prev_id] if prev_id else [], "stream_id": stream_id, - "org.matrix.opentracing_context": opentracing_context, } + if opentracing_context != "{}": + result["org.matrix.opentracing_context"] = opentracing_context + prev_id = stream_id if device is not None: @@ -549,7 +551,11 @@ class DeviceWorkerStore(RoomMemberWorkerStore, EndToEndKeyWorkerStore): if keys: result["keys"] = keys - device_display_name = device.display_name + device_display_name = None + if ( + self.hs.config.federation.allow_device_name_lookup_over_federation + ): + device_display_name = device.display_name if device_display_name: result["device_display_name"] = device_display_name else: |