Merge branch 'fix/User-Not-Found' into 'master'

[Fix] Fix an Error if a User Doesn't Exist

See merge request hull-seals/code/irc/halpybot!156

halpybot/commands/caseutils.py

@@ -10,7 +10,7 @@
 from typing import List
 from ..packages.command import Commands
 from ..packages.facts import Facts
-from ..packages.models import Context, User
+from ..packages.models import Context, User, NoUserFound
 
 
 @Commands.command("go")
@@ -33,7 +33,7 @@ async def cmd_go(ctx: Context, args: List[str]):
             try:
                 whois = await User.get_info(ctx.bot, str(seal))
                 vhost = User.process_vhost(whois.hostname)
-            except AttributeError:
+            except (AttributeError, NoUserFound):
                 vhost = "notUser"
             # There is no hard set "not a seal" vhost level.
             if vhost is None:

halpybot/packages/models/__init__.py

@@ -9,7 +9,15 @@
 """
 
 from .edsm_classes import Coordinates, Location, SystemInfo
-from .user import User
+from .user import User, UserError, NoUserFound
 from .context import Context
 
-__all__ = ["Context", "User", "Coordinates", "Location", "SystemInfo"]
+__all__ = [
+    "Context",
+    "User",
+    "Coordinates",
+    "Location",
+    "SystemInfo",
+    "UserError",
+    "NoUserFound",
+]

halpybot/packages/models/user.py

@@ -24,10 +24,21 @@
 from typing import Optional, Set
 from attr import dataclass
 import pydle
-
 import cattr
 
 
+class UserError(Exception):
+    """
+    Base class for User Class errors
+    """
+
+
+class NoUserFound(UserError):
+    """
+    An exception occurred while sending a Discord Webhook
+    """
+
+
 @dataclass(frozen=True)
 class User:
     """IRC User info
@@ -66,7 +77,11 @@ async def get_info(cls, bot: pydle.Client, nickname: str) -> Optional[User]:
 
         """
         # fetch the user object from pydle
+        if nickname.endswith(",") or nickname.endswith(":"):
+            nickname = nickname[:-1]
         data = await bot.whois(nickname)
+        if data is None:
+            raise NoUserFound
         if "nickname" not in data:
             data["nickname"] = nickname
         return cattr.structure(data, Optional[User])