fix: interaction data JSON reflects proper enum values.

Author: i0bs

interactions/api/models/message.py

@@ -552,27 +552,37 @@ def __init__(self, **kwargs):
             else datetime.utcnow()
         )
         self.footer = (
-            EmbedFooter(**self.footer) if isinstance(self._json.get("footer"), dict) else None
+            EmbedFooter(**self.footer)
+            if isinstance(self._json.get("footer"), dict)
+            else self._json.get("footer")
         )
         self.image = (
-            EmbedImageStruct(**self.image) if isinstance(self._json.get("image"), dict) else None
+            EmbedImageStruct(**self.image)
+            if isinstance(self._json.get("image"), dict)
+            else self._json.get("image")
         )
         self.thumbnail = (
             EmbedImageStruct(**self.thumbnail)
             if isinstance(self._json.get("thumbnail"), dict)
-            else None
+            else self._json.get("thumbnail")
         )
         self.video = (
-            EmbedImageStruct(**self.video) if isinstance(self._json.get("video"), dict) else None
+            EmbedImageStruct(**self.video)
+            if isinstance(self._json.get("video"), dict)
+            else self._json.get("video")
         )
         self.provider = (
-            EmbedProvider(**self.provider) if isinstance(self._json.get("provider"), dict) else None
+            EmbedProvider(**self.provider)
+            if isinstance(self._json.get("provider"), dict)
+            else self._json.get("provider")
         )
         self.author = (
-            EmbedAuthor(**self.author) if isinstance(self._json.get("author"), dict) else None
+            EmbedAuthor(**self.author)
+            if isinstance(self._json.get("author"), dict)
+            else self._json.get("author")
         )
         self.fields = (
             [EmbedField(**field) for field in self.fields]
             if isinstance(self._json.get("fields"), dict)
-            else None
+            else self._json.get("fields")
         )

interactions/context.py

@@ -87,7 +87,6 @@ class CommandContext(Context):
         "client",
         "id",
         "application_id",
-        "custom_id",
         "callback",
         "type",
         "data",
@@ -135,7 +134,6 @@ async def defer(self, ephemeral: Optional[bool] = False) -> None:
         """
         self.deferred = True
         _ephemeral: int = (1 << 6) if ephemeral else 0
-        # ephemeral doesn't change callback typings. just data json
         if self.type == InteractionType.MESSAGE_COMPONENT:
             self.callback = InteractionCallbackType.DEFERRED_UPDATE_MESSAGE
         elif self.type == InteractionType.APPLICATION_COMMAND:
@@ -482,7 +480,6 @@ class ComponentContext(CommandContext):
         "client",
         "id",
         "application_id",
-        "custom_id",
         "callback",
         "type",
         "data",
@@ -493,12 +490,10 @@ class ComponentContext(CommandContext):
         "channel_id",
         "responded",
         "deferred",
-        "custom_id",
     )
 
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
-        self.type = InteractionType(self.type)
         self.responded = False  # remind components that it was not responded to.
         self.deferred = False  # remind components they not have been deferred
 

interactions/context.pyi

@@ -7,7 +7,7 @@ from .api.models.member import Member
 from .api.models.message import Embed, Message, MessageInteraction, MessageReference
 from .api.models.misc import DictSerializerMixin, Snowflake
 from .api.models.user import User
-from .enums import InteractionCallbackType, InteractionType
+from .enums import ComponentType, InteractionCallbackType, InteractionType
 from .models.command import Choice
 from .models.component import ActionRow, Button, Component, Modal, SelectMenu
 from .models.misc import InteractionData
@@ -25,7 +25,6 @@ class Context(DictSerializerMixin):
 class CommandContext(Context):
     id: Snowflake
     application_id: Snowflake
-    custom_id: str
     type: InteractionType
     callback: Optional[InteractionCallbackType]
     data: InteractionData
@@ -42,30 +41,29 @@ class CommandContext(Context):
         self,
         content: Optional[str] = None,
         *,
-        tts: Optional[bool] = None,
+        tts: Optional[bool] = False,
         # attachments: Optional[List[Any]] = None,  # TODO: post-v4: Replace with own file type.
         embeds: Optional[Union[Embed, List[Embed]]] = None,
         allowed_mentions: Optional[MessageInteraction] = None,
         components: Optional[Union[Component, List[Component]]] = None,
-        type: Optional[Union[int, InteractionCallbackType]] = None,
-        ephemeral: Optional[bool] = None,
+        ephemeral: Optional[bool] = False,
     ) -> Message: ...
     async def edit(
         self,
         content: Optional[str] = None,
         *,
-        tts: Optional[bool] = None,
-        # file: Optional[FileIO] = None,
+        tts: Optional[bool] = False,
+        # attachments: Optional[List[Any]] = None,  # TODO: post-v4: Replace with own file type.
         embeds: Optional[Union[Embed, List[Embed]]] = None,
         allowed_mentions: Optional[MessageInteraction] = None,
-        message_reference: Optional[MessageReference] = None,
-        components: Optional[Union[ActionRow, Button, SelectMenu]] = None,
+        components: Optional[Union[Component, List[Component]]] = None,
     ) -> Message: ...
     async def delete(self) -> None: ...
     async def popup(self, modal: Modal): ...
     async def populate(self, choices: Union[Choice, List[Choice]]) -> List[Choice]: ...
 
 class ComponentContext(CommandContext):
-    type: InteractionType
     def __init__(self, **kwargs) -> None: ...
-    def defer(self, ephemeral: Optional[bool] = False, edit_origin: Optional[bool] = False) -> None: ...
+    def defer(
+        self, ephemeral: Optional[bool] = False, edit_origin: Optional[bool] = False
+    ) -> None: ...

interactions/models/misc.py

@@ -109,13 +109,13 @@ def __init__(self, **kwargs):
         self.options = (
             [Option(**option) for option in self.options] if self._json.get("options") else None
         )
-        self.component_type = (
-            ComponentType(self.component_type) if self._json.get("component_type") else None
-        )
         self.values = (
             [SelectOption(**value) for value in self.values] if self._json.get("values") else None
         )
-        self._json.update({"component_type": self.component_type.value, "type": self.type.value})
+        if self._json.get("component_type"):
+            self.component_type = ComponentType(self.component_type)
+            self._json.update({"component_type": self.component_type.value})
+        self._json.update({"type": self.type.value})
 
 
 class Interaction(DictSerializerMixin):