rename recipient_user_id_device_id_to_messages -> recipient_device_to_messages

Author: anoadragon453

synapse/handlers/appservice.py

@@ -510,7 +510,7 @@ async def _get_to_device_messages(
             return []
 
         # Retrieve the to-device messages for each user
-        recipient_user_id_device_id_to_messages = await self.store.get_new_messages(
+        recipient_device_to_messages = await self.store.get_new_messages(
             users_appservice_is_interested_in,
             from_key,
             new_token,
@@ -526,7 +526,7 @@ async def _get_to_device_messages(
         for (
             user_id,
             device_id,
-        ), messages in recipient_user_id_device_id_to_messages.items():
+        ), messages in recipient_device_to_messages.items():
             for message_json in messages:
                 # Remove 'message_id' from the to-device message, as it's an internal ID
                 message_json.pop("message_id", None)

synapse/storage/databases/main/deviceinbox.py

@@ -191,20 +191,18 @@ def get_new_messages_txn(txn: LoggingTransaction):
 
             # Create a dictionary of (user ID, device ID) -> list of messages that
             # that device is meant to receive.
-            recipient_user_id_device_id_to_messages: Dict[
-                Tuple[str, str], List[JsonDict]
-            ] = {}
+            recipient_device_to_messages: Dict[Tuple[str, str], List[JsonDict]] = {}
 
             for row in txn:
                 recipient_user_id = row[0]
                 recipient_device_id = row[1]
                 message_dict = db_to_json(row[2])
 
-                recipient_user_id_device_id_to_messages.setdefault(
+                recipient_device_to_messages.setdefault(
                     (recipient_user_id, recipient_device_id), []
                 ).append(message_dict)
 
-            return recipient_user_id_device_id_to_messages
+            return recipient_device_to_messages
 
         return await self.db_pool.runInteraction(
             "get_new_messages", get_new_messages_txn