From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 6 Sep 2025 10:27:29 +0000 (+0200)
Subject: Slightly loosen .id_for_nickuserhost expectations.
X-Git-Url: https://plomlompom.com/repos/balance?a=commitdiff_plain;h=11502e3774cc9043431524c39264196656776ee2;p=ircplom

Slightly loosen .id_for_nickuserhost expectations.
---

diff --git a/ircplom/client.py b/ircplom/client.py
index d57dabe..31f0a3a 100644
--- a/ircplom/client.py
+++ b/ircplom/client.py
@@ -485,19 +485,16 @@ class _UpdatingUsersDict(_UpdatingDict[_UpdatingUser]):
             # .nick by definition same, check other fields for updatability;
             # allow where '?', or for set .user only to add "~" prefix, assert
             # nothing else could have changed
+            if stored.user == '?' or nickuserhost.user == f'~{stored.user}':
+                assert updating
+                stored.user = nickuserhost.user
+            else:
+                assert stored.user == nickuserhost.user
             if stored.host == '?':
                 assert updating
                 stored.host = nickuserhost.host
-                if stored.user == '?':
-                    stored.user = nickuserhost.user
-                else:
-                    assert nickuserhost.user == stored.user
-            elif nickuserhost.user == f'~{stored.user}':
-                assert updating
+            else:
                 assert stored.host == nickuserhost.host
-                stored.user = nickuserhost.user
-            else:  # not seen set .host with unset .user yet
-                assert stored.user != '?'
         elif create_if_none:
             id_ = str(uuid4())
             self[id_].nickuserhost = nickuserhost