comprobot 1.2.5__tar.gz → 2.0.0__tar.gz

{comprobot-1.2.5 → comprobot-2.0.0}/Comprobot/data.py

@@ -68,6 +68,9 @@ active: Dict[str, bool] = _load_or_create(
 output: Dict[str, Dict[str, List[str]]] = _load_or_create(
     _get_data_path("output.toml"), templates.output
 )
+moderation: Dict[Any, Any] = _load_or_create(
+    _get_data_path("moderation.toml"), templates.moderation
+)
 
 _ensure_file(_get_data_path(".env"), templates.env_template)
 

comprobot-2.0.0/Comprobot/main.py

@@ -0,0 +1,50 @@
+import platform
+import sys
+from os import getenv as os_getenv
+from os import path as os_path
+
+import appdirs
+import dotenv
+
+from . import process
+from .functions import client, para
+
+dotenv.load_dotenv(
+    dotenv.find_dotenv(
+        os_path.join(
+            appdirs.user_data_dir(appname="Comprobot", appauthor=False), ".env"
+        )
+    )
+)
+
+
+response = None
+if sys.platform.startswith("win"):
+    print("Running on Windows (cmd)")
+elif platform.system() in ["Linux", "Darwin"]:
+    pass
+else:
+    print("Unknown OS")
+
+
+@client.event
+async def on_message(message):
+    await process.process(message)
+
+
+@client.event
+async def on_ready():
+    user_name = client.user.name if client.user else "Unknown"
+    print(f"Logged in as {user_name}")
+    para()
+
+
+def main():
+    print(
+        f"Configuration directory: {appdirs.user_data_dir(appname='Comprobot', appauthor=False)}"
+    )
+    token = os_getenv("BOT_TOKEN")
+    if token:
+        client.run(token)
+    else:
+        print("Error: BOT_TOKEN not found in environment variables")

comprobot-2.0.0/Comprobot/moderation.py

@@ -0,0 +1,109 @@
+from datetime import timedelta
+from random import choice
+
+import discord
+
+from .bot import client
+from .data import config, moderation, output
+from .functions import direct_msg
+
+
+async def ban(message, item):
+    member = message.guild.get_member(message.author.id)
+    if member is None:
+        try:
+            member = await message.guild.fetch_member(message.author.id)
+        except discord.NotFound:
+            print(f"Could not fetch member {message.author.name}.")
+
+    try:
+        try:
+            await member.ban(reason=output["moderation"]["reason"])
+        except discord.Forbidden:
+            print(f"Insufficient permissions to ban {message.author.name}.")
+        await direct_msg(
+            choice(output["moderation"]["ban"]).replace("{{TEXT}}", item),
+            message,
+        )
+    except (discord.Forbidden, discord.HTTPException):
+        print(f"Couldn't DM {message.author.name}")
+
+
+async def kick(message, item):
+    member = message.guild.get_member(message.author.id)
+    if member is None:
+        try:
+            member = await message.guild.fetch_member(message.author.id)
+        except discord.NotFound:
+            print(f"Could not fetch member {message.author.name}.")
+
+    try:
+        try:
+            await member.kick(reason=output["moderation"]["reason"])
+        except (discord.Forbidden, discord.HTTPException):
+            print(f"Insufficient permissions to kick {message.author.name}.")
+        await direct_msg(
+            choice(output["moderation"]["kick"]).replace("{{TEXT}}", item),
+            message,
+        )
+    except (discord.Forbidden, discord.HTTPException):
+        print(f"Couldn't DM {message.author.name}")
+
+
+async def check_message(message):
+    if message.guild is None:
+        return
+
+    if (
+        message.author == client.user
+        or (
+            isinstance(message.author, discord.Member)
+            and message.author.guild_permissions.administrator
+        )
+    ) and not config["debug_mode"]:
+        return
+
+    for item in moderation["delete"]:
+        if item.lower() in message.content.lower():
+            await message.delete()
+            await direct_msg(
+                choice(output["moderation"]["delete"]).replace("{{TEXT}}", item),
+                message,
+            )
+
+    for item in moderation["kick"]:
+        if item.lower() in message.content.lower():
+            await kick(message, item)
+
+    for item in moderation["ban"]:
+        if item.lower() in message.content.lower():
+            await ban(message, item)
+
+    for item in moderation["mute"]:
+        if item.lower() in message.content.lower():
+            await message.delete()
+
+            member = message.guild.get_member(message.author.id)
+            if member is None:
+                try:
+                    member = await message.guild.fetch_member(message.author.id)
+                except discord.NotFound:
+                    print(f"Could not fetch member {message.author.name}.")
+                    continue
+
+            try:
+                await member.timeout(
+                    timedelta(minutes=moderation["time_to_mute"]),
+                    reason=output["moderation"]["reason"],
+                )
+            except discord.Forbidden:
+                print(f"Insufficient permissions to mute {message.author.name}.")
+                continue
+
+            await direct_msg(
+                message,
+                choice(output["moderation"]["mute"]).replace(
+                    "{{MINUTES}}", str(moderation["time_to_mute"])
+                ),
+            )
+            continue

{comprobot-1.2.5 → comprobot-2.0.0}/Comprobot/process.py

@@ -1,17 +1,20 @@
 import os
 from random import choice
-from typing import Any
+from typing import Any, cast
 
+import discord
 from appdirs import user_cache_dir, user_data_dir
 
 from . import api, commands, data, money_system
 from .bot import client
-from .data import active, config, error_messages, keywords, output
+from .data import active, ai, config, error_messages, keywords, output
+from .functions import chat
+from .moderation import check_message
 
 
-async def command(ctx) -> str | None | Any:
+async def command(message) -> str | None | Any:
 
-    command_parts = ctx.content[len(config["command_prefix"]) :].strip().split()
+    command_parts = message.content[len(config["command_prefix"]) :].strip().split()
 
     command = command_parts[0]
     args = command_parts[1:]
@@ -98,7 +101,7 @@ async def command(ctx) -> str | None | Any:
         else:
             return error_messages["missing_argument"]
     elif command in keywords["money"]["add_money"] and (
-        ctx.author.guild_permissions.administrator or config["bot_admins"]
+        message.author.guild_permissions.administrator or config["bot_admins"]
     ):
         if len(args) >= 2:
             try:
@@ -109,7 +112,7 @@ async def command(ctx) -> str | None | Any:
         else:
             return "No amount given."
     elif command in keywords["money"]["remove_money"] and (
-        ctx.author.guild_permissions.administrator or config["bot_admins"]
+        message.author.guild_permissions.administrator or config["bot_admins"]
     ):
         if len(args) >= 2:
             try:
@@ -121,17 +124,17 @@ async def command(ctx) -> str | None | Any:
             return "No amount given."
 
     elif command == "purge" and active["purge"]:
-        if ctx.author.guild_permissions.administrator:
-            await ctx.channel.purge()
+        if message.author.guild_permissions.administrator:
+            await message.channel.purge()
             return "All messages deleted."
 
     else:
         return None
 
 
-async def settings(ctx):
+async def settings(message):
 
-    command_parts = ctx.content[len(config["settings_prefix"]) :].strip().split()
+    command_parts = message.content[len(config["settings_prefix"]) :].strip().split()
 
     command = command_parts[0]
     args = command_parts[1:]
@@ -140,11 +143,11 @@ async def settings(ctx):
     os.makedirs(cache_dir, exist_ok=True)
 
     if command in keywords["settings"]["profile_picture"]:
-        if not ctx.attachments:
+        if not message.attachments:
             return error_messages["no_attachments"]
         if client is None or client.user is None:
             return error_messages["bot_unavailable"]
-        new_pfp = ctx.attachments[0]
+        new_pfp = message.attachments[0]
         await new_pfp.save(f"{cache_dir}/pfp.png")
         with open(f"{cache_dir}/pfp.png", "rb") as image_file:
             image_data = image_file.read()
@@ -152,11 +155,11 @@ async def settings(ctx):
         return choice(output["settings"]["profile_picture_applied"])
 
     elif command in keywords["settings"]["banner"]:
-        if not ctx.attachments:
+        if not message.attachments:
             return error_messages["no_attachments"]
         if client is None or client.user is None:
             return error_messages["bot_unavailable"]
-        new_banner = ctx.attachments[0]
+        new_banner = message.attachments[0]
         await new_banner.save(f"{cache_dir}/banner.png")
         with open(f"{cache_dir}/banner.png", "rb") as image_file:
             image_data = image_file.read()
@@ -200,5 +203,54 @@ async def settings(ctx):
         return error_messages["unknown_command"]
 
 
-async def games(ctx):
+async def games(message):
     pass
+
+
+async def process(message):
+    print(
+        "\033[90m"
+        + f"[{message.channel}] "
+        + "\033[36m"
+        + f"{message.author.name}: "
+        + "\033[0m"
+        + message.content
+    )
+
+    global response
+
+    if message.author == client.user:
+        return
+    response = None
+
+    await check_message(message)
+
+    if message.content.startswith(cast(str, config["command_prefix"])):
+        async with message.channel.typing():
+            response = await command(message)
+    elif message.content.startswith(cast(str, config["settings_prefix"])):
+        async with message.channel.typing():
+            response = await settings(message)
+
+    is_reply_to_bot = False
+    user_id = client.user.id if client.user else None
+    if message.reference and message.reference.message_id and user_id:
+        try:
+            ref_msg = await message.channel.fetch_message(message.reference.message_id)
+            is_reply_to_bot = ref_msg.author.id == user_id
+        except discord.NotFound:
+            pass
+
+    if (
+        f"<@{user_id}>" in message.content
+        or (is_reply_to_bot if ai["answer_to_reply"] else False)
+        and ai["activate_ai"]
+    ):
+        async with message.channel.typing():
+            response = await chat(message)
+
+    if response:
+        async with message.channel.typing():
+            content = str(response)
+            for chunk in [content[i : i + 2000] for i in range(0, len(content), 2000)]:
+                await message.channel.send(chunk)

{comprobot-1.2.5 → comprobot-2.0.0}/Comprobot/templates.py

@@ -44,6 +44,8 @@ music_prefix    = "m!"
 money_symbol    = "$"
 bot_admins      = []
 ascii_art       = ["¯\\_(ツ)_/¯"]
+
+debug_mode      = false
 """
 
 error_messages = r'''quote      = "Failed to get a quote."
@@ -109,7 +111,12 @@ add_money         = ["add", "add_money"]
 remove_money      = ["remove", "rm", "remove_money"]
 check_balance     = ["check", "check_balance", "balance"]"""
 
-moderation = r""""""
+moderation = r"""delete = []
+kick   = []
+ban    = []
+mute   = []
+time_to_mute = 5 # In minutes
+"""
 
 env_template = r"""BOT_TOKEN=
 GEMINI=
@@ -182,8 +189,16 @@ nickname_applied        = ["Name '{{NAME}}' applied successfully."]
 keywords_applied        = ["Custom keywords '{{KEYWORDS}}' for the command '{{COMMAND}}' applied successfully!"]
 
 [money]
-add_money         = ["{{AMOUNT}}{{MONEY_SYMBOL}} added to to the account of {{USERNAME}}. They now have {{BALANCE}}{{MONEY_SYMBOL}}."]
-remove_money      = ["{{AMOUNT}} subtracted from the account of {{USERNAME}}. They now have {{BALANCE}}{{MONEY_SYMBOL}}."]
-check_balance     = ["The balance of the account from {{USERNAME}} is currently {{BALANCE}}{{MONEY_SYMBOL}}."]
+add_money          = ["{{AMOUNT}}{{MONEY_SYMBOL}} added to to the account of {{USERNAME}}. They now have {{BALANCE}}{{MONEY_SYMBOL}}."]
+remove_money       = ["{{AMOUNT}} subtracted from the account of {{USERNAME}}. They now have {{BALANCE}}{{MONEY_SYMBOL}}."]
+check_balance      = ["The balance of the account from {{USERNAME}} is currently {{BALANCE}}{{MONEY_SYMBOL}}."]
 insufficient_funds = ["{{USERNAME}} doesn't have enough money. They now have {{BALANCE}}{{MONEY_SYMBOL}}."]
+
+[moderation]
+delete = ["Your message was deleted because it contains banned text: {{TEXT}}"]
+kick   = ["Your account was kicked because your message contains banned text: {{TEXT}}"]
+ban    = ["Your account was banned because your message contains banned text: {{TEXT}}"]
+mute   = ["Your account was muted for {{MINUTES}} minutes because your message contains banned text: {{TEXT}}"]
+
+reason = "Sending banned text"
 """

{comprobot-1.2.5/comprobot.egg-info → comprobot-2.0.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: comprobot
-Version: 1.2.5
+Version: 2.0.0
 Summary: A self-hostable Discord bot built for maximum customization.
 Author: badluma
 License: MIT
-Project-URL: Homepage, https://github.com/badluma/comprobot
+Project-URL: Homepage, https://badluma.github.io/Comprobot-Docs
 Project-URL: Repository, https://github.com/badluma/comprobot
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

{comprobot-1.2.5 → comprobot-2.0.0/comprobot.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: comprobot
-Version: 1.2.5
+Version: 2.0.0
 Summary: A self-hostable Discord bot built for maximum customization.
 Author: badluma
 License: MIT
-Project-URL: Homepage, https://github.com/badluma/comprobot
+Project-URL: Homepage, https://badluma.github.io/Comprobot-Docs
 Project-URL: Repository, https://github.com/badluma/comprobot
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License

comprobot-2.0.0/comprobot.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+comprobot = Comprobot.main:__main__

{comprobot-1.2.5 → comprobot-2.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "comprobot"
-version = "1.2.5"
+version = "2.0.0"
 authors = [{name = "badluma"}]
 description = "A self-hostable Discord bot built for maximum customization."
 readme = "README.md"
@@ -30,11 +30,11 @@ dependencies = [
 dev = ["ruff"]
 
 [project.urls]
-Homepage = "https://github.com/badluma/comprobot"
+Homepage = "https://badluma.github.io/Comprobot-Docs"
 Repository = "https://github.com/badluma/comprobot"
 
 [project.scripts]
-comprobot = "Comprobot.__main__:main"
+comprobot = "Comprobot.main:__main__"
 
 [tool.setuptools.packages.find]
 where = ["."]

comprobot-1.2.5/Comprobot/main.py

@@ -1,97 +0,0 @@
-import platform
-import sys
-from os import getenv as os_getenv
-from os import path as os_path
-from typing import cast
-
-import appdirs
-import discord
-import dotenv
-
-from . import process
-from .data import ai, config
-from .functions import chat, client, para
-
-dotenv.load_dotenv(
-    dotenv.find_dotenv(
-        os_path.join(
-            appdirs.user_data_dir(appname="Comprobot", appauthor=False), ".env"
-        )
-    )
-)
-
-
-response = None
-if sys.platform.startswith("win"):
-    print("Running on Windows (cmd)")
-elif platform.system() in ["Linux", "Darwin"]:
-    pass
-else:
-    print("Unknown OS")
-
-
-@client.event
-async def on_message(message):
-
-    print(
-        "\033[90m"
-        + f"[{message.channel}] "
-        + "\033[36m"
-        + f"{message.author.name}: "
-        + "\033[0m"
-        + message.content
-    )
-
-    global response
-
-    if message.author == client.user:
-        return
-    response = None
-
-    if message.content.startswith(cast(str, config["command_prefix"])):
-        async with message.channel.typing():
-            response = await process.command(message)
-    elif message.content.startswith(cast(str, config["settings_prefix"])):
-        async with message.channel.typing():
-            response = await process.settings(message)
-
-    is_reply_to_bot = False
-    user_id = client.user.id if client.user else None
-    if message.reference and message.reference.message_id and user_id:
-        try:
-            ref_msg = await message.channel.fetch_message(message.reference.message_id)
-            is_reply_to_bot = ref_msg.author.id == user_id
-        except discord.NotFound:
-            pass
-
-    if (
-        f"<@{user_id}>" in message.content
-        or (is_reply_to_bot if ai["answer_to_reply"] else False)
-        and ai["activate_ai"]
-    ):
-        async with message.channel.typing():
-            response = await chat(message)
-
-    if response:
-        async with message.channel.typing():
-            content = str(response)
-            for chunk in [content[i : i + 2000] for i in range(0, len(content), 2000)]:
-                await message.channel.send(chunk)
-
-
-@client.event
-async def on_ready():
-    user_name = client.user.name if client.user else "Unknown"
-    print(f"Logged in as {user_name}")
-    para()
-
-
-def main():
-    print(
-        f"Configuration directory: {appdirs.user_data_dir(appname='Comprobot', appauthor=False)}"
-    )
-    token = os_getenv("BOT_TOKEN")
-    if token:
-        client.run(token)
-    else:
-        print("Error: BOT_TOKEN not found in environment variables")

comprobot-1.2.5/Comprobot/moderation.py

@@ -1,44 +0,0 @@
-import discord
-from .functions import direct_msg
-
-
-async def ban(message):
-    member = message.guild.get_member(message.author.id)
-    if member is None:
-        try:
-            member = await message.guild.fetch_member(message.author.id)
-        except discord.NotFound:
-            print(f"Could not fetch member {message.author.name}.")
-
-    try:
-        try:
-            await member.ban(reason=f"Sending banned text")
-        except discord.Forbidden:
-            print(f"Insufficient permissions to ban {message.author.name}.")
-        await direct_msg(
-            f"Your account has been banned because your message contains banned text",
-            message,
-        )
-    except (discord.Forbidden, discord.HTTPException):
-        print(f"Couldn't DM {message.author.name}")
-
-
-async def kick(message):
-    member = message.guild.get_member(message.author.id)
-    if member is None:
-        try:
-            member = await message.guild.fetch_member(message.author.id)
-        except discord.NotFound:
-            print(f"Could not fetch member {message.author.name}.")
-
-    try:
-        try:
-            await member.kick(reason=f"Sending banned text")
-        except (discord.Forbidden, discord.HTTPException):
-            print(f"Insufficient permissions to kick {message.author.name}")
-        await direct_msg(
-            f"Your account has been kicked because your message contains banned text",
-            message,
-        )
-    except (discord.Forbidden, discord.HTTPException):
-        print(f"Couldn't DM {message.author.name}")

comprobot-1.2.5/comprobot.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-comprobot = Comprobot.__main__:main