scurrypy 0.5__tar.gz → 0.5.3__tar.gz

{scurrypy-0.5 → scurrypy-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scurrypy
-Version: 0.5
+Version: 0.5.3
 Summary: Dataclass-driven Discord API Wrapper in Python
 Author: Furmissile
 Requires-Python: >=3.10
@@ -21,10 +21,11 @@ A dataclass-driven Discord API wrapper in Python!
 While this wrapper is mainly used for various squirrel-related shenanigans, it can also be used for more generic bot purposes.
 
 ## Features
-* Command and event handling  
-* Declarative style using decorators  
-* Supports both legacy and new features  
-* Respects Discord’s rate limits  
+* Command, and event handling
+* Unix shell-style wildcards for component routing
+* Declarative style using decorators
+* Supports both legacy and new features
+* Respects Discord’s rate limits
 
 ## Notes & Early Status
 * This is an early version — feedback, ideas, and contributions are very welcome! That said, there may be bumps along the way, so expect occasional bugs and quirks.  
@@ -45,24 +46,24 @@ The following demonstrates building and responding to a slash command.
 *Note: Adjust `dotenv_path` if your `.env` file is not in the same directory as this script.*
 
 ```py
-import discord, os
+import scurrypy, os
 from dotenv import load_dotenv
 
 load_dotenv(dotenv_path='./path/to/env')
 
-client = discord.Client(
+client = scurrypy.Client(
     token=os.getenv("DISCORD_TOKEN"),
     application_id=APPLICATION_ID  # your bot’s application ID
 )
 
 @client.command(
-    command=discord.SlashCommand(
+    command=scurrypy.SlashCommand(
         name='example',
         description='Demonstrate the minimal slash command!'
     ),
     guild_ids=GUILD_ID  # must be a guild ID your bot is in
 )
-async def example(bot: discord.Client, event: discord.InteractionEvent):
+async def example(bot: scurrypy.Client, event: scurrypy.InteractionEvent):
     await event.interaction.respond(f'Hello, {event.interaction.member.user.username}!')
 
 client.run()
@@ -71,20 +72,20 @@ client.run()
 ## Minimal Prefix Command (Legacy)
 The following demonstrates building and responding to a message prefix command.
 ```py
-import discord, os
+import scurrypy, os
 from dotenv import load_dotenv
 
 load_dotenv(dotenv_path='./path/to/env')
 
-client = discord.Client(
+client = scurrypy.Client(
     token=os.getenv("DISCORD_TOKEN"),
     application_id=APPLICATION_ID  # your bot’s application ID
-    intents=discord.set_intents(message_content=True),
+    intents=scurrypy.set_intents(message_content=True),
     prefix='!'  # your custom prefix
 )
 
 @client.prefix_command
-async def ping(bot: discord.Client, event: discord.MessageCreateEvent):
+async def ping(bot: scurrypy.Client, event: scurrypy.MessageCreateEvent):
     # The function name is the name of the command
     await event.message.send("Pong!")
 

{scurrypy-0.5 → scurrypy-0.5.3}/README.md

@@ -11,10 +11,11 @@ A dataclass-driven Discord API wrapper in Python!
 While this wrapper is mainly used for various squirrel-related shenanigans, it can also be used for more generic bot purposes.
 
 ## Features
-* Command and event handling  
-* Declarative style using decorators  
-* Supports both legacy and new features  
-* Respects Discord’s rate limits  
+* Command, and event handling
+* Unix shell-style wildcards for component routing
+* Declarative style using decorators
+* Supports both legacy and new features
+* Respects Discord’s rate limits
 
 ## Notes & Early Status
 * This is an early version — feedback, ideas, and contributions are very welcome! That said, there may be bumps along the way, so expect occasional bugs and quirks.  
@@ -35,24 +36,24 @@ The following demonstrates building and responding to a slash command.
 *Note: Adjust `dotenv_path` if your `.env` file is not in the same directory as this script.*
 
 ```py
-import discord, os
+import scurrypy, os
 from dotenv import load_dotenv
 
 load_dotenv(dotenv_path='./path/to/env')
 
-client = discord.Client(
+client = scurrypy.Client(
     token=os.getenv("DISCORD_TOKEN"),
     application_id=APPLICATION_ID  # your bot’s application ID
 )
 
 @client.command(
-    command=discord.SlashCommand(
+    command=scurrypy.SlashCommand(
         name='example',
         description='Demonstrate the minimal slash command!'
     ),
     guild_ids=GUILD_ID  # must be a guild ID your bot is in
 )
-async def example(bot: discord.Client, event: discord.InteractionEvent):
+async def example(bot: scurrypy.Client, event: scurrypy.InteractionEvent):
     await event.interaction.respond(f'Hello, {event.interaction.member.user.username}!')
 
 client.run()
@@ -61,20 +62,20 @@ client.run()
 ## Minimal Prefix Command (Legacy)
 The following demonstrates building and responding to a message prefix command.
 ```py
-import discord, os
+import scurrypy, os
 from dotenv import load_dotenv
 
 load_dotenv(dotenv_path='./path/to/env')
 
-client = discord.Client(
+client = scurrypy.Client(
     token=os.getenv("DISCORD_TOKEN"),
     application_id=APPLICATION_ID  # your bot’s application ID
-    intents=discord.set_intents(message_content=True),
+    intents=scurrypy.set_intents(message_content=True),
     prefix='!'  # your custom prefix
 )
 
 @client.prefix_command
-async def ping(bot: discord.Client, event: discord.MessageCreateEvent):
+async def ping(bot: scurrypy.Client, event: scurrypy.MessageCreateEvent):
     # The function name is the name of the command
     await event.message.send("Pong!")
 

{scurrypy-0.5 → scurrypy-0.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scurrypy"
-version = "0.5"
+version = "0.5.3"
 
 description = "Dataclass-driven Discord API Wrapper in Python"
 readme = "README.md"
@@ -14,10 +14,10 @@ dependencies = []
 
 [tool.setuptools]
 packages = [
-  "discord",
-  "discord.dispatch",
-  "discord.events",
-  "discord.models",
-  "discord.resources",
-  "discord.parts"
+  "scurrypy",
+  "scurrypy.dispatch",
+  "scurrypy.events",
+  "scurrypy.models",
+  "scurrypy.resources",
+  "scurrypy.parts"
 ]

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/__init__.py

@@ -1,4 +1,4 @@
-# discord
+# scurrypy
 
 import importlib
 from typing import TYPE_CHECKING
@@ -261,110 +261,110 @@ def __getattr__(name: str):
 
     mapping = {
         # top-level
-        "Logger": "discord.logger",
-        "Client": "discord.client",
-        "Intents": "discord.intents",
-        "set_intents": "discord.intents",
-        "BaseConfig": "discord.config",
+        "Logger": "scurrypy.logger",
+        "Client": "scurrypy.client",
+        "Intents": "scurrypy.intents",
+        "set_intents": "scurrypy.intents",
+        "BaseConfig": "scurrypy.config",
 
-        'InteractionTypes': "discord.dispatch.command_dispatcher",
+        'InteractionTypes': "scurrypy.dispatch.command_dispatcher",
 
-        "ReadyEvent": "discord.events.ready_event",
+        "ReadyEvent": "scurrypy.events.ready_event",
         
-        "ReactionAddEvent": "discord.events.reaction_events",
-        "ReactionRemoveEvent": "discord.events.reaction_events",
-        "ReactionRemoveEmojiEvent": "discord.events.reaction_events",
-        "ReactionRemoveAllEvent": "discord.events.reaction_events",
-
-        "GuildCreateEvent": "discord.events.guild_events",
-        "GuildUpdateEvent": "discord.events.guild_events",
-        "GuildDeleteEvent": "discord.events.guild_events",
-
-        "MessageCreateEvent": "discord.events.message_events",
-        "MessageUpdateEvent": "discord.events.message_events",
-        "MessageDeleteEvent": "discord.events.message_events",
-
-        "GuildChannelCreateEvent": "discord.events.channel_events",
-        "GuildChannelUpdateEvent": "discord.events.channel_events",
-        "GuildChannelDeleteEvent": "discord.events.channel_events",
-        "ChannelPinsUpdateEvent": "discord.events.channel_events",
-
-        "InteractionEvent": "discord.events.interaction_events",
-
-        'ApplicationModel': "discord.models.application",
-        'EmojiModel': "discord.models.emoji",
-        'GuildModel': "discord.models.guild",
-        'MemberModel': "discord.models.member",
-        'UserModel': "discord.models.user",
-        'RoleModel': "discord.models.role",
-
-        'ChannelTypes': "discord.parts.channel",
-        'GuildChannel': "discord.parts.channel",
-
-        'CommandTypes': "discord.parts.command",
-        'CommandOptionTypes': "discord.parts.command",
-        'SlashCommand': "discord.parts.command",
-        'UserCommand': "discord.parts.command",
-        'MessageCommand': "discord.parts.command",
-
-        'ComponentV2Types': "discord.parts.components_v2",
-        'SectionPart': "discord.parts.components_v2",
-        'TextDisplay': "discord.parts.components_v2",
-        'Thumbnail': "discord.parts.components_v2",
-        'MediaGalleryItem': "discord.parts.components_v2",
-        'MediaGallery': "discord.parts.components_v2",
-        'File': "discord.parts.components_v2",
-        'SeparatorTypes': "discord.parts.components_v2",
-        'Separator': "discord.parts.components_v2",
-        'ContainerPart': "discord.parts.components_v2",
-        'Label': "discord.parts.components_v2",
-
-        'ComponentTypes': "discord.parts.components",
-        'ActionRowPart': "discord.parts.components",
-        'ButtonStyles': "discord.parts.components",
-        'Button': "discord.parts.components",
-        'SelectOption': "discord.parts.components",
-        'StringSelect': "discord.parts.components",
-        'TextInputStyles': 'discord.parts.components',
-        'TextInput': "discord.parts.components",
-        'DefaultValue': "discord.parts.components",
-        'UserSelect': "discord.parts.components",
-        'RoleSelect': "discord.parts.components",
-        'MentionableSelect': "discord.parts.components",
-        'ChannelSelect': "discord.parts.components",
+        "ReactionAddEvent": "scurrypy.events.reaction_events",
+        "ReactionRemoveEvent": "scurrypy.events.reaction_events",
+        "ReactionRemoveEmojiEvent": "scurrypy.events.reaction_events",
+        "ReactionRemoveAllEvent": "scurrypy.events.reaction_events",
+
+        "GuildCreateEvent": "scurrypy.events.guild_events",
+        "GuildUpdateEvent": "scurrypy.events.guild_events",
+        "GuildDeleteEvent": "scurrypy.events.guild_events",
+
+        "MessageCreateEvent": "scurrypy.events.message_events",
+        "MessageUpdateEvent": "scurrypy.events.message_events",
+        "MessageDeleteEvent": "scurrypy.events.message_events",
+
+        "GuildChannelCreateEvent": "scurrypy.events.channel_events",
+        "GuildChannelUpdateEvent": "scurrypy.events.channel_events",
+        "GuildChannelDeleteEvent": "scurrypy.events.channel_events",
+        "ChannelPinsUpdateEvent": "scurrypy.events.channel_events",
+
+        "InteractionEvent": "scurrypy.events.interaction_events",
+
+        'ApplicationModel': "scurrypy.models.application",
+        'EmojiModel': "scurrypy.models.emoji",
+        'GuildModel': "scurrypy.models.guild",
+        'MemberModel': "scurrypy.models.member",
+        'UserModel': "scurrypy.models.user",
+        'RoleModel': "scurrypy.models.role",
+
+        'ChannelTypes': "scurrypy.parts.channel",
+        'GuildChannel': "scurrypy.parts.channel",
+
+        'CommandTypes': "scurrypy.parts.command",
+        'CommandOptionTypes': "scurrypy.parts.command",
+        'SlashCommand': "scurrypy.parts.command",
+        'UserCommand': "scurrypy.parts.command",
+        'MessageCommand': "scurrypy.parts.command",
+
+        'ComponentV2Types': "scurrypy.parts.components_v2",
+        'SectionPart': "scurrypy.parts.components_v2",
+        'TextDisplay': "scurrypy.parts.components_v2",
+        'Thumbnail': "scurrypy.parts.components_v2",
+        'MediaGalleryItem': "scurrypy.parts.components_v2",
+        'MediaGallery': "scurrypy.parts.components_v2",
+        'File': "scurrypy.parts.components_v2",
+        'SeparatorTypes': "scurrypy.parts.components_v2",
+        'Separator': "scurrypy.parts.components_v2",
+        'ContainerPart': "scurrypy.parts.components_v2",
+        'Label': "scurrypy.parts.components_v2",
+
+        'ComponentTypes': "scurrypy.parts.components",
+        'ActionRowPart': "scurrypy.parts.components",
+        'ButtonStyles': "scurrypy.parts.components",
+        'Button': "scurrypy.parts.components",
+        'SelectOption': "scurrypy.parts.components",
+        'StringSelect': "scurrypy.parts.components",
+        'TextInputStyles': 'scurrypy.parts.components',
+        'TextInput': "scurrypy.parts.components",
+        'DefaultValue': "scurrypy.parts.components",
+        'UserSelect': "scurrypy.parts.components",
+        'RoleSelect': "scurrypy.parts.components",
+        'MentionableSelect': "scurrypy.parts.components",
+        'ChannelSelect': "scurrypy.parts.components",
         
-        'EmbedAuthor': "discord.parts.embed",
-        'EmbedThumbnail': "discord.parts.embed",
-        'EmbedField': "discord.parts.embed",
-        'EmbedImage': "discord.parts.embed",
-        'EmbedFooter': "discord.parts.embed",
-        'EmbedPart': "discord.parts.embed",
+        'EmbedAuthor': "scurrypy.parts.embed",
+        'EmbedThumbnail': "scurrypy.parts.embed",
+        'EmbedField': "scurrypy.parts.embed",
+        'EmbedImage': "scurrypy.parts.embed",
+        'EmbedFooter': "scurrypy.parts.embed",
+        'EmbedPart': "scurrypy.parts.embed",
 
-        'MessageFlags': "discord.parts.message",
-        'MessageReferenceTypes': "discord.parts.message",
-        'MessageReference': "discord.parts.message",
-        'Attachment': "discord.parts.message",
-        'MessagePart': "discord.parts.message",
+        'MessageFlags': "scurrypy.parts.message",
+        'MessageReferenceTypes': "scurrypy.parts.message",
+        'MessageReference': "scurrypy.parts.message",
+        'Attachment': "scurrypy.parts.message",
+        'MessagePart': "scurrypy.parts.message",
 
-        'ModalPart': "discord.parts.modal",
-        'Role': "discord.parts.role",
+        'ModalPart': "scurrypy.parts.modal",
+        'Role': "scurrypy.parts.role",
 
-        'ApplicationFlags': "discord.resources.application",
-        'Application': "discord.resources.application",
+        'ApplicationFlags': "scurrypy.resources.application",
+        'Application': "scurrypy.resources.application",
 
-        'BotEmojis': "discord.resources.bot_emojis",
+        'BotEmojis': "scurrypy.resources.bot_emojis",
 
-        'PinnedMessage': "discord.resources.channel",
-        'Channel': "discord.resources.channel",
+        'PinnedMessage': "scurrypy.resources.channel",
+        'Channel': "scurrypy.resources.channel",
 
-        'Guild': "discord.resources.guild",
+        'Guild': "scurrypy.resources.guild",
 
-        'InteractionCallbackTypes': "discord.resources.interaction",
-        'Interaction': "discord.resources.interaction",
+        'InteractionCallbackTypes': "scurrypy.resources.interaction",
+        'Interaction': "scurrypy.resources.interaction",
 
-        'Message': "discord.resources.message",
+        'Message': "scurrypy.resources.message",
         
-        'User': "discord.resources.user"
+        'User': "scurrypy.resources.user"
     }
 
     module = importlib.import_module(mapping[name])

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/client_like.py

@@ -5,7 +5,7 @@ from .http import HTTPClient
 from .logger import Logger
 
 class ClientLike(Protocol):
-    """Exposes a common interface for [`Client`][discord.client.Client]."""
+    """Exposes a common interface for [`Client`][scurrypy.client.Client]."""
     application_id: int
     """Bot's application ID."""
 

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/dispatch/command_dispatcher.py

@@ -25,7 +25,7 @@ class CommandDispatcher:
         InteractionTypes.MESSAGE_COMPONENT: MessageComponentData,
         InteractionTypes.MODAL_SUBMIT: ModalData
     }
-    """Maps [`InteractionTypes`][discord.dispatch.command_dispatcher.InteractionTypes] to their respective dataclass."""
+    """Maps [`InteractionTypes`][scurrypy.dispatch.command_dispatcher.InteractionTypes] to their respective dataclass."""
 
     def __init__(self, client: ClientLike):
         self.application_id = client.application_id
@@ -66,7 +66,7 @@ class CommandDispatcher:
             await self._http.request(
                 'PUT', 
                 f"applications/{self.application_id}/guilds/{guild_id}/commands", 
-                data=[command._to_dict() for command in cmds]
+                data=[command.to_dict() for command in cmds]
             )
     
     async def _register_global_commands(self, commands: list):
@@ -76,7 +76,7 @@ class CommandDispatcher:
             commands (list): list of serialized commands
         """
 
-        global_commands = [command._to_dict() for command in commands]
+        global_commands = [command.to_dict() for command in commands]
 
         await self._http.request('PUT', f"applications/{self.application_id}/commands", data=global_commands)
 

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/dispatch/event_dispatcher.py

@@ -7,25 +7,25 @@ class EventDispatcher:
     """Central hub for handling Discord Gateway events."""
 
     RESOURCE_MAP = { # maps discord events to their respective dataclass (lazy loading)
-        'READY': ('discord.events.ready_event', 'ReadyEvent'),
+        'READY': ('scurrypy.events.ready_event', 'ReadyEvent'),
 
-        'GUILD_CREATE': ('discord.events.guild_events', 'GuildCreateEvent'),
-        'GUILD_UPDATE': ('discord.events.guild_events', 'GuildUpdateEvent'),
-        'GUILD_DELETE': ('discord.events.guild_events', 'GuildDeleteEvent'),
+        'GUILD_CREATE': ('scurrypy.events.guild_events', 'GuildCreateEvent'),
+        'GUILD_UPDATE': ('scurrypy.events.guild_events', 'GuildUpdateEvent'),
+        'GUILD_DELETE': ('scurrypy.events.guild_events', 'GuildDeleteEvent'),
 
-        'CHANNEL_CREATE': ('discord.events.channel_events', 'GuildChannelCreateEvent'),
-        'CHANNEL_UPDATE': ('discord.events.channel_events', 'GuildChannelUpdateEvent'),
-        'CHANNEL_DELETE': ('discord.events.channel_events', 'GuildChannelDeleteEvent'),
-        'CHANNEL_PINS_UPDATE': ('discord.events.channel_events', 'ChannelPinsUpdateEvent'),
+        'CHANNEL_CREATE': ('scurrypy.events.channel_events', 'GuildChannelCreateEvent'),
+        'CHANNEL_UPDATE': ('scurrypy.events.channel_events', 'GuildChannelUpdateEvent'),
+        'CHANNEL_DELETE': ('scurrypy.events.channel_events', 'GuildChannelDeleteEvent'),
+        'CHANNEL_PINS_UPDATE': ('scurrypy.events.channel_events', 'ChannelPinsUpdateEvent'),
 
-        'MESSAGE_CREATE': ('discord.events.message_events', 'MessageCreateEvent'),
-        'MESSAGE_UPDATE': ('discord.events.message_events', 'MessageUpdateEvent'),
-        'MESSAGE_DELETE': ('discord.events.message_events', 'MessageDeleteEvent'),
+        'MESSAGE_CREATE': ('scurrypy.events.message_events', 'MessageCreateEvent'),
+        'MESSAGE_UPDATE': ('scurrypy.events.message_events', 'MessageUpdateEvent'),
+        'MESSAGE_DELETE': ('scurrypy.events.message_events', 'MessageDeleteEvent'),
         
-        'MESSAGE_REACTION_ADD': ('discord.events.reaction_events', 'ReactionAddEvent'),
-        'MESSAGE_REACTION_REMOVE': ('discord.events.reaction_events', 'ReactionRemoveEvent'),
-        'MESSAGE_REACTION_REMOVE_ALL': ('discord.events.reaction_events', 'ReactionRemoveAllEvent'),
-        'MESSAGE_REACTION_REMOVE_EMOJI': ('discord.events.reaction_events', 'ReactionRemoveEmojiEvent'),
+        'MESSAGE_REACTION_ADD': ('scurrypy.events.reaction_events', 'ReactionAddEvent'),
+        'MESSAGE_REACTION_REMOVE': ('scurrypy.events.reaction_events', 'ReactionRemoveEvent'),
+        'MESSAGE_REACTION_REMOVE_ALL': ('scurrypy.events.reaction_events', 'ReactionRemoveAllEvent'),
+        'MESSAGE_REACTION_REMOVE_EMOJI': ('scurrypy.events.reaction_events', 'ReactionRemoveEmojiEvent'),
 
         # and other events...
     }

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/events/interaction_events.py

@@ -15,7 +15,7 @@ class ApplicationCommandOptionData(DataModel):
     """Name of the command option."""
 
     type: int
-    """Type of command option. See [`CommandOptionTypes`][discord.parts.command.CommandOptionTypes]."""
+    """Type of command option. See [`CommandOptionTypes`][scurrypy.parts.command.CommandOptionTypes]."""
 
     value: str | int | float | bool
     """Input value for option."""
@@ -153,7 +153,7 @@ class InteractionEvent(DataModel):
     """Represents the interaction response."""
 
     interaction: Interaction
-    """Interaction resource object. See [`Interaction`][discord.resources.interaction.Interaction]."""
+    """Interaction resource object. See [`Interaction`][scurrypy.resources.interaction.Interaction]."""
 
     data: Optional[ApplicationCommandData | MessageComponentData | ModalData] = None
     """Interaction response data."""

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/events/message_events.py

@@ -9,25 +9,25 @@ from ..models.member import MemberModel
 class MessageCreateEvent(DataModel):
     """Received when a message is created."""
     message: Message
-    """Message resource object. See [`Resource.Message`][discord.resources.message.Message]."""
+    """Message resource object. See [`Resource.Message`][scurrypy.resources.message.Message]."""
 
     guild_id: Optional[int]
     """Guild ID of the updated message (if in a guild channel)."""
 
     member: Optional[MemberModel]  # guild-only author info
-    """Partial Member object of the author of the message. See [`MemberModel`][discord.models.member.MemberModel]."""
+    """Partial Member object of the author of the message. See [`MemberModel`][scurrypy.models.member.MemberModel]."""
     
 @dataclass
 class MessageUpdateEvent(DataModel):
     """Received when a message is updated."""
     message: Message
-    """Message resource object. See [`Resource.Message`][discord.resources.message.Message]."""
+    """Message resource object. See [`Resource.Message`][scurrypy.resources.message.Message]."""
 
     guild_id: Optional[int]
     """Guild ID of the updated message (if in a guild channel)."""
 
     member: Optional[MemberModel]
-    """Partial Member object of the author of the message. See [`MemberModel`][discord.models.member.MemberModel]."""
+    """Partial Member object of the author of the message. See [`MemberModel`][scurrypy.models.member.MemberModel]."""
 
 @dataclass
 class MessageDeleteEvent(DataModel):

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/intents.py

@@ -54,7 +54,7 @@ class IntentFlagParams(TypedDict, total=False):
     message_content: bool
 
 def set_intents(**flags: Unpack[IntentFlagParams]):
-    """Set bot intents using [`IntentFlagParams`][discord.intents.IntentFlagParams].  
+    """Set bot intents using [`IntentFlagParams`][scurrypy.intents.IntentFlagParams].  
     `Intents.DEFAULT` = (GUILDS | GUILD_MESSAGES) will also be set.
 
     Args:

scurrypy-0.5.3/scurrypy/model.py

@@ -0,0 +1,71 @@
+from dataclasses import dataclass, fields, is_dataclass
+from typing import get_args, get_origin, Union
+
+from .http import HTTPClient
+
+@dataclass
+class DataModel:    
+    """DataModel is a base class for Discord JSONs that provides hydration from raw dicts, 
+        optional field defaults, and access to HTTP-bound methods.
+    """
+    
+    @classmethod
+    def from_dict(cls, data: dict, http: 'HTTPClient' = None):
+        """Hydrates the given data into the dataclass child.
+
+        Args:
+            data (dict): JSON data
+            http (HTTPClient, optional): HTTP session for requests
+
+        Returns:
+            (dataclass): hydrated dataclass
+        """
+        def unwrap_optional(t):
+            if get_origin(t) is Union:
+                args = tuple(a for a in get_args(t) if a is not type(None))
+                return args[0] if len(args) == 1 else Union[args]
+            return t
+
+        kwargs = {}
+        for f in fields(cls):
+            v = data.get(f.name)
+            t = unwrap_optional(f.type)
+
+            if v is None:
+                kwargs[f.name] = None
+            elif is_dataclass(t):
+                kwargs[f.name] = t.from_dict(v, http)
+            elif get_origin(t) is list:
+                lt = get_args(t)[0]
+                kwargs[f.name] = [lt.from_dict(x, http) if is_dataclass(lt) else x for x in v]
+            else:
+                try:
+                    kwargs[f.name] = t(v)
+                except Exception:
+                    kwargs[f.name] = v  # fallback to raw
+
+        inst = cls(**kwargs)
+        if http: inst._http = http
+        return inst
+
+    def to_dict(self):
+        """Recursively turns the dataclass into a dictionary and drops empty fields.
+
+        Returns:
+            (dict): serialized dataclasss
+        """
+        def serialize(val):
+            if isinstance(val, list):
+                return [serialize(v) for v in val if v is not None]
+            if isinstance(val, DataModel):
+                return val.to_dict()
+            return val
+
+        result = {}
+        for f in fields(self):
+            if f.name.startswith('_'):
+                continue
+            val = getattr(self, f.name)
+            # if val not in (None, [], {}, "", 0):
+            result[f.name] = serialize(val)
+        return result

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/models/emoji.py

@@ -32,3 +32,19 @@ class EmojiModel(DataModel):
             return quote(f"a:{self.name}:{self.id}")
         
         return quote(f"{self.name}:{self.id}")
+
+    @property
+    def url(self) -> str:
+        """
+            Return the full qualifying link for this emoji.
+
+            !!! important
+                This only works for custom Discord emojis (those with an ID). 
+                Unicode emojis will return `None`.
+        """
+        if not self.id:
+            return None
+        
+        ext = 'gif' if self.animated else 'png'
+
+        return f"https://cdn.discordapp.com/emojis/{self.id}.{ext}"

{scurrypy-0.5/discord → scurrypy-0.5.3/scurrypy}/parts/channel.py

@@ -27,7 +27,7 @@ class GuildChannel(DataModel):
     """Name of the channel."""
 
     type: Optional[int] = None
-    """Type of channel. See [`ChannelTypes`][discord.parts.channel.ChannelTypes]."""
+    """Type of channel. See [`ChannelTypes`][scurrypy.parts.channel.ChannelTypes]."""
 
     topic: Optional[str] = None
     """Topic of channel."""