Add files via upload

Author: mccoderpy

discord/components.py

@@ -95,7 +95,7 @@ def __init__(self, **kwargs):
                 'The maximum length of Button-custom_id\'s are 100; your one is %s long. (%s Characters to long)' % (len(self.custom_id), len(self.custom_id) - 100))
         if self._custom_id and self.url:
             raise URLAndCustomIDNotAlowed(self.custom_id)
-        self._label: str = kwargs.get('label', kwargs.get('name', 'I\'m an Button'))
+        self._label: str = kwargs.get('label', kwargs.get('name', ''))
         if self._label and len(self._label) > 80:
             raise InvalidArgument(f'The maximum length of Button-Labels\'s are 80; your one is {len(self.label)} long. ({len(self.label) - 100} Characters to long)')
         self._emoji = kwargs.get('emoji', None)

discord/errors.py

@@ -23,6 +23,8 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
+import sys
+
 
 class DiscordException(Exception):
     """Base exception class for discord.py
@@ -31,6 +33,13 @@ class DiscordException(Exception):
     """
     pass
 
+class DiscordWarning(Warning):
+    """Base warning class for discord.py
+
+    Ideally speaking, this could be caught to handle any warnings thrown from this library.
+    """
+    pass
+
 class ClientException(DiscordException):
     """Exception that's thrown when an operation in the :class:`Client` fails.
 
@@ -235,7 +244,7 @@ def __init__(self):
               'Note: this Error could be supressed by adding `force=True` to the Innit of the ActionRow'
         super().__init__(msg)
 
-class UnknowInteraction(DiscordException):
+class UnknowInteraction(DiscordWarning):
     def __init__(self, interaction_id: int):
         msg = f'You have already replied to this interaction ({interaction_id})' \
               f' and/or 15 minutes have passed since the interaction, which is why Discord has deleted the interaction.'

discord/message.py

@@ -1159,10 +1159,9 @@ async def edit(self, **fields):
                                                                             interaction_id=interaction_id,
                                                                             token=interaction_token,
                                                                             application_id=application_id,
-                                                                            deffered=deffered,**fields)
+                                                                            deffered=deffered, **fields)
                 except NotFound:
                     is_interaction_responce = None
-                    raise UnknowInteraction(application_id)
                 else:
                     [self.__setattr__(k, v) for k, v in fields.items()]
 
@@ -1695,7 +1694,6 @@ async def edit(self, **fields):
                                                                             deffered=deffered, **fields)
                 except NotFound:
                     is_interaction_responce = None
-                    raise UnknowInteraction(application_id)
                 else:
                     [self.__setattr__(k, v) for k, v in fields.items()]
 

discord/raw_models.py

@@ -25,10 +25,12 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 """
+import sys
 import typing
 from .member import Member
+from .user import User
 from .message import Message
-from .errors import NotFound
+from .errors import NotFound, UnknowInteraction
 
 
 class _RawReprMixin:
@@ -253,15 +255,15 @@ def __init__(self, data, http=None):
         self._message_id = data.get('message').get('id', None)
         self._data = data.get('data', None)
         self._member = data.get('member', None)
+        self._user = data.get('user', self._member.get('user'))
         self.__interaction_id = data.get('id', 0)
         self._guild_id = data.get('guild_id', 0)
         self._channel_id = data.get('channel_id', 0)
         self.__application_id = data.get('application_id', 0)
         self.guild = None
         self.channel = None
         self.member: Member = None
-        self.user = None
-        self._user = dict(self.member._user) if self.member else data.get('user')
+        self.user: User = None
         self.button = ClickEvent(self._data)
         self.message: Message = None
         self._deferred = False
@@ -276,7 +278,8 @@ async def defer(self, ):
         try:
             await self.http.post_initial_response(_resp=base, use_webhook=False, interaction_id=self.__interaction_id, token=self.__token, application_id=self.__application_id)
         except NotFound:
-            pass
+            sys.stderr.write(f'You have already replied to this interaction ({self.__interaction_id})\nand/or 15 minutes have passed since the interaction, which is why'
+                             f' Discord has deleted the interaction.')
         else:
             self._deferred = True
 

discord/state.py

@@ -535,7 +535,6 @@ def parse_message_update(self, data):
             self.dispatch('raw_message_edit', raw)
 
     def parse_interaction_create(self, data):
-
         if data.get('type', data.get('t', None)) != 3:
             #to make sure that other-libraries like `discord-py-slash-command` still work
             self.dispatch('socket_responce', data)
@@ -548,8 +547,7 @@ def parse_interaction_create(self, data):
             raw.member: Member = Member(guild=raw.guild, data=raw._member, state=self)
         else:
             raw.channel = self._get_private_channel(raw.channel_id)
-        if raw._user is not None:
-            raw.user = self.get_user(raw._user.get('id', None))
+        raw.user = User(state=self, data=raw._user)
         if raw.message is not None:
             self.dispatch('interaction_create', raw)
             self.dispatch('raw_interaction_create', raw)