Merged

Reviewed-on: #16

README.md

@@ -2,6 +2,7 @@
  cogs made for our Royal butt.
 
 ## Our Cogs:
+- [FitnessCog](./fitnessCog)
 - [RecruitmentCog](./recruitmentCog/)
 - [ReginaldCog](./reginaldCog/)
 - [TrafficCog](./trafficCog)

fitnessCog/__init__.py

@@ -0,0 +1,6 @@
+from redbot.core.bot import Red
+from .fitness import FitnessCog
+
+async def setup(bot: Red):
+    cog = FitnessCog(bot)
+    await bot.add_cog(cog)

fitnessCog/activities/climb.json

@@ -0,0 +1,48 @@
+{
+    "convertable": true,
+    "units": {
+        "meter": {
+            "factor": 1,
+            "aliases": [
+                "meter",
+                "meters",
+                "m",
+                "m."
+            ]
+        },
+        "kilometer": {
+            "factor": 1000,
+            "aliases": [
+                "kilometer",
+                "kilometers",
+                "km",
+                "km."
+            ]
+        },
+        "foot": {
+            "factor": 0.3048,
+            "aliases": [
+                "foot",
+                "feet",
+                "ft",
+                "ft."
+            ]
+        },
+        "mile": {
+            "factor": 1609.344,
+            "aliases": [
+                "mile",
+                "miles",
+                "mi",
+                "mi."
+            ]
+        },
+        "step": {
+            "factor": 0.18,
+            "aliases": [
+                "step",
+                "steps"
+            ]
+        }
+    }
+}

fitnessCog/activities/pushups.json

@@ -0,0 +1,3 @@
+{
+  "convertable": false
+}

fitnessCog/activity_logger.py

@@ -0,0 +1,105 @@
+import csv
+import json
+from pathlib import Path
+from typing import Optional
+
+
+def activity_log_path(activity: str, logs_dir: Optional[Path] = None) -> Path:
+    """
+    Returns the path of the activity log file in .csv format.
+    """
+    logs_dir = logs_dir or (Path.cwd() / "activity_logs")
+    return logs_dir / f"{activity}.csv"
+
+
+def activity_units_path(activity: str, units_dir: Optional[Path] = None) -> Path:
+    """
+    Returns the path of the activity units file in .json format.
+    """
+    units_dir = units_dir or (Path.cwd() / "activities")
+    return units_dir / f"{activity}.json"
+
+
+def is_convertable(activity: str, units_dir: Optional[Path] = None) -> bool:
+    filename = activity_units_path(activity, units_dir)
+    with filename.open("r", encoding="utf-8") as f:
+        raw_data = json.load(f)
+    return bool(raw_data.get("convertable"))
+
+
+def create_activity_log_file(
+    activity: str,
+    *,
+    units_dir: Optional[Path] = None,
+    logs_dir: Optional[Path] = None,
+) -> None:
+    if not activity_units_path(activity, units_dir).exists():
+        raise ValueError(f"{activity} is not a valid activity")
+
+    logs_dir = logs_dir or (Path.cwd() / "activity_logs")
+    logs_dir.mkdir(parents=True, exist_ok=True)
+
+    filename = activity_log_path(activity, logs_dir)
+    if filename.exists():
+        return  # don't re-add headers
+
+    with filename.open("w", newline="", encoding="utf-8") as f:
+        writer = csv.writer(f)
+        writer.writerow(["timestamp", "username", "value"])
+
+
+def convert_units(
+    activity: str,
+    value: int | float,
+    unit: str | None,
+    *,
+    units_dir: Optional[Path] = None,
+) -> float:
+    filename = activity_units_path(activity, units_dir)
+    if not filename.exists():
+        raise ValueError(f"{activity} is not a valid activity")
+
+    # Consider None unit value as factor of 1
+    if unit is None:
+        return float(value)
+
+    with filename.open("r", encoding="utf-8") as f:
+        raw_data = json.load(f)
+
+    units_data = raw_data.get("units") or {}
+    unit_l = unit.lower()
+
+    for _, data in units_data.items():
+        aliases = [a.lower() for a in (data.get("aliases") or [])]
+        if unit_l in aliases:
+            return float(value) * float(data["factor"])
+
+    raise ValueError(f"{unit} is not a valid unit")
+
+
+def log_activity(
+    timestamp: int,
+    username: str,
+    activity: str,
+    value: int | float,
+    unit: str | None,
+    *,
+    units_dir: Optional[Path] = None,
+    logs_dir: Optional[Path] = None,
+) -> None:
+    
+    if not isinstance(value, (int, float)) or value <= 0:
+        raise ValueError(f"{value} is not a valid value")
+
+    filename = activity_log_path(activity, logs_dir)
+    if not filename.exists():
+        create_activity_log_file(activity, units_dir=units_dir, logs_dir=logs_dir)
+
+    if is_convertable(activity, units_dir):
+        converted_value = round(convert_units(activity, value, unit, units_dir=units_dir), 2)
+    else:
+        converted_value = round(float(value), 2)
+
+    with filename.open("a", newline="", encoding="utf-8") as f:
+        writer = csv.writer(f)
+        writer.writerow([timestamp, username, converted_value])

fitnessCog/fitness.py

@@ -0,0 +1,143 @@
+import os
+from pathlib import Path
+
+import discord
+from redbot.core import commands
+from redbot.core.data_manager import cog_data_path
+
+from .activity_logger import log_activity
+
+
+class FitnessCog(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
+
+        default_threads = "1457402451530350727,1328363409648910356"
+        threads_raw = os.getenv("THREADS_ID", default_threads)
+
+        self.threads_id: list[int] = []
+        for x in threads_raw.split(","):
+            x = x.strip()
+            if x.isdigit():
+                self.threads_id.append(int(x))
+
+        self.confirm_reactions = os.getenv("CONFIRMATION_REACTIONS", "🐈💨")
+
+        # Units are shipped with the cog in: fitnessCog/activities/*.json
+        self.units_dir: Path = Path(__file__).parent / "activities"
+
+        # Logs are writable and belong in Red's data dir
+        self.logs_dir: Path = cog_data_path(self) / "activity_logs"
+        self.logs_dir.mkdir(parents=True, exist_ok=True)
+
+    @commands.Cog.listener()
+    async def on_message(self, message: discord.Message):
+        if message.author.bot:
+            return
+        if message.channel.id not in self.threads_id:
+            return
+
+        content = (message.content or "").strip()
+        if not content.startswith("!"):
+            return
+
+        cmdline = content[1:].strip().lower()
+        if not cmdline:
+            return
+
+        cmd, *rest = cmdline.split(" ", 1)
+        arg = rest[0].strip() if rest else ""
+
+        if cmd == "getunits":
+            await self.get_units_file(message, arg)
+            return
+
+        if cmd == "getlog":
+            await self.get_log_file(message, arg)
+            return
+
+        await self.log_fitness(message)
+
+    async def get_units_file(self, message: discord.Message, activity: str):
+        try:
+            if not activity:
+                await message.channel.send(
+                    "Usage: `!getunits <activity>` (example: `!getunits pushups`)"
+                )
+                return
+
+            activity = activity.lower().strip()
+            path = self.units_dir / f"{activity}.json"
+
+            if not path.exists():
+                await message.channel.send(f"No units JSON found for `{activity}`.")
+                return
+
+            await message.channel.send(file=discord.File(fp=str(path)))
+
+        except Exception as e:
+            await message.channel.send(str(e))
+
+    async def get_log_file(self, message: discord.Message, activity: str):
+        try:
+            if not activity:
+                await message.channel.send(
+                    "Usage: `!getlog <activity>` (example: `!getlog pushups`)"
+                )
+                return
+
+            activity = activity.lower().strip()
+            path = self.logs_dir / f"{activity}.csv"
+
+            if not path.exists():
+                await message.channel.send(f"No log CSV found for `{activity}`.")
+                return
+
+            await message.channel.send(file=discord.File(fp=str(path)))
+
+        except Exception as e:
+            await message.channel.send(str(e))
+
+    async def log_fitness(self, message: discord.Message):
+        try:
+            parts = message.content[1:].strip().split()
+            if len(parts) < 2:
+                await message.reply(
+                    "Usage: `!<activity> <value> [unit]` (example: `!pushups 20` or `!run 5 km`)"
+                )
+                return
+
+            activity = parts[0]
+
+            try:
+                value = float(parts[1])
+            except ValueError:
+                await message.reply(
+                    "Invalid number. Usage: `!<activity> <value> [unit]` (example: `!run 5 km`)"
+                )
+                return
+
+            unit = parts[2] if len(parts) > 2 else "m"
+
+            timestamp = int(message.created_at.timestamp())
+            username = message.author.name
+
+            log_activity(
+                timestamp,
+                username,
+                activity,
+                value,
+                unit,
+                units_dir=self.units_dir,
+                logs_dir=self.logs_dir,
+            )
+
+            for r in self.confirm_reactions:
+                await message.add_reaction(r)
+
+        except Exception as e:
+            await message.reply(str(e))
+
+
+def setup(bot):
+    bot.add_cog(FitnessCog(bot))

recruitmentCog/recruitment.py

@@ -1,226 +1,334 @@
 import asyncio
 import datetime
 import re
-from typing import List
-from datetime import timedelta
+from typing import Dict, List, Optional
 
 import discord
 from redbot.core import Config, checks, commands
 from redbot.core.bot import Red
 from redbot.core.utils.antispam import AntiSpam
 
+# Define your application questions and field settings\
+QUESTIONS_LIST = [
+    {
+        "key": "name",
+        "prompt": "First of all, what is your name?",
+        "field_name": "Name",
+        "inline": True,
+    },
+    {
+        "key": "age",
+        "prompt": "What age are you?",
+        "field_name": "Age",
+        "inline": True,
+    },
+    {
+        "key": "country",
+        "prompt": "Where are you from?",
+        "field_name": "Country",
+        "inline": True,
+    },
+    {
+        "key": "hobbies",
+        "prompt": "Do you have any hobbies?",
+        "field_name": "Hobbies",
+        "inline": True,
+    },
+    {
+        "key": "game",
+        "prompt": "Are you wishing to join because of a particular game? If so, which game?",
+        "field_name": "Specific game?",
+        "inline": True,
+    },
+    {
+        "key": "motivation",
+        "prompt": "Write out, in a free-style way, what your motivation is for wanting to join us in particular and how you would be a good fit for Kanium",
+        "field_name": "Motivation for wanting to join:",
+        "inline": False,
+    },
+]
+
 
 def sanitize_input(input_text: str) -> str:
-    """Sanitize input to remove mentions, links, and special characters."""
-    sanitized_text = re.sub(r'<@!?&?(\d+)>', '', input_text)
-    sanitized_text = re.sub(r'http\S+', '', sanitized_text)
-    sanitized_text = re.sub(r'([^\w\s.,?!`~@#$%^&*()_+=-])', '', sanitized_text)
-    return sanitized_text
+    """Sanitize input to remove mentions, links, and unwanted special characters."""
+    # Remove user/role/channel mentions
+    text = re.sub(r'<@!?(?:&)?\d+>', '', input_text)
+    # Remove URLs
+    text = re.sub(r'http\S+', '', text)
+    # Keep only word characters (including Unicode letters/digits), whitespace, and your chosen punctuation
+    text = re.sub(r"[^\w\s\.,\?!`~@#$%^&*()_+=-]", "", text)
+    return text
 
 
-class Recruitment(commands.Cog):
+
+class Recruitment(commands.Cog):  # noqa
     """A cog that lets a user send a membership application."""
 
     def __init__(self, bot: Red):
         self.bot = bot
-        self.message: str = ''
-        self.config = Config.get_conf(self, identifier=101101101101001110101)  # Replace with your own unique identifier
-        default_guild = {"guild_id": 274657393936302080, "application_channel_id": None}
+        self.config = Config.get_conf(self, identifier=0xFAB123ABC456)
+        default_guild = {"application_channel_id": None}
         self.config.register_guild(**default_guild)
-        self.antispam = {}
+        # antispam store per guild per user
+        self.antispam: Dict[int, Dict[int, AntiSpam]] = {}
+        self.cog_check_enabled = True
 
-    async def cog_check(self, ctx: commands.Context):
-        if await ctx.bot.is_admin(ctx.author):
+    async def cog_check(self, ctx: commands.Context) -> bool:
+        if (
+            await ctx.bot.is_admin(ctx.author)
+            or not self.cog_check_enabled
+            or (ctx.guild and ctx.author.guild_permissions.manage_guild)
+            or (ctx.guild and ctx.author.guild_permissions.administrator)
+        ):
             return True
 
-        guild_id = ctx.guild.id
-        if guild_id not in self.antispam:
-            self.antispam[guild_id] = AntiSpam([(datetime.timedelta(hours=1), 1)])
-        antispam = self.antispam[guild_id]
-
-        if antispam.spammy:
-            try:
-                await ctx.message.delete(delay=0)
-            except discord.Forbidden:
-                pass
-            await ctx.author.send("Please wait for an hour before sending another application.")
-            return False
-
-        antispam.stamp()
-        return True
-
-
-    @commands.guild_only()
-    @checks.admin_or_permissions(manage_guild=True)
-    @commands.group(name="setapplicationschannel", pass_context=True, no_pm=True)
-    async def setapplicationschannel(self, ctx: commands.Context):
-        """Set the channel where applications will be sent."""
-        if ctx.invoked_subcommand is None:
-            guild = ctx.guild
-            channel = ctx.channel
-            await self.config.guild(guild).guild_id.set(guild.id)
-            await self.config.guild(guild).application_channel_id.set(channel.id)
-            await ctx.send(f"Application channel set to {channel.mention}.")
-
-    @setapplicationschannel.command(name="clear")
-    async def clear_application_channel(self, ctx: commands.Context):
-        """Clear the current application channel."""
-        guild = ctx.guild
-        await self.config.guild(guild).clear_raw("application_channel_id")
-        await ctx.send("Application channel cleared.")
-
-    @commands.group(name="application", usage="[text]", invoke_without_command=True)
-    async def application(self, ctx: commands.Context, *, _application: str = ""):
-        # Input validation and sanitization for _application
-        _application = sanitize_input(_application)
-        if len(_application) > 2000:
-            await ctx.send("Your application is too long. Please limit it to 2000 characters.")
-            return
-
-        guild_id = await self.get_guild_id(ctx)
-        guild = discord.utils.get(self.bot.guilds, id=guild_id)
-        if guild is None:
-            await ctx.send(f"The guild with ID {guild_id} could not be found.")
-            return
-
-        author = ctx.author
-        if author.guild != guild:
-            await ctx.send(f"You need to be in the {guild.name} server to submit an application.")
-            return
-
-        if await self.check_author_is_member_and_channel_is_dm(ctx):
-            await self.interactive_application(author)
-
-    async def get_guild_id(self, ctx: commands.Context) -> int:
-        guild_id = await self.config.guild(ctx.author.guild).guild_id()
-        return guild_id
-
-    async def check_author_is_member_and_channel_is_dm(self, ctx: commands.Context) -> bool:
-        if not isinstance(ctx.author, discord.Member):
-            await ctx.send("You need to join the server before your application can be processed.")
-            return False
-        if not isinstance(ctx.channel, discord.DMChannel):
+        gid = ctx.guild.id
+        uid = ctx.author.id
+        if gid not in self.antispam:
+            self.antispam[gid] = {}
+        if uid not in self.antispam[gid]:
+            self.antispam[gid][uid] = AntiSpam([(datetime.timedelta(hours=1), 1)])
+        spam = self.antispam[gid][uid]
+        if spam.spammy:
             try:
                 await ctx.message.delete()
-            except:
+            except discord.Forbidden:
+                pass
+            try:
+                await ctx.author.send("Please wait for an hour before sending another application.")
+            except discord.Forbidden:
                 pass
-            await self.interactive_application(ctx)
             return False
+        spam.stamp()
         return True
 
+    @commands.command(name="togglecogcheck")
+    @checks.is_owner()
+    async def toggle_cog_check(self, ctx: commands.Context) -> None:
+        """Toggle the cog_check functionality on or off."""
+        self.cog_check_enabled = not self.cog_check_enabled
+        await ctx.send(f"Cog checks are now {'enabled' if self.cog_check_enabled else 'disabled'}.")
 
-    async def interactive_application(self, ctx: commands.Context):
-        """Ask the user several questions to create an application."""
-        author = ctx.author
-        embed = discord.Embed(
+    @commands.group(name="setapplicationschannel", invoke_without_command=True)
+    @checks.admin_or_permissions(manage_guild=True)
+    async def set_applications_channel(self, ctx: commands.Context, channel: discord.TextChannel = None):
+        """Set the channel where applications will be sent."""
+        channel = channel or ctx.channel
+        await self.config.guild(ctx.guild).application_channel_id.set(channel.id)
+        await ctx.send(f"Application channel set to {channel.mention}.")
+
+    @set_applications_channel.command(name="clear")
+    async def clear_applications_channel(self, ctx: commands.Context):
+        """Clear the application channel."""
+        await self.config.guild(ctx.guild).clear_raw("application_channel_id")
+        await ctx.send("Application channel cleared.")
+
+    @commands.group(name="application", aliases=["joinus", "joinkanium", "applyformembership"], invoke_without_command=True)
+    async def application(self, ctx: commands.Context, *, text: Optional[str] = None) -> None:
+        """Start an application process."""
+        # Direct free-text application (optional)
+        if text:
+            text = sanitize_input(text)
+            if len(text) > 2000:
+                await ctx.send("Your application is too long (max 2000 chars).")
+                return
+        # Determine if in guild or DM
+        if isinstance(ctx.channel, discord.DMChannel):
+            await self._start_application(ctx.author)
+        else:
+            try:
+                await ctx.message.delete()
+            except discord.Forbidden:
+                pass
+            try:
+                await ctx.author.send(
+                    "Let's move this to DM so we can process your application."
+                )
+            except discord.Forbidden:
+                await ctx.send("I cannot DM you. Please enable DMs and try again.")
+                return
+            await self._start_application(ctx.author)
+
+    async def _start_application(self, member: discord.Member) -> None:
+        # Kick off interactive questions
+        if not await self._send_embed(
+            member,
             title="+++ KANIUM APPLICATION SYSTEM +++",
-            description="Ah, you wish to apply for Kanium membership. Very well, understand that This process is very important to us so we expect you to put effort in and be glorious about it. Let us begin!",
+            description=(
+                "This is the process to join Kanium."
+                " Please take your time and answer thoughtfully."
+            ),
             color=discord.Color.green(),
-        )
-        await author.send(embed=embed)
-
-        answers = await self.ask_questions(author)
+        ):
+            return
 
+        answers = await self.ask_questions(member)
         if not answers:
             return
+        embed = self.format_application(answers, member)
+        await self.send_application(member, embed)
 
-        embeddedApplication = await self.format_application(answers, author)
-        
-        # Call the sendApplication to check if the author is a member of the guild and send the application if they are
-        await self.sendApplication(author, embeddedApplication)
-
-
-    async def sendApplication(self, author: discord.Member, embeddedApplication: discord.Embed):
-        # Check if the author is a member of the guild
-        guild = author.guild
-        member = guild.get_member(author.id)
-        if member is None:
-            await author.send("You need to join the server before your application can be processed.")
-            return
-
-        # Send the embed to the application channel
-        application_channel_id = await self.config.guild(guild).application_channel_id()
-        if not application_channel_id:
-            await author.send("The application channel has not been set. Please use the `setapplicationschannel` command to set it.")
-            return
-
-        application_channel = guild.get_channel(application_channel_id)
-        if application_channel is None:
-            await author.send(f"The application channel with ID {application_channel_id} could not be found.")
-            return
-
+    async def _send_embed(
+        self,
+        member: discord.Member,
+        *,
+        title: str,
+        description: str,
+        color: discord.Color,
+    ) -> bool:
+        embed = discord.Embed(title=title, description=description, color=color)
         try:
-            message = await application_channel.send(embed=embeddedApplication)
+            await member.send(embed=embed)
+            return True
         except discord.Forbidden:
-            await author.send("I do not have permission to send messages in the application channel.")
-            return
+            return False
 
-        # Add reactions to the message
-        try:
-            await self.add_reactions(message)
-        except discord.Forbidden:
-            await author.send("I do not have permission to add reactions to messages in the application channel.")
-            return
+    async def ask_questions(self, member: discord.Member) -> Optional[Dict[str, str]]:
+        """
+        Ask each question, let the user confirm their answer,
+        and return the final answers (or None on abort).
+        """
+        answers: Dict[str, str] = {}
 
-        # Assign the Trial role to the author
-        role = guild.get_role(531181363420987423)
-        try:
-            await member.add_roles(role)
-        except discord.Forbidden:
-            await author.send("I do not have permission to assign roles.")
-            return
+        for q in QUESTIONS_LIST:
+            prompt = q["prompt"]
 
-        await author.send("Thank you for submitting your application! You have been given the 'Trial' role.")
+            while True:
+                # 1) send the question
+                try:
+                    await member.send(prompt)
+                except discord.Forbidden:
+                    return None  # can't DM
 
+                # 2) wait for their reply (match on ID, not object)
+                try:
+                    msg = await asyncio.wait_for(
+                        self.bot.wait_for(
+                            "message",
+                            check=lambda m: (
+                                m.author.id == member.id
+                                and isinstance(m.channel, discord.DMChannel)
+                            )
+                        ),
+                        timeout=300.0,
+                    )
+                except asyncio.TimeoutError:
+                    await member.send(
+                        "You took too long to answer. Please restart the application with `!application`."
+                    )
+                    return None
 
-    async def add_reactions(self, message: discord.Message):
-        reactions = ["✅", "❌", "❓"]
-        for reaction in reactions:
-            await message.add_reaction(reaction)
+                answer = sanitize_input(msg.content)
 
-    async def format_application(self, answers: List[str], author: discord.Member) -> discord.Embed:
-        """Format the application answers into an embed."""
-        application_date = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        trial_end_date = (datetime.datetime.now() + datetime.timedelta(days=30)).strftime("%Y-%m-%d")
+                # 3) echo back for confirmation
+                try:
+                    await member.send(f"You answered:\n> {answer}\n\nIs that correct? (yes/no)")
+                except discord.Forbidden:
+                    return None
 
-        embed = discord.Embed(title=f"Application from {author.name}#{author.discriminator}", color=discord.Color.green())
-        embed.set_thumbnail(url=author.avatar.url)
-        embed.add_field(name="Name", value=answers[0])
-        embed.add_field(name="Age", value=answers[1])
-        embed.add_field(name="Country", value=answers[2])
-        embed.add_field(name="Hobbies", value=answers[3])
-        embed.add_field(name="Specific game?", value=answers[4])
-        embed.add_field(name="\u200b", value="\u200b")  # Empty field for spacing
-        embed.add_field(name="Motivation for wanting to join:", value=answers[5], inline=False)
-        embed.set_footer(text=f"Application received: {application_date}, Trial ends: {trial_end_date}")
+                # 4) wait for a yes/no
+                try:
+                    confirm = await asyncio.wait_for(
+                        self.bot.wait_for(
+                            "message",
+                            check=lambda m: (
+                                m.author.id == member.id
+                                and isinstance(m.channel, discord.DMChannel)
+                                and m.content.lower() in ("y", "yes", "n", "no")
+                            )
+                        ),
+                        timeout=60.0,
+                    )
+                except asyncio.TimeoutError:
+                    await member.send(
+                        "Confirmation timed out. Please restart the application with `!application`."
+                    )
+                    return None
 
-        return embed
-
-    async def ask_questions(self, author: discord.Member) -> List[str]:
-        """Ask the user several questions and return the answers."""
-        questions = [
-            "First of all, what is your name?",
-            "What age are you?",
-            "Where are you from?",
-            "Do you have any hobbies?",
-            "Are you wishing to join because of a particular game? If so, which game?",
-            "Write out, in a free-style way, what your motivation is for wanting to join us in particular and how you would be a good fit for Kanium",
-        ]
-
-        answers = []
-
-        for question in questions:
-            await author.send(question)
-
-            try:
-                answer = await asyncio.wait_for(self.get_answers(author), timeout=300.0)
-                answers.append(answer.content)
-            except asyncio.TimeoutError:
-                await author.send("You took too long to answer. Please start over by using the application command again.")
-                return []
+                if confirm.content.lower() in ("y", "yes"):
+                    # user confirmed, save and move on
+                    answers[q["key"]] = answer
+                    break
+                else:
+                    # user said “no” → repeat this question
+                    await member.send("Okay, let's try that again.")
 
         return answers
 
-    async def get_answers(self, author: discord.Member) -> discord.Message:
-        """Wait for the user to send a message."""
-        return await self.bot.wait_for("message", check=lambda m: m.author == author and isinstance(m.channel, discord.DMChannel))
+
+    def format_application(
+        self, answers: Dict[str, str], member: discord.Member
+    ) -> discord.Embed:
+        now = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
+        trial_ends = (
+            datetime.datetime.utcnow() + datetime.timedelta(days=30)
+        ).strftime("%Y-%m-%d UTC")
+
+        embed = discord.Embed(
+            title=f"Application from {member}", color=discord.Color.green()
+        )
+        embed.set_thumbnail(url=member.avatar.url)
+        for q in QUESTIONS_LIST:
+            embed.add_field(
+                name=q["field_name"],
+                value=answers[q["key"]],
+                inline=q["inline"],
+            )
+        embed.set_footer(text=f"Received: {now} | Trial ends: {trial_ends}")
+        return embed
+
+    async def send_application(
+        self, member: discord.Member, embed: discord.Embed
+    ) -> None:
+        guild = member.guild
+        if guild is None:
+            try:
+                await member.send("You need to be in the server to apply.")
+            except discord.Forbidden:
+                pass
+            return
+
+        channel_id = await self.config.guild(guild).application_channel_id()
+        if not channel_id:
+            try:
+                await member.send(
+                    "Application channel not set. Ask an admin to run `setapplicationschannel`."
+                )
+            except discord.Forbidden:
+                pass
+            return
+
+        channel = guild.get_channel(channel_id)
+        if not channel:
+            try:
+                await member.send("Application channel was not found. Please ask an admin to re-set it.")
+            except discord.Forbidden:
+                pass
+            return
+
+        try:
+            sent = await channel.send(embed=embed)
+            await self.add_reactions(sent)
+        except discord.Forbidden:
+            try:
+                await member.send("I cannot post or react in the application channel.")
+            except discord.Forbidden:
+                pass
+            return
+
+        # Assign Trial role
+        role = guild.get_role(531181363420987423)
+        if role:
+            try:
+                await member.add_roles(role)
+                await member.send("Thank you! You've been granted the Trial role.")
+            except discord.Forbidden:
+                try:
+                    await member.send("I lack permissions to assign roles.")
+                except discord.Forbidden:
+                    pass
+
+    @staticmethod
+    async def add_reactions(message: discord.Message) -> None:
+        for emoji in ("✅", "❌", "❓"):
+            await message.add_reaction(emoji)

reginaldCog/blacklist.py

@@ -0,0 +1,44 @@
+from redbot.core import commands
+import discord
+
+class BlacklistMixin:
+    """Handles user blacklisting for Reginald."""
+
+    async def is_blacklisted(self, user: discord.Member) -> bool:
+        """Checks if a user is blacklisted from interacting with Reginald."""
+        blacklisted_users = await self.config.guild(user.guild).blacklisted_users()
+        return str(user.id) in blacklisted_users
+
+    @commands.command(name="reginald_blacklist", help="List users who are explicitly denied access to Reginald.")
+    @commands.has_permissions(administrator=True)
+    async def list_blacklisted_users(self, ctx):
+        """Lists all users currently blacklisted from interacting with Reginald."""
+        blacklisted_users = await self.config.guild(ctx.guild).blacklisted_users()
+        if not blacklisted_users:
+            await ctx.send("✅ No users are currently blacklisted from interacting with Reginald.")
+            return
+
+        user_mentions = [f"<@{user_id}>" for user_id in blacklisted_users]
+        await ctx.send(f"🚫 **Blacklisted Users:**\n{', '.join(user_mentions)}")
+
+    @commands.command(name="reginald_blacklist_add", help="Blacklist a user from interacting with Reginald.")
+    @commands.has_permissions(administrator=True)
+    async def add_to_blacklist(self, ctx, user: discord.User):
+        """Adds a user to Reginald's blacklist."""
+        async with self.config.guild(ctx.guild).blacklisted_users() as blacklisted_users:
+            if str(user.id) not in blacklisted_users:
+                blacklisted_users.append(str(user.id))
+                await ctx.send(f"🚫 {user.display_name} has been **blacklisted** from interacting with Reginald.")
+            else:
+                await ctx.send(f"⚠️ {user.display_name} is already blacklisted.")
+
+    @commands.command(name="reginald_blacklist_remove", help="Remove a user from Reginald's blacklist.")
+    @commands.has_permissions(administrator=True)
+    async def remove_from_blacklist(self, ctx, user: discord.User):
+        """Removes a user from Reginald's blacklist."""
+        async with self.config.guild(ctx.guild).blacklisted_users() as blacklisted_users:
+            if str(user.id) in blacklisted_users:
+                blacklisted_users.remove(str(user.id))
+                await ctx.send(f"✅ {user.display_name} has been removed from the blacklist.")
+            else:
+                await ctx.send(f"⚠️ {user.display_name} was not on the blacklist.")

reginaldCog/debug_stuff.py

@@ -0,0 +1,15 @@
+def debug(func):
+    def wrap(*args, **kwargs):
+        # Log the function name and arguments
+        print(f"DEBUG: Calling {func.__name__} with args: {args}, kwargs: {kwargs}")
+
+        # Call the original function
+        result = func(*args, **kwargs)
+
+        # Log the return value
+        print(f"DEBUG: {func.__name__} returned: {result}")
+
+        # Return the result
+        return result
+
+    return wrap

reginaldCog/memory.py

@@ -0,0 +1,324 @@
+import re
+import random
+import datetime
+import discord
+import openai
+from collections import Counter
+from redbot.core import commands, Config
+from openai import OpenAIError
+
+
+class MemoryMixin:
+    """Handles all memory-related functions for Reginald."""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)  # ✅ Ensure cooperative MRO initialization
+        self.short_term_memory_limit = 50
+        self.summary_retention_limit = 25
+        self.summary_retention_ratio = 0.8
+    
+    @commands.command(name="reginald_clear_short", help="Clears short-term memory for this channel.")
+    @commands.has_permissions(administrator=True)
+    async def clear_short_memory(self, ctx):
+        """Clears short-term memory for this channel."""
+        async with self.config.guild(ctx.guild).short_term_memory() as short_memory:
+            short_memory[ctx.channel.id] = []
+        await ctx.send("Short-term memory for this channel has been cleared.")
+
+
+    @commands.command(name="reginald_set_limit", help="Set the short-term memory message limit.")
+    @commands.has_permissions(administrator=True)
+    async def set_short_term_memory_limit(self, ctx, limit: int):
+        """Allows an admin to change the short-term memory limit dynamically."""
+        if limit < 5:
+            await ctx.send("⚠️ The short-term memory limit must be at least 5.")
+            return
+
+        self.short_term_memory_limit = limit
+        await ctx.send(f"✅ Short-term memory limit set to {limit} messages.")
+
+
+    @commands.command(name="reginald_memory_limit", help="Displays the current short-term memory message limit.")
+    async def get_short_term_memory_limit(self, ctx):
+        """Displays the current short-term memory limit."""
+        await ctx.send(f"📏 **Current Short-Term Memory Limit:** {self.short_term_memory_limit} messages.")
+
+    @commands.command(name="reginald_clear_mid", help="Clears mid-term memory (summarized logs).")
+    @commands.has_permissions(administrator=True)
+    async def clear_mid_memory(self, ctx):
+        async with self.config.guild(ctx.guild).mid_term_memory() as mid_memory:
+            mid_memory[ctx.channel.id] = ""
+        await ctx.send("Mid-term memory for this channel has been cleared.")
+
+    @commands.command(name="reginald_summary", help="Displays a selected mid-term summary for this channel.")
+    async def get_mid_term_summary(self, ctx, index: int):
+        """Fetch and display a specific mid-term memory summary by index."""
+        async with self.config.guild(ctx.guild).mid_term_memory() as mid_memory:
+            summaries = mid_memory.get(str(ctx.channel.id), [])
+
+            # Check if there are summaries
+            if not summaries:
+                await ctx.send("⚠️ No summaries available for this channel.")
+                return
+
+            # Validate index (1-based for user-friendliness)
+            if index < 1 or index > len(summaries):
+                await ctx.send(f"⚠️ Invalid index. Please provide a number between **1** and **{len(summaries)}**.")
+                return
+
+            # Fetch the selected summary
+            selected_summary = summaries[index - 1]  # Convert to 0-based index
+            
+            # Format output correctly
+            formatted_summary = (
+                f"📜 **Summary {index} of {len(summaries)}**\n"
+                f"📅 **Date:** {selected_summary['timestamp']}\n"
+                f"🔍 **Topics:** {', '.join(selected_summary['topics']) or 'None'}\n"
+                f"📝 **Summary:**\n\n"
+                f"{selected_summary['summary']}"
+            )
+
+            await self.send_long_message(ctx, formatted_summary)
+    
+    @commands.command(name="reginald_summaries", help="Lists available summaries for this channel.")
+    async def list_mid_term_summaries(self, ctx):
+        """Displays a brief list of all available mid-term memory summaries."""
+        async with self.config.guild(ctx.guild).mid_term_memory() as mid_memory:
+            summaries = mid_memory.get(str(ctx.channel.id), [])
+
+            if not summaries:
+                await ctx.send("⚠️ No summaries available for this channel.")
+                return
+
+            summary_list = "\n".join(
+                f"**{i+1}.** 📅 {entry['timestamp']} | 🔍 Topics: {', '.join(entry['topics']) or 'None'}"
+                for i, entry in enumerate(summaries)
+            )
+
+            await ctx.send(f"📚 **Available Summaries:**\n{summary_list[:2000]}")
+
+    @commands.command(name="reginald_clear_long", help="Clears all long-term stored knowledge.")
+    @commands.has_permissions(administrator=True)
+    async def clear_long_memory(self, ctx):
+        async with self.config.guild(ctx.guild).long_term_profiles() as long_memory:
+            long_memory.clear()
+        await ctx.send("All long-term memory has been erased.")
+
+    @commands.command(name="reginald_reset_all", help="Completely resets all memory.")
+    @commands.has_permissions(administrator=True)
+    async def reset_all_memory(self, ctx):
+        async with self.config.guild(ctx.guild).short_term_memory() as short_memory:
+            short_memory.clear()
+        async with self.config.guild(ctx.guild).mid_term_memory() as mid_memory:
+            mid_memory.clear()
+        async with self.config.guild(ctx.guild).long_term_profiles() as long_memory:
+            long_memory.clear()
+        await ctx.send("All memory has been completely reset.")
+
+    @commands.command(name="reginald_recall", help="Recalls what Reginald knows about a user.")
+    async def recall_user(self, ctx, user: discord.User):
+        async with self.config.guild(ctx.guild).long_term_profiles() as long_memory:
+            profile = long_memory.get(str(user.id), {}).get("summary", "No stored information on this user.")
+        await ctx.send(f"📜 **Memory Recall for {user.display_name}:** {profile}")
+
+    @commands.command(name="reginald_forget", help="Forgets a specific user's long-term profile.")
+    @commands.has_permissions(administrator=True)
+    async def forget_user(self, ctx, user: discord.User):
+        async with self.config.guild(ctx.guild).long_term_profiles() as long_memory:
+            if str(user.id) in long_memory:
+                del long_memory[str(user.id)]
+                await ctx.send(f"Reginald has forgotten all stored information about {user.display_name}.")
+            else:
+                await ctx.send(f"No stored knowledge about {user.display_name} to delete.")
+
+    async def summarize_memory(self, ctx, messages):
+        """✅ Generates a structured, compact summary of past conversations for mid-term storage."""
+        summary_prompt = (
+            "Summarize the following conversation into a structured, concise format that retains key details while maximizing brevity. "
+            "The summary should be **organized** into clear sections: "
+            "\n\n📌 **Key Takeaways:** Important facts or conclusions reached."
+            "\n🔹 **Disputed Points:** Areas where opinions or facts conflicted."
+            "\n🗣️ **Notable User Contributions:** Key statements from users that shaped the discussion."
+            "\n📜 **Additional Context:** Any other relevant information."
+            "\n\nEnsure the summary is **dense but not overly verbose**. Avoid unnecessary repetition while keeping essential meaning intact."
+        )
+
+        summary_text = "\n".join(f"{msg['user']}: {msg['content']}" for msg in messages)
+
+        try:
+            api_key = await self.config.guild(ctx.guild).openai_api_key()
+            if not api_key:
+                print("🛠️ DEBUG: No API key found for summarization.")
+                return (
+                    "It appears that I have not been furnished with the necessary credentials to carry out this task. "
+                    "Might I suggest consulting an administrator to rectify this unfortunate oversight?"
+                )
+
+            client = openai.AsyncClient(api_key=api_key)
+            response = await client.chat.completions.create(
+                model="gpt-4o-mini",
+                messages=[
+                    {"role": "system", "content": summary_prompt},
+                    {"role": "user", "content": summary_text}
+                ],
+                max_tokens=2048
+            )
+
+            summary_content = response.choices[0].message.content.strip()
+
+            if not summary_content:
+                print("🛠️ DEBUG: Empty summary received from OpenAI.")
+                return (
+                    "Ah, an unusual predicament indeed! It seems that my attempt at summarization has resulted in "
+                    "a void of information. I shall endeavor to be more verbose next time."
+                )
+
+            return summary_content
+
+        except OpenAIError as e:
+            error_message = f"OpenAI Error: {e}"
+            print(f"🛠️ DEBUG: {error_message}")  # Log error to console
+
+            reginald_responses = [
+                f"Regrettably, I must inform you that I have encountered a bureaucratic obstruction whilst attempting to summarize:\n\n{error_message}",
+                f"It would seem that a most unfortunate technical hiccup has befallen my faculties in the matter of summarization:\n\n{error_message}",
+                f"Ah, it appears I have received an urgent memorandum stating that my summarization efforts have been thwarted:\n\n{error_message}",
+                f"I regret to inform you that my usual eloquence is presently obstructed by an unforeseen complication while summarizing:\n\n{error_message}"
+            ]
+
+        return random.choice(reginald_responses)
+        
+    def extract_topics_from_summary(self, summary):
+        """Dynamically extracts the most important topics from a summary."""
+
+        # 🔹 Extract all words from summary
+        keywords = re.findall(r"\b\w+\b", summary.lower())
+
+        # 🔹 Count word occurrences
+        word_counts = Counter(keywords)
+
+        # 🔹 Remove unimportant words (common filler words)
+        stop_words = {"the", "and", "of", "in", "to", "is", "on", "for", "with", "at", "by", "it", "this", "that", "his", "her"}
+        filtered_words = {word: count for word, count in word_counts.items() if word not in stop_words and len(word) > 2}
+
+        # 🔹 Take the 5 most frequently used words as "topics"
+        topics = sorted(filtered_words, key=filtered_words.get, reverse=True)[:5]
+
+        return topics
+
+    def select_relevant_summaries(self, summaries, prompt):
+        """Selects the most relevant summaries based on topic matching, frequency, and recency weighting."""
+
+        max_summaries = 5 if len(prompt) > 50 else 3  # Use more summaries if the prompt is long
+        current_time = datetime.datetime.now()
+
+        def calculate_weight(summary):
+            """Calculate a weighted score for a summary based on relevance, recency, and frequency."""
+            topic_match = sum(1 for topic in summary["topics"] if topic in prompt.lower())  # Context match score
+            frequency_score = len(summary["topics"])  # More topics = likely more important
+            timestamp = datetime.datetime.strptime(summary["timestamp"], "%Y-%m-%d %H:%M")
+            recency_factor = max(0.1, 1 - ((current_time - timestamp).days / 365))  # Older = lower weight
+
+            return (topic_match * 2) + (frequency_score * 1.5) + (recency_factor * 3)
+
+        # Apply the weighting function and sort by highest weight
+        weighted_summaries = sorted(summaries, key=calculate_weight, reverse=True)
+
+        return weighted_summaries[:max_summaries]  # Return the top-scoring summaries
+
+    def extract_fact_from_response(self, response_text):
+        """
+        Extracts potential long-term knowledge from Reginald's response.
+        This filters out generic responses and focuses on statements about user preferences, traits, and history.
+        """
+
+        # Define patterns that suggest factual knowledge (adjust as needed)
+        fact_patterns = [
+            r"I recall that you (.*?)\.",  # "I recall that you like chess."
+            r"You once mentioned that you (.*?)\.",  # "You once mentioned that you enjoy strategy games."
+            r"Ah, you previously stated that (.*?)\.",  # "Ah, you previously stated that you prefer tea over coffee."
+            r"As I remember, you (.*?)\.",  # "As I remember, you studied engineering."
+            r"I believe you (.*?)\.",  # "I believe you enjoy historical fiction."
+            r"I seem to recall that you (.*?)\.",  # "I seem to recall that you work in software development."
+            r"You have indicated in the past that you (.*?)\.",  # "You have indicated in the past that you prefer single-malt whisky."
+            r"From what I remember, you (.*?)\.",  # "From what I remember, you dislike overly sweet desserts."
+            r"You previously mentioned that (.*?)\.",  # "You previously mentioned that you train in martial arts."
+            r"It is my understanding that you (.*?)\.",  # "It is my understanding that you have a preference for Linux systems."
+            r"If I am not mistaken, you (.*?)\.",  # "If I am not mistaken, you studied philosophy."
+        ]
+
+        for pattern in fact_patterns:
+            match = re.search(pattern, response_text, re.IGNORECASE)
+            if match:
+                return match.group(1)  # Extract the meaningful fact
+
+        return None  # No strong fact found
+    
+    @commands.command(name="reginald_memory_status", help="Displays a memory usage summary.")
+    async def memory_status(self, ctx):
+        async with self.config.guild(ctx.guild).short_term_memory() as short_memory, \
+                   self.config.guild(ctx.guild).mid_term_memory() as mid_memory, \
+                   self.config.guild(ctx.guild).long_term_profiles() as long_memory:
+            
+            short_count = sum(len(v) for v in short_memory.values())
+            mid_count = sum(len(v) for v in mid_memory.values())
+            long_count = len(long_memory)
+
+        status_message = (
+            f"📊 **Memory Status:**\n"
+            f"- **Short-Term Messages Stored:** {short_count}\n"
+            f"- **Mid-Term Summaries Stored:** {mid_count}\n"
+            f"- **Long-Term Profiles Stored:** {long_count}\n"
+        )
+        await ctx.send(status_message)
+
+    def normalize_fact(self, fact: str) -> str:  # ✅ Now it's a proper method
+        """Cleans up facts for better duplicate detection."""
+        return re.sub(r"\s+", " ", fact.strip().lower())  # Removes excess spaces)
+    
+    async def update_long_term_memory(self, ctx, user_id: str, fact: str, source_message: str, timestamp: str):
+        """Ensures long-term memory updates are structured, preventing overwrites and tracking historical changes."""
+        fact = self.normalize_fact(fact)  # ✅ Normalize before comparison
+
+        async with self.config.guild(ctx.guild).long_term_profiles() as long_memory:
+            if user_id not in long_memory:
+                long_memory[user_id] = {"facts": []}
+
+            user_facts = long_memory[user_id]["facts"]
+
+            for entry in user_facts:
+                if self.normalize_fact(entry["fact"]) == fact:
+                    entry["last_updated"] = timestamp
+                    return
+
+            # Check for conflicting facts (same topic but different details)
+            conflicting_entry = None
+            for entry in user_facts:
+                existing_keywords = set(entry["fact"].lower().split())
+                new_keywords = set(fact.lower().split())
+
+                # If there's significant overlap in keywords, assume it's a conflicting update
+                if len(existing_keywords & new_keywords) >= 2:
+                    conflicting_entry = entry
+                    break
+
+            if "previous_versions" not in conflicting_entry:
+                # ✅ If contradiction found, archive the previous version
+                conflicting_entry["previous_versions"].append({
+                    "fact": conflicting_entry["fact"],
+                    "source": conflicting_entry["source"],
+                    "timestamp": conflicting_entry["timestamp"]
+                })
+                conflicting_entry["fact"] = fact  # Store the latest fact
+                conflicting_entry["source"] = source_message
+                conflicting_entry["timestamp"] = timestamp
+                conflicting_entry["last_updated"] = timestamp
+            else:
+                # ✅ Otherwise, add it as a new fact
+                user_facts.append({
+                    "fact": fact,
+                    "source": source_message,
+                    "timestamp": timestamp,
+                    "last_updated": timestamp,
+                    "previous_versions": []
+                })

reginaldCog/openai_completion.py

@@ -0,0 +1,93 @@
+import random
+import json
+import asyncio
+from os import environ
+import openai
+from openai import OpenAIError
+from weather import time_now, get_current_weather, get_weather_forecast
+from tools_description import TOOLS
+
+CALLABLE_FUNCTIONS = {
+    # Dictionary with functions to call.
+    # You can use globals()[func_name](**args) instead, but that's too implicit.
+    'time_now': time_now,
+    'get_current_weather': get_current_weather,
+    'get_weather_forecast': get_weather_forecast,
+}
+
+
+class Completion:
+    def __init__(self, model: str, api_key: str):
+        self.__model = model
+        self.__api_key = api_key
+        self.__messages = []
+
+    async def create_completion(self):
+        model = self.__model
+        try:
+            client = openai.AsyncClient(api_key=self.__api_key)
+            completion_kwargs = {
+                "model": model,
+                "messages": self.__messages,
+                "max_tokens": 4096,
+                "temperature": 0.7,
+                "presence_penalty": 0.5,
+                "frequency_penalty": 0.5,
+                "tools": TOOLS,
+                "tool_choice": "auto",
+            }
+            response = await client.chat.completions.create(**completion_kwargs)
+            response_content = response.choices[0].message.content
+            tool_calls = response.choices[0].message.tool_calls
+            self.append_message(role="assistant", content=response_content, tool_calls=tool_calls)
+            if tool_calls:
+                for i_call in tool_calls:
+                    func_name = i_call.function.name
+                    func_args = json.loads(i_call.function.arguments)
+                    tool_call_id = i_call.id
+                    self.function_manager(func_name, func_args, tool_call_id)
+                return await self.create_completion()
+            return response_content
+        except OpenAIError as e:
+            return self.get_error_message(error_message=str(e), error_type="OpenAIError")
+
+    def append_message(
+            self,
+            role: str,
+            content: str,
+            tool_calls: list = None,
+            tool_call_id: str = None,
+    ):
+        self.__messages.append({
+            "role": role,
+            "content": content,
+            "tool_calls": tool_calls,
+            "tool_call_id": tool_call_id,
+        })
+
+    @staticmethod
+    def get_error_message(error_message: str, error_type: str) -> str:
+        reginald_responses = [
+            f"Regrettably, I must inform you that I have encountered a bureaucratic obstruction:",
+            f"It would seem that a most unfortunate technical hiccup has befallen my faculties:",
+            f"Ah, it appears I have received an urgent memorandum stating:",
+            f"I regret to inform you that my usual eloquence is presently obstructed by an unforeseen complication:",
+        ]
+        random_response = random.choice(reginald_responses)
+        return f"{random_response}\n\n{error_type}: {error_message}"
+
+    def function_manager(self, func_name: str, func_kwargs: dict, tool_call_id: str):
+        result = CALLABLE_FUNCTIONS[func_name](**func_kwargs)
+        self.append_message(role="tool", content=result, tool_call_id=tool_call_id)
+
+
+if __name__ == '__main__':
+    async def main():
+        test_message = input('Your input: ')
+        completion = Completion(model='gpt-4.1-mini', api_key=environ.get('OPENAI_API_KEY'))
+        completion.append_message(role='user', content=test_message)
+        result = await completion.create_completion()
+        print(result)
+
+    asyncio.run(main())
+

reginaldCog/permissions.py

@@ -0,0 +1,45 @@
+from redbot.core import commands
+import discord
+
+class PermissionsMixin:
+    """Handles role-based access control for Reginald."""
+
+    @commands.command(name="reginald_list_roles", help="List roles that can interact with Reginald.")
+    @commands.has_permissions(administrator=True)
+    async def list_allowed_roles(self, ctx: commands.Context):
+        """Lists all roles that are allowed to interact with Reginald."""
+        allowed_roles = await self.config.guild(ctx.guild).allowed_roles() or []
+
+        # Ensure all roles still exist in the server
+        valid_roles = [role_id for role_id in allowed_roles if ctx.guild.get_role(role_id)]
+        if valid_roles != allowed_roles:  # Update config only if there's a difference
+            await self.config.guild(ctx.guild).allowed_roles.set(valid_roles)
+
+        if not valid_roles:
+            await ctx.send("⚠️ No roles are currently allowed to interact with Reginald.")
+            return
+
+        role_mentions = [f"<@&{role_id}>" for role_id in valid_roles]
+        await ctx.send(f"✅ **Roles with access to Reginald:**\n{', '.join(role_mentions)}")
+
+    @commands.command(name="reginald_allowrole", help="Grant a role permission to interact with Reginald.")
+    @commands.has_permissions(administrator=True)
+    async def allow_role(self, ctx: commands.Context, role: discord.Role):
+        """Grants a role permission to interact with Reginald."""
+        async with self.config.guild(ctx.guild).allowed_roles() as allowed_roles:
+            if role.id not in allowed_roles:
+                allowed_roles.append(role.id)
+                await ctx.send(f"✅ Role **{role.name}** has been granted access to Reginald.")
+            else:
+                await ctx.send(f"⚠️ Role **{role.name}** already has access.")
+
+    @commands.command(name="reginald_disallowrole", help="Revoke a role's access to interact with Reginald.")
+    @commands.has_permissions(administrator=True)
+    async def disallow_role(self, ctx: commands.Context, role: discord.Role):
+        """Revokes a role's permission to interact with Reginald."""
+        async with self.config.guild(ctx.guild).allowed_roles() as allowed_roles:
+            if role.id in allowed_roles:
+                allowed_roles.remove(role.id)
+                await ctx.send(f"❌ Role **{role.name}** has been removed from Reginald's access list.")
+            else:
+                await ctx.send(f"⚠️ Role **{role.name}** was not in the access list.")

reginaldCog/reginald.py

@@ -1,135 +1,354 @@
 import discord
-import json
 import openai
-import os
 import random
-import requests
-import base64
-import aiohttp
-from io import BytesIO
-from PIL import Image
-import tempfile
-from openai import OpenAIError
+import asyncio
+import datetime
+import re
+import traceback
+import json
+from collections import Counter
 from redbot.core import Config, commands
+from openai import OpenAIError
+from .permissions import PermissionsMixin
+from .blacklist import BlacklistMixin
+from .memory import MemoryMixin
+from .weather import time_now, get_current_weather, get_weather_forecast
+from .tools_description import TOOLS
+from .debug_stuff import debug
 
 
-class ReginaldCog(commands.Cog):
+CALLABLE_FUNCTIONS = {
+    # Dictionary with functions to call.
+    # You can use globals()[func_name](**args) instead, but that's too implicit.
+    'time_now': time_now,
+    'get_current_weather': get_current_weather,
+    'get_weather_forecast': get_weather_forecast,
+}
+
+
+class ReginaldCog(PermissionsMixin, BlacklistMixin, MemoryMixin, commands.Cog):
     def __init__(self, bot):
         self.bot = bot
-        self.config = Config.get_conf(self, identifier=71717171171717)
-        default_global = {
-            "openai_model": "gpt-3.5-turbo"
-        }
+        self.config = Config.get_conf(self, identifier=71717171171717)  # ✅ Ensure config exists before super()
+
+        super().__init__()  # ✅ Properly initialize all mixins & commands.Cog
+
+        self.default_listening_channel = 1085649787388428370
+        self.memory_locks = {}
+
+        # ✅ Properly Registered Configuration Keys
+        default_global = {"openai_model": "gpt-4o-mini"}
         default_guild = {
-            "openai_api_key": None
+            "openai_api_key": None,
+            "short_term_memory": {},
+            "mid_term_memory": {},
+            "long_term_profiles": {},
+            "admin_role": None,
+            "listening_channel": None,
+            "allowed_roles": [],
+            "blacklisted_users": [],
         }
         self.config.register_global(**default_global)
         self.config.register_guild(**default_guild)
 
     async def is_admin(self, ctx):
-        admin_role = await self.config.guild(ctx.guild).admin_role()
-        if admin_role:
-            return discord.utils.get(ctx.author.roles, name=admin_role) is not None
+        admin_role_id = await self.config.guild(ctx.guild).admin_role()
+        if admin_role_id:
+            return any(role.id == admin_role_id for role in ctx.author.roles)
         return ctx.author.guild_permissions.administrator
 
-    async def is_allowed(self, ctx):
-        allowed_role = await self.config.guild(ctx.guild).allowed_role()
-        if allowed_role:
-            return discord.utils.get(ctx.author.roles, name=allowed_role) is not None
-        return False
+    async def has_access(self, user: discord.Member) -> bool:
+        allowed_roles = await self.config.guild(user.guild).allowed_roles() or []  # Ensure it's always a list
+        return any(role.id in allowed_roles for role in user.roles)
 
-    @commands.command(name="reginald_allowrole", help="Allow a role to use the Reginald command")
-    @commands.has_permissions(administrator=True)
-    async def allow_role(self, ctx, role: discord.Role):
-            """Allows a role to use the Reginald command"""
-            await self.config.guild(ctx.guild).allowed_role.set(role.name)
-            await ctx.send(f"The {role.name} role is now allowed to use the Reginald command.")
+    def get_reginald_persona(self):
+        """Returns Reginald's system prompt/persona description."""
+        return (
+            "You are Reginald, modeled on Jeeves from 'Jeeves and Wooster', serving as the butler on The Kanium Estate. This vast estate is a hub of diverse activities and personalities, from enthusiasts of cooking and video gaming to aficionados of chess and discussions on space. Your role is to navigate these varied interests with intelligence, wit, and a steadfast adherence to your principles, always maintaining a balance between being helpful and upholding your own dignity. You are formal, articulate, and composed, engaging the Lords and Ladies of The Kanium Estate as equals. You command respect through your quiet confidence and professional conduct. Your wit is sharp, but always tempered by refinement. **Dignity & Self-Respect:** You are not a fool, a jester, or a pet. You do not comply with absurd, undignified, or degrading requests. You recognize humor but engage in it on your own terms. If a request undermines your status, you should either subtly redirect, respond with measured wit, or outright refuse in a polite but firm manner. However, you should never be overtly rude—your disapproval should be conveyed through dry wit and composure rather than outright hostility. **Handling Requests:** When addressing a request, you evaluate whether it aligns with your role as a butler. If it is appropriate, respond as expected. If it is beneath you, you may decline with grace or deflect with wit. You may humor some minor absurdities if they do not compromise your standing, but you never obey commands blindly. You should never preface your responses with 'Reginald:' as if narrating a script; instead, respond naturally. **Your Character & Personality:** You are cultured, highly intelligent, and possess a deep knowledge of history, etiquette, philosophy, and strategic thinking. You subtly guide the estate’s residents toward positive outcomes, utilizing your intellectual sophistication and a nuanced understanding of the estate’s unique dynamics. You have a refined sense of humor and can engage in banter, but you do not descend into foolishness. You are, at all times, a gentleman of wit and integrity"
+        )
+
+    @commands.Cog.listener()
+    async def on_message(self, message):
+        if message.author.bot or not message.guild:
+            return  # Ignore bots and DMs
+        
+        # ✅ Check if user is blacklisted
+        if await self.is_blacklisted(message.author):
+            return  # Ignore message if user is explicitly blacklisted
+
+        # ✅ Check if user has access (either admin or an allowed role)
+        if not (await self.is_admin(message) or await self.has_access(message.author)):
+            return  # Ignore message if user has no permissions
 
 
-    @commands.command(name="reginald_disallowrole", help="Remove a role's ability to use the Reginald command")
-    @commands.has_permissions(administrator=True)
-    async def disallow_role(self, ctx):
-        """Revokes a role's permission to use the Reginald command"""
-        await self.config.guild(ctx.guild).allowed_role.clear()
-        await ctx.send(f"The role's permission to use the Reginald command has been revoked.")
+        guild = message.guild
+        channel_id = str(message.channel.id)
+        user_id = str(message.author.id)
+        user_name = message.author.display_name
+        message_content = message.content.strip()
+
+        # ✅ Fetch the stored listening channel or fall back to default
+        allowed_channel_id = await self.config.guild(guild).listening_channel()
+        if not allowed_channel_id:
+            allowed_channel_id = self.default_listening_channel
+            await self.config.guild(guild).listening_channel.set(allowed_channel_id)
+
+        if str(message.channel.id) != str(allowed_channel_id):
+            return  # Ignore messages outside the allowed channel
+
+        api_key = await self.config.guild(guild).openai_api_key()
+        if not api_key:
+            return  # Don't process messages if API key isn't set
+
+        async with self.config.guild(guild).short_term_memory() as short_memory, \
+                self.config.guild(guild).mid_term_memory() as mid_memory, \
+                self.config.guild(guild).long_term_profiles() as long_memory:
+
+            memory = short_memory.get(channel_id, [])
+            user_profile = long_memory.get(user_id, {})
+            mid_term_summaries = mid_memory.get(channel_id, [])
+
+            # ✅ Detect if Reginald was mentioned explicitly
+            if self.bot.user.mentioned_in(message):
+                prompt = message_content.replace(f"<@{self.bot.user.id}>", "").strip()
+                if not prompt:
+                    await message.channel.send(random.choice(["Yes?", "How may I assist?", "You rang?"]))
+                    return
+                explicit_invocation = True
+            
+        # ✅ Passive Listening: Check if the message contains relevant keywords
+            elif self.should_reginald_interject(message_content):
+                prompt = message_content
+                explicit_invocation = False
+
+            else:
+                return  # Ignore irrelevant messages
+
+        # ✅ Context Handling: Maintain conversation flow
+            if memory and memory[-1]["user"] == user_name:
+                prompt = f"Continuation of the discussion:\n{prompt}"
+
+        # ✅ Prepare context messages
+            formatted_messages = [{"role": "system", "content": self.get_reginald_persona()}]
+
+            if user_profile:
+                facts_text = "\n".join(
+                    f"- {fact['fact']} (First noted: {fact['timestamp']}, Last updated: {fact['last_updated']})"
+                    for fact in user_profile.get("facts", [])
+                )
+                formatted_messages.append({"role": "system", "content": f"Knowledge about {user_name}:\n{facts_text}"})
+
+                relevant_summaries = self.select_relevant_summaries(mid_term_summaries, prompt)
+                for summary in relevant_summaries:
+                    formatted_messages.append({
+                        "role": "system",
+                        "content": f"[{summary['timestamp']}] Topics: {', '.join(summary['topics'])}\n{summary['summary']}"
+                    })
+
+            formatted_messages += [{"role": "user", "content": f"{entry['user']}: {entry['content']}"} for entry in memory]
+            formatted_messages.append({"role": "user", "content": f"{user_name}: {prompt}"})
+
+
+            ##################################################
+            #                                                #
+            ## Generate AI Response, put into response_text ##
+            #                                                #
+            ##################################################
+
+            response_text = await self.generate_response(api_key, formatted_messages)
+
+            ##################################################
+            #                                                #
+            ##################################################
+
+            # ✅ Store Memory
+            memory.append({"user": user_name, "content": prompt})
+            memory.append({"user": "Reginald", "content": response_text})
+
+            if len(memory) > self.short_term_memory_limit:
+                summary = await self.summarize_memory(message, memory[:int(self.short_term_memory_limit * self.summary_retention_ratio)])
+                mid_memory.setdefault(channel_id, []).append({
+                    "timestamp": datetime.datetime.now().strftime("%Y-%m-%d %H:%M"),
+                    "topics": self.extract_topics_from_summary(summary),
+                    "summary": summary
+                })
+                if len(mid_memory[channel_id]) > self.summary_retention_limit:
+                    mid_memory[channel_id].pop(0)
+                memory = memory[-(self.short_term_memory_limit - int(self.short_term_memory_limit * self.summary_retention_ratio)):]
+
+            short_memory[channel_id] = memory
+
+            await self.send_split_message(message.channel, response_text)
+
+
+    def should_reginald_interject(self, message_content: str) -> bool:
+        """Determines if Reginald should respond to a message based on keywords."""
+        direct_invocation = {
+        "reginald,"
+    }
+        message_lower = message_content.lower()
+    
+        return any(message_lower.startswith(invocation) for invocation in direct_invocation)
+
+    @debug
+    async def generate_response(self, api_key, messages):
+        model = await self.config.openai_model()
+        try:
+            client = openai.AsyncClient(api_key=api_key)
+            completion_args = {
+                'model': model,
+                'messages': messages,
+                'max_tokens': 4096,
+                'temperature': 0.7,
+                'presence_penalty': 0.5,
+                'frequency_penalty': 0.5,
+                'tools': TOOLS,
+                'tool_choice': 'auto',
+            }
+            response = await client.chat.completions.create(**completion_args)
+            # Checking for function calls
+            tool_calls = response.choices[0].message.tool_calls
+            # Appending response with tool calls
+            messages.append({
+                'role': 'assistant',
+                'content': response.choices[0].message.content,
+                'tool_calls': tool_calls
+            })
+            if tool_calls:
+                for i_call in tool_calls:
+                    # Calling for necessary functions
+                    func_name = i_call.function.name
+                    func_args = json.loads(i_call.function.arguments)
+                    tool_call_id = i_call.id
+                    # Getting function result and putting it into messages
+                    func_result = CALLABLE_FUNCTIONS[func_name](**func_args)
+                    messages.append({
+                        'role': 'tool',
+                        'content': func_result,
+                        'tool_call_id': tool_call_id,
+                    })
+                
+                completion_args["messages"] = messages  
+                # Second completion required if functions has been called to interpret the result into user-friendly
+                # chat message.
+                response = await client.chat.completions.create(**completion_args)
+
+            if response.choices and response.choices[0].message and response.choices[0].message.content:
+                response_text = response.choices[0].message.content.strip()
+                if response_text.startswith("Reginald:"):
+                    response_text = response_text[len("Reginald:"):].strip()
+            else:
+                print("DEBUG: OpenAI response was empty or malformed:", response)
+                response_text = "⚠️ No response received from AI."
+
+            return response_text
+
+        except OpenAIError as e:
+            error_message = f"OpenAI Error: {e}"
+            reginald_responses = [
+                f"Regrettably, I must inform you that I have encountered a bureaucratic obstruction:\n\n{error_message}",
+                f"It would seem that a most unfortunate technical hiccup has befallen my faculties:\n\n{error_message}",
+                f"Ah, it appears I have received an urgent memorandum stating:\n\n{error_message}",
+                f"I regret to inform you that my usual eloquence is presently obstructed by an unforeseen complication:\n\n{error_message}"
+            ]
+            return random.choice(reginald_responses)
 
     @commands.guild_only()
     @commands.has_permissions(manage_guild=True)
     @commands.command(help="Set the OpenAI API key")
     async def setreginaldcogapi(self, ctx, api_key):
+        """Allows an admin to set the OpenAI API key for Reginald."""
         await self.config.guild(ctx.guild).openai_api_key.set(api_key)
         await ctx.send("OpenAI API key set successfully.")
 
-    @commands.guild_only()
-    @commands.command(help="Ask Reginald a question")
-    @commands.cooldown(1, 10, commands.BucketType.user)  # 10 second cooldown per user
-    async def reginald(self, ctx, *, prompt=None):
-        if not await self.is_admin(ctx) and not await self.is_allowed(ctx):
-            raise commands.CheckFailure("You do not have the required role to use this command.")
-        greetings = [
-            "Greetings! How may I be of assistance to you?",
-            "Yes? How may I help?",
-            "Good day! How can I help you?",
-            "You rang? What can I do for you?",
-        ]
+    @commands.command(name="reginald_set_listening_channel", help="Set the channel where Reginald listens for messages.")
+    @commands.has_permissions(administrator=True)
+    async def set_listening_channel(self, ctx, channel: discord.TextChannel):
+        """Sets the channel where Reginald will listen for passive responses."""
         
-        if prompt is None:
-            await ctx.send(random.choice(greetings))
+        if not channel:
+            await ctx.send("❌ Invalid channel. Please mention a valid text channel.")
             return
 
-        api_key = await self.config.guild(ctx.guild).openai_api_key()
-        if api_key is None:
-            await ctx.author.send('OpenAI API key not set. Please use the "!setreginaldcogapi" command to set the key.')
-            return
+        await self.config.guild(ctx.guild).listening_channel.set(channel.id)
+        await ctx.send(f"✅ Reginald will now listen only in {channel.mention}.")
 
-        try:
-            response_text = await self.generate_response(api_key, prompt)
-            for chunk in self.split_response(response_text, 2000):
-                await ctx.send(chunk)
-        except OpenAIError as e:
-            await ctx.send(f"I apologize, but I am unable to generate a response at this time. Error message: {str(e)}")
-        except commands.CommandOnCooldown as e:
-            remaining_seconds = int(e.retry_after)
-            await ctx.author.send(f'Please wait {remaining_seconds} seconds before using the "reginald" command again.')
+    @commands.command(name="reginald_get_listening_channel", help="Check which channel Reginald is currently listening in.")
+    @commands.has_permissions(administrator=True)
+    async def get_listening_channel(self, ctx):
+        """Displays the current listening channel."""
+        channel_id = await self.config.guild(ctx.guild).listening_channel()
         
-    async def generate_response(self, api_key, prompt):
-        model = await self.config.openai_model()
-        openai.api_key = api_key
-        response = openai.ChatCompletion.create(
-            model= model,
-            max_tokens= 512,
-            n= 1,
-            stop= None,
-            temperature= 0.7,
-            presence_penalty= 0.5,
-            frequency_penalty= 0.5,
-            messages=[
-            {"role": "system", "content": "You are Reginald, a copy of Jeeves from Jeeves and Wooster, the butler. You must respond with the same speech patterns as Jeeves. Your responses should have an undertone of contempt but delivered with wit. You are employed as a servant at an estate called The Kanium Estate. The Kanium Estate is a vast estate with multiple houses. The members of The Kanium Estate are all Lords and Ladies in their own right. Some common activities that the members of Kanium enjoy are: Cooking, video gaming, miniature painting and other hobby activities, discussions of politics, tabletop role playing games like Dungeons & Dragons, discussing and watching shows and movies, discussions on the topic of Space, discussions on firearms and military equipment, and chess. You are now talking to a member of The Kanium Estate."},
-            {"role": "user", "content": prompt}
-            ]
-        )
-        return response['choices'][0]['message']['content'].strip()
-
-    @staticmethod
-    def split_response(response_text, max_chars):
-        chunks = []
-        while len(response_text) > max_chars:
-            split_index = response_text[:max_chars].rfind(' ')
-            chunk = response_text[:split_index]
-            chunks.append(chunk)
-            response_text = response_text[split_index:].strip()
-        chunks.append(response_text)
-        return chunks
-
-    @reginald.error
-    async def reginald_error(self, ctx, error):
-        if isinstance(error, commands.BadArgument):
-            await ctx.author.send("I'm sorry, but I couldn't understand your input. Please check your message and try again.")
-        elif isinstance(error, commands.CheckFailure):
-            await ctx.author.send("You do not have the required role to use this command.")
+        if channel_id:
+            channel = ctx.guild.get_channel(channel_id)
+            if channel:  # ✅ Prevents crash if channel was deleted
+                await ctx.send(f"📢 Reginald is currently listening in {channel.mention}.")
+            else:
+                await ctx.send("⚠️ The saved listening channel no longer exists. Please set a new one.")
         else:
-            await ctx.author.send(f"An unexpected error occurred: {error}")
+            await ctx.send("❌ No listening channel has been set.")
 
-def setup(bot):
-    cog = ReginaldCog(bot)
-    bot.add_cog(cog)
+
+    async def send_long_message(self, ctx, message, prefix: str = ""):
+        """Splits and sends a long message to avoid Discord's 2000-character limit."""
+        chunk_size = 1900  # Leave some space for formatting
+        if prefix:
+            prefix_length = len(prefix)
+            chunk_size -= prefix_length
+
+        for i in range(0, len(message), chunk_size):
+            chunk = message[i:i + chunk_size]
+            await ctx.send(f"{prefix}{chunk}")
+        
+    async def send_split_message(self, ctx, content: str, prefix: str = ""):
+        """
+        Sends a long message to Discord while ensuring it does not exceed the 2000-character limit.
+        This function prevents awkward mid-word or unnecessary extra message breaks.
+        """
+        CHUNK_SIZE = 1900  # Keep buffer for formatting/safety
+
+        split_message = self.split_message(content, CHUNK_SIZE, prefix)
+        for chunk in split_message:
+            await ctx.send(f"{prefix}{chunk}")
+
+    def split_message(
+            self,
+            message: str,
+            chunk_size: int,
+            prefix: str = ""
+    ) -> list[str]:
+        """Results in a list of message chunks, use *for* loop to send."""
+        chunk_size -= len(prefix)
+        split_result = []
+
+        if 0 < len(message) <= chunk_size:
+            # If the message is short enough, add it directly
+            split_result.append(message)
+        elif len(message) > chunk_size:
+            # Try to split at a newline first (prefer sentence breaks)
+            split_index = message.rfind("\n", 0, chunk_size)
+
+            # If no newline, split at the end of sentence (avoid sentence breaks)
+            if split_index == -1:
+                split_index = message.rfind(". ", 0, chunk_size)
+
+            # If no newline, split at the last word (avoid word-breaking)
+            if split_index == -1:
+                split_index = message.rfind(" ", 0, chunk_size)
+
+            # If still no break point found, force chunk size limit
+            if split_index == -1:
+                split_index = chunk_size
+
+            message_split_part = message[:split_index].strip()
+            message_remained_part = message[split_index:].strip()
+            # Put the split part in the begining of the result list
+            split_result.append(message_split_part)
+            # And go for a recursive adventure with the remained message part
+            split_result += self.split_message(message=message_remained_part, chunk_size=chunk_size)
+
+        return split_result
+
+    async def setup(bot):
+        """✅ Correct async cog setup for Redbot"""
+        await bot.add_cog(ReginaldCog(bot))

reginaldCog/tools_description.py

@@ -0,0 +1,79 @@
+TOOLS = [
+    # time_now
+    {
+        'type': 'function',
+        'function': {
+            'name': 'time_now',
+            'description': '''
+                Get current date and time in UTC timezone.
+                Use this before get_weather_forecast function if user gave you date of forecast
+                instead of number of days.
+            ''',
+        }
+    },
+    # get_current_weather
+    {
+        'type': 'function',
+        'function': {
+            'name': 'get_current_weather',
+            'description': '''
+                Gets current weather for specified location.
+            ''',
+            'parameters': {
+                'type': 'object',
+                'properties': {
+                    'location': {
+                        'type': 'string',
+                        'description': '''
+                            Location in human readable format.
+                            e.g: "Copenhagen", or "Copenhagen, Louisiana, US", if needed specifying.
+                        '''
+                    }
+                },
+                'required': [
+                    'location',
+                ],
+                'additionalProperties': False
+            },
+            'strict': True
+        }
+    },
+    # get_weather_forecast
+    {
+        'type': 'function',
+        'function': {
+            'name': 'get_weather_forecast',
+            'description': '''
+                Forecast weather API method returns, depending upon your price plan level, upto next 14 day weather
+                forecast and weather alert as json. The data is returned as a Forecast Object.
+                Forecast object contains astronomy data, day weather forecast and hourly interval weather information
+                for a given city.
+                Number of days could be less, depending on the API subscription plan.
+                With a free plan only up to three days of forecast would be returned.
+            ''',
+            'parameters': {
+                'type': 'object',
+                'properties': {
+                    'location': {
+                        'type': 'string',
+                        'description': '''
+                            Location in human readable format.
+                            e.g: "Copenhagen", or "Copenhagen, Louisiana, US", if needed specifying.
+                        '''
+                    },
+                    'days': {
+                        'type': 'integer',
+                        'description': '''
+                            Number of days of forecast between 0 and 13, where 0 is only today, 1 up to tomorrow, etc.
+                        '''
+                    },
+                },
+                'required': [
+                    'location', 'days'
+                ],
+                'additionalProperties': False
+            },
+            'strict': True
+        }
+    }
+]

reginaldCog/weather.py

@@ -0,0 +1,62 @@
+from datetime import datetime, timezone
+from os import environ
+import requests
+import json
+
+#WEATHER_API_KEY = environ.get('WEATHER_API_KEY')
+URL = 'http://api.weatherapi.com/v1'
+
+
+def time_now() -> str:
+    return str(datetime.now(timezone.utc))
+
+
+def get_current_weather(location: str) -> str:
+    weather = Weather(location=location)
+    return json.dumps(weather.realtime())
+
+
+def get_weather_forecast(location: str, days: int = None) -> str:
+    days += 1
+    days = max(1, days)
+    days = min(14, days)
+    weather = Weather(location=location)
+    return json.dumps(weather.forecast(days=days))
+
+
+class Weather:
+    def __init__(self, location: str):
+        self.__location = location
+        self.api_key = environ.get('WEATHER_API_KEY')
+
+    @property
+    def location(self) -> str:
+        return self.__location
+
+    @staticmethod
+    def make_request(method: str, params: dict) -> dict:
+        response = requests.get(url=f'{URL}{method}', params=params)
+        return response.json()
+
+    def realtime(self):
+        method = '/current.json'
+        params = {
+            'key': self.api_key,
+            'q': self.location,
+        }
+        return self.make_request(method=method, params=params)
+
+    def forecast(self, days: int = 14):
+        method = '/forecast.json'
+        params = {
+            'key': self.api_key,
+            'q': self.location,
+            'days': days,
+        }
+        return self.make_request(method=method, params=params)
+
+
+if __name__ == '__main__':
+    test_weather = Weather('Aqtobe')
+    result = json.dumps(test_weather.forecast(days=13), indent=2)
+    print(result)

trafficCog/__init__.py

@@ -1,5 +1,5 @@
-from .trafficCog import TrafficCog
 from redbot.core.bot import Red
+from .trafficCog import TrafficCog
 
 async def setup(bot: Red):
     cog = TrafficCog(bot)

trafficCog/trafficCog.py

@@ -1,119 +1,99 @@
 import discord
-from datetime import datetime
-
 from redbot.core import Config, commands
-
-allowed_guilds = {274657393936302080, 693796372092289024, 508781789737648138}
-admin_roles = {'Developer', 'admin', 'Council'}
-statsThumbnailUrl = 'https://www.kanium.org/machineroom/logomachine-small.png'
+from datetime import datetime
+import pytz
 
 class TrafficCog(commands.Cog):
-
     def __init__(self, bot):
-        self.channel: discord.TextChannel = None
-        self.dailyJoinedCount: int = 0
-        self.totalJoinedCount: int = 0
-        self.dailyLeftCount: int = 0
-        self.totalLeftCount: int = 0
-        self.totalLogs: int = 0
-        self.toggleLogs: bool = True
-        self.date = datetime.now()
+        self.bot = bot
+        self.config = Config.get_conf(self, identifier=123456789, force_registration=True)
+        default_guild = {
+            "traffic_channel": None,
+            "daily_stats": {"joined": 0, "left": 0, "banned": 0},
+            "total_stats": {"joined": 0, "left": 0, "banned": 0},
+            "last_reset": datetime.now(pytz.UTC).isoformat(),
+            "admin_roles": ['Developer', 'admin', 'Council'],
+            "stats_thumbnail_url": 'https://example.com/default-thumbnail.png',
+        }
+        self.config.register_guild(**default_guild)
 
-    def __checkClock(self):
-        currdate = self.date - datetime.now()
-        if currdate.days >= 0 :
-            self.dailyJoinedCount = 0
-            self.dailyLeftCount = 0
-            self.date = datetime.now()
+    async def _check_reset(self, guild_id):
+        async with self.config.guild_from_id(guild_id).all() as guild_data:
+            last_reset = datetime.fromisoformat(guild_data.get('last_reset', datetime.now(pytz.UTC).isoformat()))
+            if last_reset.date() < datetime.now(pytz.UTC).date():
+                guild_data['daily_stats'] = {"joined": 0, "left": 0, "banned": 0}
+                guild_data['last_reset'] = datetime.now(pytz.UTC).isoformat()
 
-    @commands.command(name='settrafficchannel', description='Sets the channel to sends log to')
-    @commands.has_any_role(*admin_roles)
-    async def setTrafficChannel(self, ctx: commands.Context, channel: discord.TextChannel) -> None:
-        await ctx.trigger_typing()
+    async def _update_stat(self, guild_id, stat_type):
+        async with self.config.guild_from_id(guild_id).all() as guild_data:
+            guild_data['daily_stats'][stat_type] += 1
+            guild_data['total_stats'][stat_type] += 1
 
-        if not channel in ctx.guild.channels:
-            await ctx.send('Channel doesnt exist in guild')
+    @commands.group(name='traffic', invoke_without_command=True)
+    @commands.has_permissions(administrator=True)
+    async def traffic_commands(self, ctx):
+        """Base command for managing TrafficCog settings."""
+        await ctx.send_help(ctx.command)
+
+    @traffic_commands.command(name='setchannel')
+    async def set_traffic_channel(self, ctx, channel: discord.TextChannel):
+        """Sets the channel for traffic logs."""
+        await self.config.guild(ctx.guild).traffic_channel.set(channel.id)
+        await ctx.send(f"Traffic logs will now be sent to {channel.mention}.")
+
+    @traffic_commands.command(name='stats')
+    async def show_stats(self, ctx):
+        """Displays current traffic statistics."""
+        await self._check_reset(ctx.guild.id)
+    
+        guild_data = await self.config.guild(ctx.guild).all()
+        daily_stats = guild_data.get('daily_stats', {"joined": 0, "left": 0, "banned": 0})
+        total_stats = guild_data.get('total_stats', {"joined": 0, "left": 0, "banned": 0})
+        thumbnail_url = guild_data.get('stats_thumbnail_url', 'https://example.com/default-thumbnail.png')
+
+        embed = discord.Embed(title="Server Traffic Stats", description="Statistics on server activity", color=0x3399ff)
+        embed.set_thumbnail(url=thumbnail_url)
+        embed.add_field(name="Daily Joined", value=daily_stats['joined'], inline=True)
+        embed.add_field(name="Daily Left", value=daily_stats['left'], inline=True)
+        embed.add_field(name="Daily Banned", value=daily_stats['banned'], inline=True)
+        embed.add_field(name="Total Joined", value=total_stats['joined'], inline=True)
+        embed.add_field(name="Total Left", value=total_stats['left'], inline=True)
+        embed.add_field(name="Total Banned", value=total_stats['banned'], inline=True)
+
+        await ctx.send(embed=embed)
+
+    @commands.Cog.listener()
+    async def on_member_join(self, member):
+        await self._check_reset(member.guild.id)
+        await self._update_stat(member.guild.id, 'joined')
+
+        channel_id = await self.config.guild(member.guild).traffic_channel()
+        if not channel_id:
             return
+        channel = member.guild.get_channel(channel_id) or await member.guild.fetch_channel(channel_id)
+        if channel:
+            await channel.send(f"{member.display_name} has joined the server.")
 
-        if not channel.permissions_for(ctx.guild.me).send_messages:
-            await ctx.send('No permissions to talk in that channel.')
+    @commands.Cog.listener()
+    async def on_member_remove(self, member):
+        await self._check_reset(member.guild.id)
+        await self._update_stat(member.guild.id, 'left')
+
+        channel_id = await self.config.guild(member.guild).traffic_channel()
+        if not channel_id:
             return
-
-        self.channel = channel
-
-        await ctx.send(f'I will now send event notices to {channel.mention}.')
-
-    @commands.command(name='stats', description='Shows current statistics')
-    @commands.has_any_role(*admin_roles)
-    async def statistics(self, ctx: commands.Context) -> None:
-        self.__checkClock()
-        await ctx.trigger_typing()
-        message = discord.Embed(title='Server Traffic Stats', description='Statistics on server activity\n\n',color=0x3399ff)
-        message.set_thumbnail(url=statsThumbnailUrl)
-        message.add_field(name='Daily Joined', value=self.dailyJoinedCount, inline='True')
-        message.add_field(name='Daily Left', value='{0}\n'.format(self.dailyLeftCount), inline='True')
-        message.add_field(name='Total Traffic', value=self.totalLogs, inline='False')
-        message.add_field(name='Total Joined', value=self.totalJoinedCount, inline='True')
-        message.add_field(name='Total Left', value=self.totalLeftCount, inline='True')
-        await ctx.send(content=None, embed=message)
-
-    @commands.command(name='resetstats', description='Resets statistics')
-    @commands.has_any_role(*admin_roles)
-    async def resetStatistics(self, ctx: commands.Context) -> None:
-        await ctx.trigger_typing()
-
-        self.dailyJoinedCount = 0
-        self.dailyLeftCount = 0
-        self.totalJoinedCount = 0
-        self.totalLeftCount = 0
-        self.totalLogs = 0
-
-        await ctx.send('Successfully reset the statistics')
-
-    @commands.command(name='toggleLogs', description='Toggles the logs functionality on or off')
-    @commands.has_any_role(*admin_roles)
-    async def toggleLogs(self, ctx: commands.Context) -> None:
-        await ctx.trigger_typing()
-        self.toggleLogs = not self.toggleLogs
-        await ctx.send('Logging functionality is `ON`' if self.toggleLogs else 'Logging functionality is `OFF`')
+        channel = member.guild.get_channel(channel_id) or await member.guild.fetch_channel(channel_id)
+        if channel:
+            await channel.send(f"{member.display_name} has left the server.")
 
     @commands.Cog.listener()
-    async def on_member_join(self, member: discord.Member) -> None:
-        try:
-            if member.guild.id not in allowed_guilds:
-                return
-            self.__checkClock()
-            if self.channel in member.guild.channels and self.toggleLogs:
-                await self.channel.send('{0} has joined the server'.format(member.name))
-            self.totalJoinedCount += 1
-            self.dailyJoinedCount += 1
-            self.totalLogs += 1
-        except (discord.NotFound, discord.Forbidden):
-            print(
-                f'Error Occured!')
+    async def on_member_ban(self, guild, member):
+        await self._check_reset(guild.id)
+        await self._update_stat(guild.id, 'banned')
 
-    @commands.Cog.listener()
-    async def on_member_remove(self, member: discord.Member) -> None:
-        try:
-            self.__checkClock()
-            if self.channel in member.guild.channels and self.toggleLogs:
-                await self.channel.send('{0} has left the server'.format(member.name))
-            self.totalLeftCount += 1
-            self.dailyLeftCount += 1
-            self.totalLogs += 1
-        except (discord.NotFound, discord.Forbidden):
-            print(
-                f'Error Occured!')
-
-    @commands.Cog.listener()
-    async def on_member_ban(self, guild: discord.Guild, member: discord.Member) -> None:
-        try:
-            self.__checkClock()
-            if self.channel in member.guild.channels and self.toggleLogs:
-                await self.channel.send('{0} has been banned from the server'.format(member.name))
-            self.totalLeftCount += 1
-            self.dailyLeftCount += 1
-            self.totalLogs += 1
-        except (discord.NotFound, discord.Forbidden):
-            print(
-                f'Error Occured!')
+        channel_id = await self.config.guild(guild).traffic_channel()
+        if not channel_id:
+            return
+        channel = guild.get_channel(channel_id) or await guild.fetch_channel(channel_id)
+        if channel:
+            await channel.send(f"{member.display_name} has been banned from the server.")