Fix merge attribute & format

beeper · Sep 1, 2022 · eb60b71 · eb60b71
1 parent ff2dc09
commit eb60b71
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
@@ -205,9 +205,11 @@ async def _wrapped_get_user_by_req(
                             errcode=Codes.EXPIRED_ACCOUNT,
                         )
 
-            if ip_addr and (
-                not requester.app_service or self._track_appservice_user_ips
-            ) and not requester.user_id.startswith("@_"):
+            if (
+                ip_addr
+                and (not requester.app_service or self._track_appservice_user_ips)
+                and not requester.user.to_string().startswith("@_")
+            ):
                 # XXX(quenting): I'm 95% confident that we could skip setting the
                 # device_id to "dummy-device" for appservices, and that the only impact
                 # would be some rows which whould not deduplicate in the 'user_ips'