Start work on support of advanced interaction options

wumpy/interactions/base.py

@@ -44,7 +44,7 @@ class ApplicationCommandOption(enum.Enum):
 class ResolvedInteractionData:
     """Asynchronously resolved data from Discord."""
 
-    users: Dict[int, Dict[str, Any]]
+    users: Dict[int, InteractionUser]
     members: Dict[int, Dict[str, Any]]
 
     roles: Dict[int, Dict[str, Any]]
@@ -54,8 +54,8 @@ class ResolvedInteractionData:
 
     __slots__ = ('users', 'members', 'roles', 'channels', 'messages')
 
-    def __init__(self, data: Dict[str, Any]) -> None:
-        self.users = {int(k): v for k, v in data.get('users', {}).items()}
+    def __init__(self, rest: InteractionRequester, data: Dict[str, Any]) -> None:
+        self.users = {int(k): InteractionUser(rest, v) for k, v in data.get('users', {}).items()}
         self.members = {int(k): v for k, v in data.get('members', {}).items()}
 
         self.roles = {int(k): v for k, v in data.get('roles', {}).items()}
@@ -208,7 +208,7 @@ def __init__(
         self.invoked = data['data']['id']
         self.invoked_type = ApplicationCommandOption(data['data']['type'])
 
-        self.resolved = ResolvedInteractionData(data['data'].get('resolved', {}))
+        self.resolved = ResolvedInteractionData(rest, data['data'].get('resolved', {}))
 
         target_id = data['data'].get('target_id')
         self.target_id = int(target_id) if target_id else None

wumpy/interactions/commands/option.py

@@ -8,6 +8,7 @@
 from typing_extensions import Annotated
 
 from ...errors import CommandSetupError
+from ...models import InteractionUser
 from ...utils import MISSING
 from ..base import (
     ApplicationCommandOption, CommandInteraction, CommandInteractionOption
@@ -72,6 +73,7 @@ class unless it is for the purpose of extending it.
         int: ApplicationCommandOption.integer,
         bool: ApplicationCommandOption.boolean,
         float: ApplicationCommandOption.number,
+        InteractionUser: ApplicationCommandOption.user,
     }
 
     def __init__(
@@ -245,12 +247,31 @@ def resolve(
             )
 
         value = data.value
+
+        if value is None:
+            raise CommandSetupError(
+                f"Expected command option value for '{self.param}' of '{interaction.name}'"
+            )
+
         if self.converter is not MISSING:
             try:
                 value = self.converter(value)
             except Exception as exc:
                 raise CommandSetupError('Could not convert argument:', value) from exc
 
+        # Some options only pass IDs because Discord asynchronously resolves
+        # the data for them, these are then passed in a special `resolved`
+        # field that we need to look them up by.
+        if self.type is ApplicationCommandOption.user:
+            value = interaction.resolved.users.get(int(value))
+
+        # At this point `value` may be None from our lookups of the resolved
+        # data
+        if value is None:
+            raise CommandSetupError(
+                "Didn't receive resolved data for command '{interaction.name}'"
+            )
+
         return value
 
     def to_dict(self) -> Dict[str, Any]:

wumpy/models/user.py

@@ -78,8 +78,7 @@ def _update(self, data: Dict) -> None:
         avatar = data['avatar']
         self.avatar = Asset(self._rest, f'avatars/{self.id}/{avatar}') if avatar else self.avatar
 
-        flags = data.get('public_flags')
-        self.public_flags = UserFlags(flags) if flags else self.public_flags
+        self.public_flags = UserFlags(data['public_flags'])
 
         self.bot = data.get('bot', self.bot)
         self.system = data.get('system', self.system)