[MAJOR] - Zorak V2.0 - Alpha

.gitignore

@@ -158,4 +158,6 @@ data/
 # ignore db data
 db/*
 /deploy
-.env
+.env
+/Pipfile
+/Pipfile.lock

Resources/ServerConfig/dev/FAKE_DB_settings.json

@@ -0,0 +1,73 @@
+{
+  "1031644670436061324": {
+    "info": {
+      "id": 1031644670436061324,
+      "name": "Practical Python",
+      "website": "https://practical-python-org.github.io/Home/",
+      "email": "[email protected]",
+      "review": "https://disboard.org/review/create/900302240559018015",
+      "invite": "https://discord.gg/vgZmgNwuHw",
+      "logo": "https://raw.githubusercontent.com/Xarlos89/PracticalPython/main/logo.png"
+    },
+    "channels": {
+      "verification": {
+        "verification_channel": 1055126587512721439
+      },
+      "quarantine": {
+        "quarantine_channel": 1055126882691076177
+      },
+      "support": {
+        "server_support": 1068103243734994964
+      },
+      "general": {
+        "role_channel": 1062268986726813758,
+        "rules_channel": 1062269049121275914,
+        "general_channel": 1031644670436061327,
+        "resources_channel": 1062300735338983485,
+        "python_help_1": 1062302503351365632,
+        "python_help_2": 12345,
+        "challenges_channel": 1045104938071633994,
+        "news_channel": 1071095960538718261,
+        "suggestions_channel": 117939062999902620
+      },
+      "logging": {
+        "chat_log": 1043607758685089932,
+        "join_log": 1043967844934762556,
+        "mod_log": 1055124663526752297,
+        "server_change_log": 1062269270047862884,
+        "user_log": 1044331443884654692,
+        "verification_log": 1043621605940674580,
+        "zorak_log": 1062754277543645324
+      }
+    },
+    "roles": {
+      "admin": {
+        "owner": 1054762426614157354,
+        "admin": 1134861924882989097,
+        "staff": 1031903615310385232,
+        "staff_networking": 1134861783358775367,
+        "bot": 1054763353538576437
+      },
+      "reaction": {
+        "beginner": 1064259543250522112,
+        "intermediate": 1064259555497877534,
+        "professional": 1064259557049761863,
+        "north_america": 1064259558819770379,
+        "europe": 1064259561302794361,
+        "asia": 1064259687924637768,
+        "africa": 1064259690948722708,
+        "south_america": 1064259693545013288,
+        "oceana": 1064259760674840666,
+        "open_to_work": 1114611004182102218,
+        "employer": 1114611092677722113
+      },
+      "punishment": {
+        "naughty": 1062270109839790110
+      },
+      "verified": {
+        "verified": 1173219859878924298
+      }
+    }
+  }
+}
+

src/zorak/__main__.py

@@ -5,20 +5,19 @@
 - [email protected]
 """
 import logging
+from datetime import datetime
 import os
 
 import discord
 from discord.ext import commands
 
 from zorak.utilities.core.args_utils import parse_args
-from zorak.utilities.core.logging_utils import setup_logger
+from zorak.utilities.core.logging_options import setup_logger
 from zorak.utilities.core.mongo import initialise_bot_db
-from zorak.utilities.core.server_settings import Settings
+from zorak.utilities.core.settings import Settings
 
-logger = logging.getLogger(__name__)
 
-COGS_ROOT_PATH = os.path.join(os.path.dirname(__file__), "cogs")
-logger.debug(f"COG_PATH: {COGS_ROOT_PATH}")
+logger = logging.getLogger(__name__)
 
 server_settings_path = None
 
@@ -28,7 +27,9 @@ def load_cogs(bot):
     Loads the directories under the /cogs/ folder,
     then digs through those directories and loads the cogs.
     """
+    COGS_ROOT_PATH = os.path.join(os.path.dirname(__file__), "cogs")
     logger.info("Loading Cogs...")
+    logger.info(f"Loading from {COGS_ROOT_PATH}")
     failed_to_load = []
     for directory in os.listdir(COGS_ROOT_PATH):
         if directory.startswith("_"):
@@ -60,29 +61,34 @@ def init_bot(token, bot):
     try:
         load_cogs(bot)
         bot.run(token)
+
     except TypeError as e:
         print(e)
 
 
+
 def main():
     args = parse_args()
 
+    bot = commands.Bot(command_prefix="/", intents=discord.Intents.all())
+    bot.remove_command("help")
+
+
+    # Set up global logging across the bot.
     setup_logger(
         level=args.log_level if args.log_level else int(os.getenv("LOGGING_LEVEL", 20)),
         stream_logs=args.console_log if args.console_log != None else bool(os.getenv("STREAM_LOGS", False)),
     )
-
-    bot = commands.Bot(command_prefix="/", intents=discord.Intents.all())
-    bot.remove_command("help")
-
     if not args.drop_db:
         logger.info("Initialising Database...")
         initialise_bot_db(bot)
 
-    server_settings_path = args.server_settings_path if args.server_settings_path else os.environ.get("SERVER_SETTINGS")
-    if server_settings_path:
-        logger.info(f"Loading server settings from {server_settings_path}")
-        bot.server_settings = Settings(server_settings_path)  # type: ignore
+    settings_path = args.server_settings_path if args.server_settings_path else os.environ.get(
+        "SERVER_SETTINGS")
+
+    if settings_path:
+        logger.info(f"Loading all server settings from {settings_path}")
+        bot.settings = Settings(settings_path, bot.guilds)  # type: ignore
 
     if args.discord_token:
         init_bot(args.discord_token, bot)

src/zorak/cogs/admin/admin_automod_spam_messages.py

@@ -39,9 +39,16 @@ async def on_message(self, message):
         if isinstance(message.channel, discord.DMChannel):
             return
 
+        settings = self.bot.db_client.get_guild_settings(message.guild)
+
         # new speaker. Welcome to auto mod.
-        if message.author.id not in self.records:
-            self.records[message.author.id] = {
+        if message.guild.id not in self.records:
+            self.records[message.guild.id] = {}
+
+        guild_record = self.records[message.guild.id]
+
+        if message.author.id not in guild_record:
+            guild_record[message.author.id] = {
                 "last_message": message.content
                 , "occurrence": 1
                 , "1st": {"message_id": message.id, "channel_id": message.channel.id}
@@ -52,7 +59,7 @@ async def on_message(self, message):
         # Old speaker. We are watching you...
         else:
             # Check if the last message is the same as the new one.
-            the_archive = self.records[message.author.id]
+            the_archive = guild_record[message.author.id]
 
             if the_archive["last_message"] == message.content:
                 # If so, increase the occurance by 1
@@ -93,10 +100,9 @@ async def on_message(self, message):
                     # timeout right away
                     await message.author.timeout(until=datetime.utcnow() + timedelta(seconds=30))
 
-                    naughty = message.author.guild.get_role(self.bot.server_settings.user_roles["bad"]["naughty"])
-                    verified = message.author.guild.get_role(self.bot.server_settings.verified_role['verified'])
-                    quarantine = await self.bot.fetch_channel(
-                        self.bot.server_settings.channels["moderation"]["quarantine_channel"])
+                    naughty = message.author.guild.get_role(settings["naughty_role"])
+                    verified = message.author.guild.get_role(settings["verified_role"])
+                    quarantine = await self.bot.fetch_channel(settings["quarantine_channel"])
 
                     # assign Naughty roll
                     member = message.author

src/zorak/cogs/admin/admin_ban.py

@@ -23,7 +23,6 @@ def __init__(self, bot):
 
     @commands.slash_command(description="Ban a user.")
     @commands.has_permissions(ban_members=True)
-    @commands.has_role("Staff")
     async def ban_member(self, ctx, target: discord.Member, reason):
         """
         Take in a user mention, and a string reason.
@@ -42,7 +41,9 @@ async def ban_member(self, ctx, target: discord.Member, reason):
                 await target.ban(reason=f"{ctx.author.name} - {reason}")
                 logger.info("{%s} banned {%s}. Reason: {%s}", ctx.author.name, target.name, reason)
                 # Then we publicly announce what happened.
-                await ctx.respond(embed=embed_cant_do_that(f"**{ctx.author.name}** banned **{target.name}**" f"\n**Reason:** {reason}"))
+                await ctx.respond(
+                    embed=embed_cant_do_that(f"**{ctx.author.name}** banned **{target.name}**" f"\n"
+                                             f"**Reason:** {reason}"))
 
             else:
                 await ctx.respond(embed=embed_cant_do_that("You can't ban an Admin."), ephemeral=True)