Improved cpl-query & added first types from discord

src/cpl_discord/container/__init__.py

@@ -0,0 +1 @@
+# imports

src/cpl_discord/container/category_channel.py

@@ -0,0 +1,11 @@
+import discord
+
+from cpl_discord.container.container import Container
+from cpl_discord.helper.ToContainersConverter import ToContainersConverter
+from cpl_query.extension import List
+
+
+class CategoryChannel(discord.CategoryChannel, Container):
+
+    def __init__(self, _t: discord.CategoryChannel):
+        Container.__init__(self, _t, CategoryChannel)

src/cpl_discord/container/container.py

@@ -0,0 +1,30 @@
+from typing import Callable
+
+
+class Container:
+
+    def __init__(self, _o: object, _t: type):
+        self._object = _o
+        self._type = _t
+
+    def __to_type(_f: Callable, _t: type):
+        def wrapper(*args, **kwargs):
+            result = _f(*args, **kwargs)
+            return _t(result)
+
+        return wrapper
+
+    def __getitem__(self, item):
+        result = self._object[item]
+        if isinstance(result, type(self._guild)):
+            result = self._type(result)
+        return result
+
+    def __getattr__(self, item):
+        result = getattr(self._object, item)
+        if callable(result):
+            result = self.__to_type(result, self._type)
+        return result
+
+    def __repr__(self):
+        return repr(self._object)

src/cpl_discord/container/guild.py

@@ -0,0 +1,42 @@
+import discord
+
+from cpl_discord.container.category_channel import CategoryChannel
+from cpl_discord.container.container import Container
+from cpl_discord.container.member import Member
+from cpl_discord.container.role import Role
+from cpl_discord.container.text_channel import TextChannel
+from cpl_discord.container.voice_channel import VoiceChannel
+from cpl_discord.helper.ToContainersConverter import ToContainersConverter
+from cpl_query.extension import List
+
+
+class Guild(discord.Guild, Container):
+
+    def __init__(self, _t: discord.Guild):
+        self._object: discord.Guild = _t
+
+        Container.__init__(self, _t, Guild)
+
+    @property
+    def categories(self) -> List[CategoryChannel]:
+        return List(CategoryChannel, ToContainersConverter.convert(self._object.categories, CategoryChannel))
+
+    @property
+    def members(self) -> List[Member]:
+        return List(Member, ToContainersConverter.convert(self._object.members, Member))
+
+    @property
+    def roles(self) -> List[Role]:
+        return List(Role, ToContainersConverter.convert(self._object.roles, Role))
+
+    @property
+    def text_channels(self) -> List[TextChannel]:
+        return List(TextChannel, ToContainersConverter.convert(self._object.text_channels, TextChannel))
+
+    @property
+    def threads(self) -> List[TextChannel]:
+        return List(TextChannel, ToContainersConverter.convert(self._object.threads, TextChannel))
+
+    @property
+    def voice_channels(self) -> List[VoiceChannel]:
+        return List(VoiceChannel, ToContainersConverter.convert(self._object.voice_channels, VoiceChannel))

src/cpl_discord/container/member.py

@@ -0,0 +1,11 @@
+import discord
+
+from cpl_discord.container.container import Container
+from cpl_discord.helper.ToContainersConverter import ToContainersConverter
+from cpl_query.extension import List
+
+
+class Member(discord.Member, Container):
+
+    def __init__(self, _t: discord.Member):
+        Container.__init__(self, _t, Member)

src/cpl_discord/container/role.py

@@ -0,0 +1,16 @@
+import discord
+
+from cpl_discord.container.container import Container
+from cpl_discord.container.member import Member
+from cpl_discord.helper.ToContainersConverter import ToContainersConverter
+from cpl_query.extension import List
+
+
+class Role(discord.Role, Container):
+
+    def __init__(self, _t: discord.Role):
+        Container.__init__(self, _t, Role)
+
+    @property
+    def members(self) -> List[discord.Member]:
+        return List(discord.Member, ToContainersConverter.convert(self._object.members, Member))

src/cpl_discord/container/text_channel.py

@@ -0,0 +1,11 @@
+import discord
+
+from cpl_discord.container.container import Container
+from cpl_discord.helper.ToContainersConverter import ToContainersConverter
+from cpl_query.extension import List
+
+
+class TextChannel(discord.TextChannel, Container):
+
+    def __init__(self, _t: discord.TextChannel):
+        Container.__init__(self, _t, TextChannel)

src/cpl_discord/container/voice_channel.py

@@ -0,0 +1,11 @@
+import discord
+
+from cpl_discord.container.container import Container
+from cpl_discord.helper.ToContainersConverter import ToContainersConverter
+from cpl_query.extension import List
+
+
+class VoiceChannel(discord.VoiceChannel, Container):
+
+    def __init__(self, _t: discord.VoiceChannel):
+        Container.__init__(self, _t, VoiceChannel)

src/cpl_discord/helper/ToContainersConverter.py

@@ -0,0 +1,13 @@
+from typing import Union, Sequence
+
+from cpl_discord.container.container import Container
+
+
+class ToContainersConverter:
+
+    @staticmethod
+    def convert(_l: Union[list[object], Sequence[object]], _t: type) -> list[Container]:
+        values = []
+        for e in _l:
+            values.append(_t(e))
+        return values

src/cpl_discord/helper/__init__.py

@@ -0,0 +1 @@
+# imports

src/cpl_discord/service/discord_bot_service.py

@@ -5,8 +5,11 @@ from cpl_core.console import Console
 from cpl_core.environment import ApplicationEnvironmentABC
 from cpl_core.logging import LoggerABC, LoggingSettings, LoggingLevelEnum
 from cpl_discord.configuration.discord_bot_settings import DiscordBotSettings
+from cpl_discord.container.guild import Guild
+from cpl_discord.helper.ToContainersConverter import ToContainersConverter
 from cpl_discord.service.discord_bot_service_abc import DiscordBotServiceABC
 from cpl_discord.service.discord_service_abc import DiscordServiceABC
+from cpl_query.extension.list import List
 
 
 class DiscordBotService(DiscordBotServiceABC):
@@ -32,6 +35,7 @@ class DiscordBotService(DiscordBotServiceABC):
 
         # setup super
         DiscordBotServiceABC.__init__(self, command_prefix=self._discord_settings.prefix, help_command=None, intents=discord.Intents().all())
+        self._base = super(DiscordBotServiceABC, self)
 
     @staticmethod
     def _is_string_invalid(x):
@@ -77,3 +81,7 @@ class DiscordBotService(DiscordBotServiceABC):
         self._logger.debug(__name__, f'Finished syncing commands')
 
         await self._discord_service.on_ready()
+
+    @property
+    def guilds(self) -> List[Guild]:
+        return List(Guild, ToContainersConverter.convert(self._base.guilds, Guild))

src/cpl_discord/service/discord_bot_service_abc.py

@@ -1,8 +1,10 @@
-from abc import ABC, abstractmethod
+from abc import abstractmethod
 
-import discord
 from discord.ext import commands
 
+from cpl_discord.container.guild import Guild
+from cpl_query.extension.list import List
+
 
 class DiscordBotServiceABC(commands.Bot):
 
@@ -17,3 +19,7 @@ class DiscordBotServiceABC(commands.Bot):
 
     @abstractmethod
     async def on_ready(self): pass
+
+    @property
+    @abstractmethod
+    def guilds(self) -> List[Guild]: pass