FIXUP

synapse/module_api/__init__.py

@@ -733,7 +733,7 @@ def is_mine(self, id: Union[str, DomainSpecificString]) -> bool:
             return self._hs.is_mine_id(id)
 
     async def get_user_ip_and_agents(
-        self, user_id: str, since_ts: Optional[float] = 0
+        self, user_id: str, since_ts: int = 0
     ) -> List[UserIpAndAgent]:
         """
         Return the list of user IPs and agents for a user.
@@ -751,6 +751,7 @@ async def get_user_ip_and_agents(
                 is_mine = True
         except Exception:
             pass
+
         if is_mine:
             raw_data = await self._store.get_user_ip_and_agents(
                 UserID.from_string(user_id), since_ts

synapse/storage/databases/main/client_ips.py

@@ -555,7 +555,7 @@ async def get_last_client_ip_by_device(
         return ret
 
     async def get_user_ip_and_agents(
-        self, user: UserID, since_ts: Optional[float] = 0
+        self, user: UserID, since_ts: int = 0
     ) -> List[Dict[str, Union[str, int]]]:
         """
         Fetch IP/User Agent connection since a given timestamp.

tests/module_api/test_api.py

@@ -92,34 +92,67 @@ def test_get_userinfo_by_id__no_user_found(self):
 
     def test_get_user_ip_and_agents(self):
         user_id = self.register_user("test_get_user_ip_and_agents_user", "1234")
+
+        # Initially, we should have no ip/agent for our user.
         info = self.get_success(self.module_api.get_user_ip_and_agents(user_id))
         self.assertEqual(info, [])
 
+        # Insert a first ip, agent. We should be able to retrieve it.
         self.get_success(
             self.store.insert_client_ip(
-                user_id, "access_token", "ip_1", "user_agent_1", None
+                user_id, "access_token", "ip_1", "user_agent_1", "device_1", None
             )
         )
+        info = self.get_success(self.module_api.get_user_ip_and_agents(user_id))
+
+        self.assertEqual(len(info), 1)
+        last_seen_1 = info[0].last_seen
+
+        # Insert a second ip, agent at a later date. We should be able to retrieve it.
+        last_seen_2 = last_seen_1 + 10000
+        print("%s => %s" % (last_seen_1, last_seen_2))
         self.get_success(
             self.store.insert_client_ip(
-                user_id, "access_token", "ip_2", "user_agent_2", None
+                user_id, "access_token", "ip_2", "user_agent_2", "device_2", last_seen_2
             )
         )
         info = self.get_success(self.module_api.get_user_ip_and_agents(user_id))
 
         self.assertEqual(len(info), 2)
         ip_1_seen = False
         ip_2_seen = False
+
         for i in info:
             if i.ip == "ip_1":
                 ip_1_seen = True
                 self.assertEqual(i.user_agent, "user_agent_1")
+                self.assertEqual(i.last_seen, last_seen_1)
             elif i.ip == "ip_2":
                 ip_2_seen = True
                 self.assertEqual(i.user_agent, "user_agent_2")
+                self.assertEqual(i.last_seen, last_seen_2)
         self.assertTrue(ip_1_seen)
         self.assertTrue(ip_2_seen)
 
+        # If we fetch from a midpoint between last_seen_1 and last_seen_2,
+        # we should only find the second ip, agent.
+        info = self.get_success(
+            self.module_api.get_user_ip_and_agents(
+                user_id, (last_seen_1 + last_seen_2) / 2
+            )
+        )
+        self.assertEqual(len(info), 1)
+        self.assertEqual(info[0].ip, "ip_2")
+        self.assertEqual(info[0].user_agent, "user_agent_2")
+        self.assertEqual(info[0].last_seen, last_seen_2)
+
+        # If we fetch from a point later than last_seen_2, we shouldn't
+        # find anything.
+        info = self.get_success(
+            self.module_api.get_user_ip_and_agents(user_id, last_seen_2 + 10000)
+        )
+        self.assertEqual(info, [])
+
     def test_get_user_ip_and_agents__no_user_found(self):
         info = self.get_success(
             self.module_api.get_user_ip_and_agents(