Merge pull request #17 from pictures2333/master

fix some bug of ctf channel join button and show more information in /ctf_menu

Author: UmmItKin

.env.example

@@ -3,7 +3,8 @@ DISCORD_BOT_TOKEN=your_discord_bot_token_here
 
 # CTF Tracking Configuration
 CHECK_INTERVAL_MINUTES=30
-ANNOUNCEMENT_CHANNEL_NAME=your_channel_name_here
+ANNOUNCEMENT_CHANNEL_ID=your_channel_id_here
+CTF_CHANNEL_CATETORY_ID=your_category_id_here
 
 # Misc
 TIMEZONE="Asia/Taipei"

README.md

@@ -74,7 +74,9 @@ Then edit the `.env` file with your specific settings. Focus on these key variab
 |----------|-------------|---------|
 | `DISCORD_BOT_TOKEN` | Your Discord bot token | `MTIzNDU2Nzg5...` |
 | `CHECK_INTERVAL_MINUTES` | How often to check for new CTFs | `30` (default) |
-| `ANNOUNCEMENT_CHANNEL_ID` | Channel name for announcements | `ctf-announcements` |
+| `ANNOUNCEMENT_CHANNEL_ID` | Channel id for announcements | `911612541829009418` |
+| `CTF_CHANNEL_CATETORY_ID` | Category id for CTF event channel creations | `1454642939559940329` |
+| `TIMEZONE` | time zone for displaying | `Asia/Taipei` (default) |
 
 *Other configuration options can remain at their default values.*
 
@@ -119,4 +121,4 @@ Once running, the bot will:
 
 1. Automatically check CTFtime.org for new CTF events
 2. Post announcements in your designated Discord channel
-3. Use `data/known_events.json` to track announced events and avoid duplicates
+3. Use `data/database.db` to track announced events, avoid duplicates, record CTF event channel, and more.

pyproject.toml

@@ -14,6 +14,8 @@ dependencies = [
     "sqlalchemy>=2.0.45",
     "aiosqlite>=0.22.1",
     "pydantic-settings>=2.12.0",
+    "fastapi>=0.128.0",
+    "uvicorn>=0.40.0",
 ]
 
 [dependency-groups]

setup_env.sh

@@ -112,10 +112,23 @@ fi
 echo ""
 echo "Announcement Channel ID:"
 echo "   The Discord channel where CTF announcements will be posted"
-echo "   The channel name that on your server"
+echo "   The channel id that on your server"
 while true; do
-    read -p "   Paste your Discord Channel Name: " ANNOUNCEMENT_CHANNEL_NAME
-    if [ -n "$ANNOUNCEMENT_CHANNEL_NAME" ]; then
+    read -p "   Paste your Discord Channel ID: " ANNOUNCEMENT_CHANNEL_ID
+    if [ -n "$ANNOUNCEMENT_CHANNEL_ID" ]; then
+        break
+    else
+        echo "   Error: Discord Channel Name cannot be empty. Please try again."
+    fi
+done
+
+echo ""
+echo "CTF Channel Category ID:"
+echo "   The Discord category where CTF channels will be created"
+echo "   The category id that on your server"
+while true; do
+    read -p "   Paste your Discord Category ID: " CTF_CHANNEL_CATETORY_ID
+    if [ -n "$CTF_CHANNEL_CATETORY_ID" ]; then
         break
     else
         echo "   Error: Discord Channel Name cannot be empty. Please try again."
@@ -135,7 +148,8 @@ 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_NAME"
+echo "   Announcement Channel ID: $ANNOUNCEMENT_CHANNEL_ID"
+echo "   CTF Channel Category ID: $CTF_CHANNEL_CATETORY_ID"
 echo "   Time Zone: $TIMEZONE"
 echo ""
 
@@ -166,7 +180,8 @@ DISCORD_BOT_TOKEN=$DISCORD_BOT_TOKEN
 
 # CTF Tracking Configuration
 CHECK_INTERVAL_MINUTES=$CHECK_INTERVAL_MINUTES
-ANNOUNCEMENT_CHANNEL_NAME=$ANNOUNCEMENT_CHANNEL_NAME
+ANNOUNCEMENT_CHANNEL_ID=$ANNOUNCEMENT_CHANNEL_ID
+CTF_CHANNEL_CATETORY_ID=$CTF_CHANNEL_CATETORY_ID
 
 # Misc
 TIMEZONE="$TIMEZONE"

src/cogs/bgtask_interactions.py

@@ -18,21 +18,13 @@
 
 # utils
 async def get_announcement_channel(bot:commands.Bot) -> discord.TextChannel:
-    channel_name = settings.ANNOUNCEMENT_CHANNEL_NAME
-    
-    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
+    channel_id = settings.ANNOUNCEMENT_CHANNEL_ID
+    channel = bot.get_channel(channel_id)
 
     if not channel:
-        logger.error(f"Can't find channel named '{channel_name}'")
+        logger.error(f"Can't find channel id={channel_id}")
         logger.error(f"Please check:")
-        logger.error(f"1. Channel name is correct: {channel_name}")
+        logger.error(f"1. Channel ID is correct: {channel_id}")
         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()
@@ -85,6 +77,7 @@ async def task_checks(self):
                 await crud.create_event(session, new_events_db)
 
             for event in new_events_ctftime:
+                event_id = event["id"]
                 embed = await create_event_embed(event, "有新的 CTF 競賽！")
 
                 view = discord.ui.View(timeout=None)

src/cogs/ctf.py

@@ -112,11 +112,11 @@ async def callback(self, interaction: discord.Interaction):
         channel_name = self.children[0].value
 
         # find category
-        category_name = "Incoming/Running CTF"
+        category_id = settings.CTF_CHANNEL_CATETORY_ID
         guild = interaction.guild
-        category = discord.utils.get(interaction.guild.categories, name=category_name)
+        category = discord.utils.get(interaction.guild.categories, id=category_id)
         if category is None:
-            await interaction.followup.send(content=f"Category '{category_name}' not found.", ephemeral=True)
+            await interaction.followup.send(content=f"Category id={category_id} not found", ephemeral=True)
             return
 
         # create channel
@@ -205,17 +205,26 @@ async def ctf_menu(self, ctx:discord.ApplicationContext):
             known_events:List[Event] = await crud.read_event(session)
 
         # embed
+        time_now = datetime.now().timestamp()
+        
         embed = discord.Embed(
             title=f"{settings.EMOJI} CTF events tracked",
             color=discord.Color.green()
         )
         for event in known_events:
+            mark = ""
+            if not(event.channel_id is None):
+                mark += "[⭐️]"
+            if event.start <= time_now and event.finish >= time_now:
+                mark += "[🏃]"
+            
             embed.add_field(
-                name=f"[id={event.event_id}] {event.title}",
+                name=f"{mark}[id={event.event_id}] {event.title}",
                 value=f"start at {datetime.fromtimestamp(event.start).astimezone(ZoneInfo(settings.TIMEZONE))}\n\
                 finish at {datetime.fromtimestamp(event.finish).astimezone(ZoneInfo(settings.TIMEZONE))}",
                 inline=False
             )
+        embed.set_footer(text="[🏃] running ctf\n[⭐️] channel created")
 
         await ctx.response.send_message(embed=embed, view=CTFMenuView(self.bot), ephemeral=True)
 

src/config.py

@@ -7,17 +7,14 @@ class Settings(BaseSettings):
     # CTFTime tracking configuration
     CTFTIME_API_URL:str="https://ctftime.org/api/v1/events/"
     TEAM_API_URL:str="https://ctftime.org/api/v1/teams/"
-    CTFTIME_SEARCH_DAYS:int=+90
     DATABASE_SEARCH_DAYS:int=-90 # known events: finish > now_day+(-90)
-    ANNOUNCEMENT_CHANNEL_NAME:str
+    ANNOUNCEMENT_CHANNEL_ID:int
+    CTF_CHANNEL_CATETORY_ID:int
     CHECK_INTERVAL_MINUTES:int
 
     # Database configuration
     DATABASE_URL:str="sqlite+aiosqlite:///data/database.db"
 
-    # Notification (todo)
-    #NOTIFY_BEFORE_EVENT:int = 1 * 24 * 60 * 60
-    
     # Misc
     TIMEZONE:str
     EMOJI:str="🚩"

src/utils/ctf_api.py

@@ -12,7 +12,7 @@ async def fetch_ctf_events(event_id:Optional[int]=None) -> List[Dict[str, Any]]:
     params = {
         "limit": 20,
         "start": int(datetime.now().timestamp()),
-        "finish": int((datetime.now() + timedelta(days=settings.CTFTIME_SEARCH_DAYS)).timestamp()),
+        #"finish": int((datetime.now() + timedelta(days=settings.CTFTIME_SEARCH_DAYS)).timestamp()),
     }
 
     url = settings.CTFTIME_API_URL

src/utils/join_channel.py

@@ -9,6 +9,7 @@
 from src import crud
 from src.utils.ctf_api import fetch_ctf_events
 from src.utils.embed_creator import create_event_embed
+from src.config import settings
 
 logger = logging.getLogger(__name__)
 
@@ -59,11 +60,11 @@ async def join_channel(
             event_api:Event = events_api[0]
 
             # create channel
-            category_name = "Incoming/Running CTF"
+            category_id = settings.CTF_CHANNEL_CATETORY_ID
             guild = interaction.guild
-            category = discord.utils.get(interaction.guild.categories, name=category_name)
+            category = discord.utils.get(interaction.guild.categories, id=category_id)
             if category is None:
-                await interaction.followup.send(content=f"Category '{category_name}' not found.", ephemeral=True)
+                await interaction.followup.send(content=f"Category id={category_id} not found", ephemeral=True)
                 return
 
             overwrites = {