Don't query for to-device messages without a device

anoadragon453 · anoadragon453 · commit 026cb8a5ca5f · 2022-01-26T15:07:16.000Z
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
@@ -1335,7 +1335,7 @@ async def _generate_sync_entry_for_to_device(
         if sync_result_builder.since_token is not None:
             since_stream_id = int(sync_result_builder.since_token.to_device_key)
 
-        if since_stream_id != int(now_token.to_device_key):
+        if device_id is not None and since_stream_id != int(now_token.to_device_key):
             messages, stream_id = await self.store.get_messages_for_device(
                 user_id, device_id, since_stream_id, now_token.to_device_key
             )

Original file line number	Diff line number	Diff line change
`@@ -1335,7 +1335,7 @@ async def _generate_sync_entry_for_to_device(`
`1335`	`1335`	`if sync_result_builder.since_token is not None:`
`1336`	`1336`	`since_stream_id = int(sync_result_builder.since_token.to_device_key)`
`1337`	`1337`
`1338`		`- if since_stream_id != int(now_token.to_device_key):`
	`1338`	`+ if device_id is not None and since_stream_id != int(now_token.to_device_key):`
`1339`	`1339`	`messages, stream_id = await self.store.get_messages_for_device(`
`1340`	`1340`	`user_id, device_id, since_stream_id, now_token.to_device_key`
`1341`	`1341`	`)`