modifyself 0.3.1__tar.gz → 0.3.4__tar.gz

{modifyself-0.3.1 → modifyself-0.3.4}/PKG-INFO

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

{modifyself-0.3.1 → modifyself-0.3.4}/modifyself/__init__.py

@@ -2,7 +2,7 @@
 modifyself ? a clean, pythonic Discord self-bot library.
 """
 
-__version__ = "0.3.1"
+__version__ = "0.3.4"
 
 from .client import Client
 from .commands.core import command

{modifyself-0.3.1 → modifyself-0.3.4}/modifyself/commands/context.py

@@ -43,7 +43,7 @@ class Context:
     @property
     def channel(self) -> "Channel | None":
         if self._cs_channel is None:
-            self._cs_channel = self.message.channel
+            self._cs_channel = self.bot.get_channel(self.message.channel_id)
         return self._cs_channel
 
     @property
@@ -72,8 +72,9 @@ class Context:
 
     async def send(self, content: str | None = None, **kwargs):
         """Send a message to the current channel."""
-        if self.channel:
-            return await self.channel.send(content, **kwargs)
+        ch = self.channel
+        if ch:
+            return await ch.send(content, **kwargs)
         raise RuntimeError("Cannot send: no channel available")
 
     async def reply(self, content: str | None = None, **kwargs):
@@ -82,16 +83,18 @@ class Context:
 
     async def trigger_typing(self):
         """Trigger typing in the current channel."""
-        if self.channel:
-            await self.channel.typing()
+        ch = self.channel
+        if ch:
+            await ch.typing()
 
     async def fetch_message(self, message_id: int):
         """Fetch a message from the current channel."""
-        if self.channel:
+        ch = self.channel
+        if ch:
             data = await self.bot._state.http.get_messages(
-                self.channel.id, limit=1, before=message_id + 1
+                ch.id, limit=1, before=message_id + 1
             )
             if data:
                 from ..models.message import Message
                 return Message(state=self.bot._state, data=data[0])
-        return None
+        return None

modifyself-0.3.4/modifyself/models/__init__.py

@@ -0,0 +1,32 @@
+from .user import User
+from .guild import Guild
+from .channel import Channel, TextChannel, DMChannel, GroupChannel, VoiceChannel, CategoryChannel, channel_factory
+from .message import Message
+from .member import Member
+from .base import DiscordObject
+from .relationship import Relationship
+from .billing import PaymentSource, Subscription
+from .settings import GuildSettings, UserSettings
+from .webhook import Webhook, WebhookMessage
+
+__all__ = [
+    "User",
+    "Guild",
+    "Channel",
+    "TextChannel",
+    "DMChannel",
+    "GroupChannel",
+    "VoiceChannel",
+    "CategoryChannel",
+    "channel_factory",
+    "Message",
+    "Member",
+    "DiscordObject",
+    "Relationship",
+    "PaymentSource",
+    "Subscription",
+    "GuildSettings",
+    "UserSettings",
+    "Webhook",
+    "WebhookMessage",
+]

{modifyself-0.3.1 → modifyself-0.3.4}/modifyself/models/channel.py

@@ -2,9 +2,10 @@
 Discord Channel models.
 """
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional, List
 
 from .base import DiscordObject
+from .user import User
 from ..core.enums import ChannelType
 
 if TYPE_CHECKING:
@@ -84,7 +85,6 @@ class DMChannel(Channel):
 
     def _update(self, data: dict):
         super()._update(data)
-        from .user import User
         self.recipients = [
             User(state=self._state, data=u) for u in data.get("recipients", [])
         ]
@@ -100,6 +100,35 @@ class DMChannel(Channel):
         return f"<DMChannel id={self.id} recipient={self.recipient}>"
 
 
+class GroupChannel(Channel):
+    """Represents a group DM channel."""
+
+    __slots__ = ("name", "icon", "recipients", "owner_id", "application_id", "managed")
+
+    def __init__(self, *, state: "ConnectionState", data: dict):
+        super().__init__(state=state, data=data)
+
+    def _update(self, data: dict):
+        super()._update(data)
+        self.name = data.get("name")
+        self.icon = data.get("icon")
+        self.recipients = [
+            User(state=self._state, data=u) for u in data.get("recipients", [])
+        ]
+        self.owner_id = int(data["owner_id"]) if data.get("owner_id") else None
+        self.application_id = int(data["application_id"]) if data.get("application_id") else None
+        self.managed = data.get("managed", False)
+
+    @property
+    def icon_url(self) -> Optional[str]:
+        if self.icon:
+            return f"https://cdn.discordapp.com/channel-icons/{self.id}/{self.icon}.png"
+        return None
+
+    def __repr__(self) -> str:
+        return f"<GroupChannel id={self.id} name={self.name!r}>"
+
+
 class VoiceChannel(Channel):
     """Represents a guild voice channel."""
 
@@ -142,9 +171,11 @@ def channel_factory(state: "ConnectionState", data: dict) -> Channel:
         return TextChannel(state=state, data=data)
     elif channel_type == ChannelType.DM:
         return DMChannel(state=state, data=data)
+    elif channel_type == ChannelType.GROUP_DM:
+        return GroupChannel(state=state, data=data)
     elif channel_type == ChannelType.GUILD_VOICE:
         return VoiceChannel(state=state, data=data)
     elif channel_type == ChannelType.GUILD_CATEGORY:
         return CategoryChannel(state=state, data=data)
     else:
-        return Channel(state=state, data=data)
+        return Channel(state=state, data=data)

{modifyself-0.3.1 → modifyself-0.3.4}/modifyself.egg-info/PKG-INFO

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

{modifyself-0.3.1 → modifyself-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "modifyself"
-version = "0.3.1"
+version = "0.3.4"
 description = "A clean, pythonic Discord self-bot library"
 readme = "README.md"
 license = "MIT"

modifyself-0.3.1/modifyself/models/__init__.py

@@ -1,23 +0,0 @@
-"""
-Discord entity models.
-"""
-
-from .base import DiscordObject
-from .user import User
-from .guild import Guild
-from .channel import Channel, TextChannel, DMChannel, VoiceChannel, CategoryChannel
-from .message import Message
-from .member import Member
-
-__all__ = [
-    "DiscordObject",
-    "User",
-    "Guild",
-    "Channel",
-    "TextChannel",
-    "DMChannel",
-    "VoiceChannel",
-    "CategoryChannel",
-    "Message",
-    "Member",
-]