summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorSean Quah <8349537+squahtx@users.noreply.github.com>2021-10-01 17:22:13 +0100
committerGitHub <noreply@github.com>2021-10-01 17:22:13 +0100
commitd1cbad388fc42d483e0e3b107620852f359d2cc8 (patch)
treefa0ebf1ce9b8e0444f12f97c8ba9d2845ab57330 /synapse
parentStrip "join_authorised_via_users_server" from join events which do not need i... (diff)
downloadsynapse-d1cbad388fc42d483e0e3b107620852f359d2cc8.tar.xz
Fix error in `get_user_ip_and_agents` when fetching from the database (#10968)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/databases/main/client_ips.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/client_ips.py b/synapse/storage/databases/main/client_ips.py
index 7e33ae578c..cc192f5c87 100644
--- a/synapse/storage/databases/main/client_ips.py
+++ b/synapse/storage/databases/main/client_ips.py
@@ -591,8 +591,8 @@ class ClientIpStore(ClientIpWorkerStore):
         )
 
         results.update(
-            ((row["access_token"], row["ip"]), (row["user_agent"], row["last_seen"]))
-            for row in rows
+            ((access_token, ip), (user_agent, last_seen))
+            for access_token, ip, user_agent, last_seen in rows
         )
         return [
             {