scurrypy 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

discord/client.py

@@ -100,13 +100,13 @@ class Client(ClientLike):
         def decorator(func):
             # hash out command type
             if isinstance(command, MessageCommand):
-                self.command_dispatcher.message_command(func)
+                self.command_dispatcher.message_command(command.name, func)
             elif isinstance(command, UserCommand):
-                self.command_dispatcher.user_command(func)
+                self.command_dispatcher.user_command(command.name, func)
             elif isinstance(command, SlashCommand):
-                self.command_dispatcher.command(func)
+                self.command_dispatcher.command(command.name, func)
             else:
-                raise ValueError(f'Command {func.__name__} expected to be of type SlashCommand, UserCommand, MessageCommand; \
+                raise ValueError(f'Command {command.name} expected to be of type SlashCommand, UserCommand, MessageCommand; \
                     got {type(command).__name__}.')
             
             # then hash out if this command should be guild or global level

discord/dispatch/command_dispatcher.py

@@ -78,39 +78,42 @@ class CommandDispatcher:
 
         await self._http.request('PUT', f"applications/{self.application_id}/commands", global_commands)
 
-    def command(self, handler):
+    def command(self, name: str, handler):
         """Decorator to register slash commands.
 
         Args:
+            name (str): name of the command to register
             handler (callable): callback handle for command response
         """
-        self._handlers[handler.__name__] = handler
-    
-    def component(self, func, custom_id: str):
-        """Decorator to register component interactions.
-
-        Args:
-            custom_id (str): Identifier of the component 
-                !!! warning "Important"
-                    Must match the `custom_id` set where the component was created.
-        """
-        self._component_handlers[custom_id] = func
+        self._handlers[name] = handler
 
-    def user_command(self, handler):
+    def user_command(self, name: str, handler):
         """Decorator to register user commands.
 
         Args:
+            name (str): name of the command to register
             handler (callable): callback handle for user command response
         """
-        self._user_handlers[handler.__name__] = handler
+        self._user_handlers[name] = handler
 
-    def message_command(self, handler):
+    def message_command(self, name: str, handler):
         """Decorator to register message commands.
 
         Args:
+            name (str): name of the command to register
             handler (callable): callback handle for message command response
         """
-        self._message_handlers[handler.__name__] = handler
+        self._message_handlers[name] = handler
+
+    def component(self, func, custom_id: str):
+        """Decorator to register component interactions.
+
+        Args:
+            custom_id (str): Identifier of the component 
+                !!! warning "Important"
+                    Must match the `custom_id` set where the component was created.
+        """
+        self._component_handlers[custom_id] = func
 
     async def dispatch(self, data: dict):
         """Dispatch a response to an `INTERACTION_CREATE` event

discord/models/interaction.py

@@ -0,0 +1,26 @@
+from dataclasses import dataclass
+from ..model import DataModel
+
+@dataclass
+class InteractionCallbackDataModel(DataModel):
+    id: int
+    """ID of the interaction."""
+
+    type: int
+    """Type of interaction."""
+
+    activity_instance_id: str
+    """Instance ID of activity if an activity was launched or joined."""
+
+    response_message_id: int
+    """ID of the message created by the interaction."""
+
+    response_message_loading: bool
+    """If the interaction is in a loading state."""
+
+    response_message_ephemeral: bool
+    """If the interaction is ephemeral."""
+
+@dataclass
+class InteractionCallbackModel(DataModel):
+    interaction: InteractionCallbackDataModel

discord/resources/channel.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import TypedDict, Unpack, Optional
+from typing import TypedDict, Unpack, Optional, Literal
 
 from ..http import HTTPClient
 from ..model import DataModel
@@ -32,6 +32,15 @@ class PinsFetchParams(TypedDict, total=False):
     limit: int
     """Max number of pinned messages to return. Range 1 - 50. Default 50."""
 
+class ThreadFromMessageParams(TypedDict, total=False):
+    """Params when attaching a thread to a message."""
+
+    rate_limit_per_user: Literal[60, 1440, 4320, 10080]
+    """time (minutes) of inactivity before thread is archived."""
+
+    rate_limit_per_user: int
+    """time (seconds) user waits before sending another message."""
+
 @dataclass
 class PinnedMessage(DataModel):
     """Pinned message data."""
@@ -160,6 +169,26 @@ class Channel(DataModel):
 
         return self
     
+    async def create_thread_from_message(self, message_id: int, name: str, **kwargs: Unpack[ThreadFromMessageParams]):
+        """Create a thread from this message
+
+        Args:
+            message_id: ID of message to attach thread
+            name (str): thread name
+
+        Returns:
+            (Channel): The updated channel object
+        """
+
+        content = {
+            'name': name, 
+            **kwargs
+        }
+
+        data = await self._http.request('POST', f"channels/{self.id}/messages/{message_id}/threads", data=content)
+
+        return Channel.from_dict(data, self._http)
+    
     async def fetch_pins(self, **kwargs: Unpack[PinsFetchParams]):
         """Get this channel's pinned messages.
 

discord/resources/interaction.py

@@ -11,6 +11,7 @@ from ..parts.component_types import *
 
 from ..models.guild import GuildModel
 from ..models.member import MemberModel
+from ..models.interaction import InteractionCallbackModel
 
 from .channel import Channel
 
@@ -98,11 +99,12 @@ class Interaction(DataModel):
     channel: Optional[Channel] = None
     """Partial channel object the interaction was invoked."""
 
-    async def respond(self, message: str | MessageBuilder, **flags: Unpack[MessageFlagParams]):
+    async def respond(self, message: str | MessageBuilder, with_response: bool = False, **flags: Unpack[MessageFlagParams]):
         """Create a message in response to an interaction.
 
         Args:
             message (str | MessageBuilder): content as a string or from MessageBuilder
+            with_response (bool, optional): if the interaction data should be returned. Defaults to False.
         """
         if isinstance(message, str):
             message = MessageBuilder(content=message).set_flags(**flags)
@@ -112,12 +114,18 @@ class Interaction(DataModel):
             'data': message._to_dict()
         }
 
-        await self._http.request(
+        params = {'with_response': with_response}
+
+        data = await self._http.request(
             'POST', 
             f'/interactions/{self.id}/{self.token}/callback', 
             content, 
-            files=[fp.path for fp in message.attachments])
+            files=[fp.path for fp in message.attachments],
+            params=params)
 
+        if with_response:
+            return InteractionCallbackModel.from_dict(data, self._http)
+        
     async def update(self, message: str | MessageBuilder, **flags: Unpack[MessageFlagParams]):
         """Update a message in response to an interaction.
 

{scurrypy-0.3.0.dist-info → scurrypy-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scurrypy
-Version: 0.3.0
+Version: 0.3.2
 Summary: Discord API Wrapper in Python
 Author: Furmissile
 Requires-Python: >=3.10
@@ -46,14 +46,14 @@ load_dotenv(dotenv_path='./path/to/env') # omit argument if your env file is on
 
 bot = discord.Client(
     token=os.getenv("DISCORD_TOKEN"),
-    application_id=1234567890 # replace with your bot's user ID
+    application_id=APPLICATION_ID # replace with your bot's user ID
 )
 
 @bot.command(
     command=discord.SlashCommand(name='example', description='Demonstrate the minimal slash command!'),
     guild_id=GUILD_ID # must be a guild ID your bot is in!
 )
-async def example(event: discord.InteractionEvent):
+async def example(bot: discord.Client, event: discord.InteractionEvent):
     await event.interaction.respond(f'Hello, {event.interaction.member.user.username}!')
 
 bot.run()
@@ -69,13 +69,13 @@ load_dotenv(dotenv_path='./path/to/env') # omit argument if your env file is on
 
 bot = discord.Client(
     token=os.getenv("DISCORD_TOKEN"),
-    application_id=1234567890, # replace with your bot's user ID
+    application_id=APPLICATION_ID, # replace with your bot's user ID
     intents=discord.set_intents(message_content=True),
     prefix='!' # your custom prefix
 )
 
 @bot.prefix_command
-async def ping(event: discord.MessageCreateEvent): # the function name is the name of the command!
+async def ping(bot: discord.Client, event: discord.MessageCreateEvent): # the function name is the name of the command!
     await event.message.send(f"Pong!")
 
 bot.run()

{scurrypy-0.3.0.dist-info → scurrypy-0.3.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 discord/__init__.py,sha256=DPE5laK7mMQPeF2ky8D8QpokCDqsGlq6slHHhbNXmso,217
-discord/client.py,sha256=XJAxnfmwm16vfgKUZ15aFMXYHvK2WGVFQoJJ7vH2zMs,13353
+discord/client.py,sha256=6fQsg7p4-LlWICdoten4I3X0PrkxtoPkv5X9rNLRmJc,13394
 discord/client_like.py,sha256=JyJq0XBq0vKuPBJ_ZnYf5yAAuX1zz_2B1TZBQE-BYbQ,473
 discord/config.py,sha256=OH1A2mNKhDlGvQYASEsVUx2pNxP1YQ2a7a7z-IM5xFg,200
 discord/error.py,sha256=AlislRTna554cM6KC0KrwKugzYDYtx_9C8_3QFe4XDc,2070
@@ -9,7 +9,7 @@ discord/intents.py,sha256=Lf2fogFFDqilZeKJv7tcUgKmMW3D7ykK4bBNi-zDzYA,2866
 discord/logger.py,sha256=GBcvldIrSBnwNSgus-oa1NsYV8hU7f8_4J4VX_GmkxA,4700
 discord/model.py,sha256=CmuxyoWLWokE_UvCQ9M7U9Cr7JH9R7ULMv9KMwzXjDQ,3105
 discord/dispatch/__init__.py,sha256=m7ixrbNhOV9QRORXPw6LSwxofQMAvLmPFBweBZu9ACc,20
-discord/dispatch/command_dispatcher.py,sha256=_91l4oJQ8LhMnxdVPzkdmDSv6AWznekNODtzudCQvrk,5740
+discord/dispatch/command_dispatcher.py,sha256=pyJOQaZLZYrHUEs6HEWp8XMKTMZX4SBrwTizGKIeUG8,5904
 discord/dispatch/event_dispatcher.py,sha256=aPyfstFdIx510P_gKAExeZOICZooRgUdL19Adb19SPY,3085
 discord/dispatch/prefix_dispatcher.py,sha256=4mkn3cuXTjdEChbewkbZQqd_sMKm4jePSFKKOPbt12g,2065
 discord/events/__init__.py,sha256=BcmwAj84-nzMZEkip-V903jD0ZCKqhySzlAx5wDwJoo,630
@@ -25,6 +25,7 @@ discord/models/application.py,sha256=2sXtRysUc2TJ40FjdcrWgosmwMrp_h3ybddubQMixKM
 discord/models/emoji.py,sha256=6iz1DhWj_eTUj2KHmwMewjB3AdEBm68EmIZp2WFFCQg,932
 discord/models/guild.py,sha256=aXUByOUUIGt9d2qIGC6_X_vh0Nyib8Iqj5ZElBeNV_I,819
 discord/models/integration.py,sha256=V29RO2925mQbVXPAMt665cML3m8mJACYmdJLWwbbUyE,612
+discord/models/interaction.py,sha256=VPbf49C1RmQpDSODk3e1voW8EnbVsH_w1qpmiq4hVRM,700
 discord/models/member.py,sha256=pkI-NVRMb3hUBkxI26FSYZxzx2mRNGXOeWWCw3BGGsY,705
 discord/models/role.py,sha256=erlERmK-IZz4YzSNY-XLNvCc-Z5PoVlClxPOX67dQJg,1169
 discord/models/user.py,sha256=lgG6GoU_7L68oHt6PGTzTkU1vrbsclRQzGjKzsLBeKA,298
@@ -42,13 +43,13 @@ discord/parts/role.py,sha256=cK96UdgT-kU0gY5C_1LZXPrYg144x2RDmGjT28so57A,920
 discord/resources/__init__.py,sha256=ubRaTXEy4dNJhqO8JXf-xBoJjPt9zKs1GZHY8Um2_mk,282
 discord/resources/application.py,sha256=vYMTli_FSbC7venMepsJ9bkzdEQVkKYpnxCJ9K2XDho,2765
 discord/resources/bot_emojis.py,sha256=RvGCSOBkjS39P2aab0FzYUOTzBOiHX99RLrJZzAYNiU,1701
-discord/resources/channel.py,sha256=-boYdVYW0v0oaV5X1SIhfdbKn0RDFF_HJo83dreVTm0,5943
+discord/resources/channel.py,sha256=fe2JUp943VnXa-BKyRMtNP-JyNd_Mp516sWBKHKn_GI,6915
 discord/resources/guild.py,sha256=Unld1lWY3XynmRHU2FCi3-LA9VNp2thMI2BlILUTTxk,8183
-discord/resources/interaction.py,sha256=8z91X49KSknaT1syBfLr0SHRgAxaQ-8lbhkb3LU21fg,4911
+discord/resources/interaction.py,sha256=JdZiGlG12-TGazjq98kak_3ydHFm9RZCUJPBFcCbMHk,5305
 discord/resources/message.py,sha256=RtvcCRx0lwW-mHPl3aNYoEvGffrvtpLsQ2fVWckywVI,7527
 discord/resources/user.py,sha256=vk89TnCVi-6ZgbDs_TZTCXrx_NfFS5Q9Wi_itYoaoyg,3085
-scurrypy-0.3.0.dist-info/licenses/LICENSE,sha256=NtspfRMAlryd1Eev4BYi9EFbKhvdmlCJJ2-ADUoEBoI,426
-scurrypy-0.3.0.dist-info/METADATA,sha256=v3X0WfX-Z1KetahNjl7PbPL_xvsqFKIdxcRKstJXrDI,2950
-scurrypy-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-scurrypy-0.3.0.dist-info/top_level.txt,sha256=fJkrNbR-_8ubMBUcDEJBcfkpECrvSEmMrNKgvLlQFoM,8
-scurrypy-0.3.0.dist-info/RECORD,,
+scurrypy-0.3.2.dist-info/licenses/LICENSE,sha256=NtspfRMAlryd1Eev4BYi9EFbKhvdmlCJJ2-ADUoEBoI,426
+scurrypy-0.3.2.dist-info/METADATA,sha256=OSm3SIus5sVJNIpZ93FZLPeSClrIsPj4pPjH1MJKdUY,3000
+scurrypy-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+scurrypy-0.3.2.dist-info/top_level.txt,sha256=fJkrNbR-_8ubMBUcDEJBcfkpECrvSEmMrNKgvLlQFoM,8
+scurrypy-0.3.2.dist-info/RECORD,,