[SPARK-243] Fix Vhost parsing

Author: theunkn0wn1

src/packages/user/user.py

@@ -12,13 +12,14 @@
 """
 from __future__ import annotations  # enable forward-references
 
-from dataclasses import dataclass
+import attr
+import cattr
 from typing import Union, Optional
 
 from pydle import BasicClient
 
 
-@dataclass(frozen=True)
+@attr.define(frozen=True)
 class User:
     """
     Represents an IRC user
@@ -50,7 +51,15 @@ async def from_pydle(cls, bot: BasicClient, nickname: str) -> Optional[User]:
 
         # if we got a object back
         if data:
-            return cls(**data)
+            result = cls(**data)
+
+            # This needs to be an evolve as the cls is frozen.
+            # That and wanting to avoid a converter on the class itself.
+
+            # Inspection false-positive. suppress.
+            # noinspection PyDataclass
+            result = attr.evolve(inst=result, hostname=cls.process_vhost(result.hostname))
+            return result
 
     @classmethod
     def process_vhost(cls, vhost: Union[str, None]) -> Optional[str]:

tests/fixtures/mock_bot.py

@@ -44,18 +44,28 @@ def __init__(self, *args, **kwargs):
             "some_ov": {
                 "nickname": "some_ov",
                 "username": "ill_stop",
-                "hostname": "overseer.fuelrats.com",
+                "hostname": "some_ov@some-ov.overseer.fuelrats.com",
                 "away": False,
                 "away_message": None,
                 "account": None,
                 "identified": True,
                 "realname": "Stop sign",
 
             },
+            "some_rat": {
+                "nickname": "some_rat",
+                "username": "ratlingDelux",
+                "hostname": "delux@delux.rat.fuelrats.com",
+                "away": False,
+                "away_message": None,
+                "account": None,
+                "identified": True,
+                "realname": "snakeeyes",
+            },
             "some_admin": {
                 "nickname": "some_admin",
                 "username": "SirRaymondLuxuryYacht",
-                "hostname": "admin.fuelrats.com",
+                "hostname": "reality@netadmin.fuelrats.com",
                 "away": False,
                 "away_message": None,
                 "account": None,