Merge pull request #1001 from interactions-py/unstable

chore: merge unstable into stable

Author: FayeDel

.pre-commit-config.yaml

@@ -37,7 +37,7 @@ repos:
       types: [file, python]
       args: [--line-length=100]
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
     - id: flake8
       name: flake8 Formatting

interactions/api/gateway/client.py

@@ -413,6 +413,7 @@ def _dispatch_event(self, event: str, data: dict) -> None:
                         "ChannelPins",
                         "MessageReaction",
                         "MessageReactionRemove",
+                        "MessageDelete",
                         # Extend this for everything that should not be cached
                     ]:
                         id = None
@@ -464,7 +465,7 @@ def __modify_guild_cache():
 
                 elif "_update" in name:
                     self._dispatch.dispatch(f"on_raw_{name}", obj)
-                    if not hasattr(obj, "id"):
+                    if not id:
                         return
                     old_obj = self._http.cache[model].get(id)
                     if old_obj:
@@ -487,6 +488,8 @@ def __modify_guild_cache():
                     if id:
                         old_obj = _cache.pop(id)
                         self._dispatch.dispatch(f"on_{name}", old_obj)
+                    elif "_delete_bulk" in name:
+                        self._dispatch.dispatch(f"on_{name}", obj)
 
                 else:
                     self._dispatch.dispatch(f"on_{name}", obj)

interactions/api/models/attrs_utils.py

@@ -47,7 +47,11 @@ def __init__(self, kwargs_dict: dict = None, /, **other_kwargs):
                     discord_name = attrib_name
 
                 if (value := kwargs.pop(discord_name, MISSING)) is not MISSING:
-                    if value is not None and attrib.metadata.get("add_client"):
+                    if (
+                        value is not None
+                        and attrib.metadata.get("add_client")
+                        and client is not None
+                    ):
                         if isinstance(value, list):
                             for item in value:
                                 if isinstance(item, dict):

interactions/api/models/channel.py

@@ -11,6 +11,7 @@
     define,
     field,
 )
+from .flags import Permissions
 from .misc import File, IDMixin, Overwrite, Snowflake
 from .user import User
 from .webhook import Webhook
@@ -363,11 +364,11 @@ async def modify(
         )
         _nsfw = self.nsfw if nsfw is MISSING else nsfw
         _permission_overwrites = (
-            [overwrite._json for overwrite in self.permission_overwrites]
+            [overwrite._json for overwrite in permission_overwrites]
+            if permission_overwrites is not MISSING
+            else [overwrite._json for overwrite in self.permission_overwrites]
             if self.permission_overwrites
             else None
-            if permission_overwrites is MISSING
-            else [overwrite._json for overwrite in permission_overwrites]
         )
         _type = self.type
 
@@ -1207,6 +1208,67 @@ async def join(self) -> None:
 
         await self._client.join_thread(int(self.id))
 
+    async def get_permissions_for(self, member: "Member") -> Permissions:
+        """
+        Returns the permissions of the member in this specific channel.
+
+        .. note::
+            The permissions returned by this function take into account role and
+            user overwrites that can be assigned to channels or categories. If you
+            don't need these overwrites, look into :meth:`.Member.get_guild_permissions`.
+
+        :param member: The member to get the permissions from
+        :type member: Member
+        :return: Permissions of the member in this channel
+        :rtype: Permissions
+        """
+        if not self.guild_id:
+            return Permissions.DEFAULT
+
+        from .guild import Guild
+
+        guild = Guild(**await self._client.get_guild(int(self.guild_id)), _client=self._client)
+
+        permissions = await member.get_guild_permissions(guild)
+
+        if permissions & Permissions.ADMINISTRATOR == Permissions.ADMINISTRATOR:
+            return Permissions.ALL
+
+        # @everyone role overwrites
+        from ...client.models.utils import search_iterable
+
+        overwrite_everyone = search_iterable(
+            self.permission_overwrites, lambda overwrite: int(overwrite.id) == int(self.guild_id)
+        )
+        if overwrite_everyone:
+            permissions &= ~int(overwrite_everyone[0].deny)
+            permissions |= int(overwrite_everyone[0].allow)
+
+        # Apply role specific overwrites
+        allow, deny = 0, 0
+        for role_id in member.roles:
+            overwrite_role = search_iterable(
+                self.permission_overwrites, lambda overwrite: int(overwrite.id) == int(role_id)
+            )
+            if overwrite_role:
+                allow |= int(overwrite_role[0].allow)
+                deny |= int(overwrite_role[0].deny)
+
+        if deny:
+            permissions &= ~deny
+        if allow:
+            permissions |= allow
+
+        # Apply member specific overwrites
+        overwrite_member = search_iterable(
+            self.permission_overwrites, lambda overwrite: int(overwrite.id) == int(member.id)
+        )
+        if overwrite_member:
+            permissions &= ~int(overwrite_member[0].deny)
+            permissions |= int(overwrite_member[0].allow)
+
+        return Permissions(permissions)
+
 
 @define()
 class Thread(Channel):

interactions/api/models/emoji.py

@@ -36,6 +36,13 @@ class Emoji(ClientSerializerMixin):
     animated: Optional[bool] = field(default=None)
     available: Optional[bool] = field(default=None)
 
+    def __str__(self):
+        return (
+            f"<{'a' if self.animated else ''}:{self.name}:{self.id}>"
+            if self.id is not None
+            else self.name
+        )
+
     @classmethod
     async def get(
         cls,

interactions/api/models/flags.py

@@ -93,6 +93,53 @@ class Permissions(IntFlag):
     START_EMBEDDED_ACTIVITIES = 1 << 39
     MODERATE_MEMBERS = 1 << 40
 
+    DEFAULT = (
+        ADD_REACTIONS
+        | VIEW_CHANNEL
+        | SEND_MESSAGES
+        | EMBED_LINKS
+        | ATTACH_FILES
+        | READ_MESSAGE_HISTORY
+        | MENTION_EVERYONE
+        | USE_EXTERNAL_EMOJIS
+    )
+    ALL = (
+        DEFAULT
+        | CREATE_INSTANT_INVITE
+        | KICK_MEMBERS
+        | BAN_MEMBERS
+        | ADMINISTRATOR
+        | MANAGE_CHANNELS
+        | MANAGE_GUILD
+        | VIEW_AUDIT_LOG
+        | PRIORITY_SPEAKER
+        | STREAM
+        | SEND_TTS_MESSAGES
+        | MANAGE_MESSAGES
+        | VIEW_GUILD_INSIGHTS
+        | CONNECT
+        | SPEAK
+        | MUTE_MEMBERS
+        | DEAFEN_MEMBERS
+        | MOVE_MEMBERS
+        | USE_VAD
+        | CHANGE_NICKNAME
+        | MANAGE_NICKNAMES
+        | MANAGE_ROLES
+        | MANAGE_WEBHOOKS
+        | MANAGE_EMOJIS_AND_STICKERS
+        | USE_APPLICATION_COMMANDS
+        | REQUEST_TO_SPEAK
+        | MANAGE_EVENTS
+        | MANAGE_THREADS
+        | CREATE_PUBLIC_THREADS
+        | CREATE_PRIVATE_THREADS
+        | USE_EXTERNAL_STICKERS
+        | SEND_MESSAGES_IN_THREADS
+        | START_EMBEDDED_ACTIVITIES
+        | MODERATE_MEMBERS
+    )
+
 
 class UserFlags(IntFlag):
     """An integer flag bitshift object representing the different user flags given by Discord."""

interactions/api/models/gw.py

@@ -39,6 +39,7 @@
     "ChannelPins",
     "ThreadMembers",
     "ThreadList",
+    "MessageDelete",
     "MessageReactionRemove",
     "MessageReaction",
     "GuildIntegrations",
@@ -761,7 +762,22 @@ class Presence(ClientSerializerMixin):
 
 
 @define()
-class MessageReaction(DictSerializerMixin):
+class MessageDelete(DictSerializerMixin):
+    """
+    A class object representing the gateway event ``MESSAGE_DELETE_BULK``.
+
+    :ivar List[Snowflake] ids: The message IDs of the event.
+    :ivar Snowflake channel_id: The channel ID of the event.
+    :ivar Optional[Snowflake] guild_id?: The guild ID of the event.
+    """
+
+    ids: List[Snowflake] = field(converter=convert_list(Snowflake))
+    channel_id: Snowflake = field(converter=Snowflake)
+    guild_id: Optional[Snowflake] = field(converter=Snowflake, default=None)
+
+
+@define()
+class MessageReaction(ClientSerializerMixin):
     """
     A class object representing the gateway event ``MESSAGE_REACTION_ADD`` and ``MESSAGE_REACTION_REMOVE``.
 
@@ -777,7 +793,7 @@ class MessageReaction(DictSerializerMixin):
     channel_id: Snowflake = field(converter=Snowflake)
     message_id: Snowflake = field(converter=Snowflake)
     guild_id: Optional[Snowflake] = field(converter=Snowflake, default=None)
-    member: Optional[Member] = field(converter=Member, default=None)
+    member: Optional[Member] = field(converter=Member, default=None, add_client=True)
     emoji: Optional[Emoji] = field(converter=Emoji, default=None)
 
 

interactions/api/models/member.py

@@ -380,6 +380,7 @@ async def add_to_thread(
     def get_avatar_url(self, guild_id: Union[int, Snowflake, "Guild"]) -> Optional[str]:
         """
         Returns the URL of the member's avatar for the specified guild.
+
         :param guild_id: The id of the guild to get the member's avatar from
         :type guild_id: Union[int, Snowflake, "Guild"]
         :return: URL of the members's avatar (None will be returned if no avatar is set)
@@ -393,3 +394,32 @@ def get_avatar_url(self, guild_id: Union[int, Snowflake, "Guild"]) -> Optional[s
         url = f"https://cdn.discordapp.com/guilds/{_guild_id}/users/{int(self.user.id)}/avatars/{self.avatar}"
         url += ".gif" if self.avatar.startswith("a_") else ".png"
         return url
+
+    async def get_guild_permissions(self, guild: "Guild") -> Permissions:
+        """
+        Returns the permissions of the member for the specified guild.
+
+        .. note::
+            The permissions returned by this function will not take into account role and
+            user overwrites that can be assigned to channels or categories. If you need
+            these overwrites, look into :meth:`.Channel.get_permissions_for`.
+
+        :param guild: The guild of the member
+        :type guild: Guild
+        :return: Base permissions of the member in the specified guild
+        :rtype: Permissions
+        """
+        if int(guild.owner_id) == int(self.id):
+            return Permissions.ALL
+
+        role_everyone = await guild.get_role(int(guild.id))
+        permissions = int(role_everyone.permissions)
+
+        for role_id in self.roles:
+            role = await guild.get_role(role_id)
+            permissions |= int(role.permissions)
+
+        if permissions & Permissions.ADMINISTRATOR == Permissions.ADMINISTRATOR:
+            return Permissions.ALL
+
+        return Permissions(permissions)

interactions/api/models/message.py

@@ -910,7 +910,7 @@ async def edit(
         if not components:
             _components = []
         elif components is MISSING:
-            _components = self.components
+            _components = _build_components(components=self.components)
         else:
             _components = _build_components(components=components)
 
@@ -1109,7 +1109,7 @@ async def create_reaction(
             raise LibraryException(code=13)
 
         _emoji = (
-            f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
+            (f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
             if isinstance(emoji, Emoji)
             else emoji
         )
@@ -1143,7 +1143,7 @@ async def remove_all_reactions_of(
             raise LibraryException(code=13)
 
         _emoji = (
-            f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
+            (f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
             if isinstance(emoji, Emoji)
             else emoji
         )
@@ -1166,7 +1166,7 @@ async def remove_own_reaction_of(
             raise LibraryException(code=13)
 
         _emoji = (
-            f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
+            (f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
             if isinstance(emoji, Emoji)
             else emoji
         )
@@ -1187,16 +1187,19 @@ async def remove_reaction_from(
         :type user: Union[Member, user, int]
         """
         _emoji = (
-            f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
+            (f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
             if isinstance(emoji, Emoji)
             else emoji
         )
         if not self._client:
             raise LibraryException(code=13)
 
-        _user_id = user if isinstance(user, int) else user.id
+        _user_id = user if isinstance(user, (int, Snowflake)) else user.id
         return await self._client.remove_user_reaction(
-            channel_id=int(self.channel_id), message_id=int(self.id), user_id=_user_id, emoji=_emoji
+            channel_id=int(self.channel_id),
+            message_id=int(self.id),
+            user_id=int(_user_id),
+            emoji=_emoji,
         )
 
     async def get_users_from_reaction(
@@ -1217,7 +1220,7 @@ async def get_users_from_reaction(
         _all_users: List[User] = []
 
         _emoji = (
-            f":{emoji.name.replace(':', '')}:{emoji.id or ''}"
+            (f":{emoji.name.replace(':', '')}:{emoji.id or ''}" if emoji.id else emoji.name)
             if isinstance(emoji, Emoji)
             else emoji
         )

interactions/base.py

@@ -6,7 +6,7 @@
     "__authors__",
 )
 
-__version__ = "4.3.0"
+__version__ = "4.3.1"
 
 __authors__ = {
     "current": [

interactions/client/context.py

@@ -255,7 +255,7 @@ async def edit(
 
         if self.message.components is not None or components is not MISSING:
             if components is MISSING:
-                _components = self.message.components
+                _components = _build_components(components=self.message.components)
             elif not components:
                 _components = []
             else:

interactions/client/models/command.py

@@ -257,7 +257,7 @@ def decorator(coro: Callable[..., Awaitable]) -> Callable[..., Awaitable]:
 
         param = parameters[-1 - len(coro._options)]
 
-        option_type = kwargs.get("type", param.annotation)
+        option_type = kwargs.pop("type", param.annotation)
         name = kwargs.pop("name", param.name)
         if name != param.name:
             kwargs["converter"] = param.name