modifyself 0.1.9__tar.gz → 0.2.0__tar.gz

{modifyself-0.1.9 → modifyself-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modifyself
-Version: 0.1.9
+Version: 0.2.0
 Summary: A clean, pythonic Discord self-bot library
 Author-email: modifyself <modifyself@example.com>
 License-Expression: MIT

{modifyself-0.1.9 → modifyself-0.2.0}/modifyself/__init__.py

@@ -1,12 +1,12 @@
-"""
-modifyself — a clean, pythonic Discord self-bot library.
-"""
-
-__version__ = "0.1.4"
-
-from .client import Client
-from .commands.core import command
-from .commands.cog import Cog
-from .commands.context import Context
-
-__all__ = ["Client", "command", "Cog", "Context"]
+"""
+modifyself ? a clean, pythonic Discord self-bot library.
+"""
+
+__version__ = "0.1.4"
+
+from .client import Client
+from .commands.core import command
+from .commands.cog import Cog
+from .commands.context import Context
+
+__all__ = ["Client", "command", "Cog", "Context"]

{modifyself-0.1.9 → modifyself-0.2.0}/modifyself/client.py

@@ -19,8 +19,14 @@ from .commands.context import Context
 from .commands.cog import Cog
 from .errors import CommandError, ConversionError, CommandNotFound
 from .models.message import Message
+from .models.relationship import Relationship
+from .models.billing import PaymentSource, Subscription
+from .models.settings import GuildSettings, UserSettings
+from .models.webhook import Webhook, WebhookMessage
 from .headers import HeaderSpoofer, EMULATION
 from .utils import send_notification, START_IMAGE, ERROR_IMAGE
+from .interactions import Interaction, InteractionHandler, interaction_handler
+from .voice import VoiceManager, VoiceClient, VoiceState
 
 logger = logging.getLogger(__name__)
 
@@ -50,14 +56,13 @@ class Client:
         command_prefix: Union[str, Callable[["Client", Message], str]] = "!",
         owner_ids: Optional[List[int]] = None,
         proxy: Optional[str] = None,
-        notifications: bool = True,  # NEW: enable/disable notifications
+        notifications: bool = True,
     ):
         self.token = token
         self.command_prefix = command_prefix
         self.owner_ids = set(owner_ids) if owner_ids else set()
-        self._notifications = notifications  # NEW
+        self._notifications = notifications
 
-        # Internal components
         self._headers = HeaderSpoofer(token, EMULATION)
         self._http = HTTPClient(
             token,
@@ -72,26 +77,27 @@ class Client:
             headers=self._headers,
         )
 
-        # Event handlers
         self._event_handlers: Dict[str, List[Callable]] = {}
         self._once_handlers: Dict[str, List[Callable]] = {}
 
-        # Command registry
         self._commands: Dict[str, Command] = {}
         self._cogs: Dict[str, Cog] = {}
 
-        # Lifecycle
         self._ready = asyncio.Event()
         self._closed = False
         self._task: Optional[asyncio.Task] = None
         self._close_task: Optional[asyncio.Task] = None
-        self._error_handled = False  # NEW: prevent duplicate error notifications
+        self._error_handled = False
+
+        self._interaction_handlers: Dict[str, Callable] = {}
+
+        self._voice = VoiceManager(self)
 
-        # Auto-register built-in event parsers
         self._dispatcher.on("READY", self._on_ready_internal)
         self._dispatcher.on("MESSAGE_CREATE", self._on_message_create_internal)
+        self._dispatcher.on("INTERACTION_CREATE", self._on_interaction_create)
+        self._dispatcher.on("VOICE_STATE_UPDATE", self._on_voice_state_update)
 
-        # Send startup notification
         if self._notifications:
             send_notification(
                 title="🚀 modifyself Initialized",
@@ -100,49 +106,40 @@ class Client:
                 timeout=3
             )
 
-    # ------------------------------------------------------------------
-    # Properties
-    # ------------------------------------------------------------------
     @property
     def user(self):
-        """The client's user object."""
         return self._state.user
 
     @property
     def guilds(self):
-        """A view of the guilds the client is in."""
         return list(self._state._guilds.values())
 
     @property
     def users(self):
-        """A view of the users the client has cached."""
         return list(self._state._users.values())
 
     @property
     def latency(self) -> float:
-        """The current gateway latency in seconds."""
         return self._gateway.latency
 
     @property
     def listeners(self) -> Dict[str, List]:
-        """A view of registered event listeners by event name."""
         return dict(self._dispatcher._handlers)
 
     @property
     def commands(self) -> List[Command]:
-        """Return a list of registered commands."""
         return list(self._commands.values())
 
     @property
     def cogs(self) -> List[Cog]:
-        """Return a list of loaded cogs."""
         return list(self._cogs.values())
 
-    # ------------------------------------------------------------------
-    # Event decorators
-    # ------------------------------------------------------------------
+    @property
+    def voice(self) -> VoiceManager:
+        """Access voice manager."""
+        return self._voice
+
     def event(self, coro: Callable):
-        """Register an event handler."""
         if not asyncio.iscoroutinefunction(coro):
             raise TypeError("Event handlers must be coroutines")
         name = coro.__name__.replace("on_", "", 1).upper()
@@ -152,7 +149,6 @@ class Client:
         return coro
 
     def listen(self, name: Optional[str] = None):
-        """Decorator to register an event listener by explicit name."""
         def decorator(coro: Callable):
             if not asyncio.iscoroutinefunction(coro):
                 raise TypeError("Listeners must be coroutines")
@@ -162,20 +158,14 @@ class Client:
         return decorator
 
     def add_listener(self, event: str, handler: Callable):
-        """Add a listener for an event."""
         event = event.upper()
         self._dispatcher.on(event, handler)
         logger.info("[client] listener registered: %s -> %s", event, handler)
 
     def remove_listener(self, event: str, handler: Callable):
-        """Remove a listener for an event."""
         self._dispatcher.off(event.upper(), handler)
 
-    # ------------------------------------------------------------------
-    # Command registration
-    # ------------------------------------------------------------------
     def command(self, *, name: Optional[str] = None, aliases: Optional[List[str]] = None, **kwargs):
-        """Decorator to register a command."""
         def decorator(func: Callable):
             cmd = Command(func, name=name, aliases=aliases, **kwargs)
             self.add_command(cmd)
@@ -184,37 +174,28 @@ class Client:
         return decorator
 
     def add_command(self, cmd: Command):
-        """Register a Command instance."""
         if cmd.name in self._commands:
             raise ValueError(f"Command {cmd.name} is already registered")
         
-        # Check aliases first before adding anything
         for alias in cmd.aliases:
             if alias in self._commands:
                 raise ValueError(f"Alias {alias} is already registered")
         
-        # Now safe to add
         self._commands[cmd.name] = cmd
         for alias in cmd.aliases:
             self._commands[alias] = cmd
         logger.debug("Registered command: %s", cmd.name)
 
     def remove_command(self, name: str):
-        """Remove a command by name or alias."""
         cmd = self._commands.pop(name, None)
         if cmd and cmd.name == name:
             for alias in cmd.aliases:
                 self._commands.pop(alias, None)
 
     def get_command(self, name: str) -> Optional[Command]:
-        """Get a command by name or alias."""
         return self._commands.get(name)
 
-    # ------------------------------------------------------------------
-    # Cog management
-    # ------------------------------------------------------------------
     def add_cog(self, cog: Cog):
-        """Add a cog to the bot."""
         if cog.name in self._cogs:
             raise ValueError(f"Cog {cog.name} is already loaded")
         cog._inject(self)
@@ -223,7 +204,6 @@ class Client:
         logger.info("Loaded cog: %s", cog.name)
 
     def remove_cog(self, name: str):
-        """Remove a cog from the bot."""
         cog = self._cogs.pop(name, None)
         if cog:
             cog.cog_unload()
@@ -231,18 +211,19 @@ class Client:
             logger.info("Unloaded cog: %s", name)
 
     def get_cog(self, name: str) -> Optional[Cog]:
-        """Get a loaded cog by name."""
         return self._cogs.get(name)
 
-    # ------------------------------------------------------------------
-    # Internal event handlers
-    # ------------------------------------------------------------------
+    def interaction_handler(self, custom_id: str):
+        """Decorator to register an interaction handler."""
+        def decorator(func: Callable):
+            self._interaction_handlers[custom_id] = func
+            return func
+        return decorator
+
     async def _on_ready_internal(self, user):
-        """Internal READY handler."""
         self._ready.set()
         logger.debug("Ready event received internally")
         
-        # Send notification when bot is ready
         if self._notifications:
             username = user.name if user else "Unknown"
             send_notification(
@@ -253,22 +234,38 @@ class Client:
             )
 
     async def _on_message_create_internal(self, message: Message):
-        """Internal MESSAGE_CREATE handler for command processing."""
         logger.debug(f"📩 MESSAGE_CREATE: {message.content[:50] if message.content else '(empty)'}")
         await self._process_commands(message)
 
+    async def _on_interaction_create(self, data: dict):
+        """Handle interaction_create events."""
+        try:
+            interaction = Interaction(self._state, data)
+            
+            if interaction.custom_id and interaction.custom_id in self._interaction_handlers:
+                await self._interaction_handlers[interaction.custom_id](interaction)
+            else:
+                await interaction_handler.handle(interaction)
+        except Exception as e:
+            logger.exception(f"Error handling interaction: {e}")
+
+    async def _on_voice_state_update(self, data: dict):
+        """Handle voice state updates."""
+        guild_id = int(data.get("guild_id", 0))
+        if not guild_id:
+            return
+        
+        voice_state = data.get("voice_state", {})
+        self._voice.update_state(guild_id, voice_state)
+
     async def _process_commands(self, message: Message):
-        """Check if a message triggers a command and invoke it."""
-        # SELF-BOT: Only respond to our own messages
         if not self.user or message.author.id != self.user.id:
             return
         
-        # Don't process messages from bots
         if message.author.bot:
             logger.debug("Message from bot, ignoring")
             return
 
-        # Resolve prefix
         if callable(self.command_prefix):
             prefix = self.command_prefix(self, message)
         else:
@@ -283,9 +280,7 @@ class Client:
 
         logger.debug(f"Checking command: content='{content}', prefix='{prefix}'")
 
-        # Check for prefix
         if not content.startswith(prefix):
-            # Check for mention prefix (if user account)
             if self.user:
                 mention = f"<@{self.user.id}>"
                 mention_nick = f"<@!{self.user.id}>"
@@ -300,7 +295,6 @@ class Client:
             else:
                 return
         else:
-            # Strip prefix
             content = content[len(prefix):].strip()
             logger.debug(f"Stripped prefix: '{content}'")
 
@@ -316,7 +310,6 @@ class Client:
         command = self._commands.get(name)
         if not command:
             logger.debug(f"Command not found: {name}")
-            # Fire command not found event if registered
             for handler in self._event_handlers.get("COMMAND_NOT_FOUND", []):
                 try:
                     await handler(message, name)
@@ -352,11 +345,7 @@ class Client:
                 except Exception:
                     pass
 
-    # ------------------------------------------------------------------
-    # Error handling
-    # ------------------------------------------------------------------
     def _handle_error(self, error_message: str):
-        """Send a notification when an error occurs."""
         if self._notifications and not self._error_handled:
             self._error_handled = True
             send_notification(
@@ -365,14 +354,9 @@ class Client:
                 image_url=ERROR_IMAGE,
                 timeout=10
             )
-            # Reset after a moment so new errors can trigger notifications
             asyncio.get_event_loop().call_later(2, lambda: setattr(self, '_error_handled', False))
 
-    # ------------------------------------------------------------------
-    # Lifecycle
-    # ------------------------------------------------------------------
     async def start(self):
-        """Start the client (connects to gateway)."""
         self._closed = False
         self._error_handled = False
         try:
@@ -383,47 +367,39 @@ class Client:
             raise
 
     async def close(self):
-        """Close the client and cleanup."""
         if self._closed:
             return
             
         self._closed = True
         self._ready.clear()
         
-        # Close gateway first
+        await self._voice.disconnect_all()
         await self._gateway.close()
-        
-        # Close HTTP client
         await self._http.close()
         
         logger.info("Client closed")
 
     def run(self):
-        """Run the client with a new event loop."""
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
 
-        # Store close task reference
         self._close_task = None
 
         def signal_handler(sig):
             logger.info("Received signal %s, shutting down...", sig)
             if loop.is_running():
-                # Schedule close in the event loop
                 asyncio.run_coroutine_threadsafe(self.close(), loop)
 
         try:
             for sig in (signal.SIGINT, signal.SIGTERM):
                 loop.add_signal_handler(sig, lambda s=sig: signal_handler(s))
         except NotImplementedError:
-            # Windows doesn't support add_signal_handler
             pass
 
         async def runner():
             try:
                 await self.start()
             except Exception as exc:
-                # Catch any unhandled errors in the main loop
                 self._handle_error(f"Bot crashed: {exc}")
                 raise
             finally:
@@ -434,7 +410,6 @@ class Client:
         except KeyboardInterrupt:
             logger.info("Keyboard interrupt received, shutting down...")
         except Exception as exc:
-            # Any unhandled exception at the top level
             self._handle_error(f"Bot crashed: {exc}")
             raise
         finally:
@@ -444,40 +419,220 @@ class Client:
                 loop.close()
 
     async def wait_until_ready(self):
-        """Wait until the client receives the READY event."""
         await self._ready.wait()
 
-    # ------------------------------------------------------------------
-    # Convenience methods
-    # ------------------------------------------------------------------
+    # ============================================================
+    # FETCH METHODS
+    # ============================================================
     async def fetch_user(self, user_id: int):
-        """Fetch a user from the HTTP API."""
         data = await self._http.request(Route.user(user_id))
         return self._state._add_user(data)
 
     async def fetch_guild(self, guild_id: int):
-        """Fetch a guild from the HTTP API."""
         data = await self._http.request(Route.guild(guild_id))
         return self._state._add_guild(data)
 
     async def fetch_channel(self, channel_id: int):
-        """Fetch a channel from the HTTP API."""
         data = await self._http.request(Route.channel(channel_id))
         return self._state._add_channel(data)
 
     async def fetch_message(self, channel_id: int, message_id: int):
-        """Fetch a message from the HTTP API."""
         data = await self._http.request(Route.channel_message(channel_id, message_id))
         return self._state._store_message(data)
 
     def get_guild(self, guild_id: int):
-        """Get a cached guild by ID."""
         return self._state._guilds.get(guild_id)
 
     def get_channel(self, channel_id: int):
-        """Get a cached channel by ID."""
         return self._state._channels.get(channel_id)
 
     def get_user(self, user_id: int):
-        """Get a cached user by ID."""
         return self._state._users.get(user_id)
+
+    # ============================================================
+    # RELATIONSHIPS
+    # ============================================================
+    async def get_relationships(self) -> List[Relationship]:
+        data = await self._http.request(Route("GET", "/users/@me/relationships"))
+        return [Relationship(state=self._state, data=r) for r in data]
+
+    async def add_friend(self, user_id: int, username: str = None) -> Dict[str, Any]:
+        payload = {"username": username} if username else {}
+        return await self._http.request(
+            Route("POST", f"/users/@me/relationships/{user_id}"),
+            json=payload
+        )
+
+    async def remove_friend(self, user_id: int) -> None:
+        await self._http.request(
+            Route("DELETE", f"/users/@me/relationships/{user_id}")
+        )
+
+    async def block_user(self, user_id: int) -> None:
+        await self._http.request(
+            Route("PUT", f"/users/@me/relationships/{user_id}"),
+            json={"type": 2}
+        )
+
+    async def unblock_user(self, user_id: int) -> None:
+        await self._http.request(
+            Route("DELETE", f"/users/@me/relationships/{user_id}")
+        )
+
+    # ============================================================
+    # BILLING
+    # ============================================================
+    async def get_payment_sources(self) -> List[PaymentSource]:
+        data = await self._http.request(Route("GET", "/users/@me/billing/payment-sources"))
+        return [PaymentSource(state=self._state, data=s) for s in data]
+
+    async def get_subscriptions(self) -> List[Subscription]:
+        data = await self._http.request(Route("GET", "/users/@me/billing/subscriptions"))
+        return [Subscription(state=self._state, data=s) for s in data]
+
+    async def get_entitlements(self) -> List[Dict[str, Any]]:
+        return await self._http.request(Route("GET", "/users/@me/entitlements"))
+
+    async def get_skus(self) -> List[Dict[str, Any]]:
+        return await self._http.request(Route("GET", "/users/@me/entitlements/skus"))
+
+    # ============================================================
+    # SETTINGS
+    # ============================================================
+    async def get_user_settings(self) -> UserSettings:
+        data = await self._http.request(Route("GET", "/users/@me/settings"))
+        return UserSettings(data)
+
+    async def update_user_settings(self, **kwargs) -> Dict[str, Any]:
+        return await self._http.request(
+            Route("PATCH", "/users/@me/settings"),
+            json=kwargs
+        )
+
+    async def set_status(self, status: str) -> Dict[str, Any]:
+        return await self.update_user_settings(status=status)
+
+    async def set_theme(self, theme: str) -> Dict[str, Any]:
+        return await self.update_user_settings(theme=theme)
+
+    async def set_language(self, locale: str) -> Dict[str, Any]:
+        return await self.update_user_settings(locale=locale)
+
+    async def set_dev_mode(self, enabled: bool) -> Dict[str, Any]:
+        return await self.update_user_settings(developer_mode=enabled)
+
+    async def get_guild_settings(self, guild_id: int) -> GuildSettings:
+        data = await self._http.request(
+            Route("GET", f"/users/@me/guilds/{guild_id}/settings")
+        )
+        return GuildSettings(state=self._state, data=data)
+
+    async def update_guild_settings(self, guild_id: int, **kwargs) -> Dict[str, Any]:
+        return await self._http.request(
+            Route("PATCH", f"/users/@me/guilds/{guild_id}/settings"),
+            json=kwargs
+        )
+
+    # ============================================================
+    # PROFILE
+    # ============================================================
+    async def get_profile(self, user_id: int = None) -> Dict[str, Any]:
+        endpoint = f"/users/{user_id}/profile" if user_id else "/users/@me/profile"
+        return await self._http.request(Route("GET", endpoint))
+
+    async def update_avatar(self, avatar_data: str) -> Dict[str, Any]:
+        return await self._http.request(
+            Route("PATCH", "/users/@me"),
+            json={"avatar": avatar_data}
+        )
+
+    async def update_banner(self, banner_data: str) -> Dict[str, Any]:
+        return await self._http.request(
+            Route("PATCH", "/users/@me"),
+            json={"banner": banner_data}
+        )
+
+    async def update_bio(self, bio: str) -> Dict[str, Any]:
+        return await self._http.request(
+            Route("PATCH", "/users/@me"),
+            json={"bio": bio}
+        )
+
+    async def update_display_name(self, name: str) -> Dict[str, Any]:
+        return await self._http.request(
+            Route("PATCH", "/users/@me"),
+            json={"global_name": name}
+        )
+
+    async def get_connections(self) -> List[Dict[str, Any]]:
+        return await self._http.request(Route("GET", "/users/@me/connections"))
+
+    # ============================================================
+    # WEBHOOKS
+    # ============================================================
+    async def get_webhook(self, webhook_id: int) -> Webhook:
+        """Get a webhook by ID."""
+        data = await self._http.request(Route("GET", f"/webhooks/{webhook_id}"))
+        return Webhook(state=self._state, data=data)
+
+    async def get_webhook_with_token(self, webhook_id: int, token: str) -> Webhook:
+        """Get a webhook by ID and token."""
+        data = await self._http.request(
+            method="GET",
+            url=f"/webhooks/{webhook_id}/{token}",
+        )
+        return Webhook(state=self._state, data=data)
+
+    async def get_channel_webhooks(self, channel_id: int) -> List[Webhook]:
+        """Get all webhooks in a channel."""
+        data = await self._http.request(Route("GET", f"/channels/{channel_id}/webhooks"))
+        return [Webhook(state=self._state, data=w) for w in data]
+
+    async def get_guild_webhooks(self, guild_id: int) -> List[Webhook]:
+        """Get all webhooks in a guild."""
+        data = await self._http.request(Route("GET", f"/guilds/{guild_id}/webhooks"))
+        return [Webhook(state=self._state, data=w) for w in data]
+
+    async def create_webhook(
+        self,
+        channel_id: int,
+        name: str,
+        avatar: Optional[str] = None,
+    ) -> Webhook:
+        """Create a webhook in a channel."""
+        payload = {"name": name}
+        if avatar:
+            payload["avatar"] = avatar
+        data = await self._http.request(
+            Route("POST", f"/channels/{channel_id}/webhooks"),
+            json=payload,
+        )
+        return Webhook(state=self._state, data=data)
+
+    # ============================================================
+    # VOICE
+    # ============================================================
+    async def create_voice_client(
+        self,
+        channel_id: int,
+        guild_id: int,
+        endpoint: str,
+        token: str,
+        session_id: str,
+    ) -> VoiceClient:
+        """Create and connect a voice client."""
+        return await self._voice.connect(
+            channel_id,
+            guild_id,
+            endpoint,
+            token,
+            session_id,
+        )
+
+    def get_voice_client(self, guild_id: int) -> Optional[VoiceClient]:
+        """Get the voice client for a guild."""
+        return self._voice.get_client(guild_id)
+
+    async def disconnect_voice(self, guild_id: int) -> None:
+        """Disconnect voice client for a guild."""
+        await self._voice.disconnect(guild_id)

modifyself-0.2.0/modifyself/types.py

@@ -0,0 +1,162 @@
+"""
+Type definitions for modifyself.
+"""
+
+from typing import Any, Dict, List, Optional, Union, Callable, Coroutine, TypeVar, Generic
+from typing_extensions import Self
+
+# ============================================
+# Basic Types
+# ============================================
+
+Snowflake = int
+Timestamp = str
+Color = int
+
+# ============================================
+# Command Types
+# ============================================
+
+CommandCallback = Callable[..., Coroutine[Any, Any, Any]]
+CommandName = str
+CommandAliases = List[str]
+CommandCooldown = int
+
+# ============================================
+# Event Types
+# ============================================
+
+EventHandler = Callable[..., Coroutine[Any, Any, Any]]
+EventName = str
+
+# ============================================
+# HTTP Types
+# ============================================
+
+HTTPMethod = str
+HTTPHeaders = Dict[str, str]
+HTTPParams = Dict[str, Any]
+HTTPData = Union[Dict[str, Any], str, None]
+
+# ============================================
+# Gateway Types
+# ============================================
+
+GatewayPayload = Dict[str, Any]
+GatewayOPCode = int
+GatewaySequence = int
+
+# ============================================
+# Model Types
+# ============================================
+
+T = TypeVar('T')
+
+class CachedObject(Generic[T]):
+    """Base class for cached objects."""
+    def __init__(self, data: T, state: Any) -> None:
+        self._data = data
+        self._state = state
+    
+    def _update(self, data: T) -> None:
+        """Update the object with new data."""
+        self._data = data
+
+# ============================================
+# Permission Types
+# ============================================
+
+PermissionValue = int
+PermissionOverwrite = Dict[str, Any]
+
+# ============================================
+# Channel Types (using Python 3.12 union syntax)
+# ============================================
+
+ChannelID = int
+GuildID = int
+UserID = int
+MessageID = int
+RoleID = int
+EmojiID = int
+
+# ============================================
+# Context Types
+# ============================================
+
+class ContextBase:
+    """Base context class."""
+    def __init__(self, **kwargs: Any) -> None:
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+# ============================================
+# Option Types (Python 3.12 union syntax)
+# ============================================
+
+OptionalStr = str | None
+OptionalInt = int | None
+OptionalList = list | None
+OptionalDict = dict | None
+
+# ============================================
+# Function Types
+# ============================================
+
+AsyncFunc = Callable[..., Coroutine[Any, Any, Any]]
+SyncFunc = Callable[..., Any]
+Predicate = Callable[[Any], bool]
+
+# ============================================
+# State Types
+# ============================================
+
+StateCache = Dict[Snowflake, Any]
+StateUpdate = Dict[str, Any]
+
+# ============================================
+# Error Types
+# ============================================
+
+ErrorCode = int
+ErrorMessage = str
+
+# ============================================
+# Rate Limit Types
+# ============================================
+
+RateLimitBucket = str
+RateLimitRemaining = int
+RateLimitReset = float
+
+# ============================================
+# WebSocket Types
+# ============================================
+
+WebSocketURL = str
+WebSocketEvent = Dict[str, Any]
+
+# ============================================
+# Notification Types (Python 3.12 union syntax)
+# ============================================
+
+NotificationTitle = str
+NotificationMessage = str
+NotificationImage = str | None  # Python 3.12 union syntax
+NotificationTimeout = int
+
+# ============================================
+# Client Types
+# ============================================
+
+ClientToken = str
+ClientPrefix = str | list[str] | Callable  # Python 3.12 union syntax
+ClientID = int
+
+# ============================================
+# JSON Types
+# ============================================
+
+JSONValue = str | int | float | bool | None | dict | list
+JSONObject = dict[str, JSONValue]
+JSONArray = list[JSONValue]

{modifyself-0.1.9 → modifyself-0.2.0}/modifyself.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modifyself
-Version: 0.1.9
+Version: 0.2.0
 Summary: A clean, pythonic Discord self-bot library
 Author-email: modifyself <modifyself@example.com>
 License-Expression: MIT

{modifyself-0.1.9 → modifyself-0.2.0}/modifyself.egg-info/SOURCES.txt

@@ -2,12 +2,16 @@ LICENSE
 README.md
 pyproject.toml
 modifyself/__init__.py
+modifyself/activity.py
 modifyself/client.py
+modifyself/components.py
 modifyself/errors.py
 modifyself/headers.py
+modifyself/interactions.py
 modifyself/state.py
 modifyself/types.py
 modifyself/utils.py
+modifyself/voice.py
 modifyself.egg-info/PKG-INFO
 modifyself.egg-info/SOURCES.txt
 modifyself.egg-info/dependency_links.txt
@@ -33,8 +37,12 @@ modifyself/http/ratelimit.py
 modifyself/http/route.py
 modifyself/models/__init__.py
 modifyself/models/base.py
+modifyself/models/billing.py
 modifyself/models/channel.py
 modifyself/models/guild.py
 modifyself/models/member.py
 modifyself/models/message.py
-modifyself/models/user.py
+modifyself/models/relationship.py
+modifyself/models/settings.py
+modifyself/models/user.py
+modifyself/models/webhook.py

{modifyself-0.1.9 → modifyself-0.2.0}/pyproject.toml

@@ -1,30 +1,30 @@
-[build-system]
-requires = ["setuptools>=61.0", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "modifyself"
-version = "0.1.9"
-description = "A clean, pythonic Discord self-bot library"
-readme = "README.md"
-license = "MIT"
-authors = [
-    {name = "modifyself", email = "modifyself@example.com"}
-]
-requires-python = ">=3.9"
-dependencies = [
-    "websockets>=10.0",
-    "wreq>=0.1.0",
-    "aiohttp>=3.8.0",
-    "plyer>=0.9",
-    "pillow>=10.0",
-    "requests>=2.28",
-]
-
-[project.urls]
-Homepage = "https://github.com/clashings/modifyself"
-Bug-Reports = "https://github.com/clashings/modifyself/issues"
-Source = "https://github.com/clashings/modifyself"
-
-[tool.setuptools.packages.find]
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "modifyself"
+version = "0.2.0"
+description = "A clean, pythonic Discord self-bot library"
+readme = "README.md"
+license = "MIT"
+authors = [
+    {name = "modifyself", email = "modifyself@example.com"}
+]
+requires-python = ">=3.9"
+dependencies = [
+    "websockets>=10.0",
+    "wreq>=0.1.0",
+    "aiohttp>=3.8.0",
+    "plyer>=0.9",
+    "pillow>=10.0",
+    "requests>=2.28",
+]
+
+[project.urls]
+Homepage = "https://github.com/clashings/modifyself"
+Bug-Reports = "https://github.com/clashings/modifyself/issues"
+Source = "https://github.com/clashings/modifyself"
+
+[tool.setuptools.packages.find]
 include = ["modifyself*"]

modifyself-0.1.9/modifyself/types.py

@@ -1,106 +0,0 @@
-"""
-TypedDict mirrors of Discord's JSON payloads.
-Update this when Discord changes their API.
-"""
-
-from typing import TypedDict, NotRequired
-
-
-class UserPayload(TypedDict):
-    id: str
-    username: str
-    discriminator: str
-    avatar: str | None
-    bot: NotRequired[bool]
-    system: NotRequired[bool]
-    public_flags: NotRequired[int]
-
-
-class MemberPayload(TypedDict):
-    user: NotRequired[UserPayload]
-    nick: NotRequired[str | None]
-    roles: list[str]
-    joined_at: str
-    premium_since: NotRequired[str | None]
-    deaf: bool
-    mute: bool
-    pending: NotRequired[bool]
-
-
-class ChannelPayload(TypedDict):
-    id: str
-    type: int
-    guild_id: NotRequired[str]
-    name: NotRequired[str]
-    topic: NotRequired[str | None]
-    nsfw: NotRequired[bool]
-    last_message_id: NotRequired[str | None]
-    parent_id: NotRequired[str | None]
-    permission_overwrites: NotRequired[list[dict]]
-    position: NotRequired[int]
-    recipients: NotRequired[list[UserPayload]]
-
-
-class MessagePayload(TypedDict):
-    id: str
-    channel_id: str
-    author: UserPayload
-    content: str
-    timestamp: str
-    edited_timestamp: str | None
-    tts: bool
-    mention_everyone: bool
-    mentions: list[UserPayload]
-    mention_roles: list[str]
-    attachments: list[dict]
-    embeds: list[dict]
-    reactions: NotRequired[list[dict]]
-    pinned: bool
-    type: int
-    guild_id: NotRequired[str]
-    member: NotRequired[MemberPayload]
-    referenced_message: NotRequired["MessagePayload" | None]
-
-
-class GuildPayload(TypedDict):
-    id: str
-    name: str
-    icon: str | None
-    splash: str | None
-    owner_id: str
-    region: NotRequired[str]
-    afk_channel_id: str | None
-    afk_timeout: int
-    verification_level: int
-    default_message_notifications: int
-    explicit_content_filter: int
-    roles: list[dict]
-    emojis: list[dict]
-    features: list[str]
-    mfa_level: int
-    system_channel_id: str | None
-    system_channel_flags: int
-    max_presences: NotRequired[int | None]
-    max_members: NotRequired[int]
-    vanity_url_code: str | None
-    description: str | None
-    banner: str | None
-    premium_tier: int
-    premium_subscription_count: NotRequired[int]
-    preferred_locale: str
-    public_updates_channel_id: str | None
-    max_video_channel_users: NotRequired[int]
-    approximate_member_count: NotRequired[int]
-    approximate_presence_count: NotRequired[int]
-    nsfw_level: int
-    members: NotRequired[list[MemberPayload]]
-    channels: NotRequired[list[ChannelPayload]]
-
-
-class ReadyPayload(TypedDict):
-    v: int
-    user: UserPayload
-    guilds: list[dict]
-    session_id: str
-    shard: NotRequired[list[int]]
-    application: NotRequired[dict]