dshellInterpreter 0.2.3__tar.gz → 0.2.4__tar.gz

{dshellinterpreter-0.2.3 → dshellinterpreter-0.2.4}/Dshell/DISCORD_COMMANDS/__init__.py

@@ -2,3 +2,4 @@ from .dshell_channel import *
 from .dshell_message import *
 from .dshell_member import *
 from .dshell_pastbin import *
+from .dshell_role import *

{dshellinterpreter-0.2.3 → dshellinterpreter-0.2.4}/Dshell/DISCORD_COMMANDS/dshell_pastbin.py

@@ -22,7 +22,7 @@ async def dshell_get_pastbin(ctx: Message, code: str):
 
         for line in response.iter_lines(decode_unicode=True, chunk_size=512):
             len_content = len(content)
-            if line and len_content < 4000 and len_content + len(line) <= 4000:
+            if len_content < 4000 and len_content + len(line) <= 4000:
                 content += line + '\n'
             else:
                 break

dshellinterpreter-0.2.4/Dshell/DISCORD_COMMANDS/dshell_role.py

@@ -0,0 +1,116 @@
+from discord import MISSING, Message, Role, Permissions, PermissionOverwrite
+from discord.utils import _MissingSentinel
+from .._DshellInterpreteur.dshell_interpreter import build_colour, ListNode
+
+__all__ = [
+    'dshell_create_role',
+    'dshell_delete_roles',
+    'dshell_edit_role'
+
+]
+
+async def dshell_create_role(ctx: Message,
+                             name: str = MISSING,
+                             permissions: dict[None, PermissionOverwrite] = MISSING,
+                             color: int = MISSING,
+                             hoist: bool = MISSING,
+                             mentionable: bool = MISSING,
+                             reason: str = None):
+    """
+    Creates a role on the server.
+    """
+    if not isinstance(name, (str, _MissingSentinel)):
+        raise Exception(f"Name must be a string, not {type(name)} !")
+
+    if not isinstance(permissions, (dict, _MissingSentinel)):
+        raise Exception(f"Permissions must be a PermissionNode, not {type(permissions)} !")
+
+    colour = build_colour(color)
+
+    if not isinstance(hoist, (bool, _MissingSentinel)):
+        raise Exception(f"Hoist must be a boolean, not {type(permissions)} !")
+
+    if not isinstance(mentionable, (bool, _MissingSentinel)):
+        raise Exception(f"Mentionable must be a boolean, not {type(permissions)} !")
+
+    if isinstance(permissions, dict):
+        if None in permissions:
+            allow, deny = permissions[None].pair()
+            permissions = allow
+
+    created_role = await ctx.guild.create_role(name=name,
+                                               permissions=permissions,
+                                               colour=colour,
+                                               hoist=hoist,
+                                               mentionable=mentionable,
+                                               reason=str(reason))
+
+    return created_role.id
+
+
+async def dshell_delete_roles(ctx: Message, roles, reason=None):
+    """
+    Delete the role on the server
+    """
+    roles: int | ListNode
+    if not isinstance(roles, (int, ListNode)):
+        raise Exception(f"Role must be a int, role mention or NodeList of both, not {type(roles)} !")
+
+    if isinstance(roles, int):
+        roles: tuple = (roles, )
+
+    for i in roles:
+        role_to_delete = ctx.guild.get_role(i)
+
+        if role_to_delete is None:
+            raise Exception(f'Role {i} not found in the server !')
+
+        await role_to_delete.delete(reason=str(reason))
+
+
+async def dshell_edit_role(ctx: Message,
+                           role,
+                           name=None,
+                           permissions: dict[None, PermissionOverwrite]=None,
+                           color=None,
+                           hoist=None,
+                           mentionable=None,
+                           position=None,
+                           reason=None,):
+    """
+    Edit the current role
+    """
+    if not isinstance(role, int):
+        raise Exception(f"Role must be a int or role mention not {type(role)} !")
+
+    role_to_edit = ctx.guild.get_role(role)
+
+    if not isinstance(name, (str, None)):
+        raise Exception(f"Name must be a string, not {type(name)} !")
+
+    if not isinstance(permissions, (dict, None)):
+        raise Exception(f"Permissions must be a PermissionNode, not {type(permissions)} !")
+
+    if isinstance(permissions, dict):
+        if None in permissions:
+            allow, deny = permissions[None].pair()
+            permissions = allow
+
+    colour = build_colour(color)
+
+    if not isinstance(hoist, (bool, None)):
+        raise Exception(f"Hoist must be a boolean, not {type(permissions)} !")
+
+    if not isinstance(mentionable, (bool, None)):
+        raise Exception(f"Mentionable must be a boolean, not {type(permissions)} !")
+
+    if not isinstance(position, (int, None)):
+        raise Exception(f"Position must be an integer, not {type(permissions)} !")
+
+    await role_to_edit.edit(name=name if name is not None else role_to_edit.name,
+                            permissions=permissions if permissions is not None else role_to_edit.permissions,
+                            colour=colour if color is not None else role_to_edit.colour,
+                            hoist=hoist if hoist is not None else role_to_edit.hoist,
+                            mentionable=mentionable if mentionable is not None else role_to_edit.mentionable,
+                            position=position if position is not None else role_to_edit.position,
+                            reason=str(reason))

{dshellinterpreter-0.2.3 → dshellinterpreter-0.2.4}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -366,9 +366,8 @@ def build_embed(body: list[Token], fields: list[FieldEmbedNode], interpreter: Ds
         a: dict[str, Token]
         args_fields.append(a)
 
-    if 'color' in args_main_embed and isinstance(args_main_embed['color'],
-                                                 ListNode):  # if color is a ListNode, convert it to Colour
-        args_main_embed['color'] = Colour.from_rgb(*args_main_embed['color'])
+    if 'color' in args_main_embed:
+        args_main_embed['color'] = build_colour(args_main_embed['color'])  # convert color to Colour object or int
 
     embed = Embed(**args_main_embed)  # build the main embed
     for field in args_fields:
@@ -376,6 +375,21 @@ def build_embed(body: list[Token], fields: list[FieldEmbedNode], interpreter: Ds
 
     return embed
 
+def build_colour(color: Union[int, ListNode]) -> Union[Colour, int]:
+    """
+    Builds a Colour object from an integer or a ListNode.
+    :param color: The color to build.
+    :return: A Colour object.
+    """
+    if isinstance(color, int):
+        return color
+    elif isinstance(color, (ListNode, list)):
+        if not len(color) == 3:
+            raise ValueError(f"Color must be a list of 3 integers, not {len(color)} elements !")
+        return Colour.from_rgb(*color)
+    else:
+        raise TypeError(f"Color must be an integer or a ListNode, not {type(color)} !")
+
 
 def build_permission(body: list[Token], interpreter: DshellInterpreteur) -> dict[
     Union[Member, Role], PermissionOverwrite]:
@@ -446,9 +460,12 @@ class DshellPermissions:
         if member is not None:
             return member
 
-        if role is not None:
+        elif role is not None:
             return role
 
+        else:
+            raise ValueError(f"No member or role found with ID {target_id} in guild {guild.name}.")
+
     @staticmethod
     def get_member(guild: Guild, target_id: int) -> Member:
         """
@@ -480,10 +497,11 @@ class DshellPermissions:
     def get_permission_overwrite(self, guild: Guild) -> dict[Union[Member, Role], PermissionOverwrite]:
         """
         Returns a PermissionOverwrite object with member and role permissions.
+        If no members or roles are specified, it returns a PermissionOverwrite with None key.
         :param guild: The Discord server
         :return: A dictionary of PermissionOverwrite objects with members and roles as keys
         """
-        permissions: dict[Union[Member, Role], PermissionOverwrite] = {}
+        permissions: dict[Union[Member, Role, None], PermissionOverwrite] = {}
         target_keys = self.target.keys()
 
         if 'members' in target_keys:
@@ -506,6 +524,9 @@ class DshellPermissions:
                     deny=Permissions(permissions=self.target.get('deny', 0))
                 )
         else:
-            raise ValueError("No members or roles specified in the permissions target.")
+            permissions[None] = PermissionOverwrite.from_pair(
+                allow=Permissions(permissions=self.target.get('allow', 0)),
+                deny=Permissions(permissions=self.target.get('deny', 0))
+            )
 
         return permissions

{dshellinterpreter-0.2.3 → dshellinterpreter-0.2.4}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -13,6 +13,7 @@ from ..DISCORD_COMMANDS.dshell_channel import *
 from ..DISCORD_COMMANDS.dshell_member import *
 from ..DISCORD_COMMANDS.dshell_message import *
 from ..DISCORD_COMMANDS.dshell_pastbin import *
+from ..DISCORD_COMMANDS.dshell_role import *
 
 dshell_keyword: set[str] = {
     'if', 'else', 'elif', 'loop', '#end', 'var', '#loop', '#if', 'sleep', 'param', '#param'
@@ -49,6 +50,10 @@ dshell_commands: dict[str, Callable] = {
     "ec": dshell_edit_text_channel,  # edit text channel
     "evc": dshell_edit_voice_channel,  # edit voice channel
 
+    "cr": dshell_create_role,
+    "dr": dshell_delete_roles,
+    "er": dshell_edit_role,
+
     "amr": dshell_add_reactions,  # add reactions to a message
     "rmr": dshell_remove_reactions,  # remove reactions from a message
 

{dshellinterpreter-0.2.3/dshellInterpreter.egg-info → dshellinterpreter-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.3
+Version: 0.2.4
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos
@@ -16,6 +16,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: py-cord==2.6.1
+Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{dshellinterpreter-0.2.3 → dshellinterpreter-0.2.4/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 0.2.3
+Version: 0.2.4
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos
@@ -16,6 +16,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: py-cord==2.6.1
+Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{dshellinterpreter-0.2.3 → dshellinterpreter-0.2.4}/dshellInterpreter.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ Dshell/DISCORD_COMMANDS/dshell_channel.py
 Dshell/DISCORD_COMMANDS/dshell_member.py
 Dshell/DISCORD_COMMANDS/dshell_message.py
 Dshell/DISCORD_COMMANDS/dshell_pastbin.py
+Dshell/DISCORD_COMMANDS/dshell_role.py
 Dshell/_DshellInterpreteur/__init__.py
 Dshell/_DshellInterpreteur/dshell_interpreter.py
 Dshell/_DshellParser/__init__.py

{dshellinterpreter-0.2.3 → dshellinterpreter-0.2.4}/dshellInterpreter.egg-info/requires.txt

@@ -1 +1,2 @@
 py-cord==2.6.1
+requests

{dshellinterpreter-0.2.3 → dshellinterpreter-0.2.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="0.2.3",
+    version="0.2.4",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",
@@ -14,7 +14,7 @@ setup(
     url="https://github.com/BOXERRMD/Dshell_Interpreter",
     packages=["Dshell", "Dshell._DshellInterpreteur", "Dshell._DshellTokenizer", "Dshell._DshellParser",
               "Dshell.DISCORD_COMMANDS"],
-    install_requires=["py-cord==2.6.1"],
+    install_requires=["py-cord==2.6.1", "requests"],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",