Merge pull request #985 from interactions-py/unstable

chore: Merge unstable to stable

Author: FayeDel

interactions/api/gateway/client.py

@@ -372,13 +372,9 @@ def _dispatch_event(self, event: str, data: dict) -> None:
                 elif data["type"] == InteractionType.MODAL_SUBMIT:
                     _name = f"modal_{_context.data.custom_id}"
 
-                    if _context.data._json.get("components"):
+                    if _context.data.components:
                         for component in _context.data.components:
-                            if component.get("components"):
-                                __args.append(
-                                    [_value["value"] for _value in component["components"]][0]
-                                )
-                            else:
+                            if component.components:
                                 __args.append([_value.value for _value in component.components][0])
 
                     self._dispatch.dispatch("on_modal", _context)
@@ -466,7 +462,10 @@ def __modify_guild_cache():
                     self._dispatch.dispatch(f"on_{name}", obj)
                     __modify_guild_cache()
 
-                elif "_update" in name and hasattr(obj, "id"):
+                elif "_update" in name:
+                    self._dispatch.dispatch(f"on_raw_{name}", obj)
+                    if not hasattr(obj, "id"):
+                        return
                     old_obj = self._http.cache[model].get(id)
                     if old_obj:
                         before = model(**old_obj._json)
@@ -481,7 +480,6 @@ def __modify_guild_cache():
                     self._dispatch.dispatch(
                         f"on_{name}", before, old_obj
                     )  # give previously stored and new one
-                    return
 
                 elif "_remove" in name or "_delete" in name:
                     self._dispatch.dispatch(f"on_raw_{name}", obj)

interactions/api/http/emoji.py

@@ -1,8 +1,9 @@
 from typing import List, Optional
 
 from ...api.cache import Cache
-from ...api.models.guild import Emoji, Guild
-from ...api.models.misc import Snowflake
+from ..models.emoji import Emoji
+from ..models.guild import Guild
+from ..models.misc import Snowflake
 from .request import _Request
 from .route import Route
 

interactions/api/http/invite.py

@@ -4,7 +4,7 @@
 from .request import _Request
 from .route import Route
 
-__all__ = ["InviteRequest"]
+__all__ = ("InviteRequest",)
 
 
 class InviteRequest:

interactions/api/http/member.py

@@ -1,9 +1,9 @@
 from typing import List, Optional
 
 from ...api.cache import Cache
-from ...api.models.guild import Guild
-from ...api.models.member import Member
-from ...api.models.misc import Snowflake
+from ..models.guild import Guild
+from ..models.member import Member
+from ..models.misc import Snowflake
 from .request import _Request
 from .route import Route
 

interactions/api/http/request.py

@@ -163,7 +163,8 @@ async def request(self, route: Route, **kwargs) -> Optional[Any]:
                         self.buckets[route.endpoint] = _bucket
                         # real-time replacement/update/add if needed.
                     if isinstance(data, dict) and (
-                        data.get("errors") or (data.get("code") and data.get("code") != 429)
+                        data.get("errors")
+                        or ((code := data.get("code")) and code != 429 and data.get("message"))
                     ):
                         log.debug(
                             f"RETURN {response.status}: {dumps(data, indent=4, sort_keys=True)}"

interactions/api/models/__init__.py

@@ -8,6 +8,7 @@
 from .attrs_utils import *  # noqa: F401 F403
 from .audit_log import *  # noqa: F401 F403
 from .channel import *  # noqa: F401 F403
+from .emoji import *  # noqa: F401 F403
 from .flags import *  # noqa: F401 F403
 from .guild import *  # noqa: F401 F403
 from .gw import *  # noqa: F401 F403

interactions/api/models/attrs_utils.py

@@ -50,9 +50,23 @@ def __init__(self, kwargs_dict: dict = None, /, **other_kwargs):
                     if value is not None and attrib.metadata.get("add_client"):
                         if isinstance(value, list):
                             for item in value:
-                                item["_client"] = client
+                                if isinstance(item, dict):
+                                    item["_client"] = client
+                                elif isinstance(item, DictSerializerMixin):
+                                    item._client = client
                         else:
-                            value["_client"] = client
+                            if isinstance(value, dict):
+                                value["_client"] = client
+                            elif isinstance(value, DictSerializerMixin):
+                                value._client = client
+
+                    # make sure json is recursively handled
+                    if isinstance(value, list):
+                        self._json[attrib_name] = [
+                            i._json if isinstance(i, DictSerializerMixin) else i for i in value
+                        ]
+                    elif isinstance(value, DictSerializerMixin):
+                        self._json[attrib_name] = value._json  # type: ignore
 
                     passed_kwargs[attrib_name] = value
 

interactions/api/models/emoji.py

@@ -0,0 +1,118 @@
+from typing import TYPE_CHECKING, List, Optional, Union
+
+from ..error import LibraryException
+from .attrs_utils import ClientSerializerMixin, convert_list, define, field
+from .misc import Snowflake
+from .user import User
+
+if TYPE_CHECKING:
+    from ..http import HTTPClient
+    from .guild import Guild
+
+__all__ = ("Emoji",)
+
+
+@define()
+class Emoji(ClientSerializerMixin):
+    """
+    A class objecting representing an emoji.
+
+    :ivar Optional[Snowflake] id?: Emoji id
+    :ivar Optional[str] name?: Emoji name.
+    :ivar Optional[List[int]] roles?: Roles allowed to use this emoji
+    :ivar Optional[User] user?: User that created this emoji
+    :ivar Optional[bool] require_colons?: Status denoting of this emoji must be wrapped in colons
+    :ivar Optional[bool] managed?: Status denoting if this emoji is managed (by an integration)
+    :ivar Optional[bool] animated?: Status denoting if this emoji is animated
+    :ivar Optional[bool] available?: Status denoting if this emoji can be used. (Can be false via server boosting)
+    """
+
+    id: Optional[Snowflake] = field(converter=Snowflake, default=None)
+    name: Optional[str] = field(default=None)
+    roles: Optional[List[int]] = field(converter=convert_list(int), default=None)
+    user: Optional[User] = field(converter=User, default=None)
+    require_colons: Optional[bool] = field(default=None)
+    managed: Optional[bool] = field(default=None)
+    animated: Optional[bool] = field(default=None)
+    available: Optional[bool] = field(default=None)
+
+    @classmethod
+    async def get(
+        cls,
+        guild_id: Union[int, Snowflake, "Guild"],
+        emoji_id: Union[int, Snowflake],
+        client: "HTTPClient",
+    ) -> "Emoji":
+        """
+        Gets an emoji.
+
+        :param guild_id: The id of the guild of the emoji
+        :type guild_id: Union[int, Snowflake, "Guild"]
+        :param emoji_id: The id of the emoji
+        :type emoji_id: Union[int, Snowflake]
+        :param client: The HTTPClient of your bot. Equals to ``bot._http``
+        :type client: HTTPClient
+        :return: The Emoji as object
+        :rtype: Emoji
+        """
+
+        _guild_id = int(guild_id) if isinstance(guild_id, (int, Snowflake)) else int(guild_id.id)
+
+        res = await client.get_guild_emoji(guild_id=_guild_id, emoji_id=int(emoji_id))
+        return cls(**res, _client=client)
+
+    @classmethod
+    async def get_all_of_guild(
+        cls,
+        guild_id: Union[int, Snowflake, "Guild"],
+        client: "HTTPClient",
+    ) -> List["Emoji"]:
+        """
+        Gets all emoji of a guild.
+
+        :param guild_id: The id of the guild to get the emojis of
+        :type guild_id: Union[int, Snowflake, "Guild"]
+        :param client: The HTTPClient of your bot. Equals to ``bot._http``
+        :type client: HTTPClient
+        :return: The Emoji as list
+        :rtype: List[Emoji]
+        """
+
+        _guild_id = int(guild_id) if isinstance(guild_id, (int, Snowflake)) else int(guild_id.id)
+
+        res = await client.get_all_emoji(guild_id=_guild_id)
+        return [cls(**emoji, _client=client) for emoji in res]
+
+    async def delete(
+        self,
+        guild_id: Union[int, Snowflake, "Guild"],
+        reason: Optional[str] = None,
+    ) -> None:
+        """
+        Deletes the emoji.
+
+        :param guild_id: The guild id to delete the emoji from
+        :type guild_id: Union[int, Snowflake, "Guild"]
+        :param reason?: The reason of the deletion
+        :type reason?: Optional[str]
+        """
+        if not self._client:
+            raise LibraryException(code=13)
+
+        _guild_id = int(guild_id) if isinstance(guild_id, (int, Snowflake)) else int(guild_id.id)
+
+        return await self._client.delete_guild_emoji(
+            guild_id=_guild_id, emoji_id=int(self.id), reason=reason
+        )
+
+    @property
+    def url(self) -> str:
+        """
+        Returns the emoji's URL.
+
+        :return: URL of the emoji
+        :rtype: str
+        """
+        url = f"https://cdn.discordapp.com/emojis/{self.id}"
+        url += ".gif" if self.animated else ".png"
+        return url

interactions/api/models/guild.py

@@ -13,8 +13,9 @@
 )
 from .audit_log import AuditLogEvents, AuditLogs
 from .channel import Channel, ChannelType, Thread, ThreadMember
+from .emoji import Emoji
 from .member import Member
-from .message import Emoji, Sticker
+from .message import Sticker
 from .misc import (
     AutoModAction,
     AutoModTriggerMetadata,

interactions/api/models/gw.py

@@ -12,9 +12,10 @@
     field,
 )
 from .channel import Channel, ThreadMember
+from .emoji import Emoji
 from .guild import EventMetadata
 from .member import Member
-from .message import Embed, Emoji, Message, MessageInteraction, Sticker
+from .message import Embed, Message, MessageInteraction, Sticker
 from .misc import (
     AutoModAction,
     AutoModTriggerMetadata,
@@ -341,7 +342,7 @@ async def kick(
     async def add_role(
         self,
         role: Union[Role, int],
-        reason: Optional[str],
+        reason: Optional[str] = None,
     ) -> None:
         """
         This method adds a role to a member.
@@ -371,7 +372,7 @@ async def add_role(
     async def remove_role(
         self,
         role: Union[Role, int],
-        reason: Optional[str],
+        reason: Optional[str] = None,
     ) -> None:
         """
         This method removes a role from a member.