Merge pull request #16 from pictures2333/master

feat: rewrite ctf events detection, notification and ctf channel creation

Author: UmmItKin

.env.example

@@ -3,7 +3,7 @@ DISCORD_BOT_TOKEN=your_discord_bot_token_here
 
 # CTF Tracking Configuration
 CHECK_INTERVAL_MINUTES=30
-ANNOUNCEMENT_CHANNEL_ID=your_channel_id_here
+ANNOUNCEMENT_CHANNEL_NAME=your_channel_name_here
 
-# CTFtime API Configuration
-CTFTIME_API_BASE_URL=https://ctftime.org/api/v1 
+# Misc
+TIMEZONE="Asia/Taipei"

ctfeed.py

@@ -1,20 +1,26 @@
 #!/usr/bin/env python3
 
-import discord
-from discord import embeds
-from discord.ext import tasks, commands
 import logging
-import os
+import asyncio
+import glob
+import pathlib
+
+import discord
+from discord.ext import commands
 
-from src.config import DISCORD_BOT_TOKEN, ANNOUNCEMENT_CHANNEL_ID, CHECK_INTERVAL
-from src.data_manager import load_known_events, save_known_events
-from src.ctf_api import fetch_ctf_events
-from src.embed_creator import create_event_embed
+from src.config import settings
+from src.database.database import init_db
 
-logging.basicConfig(level=logging.INFO)
+# logging
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s | %(levelname)s | %(name)s | %(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+)
 logging.getLogger("discord.client").setLevel(logging.ERROR)
 logger = logging.getLogger(__name__)
 
+# bot
 intents = discord.Intents.default()
 intents.members = True
 intents.guilds = True
@@ -23,142 +29,36 @@
 
 bot = commands.Bot(intents=intents)
 
-known_events = load_known_events()
-
-emoji = "🚩"
-
 @bot.event
 async def on_ready():
     logger.info(f"Bot logged in: {bot.user}")
-    if known_events:
-        logger.info(
-            f"Loading data/known_events.json for {len(known_events)} known competitions"
-        )
-    else:
-        logger.info(
-            "No known competitions found, creating new file data/known_events.json"
-        )
-        save_known_events(set())
-    check_new_events.start()
-
-
-@tasks.loop(minutes=CHECK_INTERVAL)
-async def check_new_events():
-    global known_events
-
-    events = await fetch_ctf_events()
-
-    channel_name = ANNOUNCEMENT_CHANNEL_ID
-    if not channel_name:
-        logger.error("Please set ANNOUNCEMENT_CHANNEL_ID in .env file")
-        logger.error("For example: ANNOUNCEMENT_CHANNEL_ID=ctftime")
-        logger.error("Please check if the .env file is correctly set")
-        await bot.close()
-        return
-
-    channel = None
-    for guild in bot.guilds:
-        for text_channel in guild.text_channels:
-            if text_channel.name.lower() == channel_name.lower():
-                channel = text_channel
-                break
-        if channel:
-            break
-
-    if not channel:
-        logger.error(f"Can't find channel named '{channel_name}'")
-        logger.error(f"Please check:")
-        logger.error(f"1. Channel name is correct: {channel_name}")
-        logger.error(f"2. Bot has permission to view the channel")
-        logger.error(f"3. The channel exists in the server where the Bot is located")
-        await bot.close()
-        return
-
-    new_events_found = False
-    for event in events:
-        event_id = event["id"]
-        if event_id not in known_events:
-            known_events.add(event_id)
-            new_events_found = True
-
-            embed = await create_event_embed(event)
-            try:
-                await channel.send(embed=embed)
-                logger.info(f"Sent new event notification: {event['title']}")
-            except Exception as e:
-                logger.error(f"Failed to send notification: {e}")
 
-    if new_events_found:
-        save_known_events(known_events)
 
+async def main():
+    # setup
+    
+    # initializing database    
+    logger.info("Initializing database...")
+    await init_db()
+    
+    # start
+    logger.info(f"Starting CTF Bot...")
+    async with bot:
+        await bot.start(settings.DISCORD_BOT_TOKEN)
 
-@check_new_events.before_loop
-async def before_check():
-    await bot.wait_until_ready()
-
-
-def main():
-    if not DISCORD_BOT_TOKEN:
-        print("Please set DISCORD_BOT_TOKEN in .env file")
-        exit(1)
-
-    print("Start CTF Bot...")
-    bot.run(DISCORD_BOT_TOKEN)
-
-
-@bot.slash_command(name = "create_ctf_channel", description = "Create a CTF channel in the CTF category")
-async def create_CTF_channel(ctx, channel_name:str):
-    category_name = "Incoming/Running CTF"
-    guild = ctx.guild
-    category = discord.utils.get(ctx.guild.categories, name=category_name)
-
-    if category is None:
-        await ctx.send(f"Category '{category_name}' not found.")
-        return
-
-    overwrites = {
-        guild.default_role: discord.PermissionOverwrite(view_channel=False),
-        ctx.author: discord.PermissionOverwrite(view_channel=True),
-        guild.me: discord.PermissionOverwrite(view_channel=True)
-    }
-
-    try:
-        new_channel = await guild.create_text_channel(channel_name, category=category, overwrites=overwrites)
-        msg = await new_channel.send(
-            embed = discord.Embed(
-                title=f"{ctx.author.display_name} 發起了 {channel_name}！",
-            )
-        )
-
-        public_msg = await ctx.send(
-            embed = discord.Embed(
-                title=f"新CTF頻道創建{channel_name}",
-                description=f"加入請按下面的Emoji{emoji}"
-            )
-        )
-
-        await public_msg.add_reaction(emoji)
-        bot.ctf_join_message_id = public_msg.id
-        bot.ctf_channel = new_channel
-    except Exception as e:
-        await ctx.send(f"Failed to create channel: {e}")
-
-@bot.event
-async def on_raw_reaction_add(payload):
-    if payload.message_id != getattr(bot, "ctf_join_message_id", None):
-        return
-
-    if str(payload.emoji) != emoji:
-        return
 
-    guild = bot.get_guild(payload.guild_id)
-    member = guild.get_member(payload.user_id)
-    if member.bot:
-        return
+# cogs
+def load_cogs():
+    for filename in glob.glob("./src/cogs/*.py"):
+        name = pathlib.Path(filename).name.split(".")[0]
+        extension_name = f"src.cogs.{name}"
+        try:
+            bot.load_extension(extension_name)
+            logger.info(f"{extension_name} loaded")
+        except Exception as e:
+            logger.error(f"failed to load {extension_name}: {str(e)}")
 
-    channel = bot.ctf_channel
-    await channel.set_permissions(member, view_channel=True)
-    print(f"{member} 已加入 {channel.name}")
 
 if __name__ == "__main__":
-    main()
+    load_cogs()
+    asyncio.run(main())

pyproject.toml

@@ -11,6 +11,9 @@ dependencies = [
     "asyncio-throttle>=1.0.2",
     "pytz>=2023.3",
     "audioop-lts>=0.2.2",
+    "sqlalchemy>=2.0.45",
+    "aiosqlite>=0.22.1",
+    "pydantic-settings>=2.12.0",
 ]
 
 [dependency-groups]

setup_env.sh

@@ -114,19 +114,29 @@ echo "Announcement Channel ID:"
 echo "   The Discord channel where CTF announcements will be posted"
 echo "   The channel name that on your server"
 while true; do
-    read -p "   Paste your Discord Channel Name: " ANNOUNCEMENT_CHANNEL_ID
-    if [ -n "$ANNOUNCEMENT_CHANNEL_ID" ]; then
+    read -p "   Paste your Discord Channel Name: " ANNOUNCEMENT_CHANNEL_NAME
+    if [ -n "$ANNOUNCEMENT_CHANNEL_NAME" ]; then
         break
     else
         echo "   Error: Discord Channel Name cannot be empty. Please try again."
     fi
 done
 
+echo ""
+echo "Time zone:"
+echo "   The display time zone"
+echo "   Default is Asia/Taipei"
+read -p "   Enter time zone (press Enter for default Asia/Taipei): " TIMEZONE
+if [ -z "$TIMEZONE" ]; then
+    TIMEZONE="Asia/Taipei"
+fi
+
 echo ""
 echo "Please review your configuration:"
 echo "   Discord Bot Token: ${DISCORD_BOT_TOKEN:0:30}********** (hidden)"
 echo "   Check Interval: $CHECK_INTERVAL_MINUTES minutes"
-echo "   Announcement Channel Name: $ANNOUNCEMENT_CHANNEL_ID"
+echo "   Announcement Channel Name: $ANNOUNCEMENT_CHANNEL_NAME"
+echo "   Time Zone: $TIMEZONE"
 echo ""
 
 while true; do
@@ -156,10 +166,10 @@ DISCORD_BOT_TOKEN=$DISCORD_BOT_TOKEN
 
 # CTF Tracking Configuration
 CHECK_INTERVAL_MINUTES=$CHECK_INTERVAL_MINUTES
-ANNOUNCEMENT_CHANNEL_ID=$ANNOUNCEMENT_CHANNEL_ID
+ANNOUNCEMENT_CHANNEL_NAME=$ANNOUNCEMENT_CHANNEL_NAME
 
-# CTFtime API Configuration
-CTFTIME_API_BASE_URL=https://ctftime.org/api/v1
+# Misc
+TIMEZONE="$TIMEZONE"
 EOF
 
 echo -e "${GREEN}✓ Configuration complete! .env file created successfully.${NC}"