Update async io to connect the bot

app.py

@@ -3,6 +3,7 @@ import discord
 import time
 from fastapi import FastAPI
 import uvicorn
+import asyncio
 from threading import Thread
 from discord import app_commands, ui
 # 导入数据库基础类
@@ -15,28 +16,28 @@ from material import (
     delete_material_logic, 
     list_materials_logic
 )
+
 # 初始化数据库管理器
-# 假设你已经设置了环境变量 MONGO_URL
 db_manager = MongoManager(os.getenv("MONGO_URL"), "tonyd")
 
 # 身份组权限列表
 mod = [1357078628969746462, 1357079285113819146, 1436537252317626449, 1357079707539214417, 1357079889160835183]
 
-# --- 1. Flask 保活 ---
+# --- 1. FastAPI 保活 ---
 app = FastAPI()
 @app.get('/')
 def home(): return {"Stauts": "Alive"}
 
 def run_flask():
+    # Hugging Face 默认使用 7860 端口
     port = int(os.environ.get('PORT', 7860))
     uvicorn.run(app, host='0.0.0.0', port=port)
 
-# --- 2. 辅助函数：处理多个 Role Ping ---
+# --- 2. 辅助函数 ---
 def format_pings(role_input: str):
     pass
 
 # --- 3. Modal 表单定义 ---
-
 class AnnounceModal(ui.Modal):
     def __init__(self, channel: discord.TextChannel, ping_roles_str: str = None):
         super().__init__(title="New Announcement")
@@ -47,21 +48,15 @@ class AnnounceModal(ui.Modal):
     announcement_body = ui.TextInput(label="Body", placeholder="Enter message...", style=discord.TextStyle.long)
 
     async def on_submit(self, interaction: discord.Interaction):
-        # 准备正文
         content = self.announcement_body.value
         pings = self.ping_roles_str
-        
-        # 按照你的要求：Ping 放在文本最下面，但是在 --- 上面
-        if pings:
-            pass
+        if pings: pass
         
         embed = discord.Embed(
             title=self.announcement_title.value,
             description=content,
             color=discord.Color.blue()
         )
-        
-        # Footer 只留发送人和时间
         footer = f"\n\n||{pings}||\n\n---\n**Sent by:** ||{interaction.user.mention}||\n**Time:** <t:{int(time.time())}:f>"
         embed.description += footer
 
@@ -75,7 +70,6 @@ class EditAnnounceModal(ui.Modal):
         self.new_ping_roles_str = new_ping_roles_str
         
         old_title = message.embeds[0].title if message.embeds else ""
-        # 裁掉旧的 Footer 
         old_body = message.embeds[0].description.split("\n\n---")[0] if message.embeds else ""
 
         self.edit_title = ui.TextInput(label="Title", default=old_title, style=discord.TextStyle.short)
@@ -87,21 +81,18 @@ class EditAnnounceModal(ui.Modal):
     async def on_submit(self, interaction: discord.Interaction):
         content = self.edit_body.value
         pings = self.new_ping_roles_str
-        
-        if pings:
-            pass
+        if pings: pass
 
         new_embed = discord.Embed(
             title=self.edit_title.value,
             description=content,
             color=discord.Color.blue()
         )
-        
         footer = f"\n\n||{pings}||\n\n---\n**Edited by:** ||{interaction.user.mention}||\n**Time:** <t:{int(time.time())}:f>"
         new_embed.description += footer
 
         await self.message.edit(embed=new_embed)
-        await interaction.response.send_message(f"✅ Updated announcement {message.id} !", ephemeral=False)
+        await interaction.response.send_message(f"✅ Updated announcement {self.message.id} !", ephemeral=False)
 
 # --- 4. 机器人主体 ---
 class MyBot(discord.Client):
@@ -114,16 +105,10 @@ class MyBot(discord.Client):
         print(f"✅ Slash commands synced")
 
 client = MyBot()
-# 如果你使用的是 client.tree，请确保将 db_manager 挂载到 client 上
-# 这样在指令内部可以通过 interaction.client.db 访问
 client.db = db_manager 
-# --- 5. 指令定义 ---
 
+# --- 5. 指令定义 ---
 @client.tree.command(name="announce", description="Post announcement")
-@app_commands.describe(
-    channel="Target channel", 
-    role_ids="Input Role Pings"
-)
 async def announce(interaction: discord.Interaction, channel: discord.TextChannel, role_ids: str = None):
     if not any(role.id in mod for role in interaction.user.roles):
         await interaction.response.send_message("❌ **Access Denied**", ephemeral=True)
@@ -131,145 +116,108 @@ async def announce(interaction: discord.Interaction, channel: discord.TextChanne
     await interaction.response.send_modal(AnnounceModal(channel, role_ids))
 
 @client.tree.command(name="announce_edit", description="Edit announcement")
-@app_commands.describe(
-    channel="The channel", 
-    message_id="The ID of the message", 
-    new_role_ids="New Role Pings to add to the bottom"
-)
 async def announce_edit(interaction: discord.Interaction, channel: discord.TextChannel, message_id: str, new_role_ids: str = None):
     if not any(role.id in mod for role in interaction.user.roles):
         await interaction.response.send_message("❌ **Access Denied**", ephemeral=True)
         return
-
     try:
         message = await channel.fetch_message(int(message_id))
         await interaction.response.send_modal(EditAnnounceModal(message, new_role_ids))
     except Exception as e:
         await interaction.response.send_message(f"❌ Error: {e}", ephemeral=False)
 
-@client.tree.command(name="wismer_commands", description="Show all avaliable commands for Wismer Bot")
+@client.tree.command(name="wismer_commands", description="Show all avaliable commands")
 async def wismer_commands(interaction: discord.Interaction):
     await interaction.response.send_message(
         '''**Avaliable Commands**:
-        `/announce`: Post an announcement in selected channel. Only Moderator+ can use it.
-        `/announce_edit`: Edit an announcement that sent by Wismer Bot. Only Moderator+ can use it.
+        `/announce`: Post an announcement.
+        `/announce_edit`: Edit an announcement.
         `/mats`: Show all materials.
         `/uploadmat`: Upload a material.''',
         ephemeral=False
     )
 
+ADMIN_LOG_CHANNEL_ID = 1468391869686878455 
 
-
-ADMIN_LOG_CHANNEL_ID = 1468391869686878455  # Replace with your Admin/Staff channel ID
-
-# --- 1. Upload Material ---
-# --- 1. Upload Material ---
-@client.tree.command(name="uploadmat", description="Upload a study link (Requires Approval)")
-@app_commands.describe(category="Subject", title="Resource Title", url="Resource Link")
+@client.tree.command(name="uploadmat", description="Upload a study link")
 @app_commands.choices(category=[app_commands.Choice(name=c, value=c) for c in CATEGORIES])
 async def uploadmat(interaction: discord.Interaction, category: str, title: str, url: str):
-    # 改为 ephemeral=True，因为你的反馈消息是发给个人看的
     await interaction.response.defer(ephemeral=True)
-    
     if not url.startswith(("http://", "https://")):
-        return await interaction.followup.send("❌ Invalid URL! Must start with http or https.", ephemeral=True)
-
+        return await interaction.followup.send("❌ Invalid URL!", ephemeral=True)
     try:
-        # 执行逻辑
         new_id = await upload_material_logic(client.db, category, title, url, interaction.user.id)
-        
-        # 1. Feedback to User (保持和 defer 一致的 ephemeral)
-        await interaction.followup.send(
-            f"✅ Submitted! **{category}** ID: `#{new_id}`. Please wait for Moderator approval.", 
-            ephemeral=True
-        )
-
-        # 2. Alert to Staff Channel (这是发送到频道，不涉及交互反馈)
+        await interaction.followup.send(f"✅ Submitted! ID: `#{new_id}`.", ephemeral=True)
         log_channel = client.get_channel(ADMIN_LOG_CHANNEL_ID)
         if log_channel:
-            embed = discord.Embed(title="🔔 New Material Pending Approval", color=discord.Color.orange())
+            embed = discord.Embed(title="🔔 New Material Pending", color=discord.Color.orange())
             embed.add_field(name="Subject", value=category, inline=True)
             embed.add_field(name="Index ID", value=f"`#{new_id}`", inline=True)
-            embed.add_field(name="Title", value=title, inline=False)
-            embed.add_field(name="URL", value=url, inline=False)
-            embed.add_field(name="Uploader", value=interaction.user.mention, inline=False)
-            embed.set_footer(text="Use /approvemat to authorize this link.")
             await log_channel.send(embed=embed)
-            
     except Exception as e:
-        print(f"Error in uploadmat: {e}")
-        # 如果报错了也给用户一个反馈，防止他们因为没反应而狂点
-        try:
-            await interaction.followup.send(f"❌ An error occurred: {e}", ephemeral=True)
-        except:
-            pass
-        
-# --- 2. Approve Material ---
-@client.tree.command(name="approvemat", description="[Mod Only] Approve a pending material")
+        await interaction.followup.send(f"❌ Error: {e}", ephemeral=True)
+
+@client.tree.command(name="approvemat", description="[Mod Only] Approve material")
 @app_commands.choices(category=[app_commands.Choice(name=c, value=c) for c in CATEGORIES])
 async def approvemat(interaction: discord.Interaction, category: str, index_id: str):
     await interaction.response.defer(ephemeral=False)
-    # Changed MOD_ROLES to mod
     if not any(role.id in mod for role in interaction.user.roles):
-        return await interaction.followup.send("❌ Access Denied: Staff Only", ephemeral=True)
-
+        return await interaction.followup.send("❌ Access Denied", ephemeral=True)
     await approve_material_logic(client.db, category, index_id)
-    await interaction.followup.send(
-        f"✅ Approved **{category}** `#{index_id}`. It is now visible to everyone.", 
-        ephemeral=False
-    )
+    await interaction.followup.send(f"✅ Approved **{category}** `#{index_id}`.")
 
-# --- 3. Delete Material ---
-@client.tree.command(name="deletemat", description="[Mod Only] Delete a material")
+@client.tree.command(name="deletemat", description="[Mod Only] Delete material")
 @app_commands.choices(category=[app_commands.Choice(name=c, value=c) for c in CATEGORIES])
 async def deletemat(interaction: discord.Interaction, category: str, index_id: str):
-    # Changed MOD_ROLES to mod
     await interaction.response.defer(ephemeral=False)
     if not any(role.id in mod for role in interaction.user.roles):
-        return await interaction.followup.send("❌ Access Denied: Staff Only", ephemeral=True)
-
+        return await interaction.followup.send("❌ Access Denied", ephemeral=True)
     await delete_material_logic(client.db, category, index_id)
-    await interaction.followup.send(
-        f"🗑️ Deleted ID `#{index_id}` from **{category}**.", 
-        ephemeral=False
-    )
+    await interaction.followup.send(f"🗑️ Deleted ID `#{index_id}`.")
 
-# --- 4. List Approved Materials ---
-@client.tree.command(name="mats", description="View approved study materials")
+@client.tree.command(name="mats", description="View approved materials")
 @app_commands.choices(category=[app_commands.Choice(name=c, value=c) for c in CATEGORIES])
 async def mats(interaction: discord.Interaction, category: str):
     await interaction.response.defer(ephemeral=False)
     materials = await list_materials_logic(client.db, category, status="approved")
     if not materials:
-        return await interaction.followup.send(f"📭 No approved materials found in **{category}**.", ephemeral=True)
-
+        return await interaction.followup.send(f"📭 No materials in **{category}**.")
     list_text = "\n".join([f"`#{m['_id']}` [{m['title']}]({m['url']})" for m in materials])
-    embed = discord.Embed(title=f"📚 {category} Resource Directory", description=list_text, color=discord.Color.blue())
+    embed = discord.Embed(title=f"📚 {category}", description=list_text, color=discord.Color.blue())
     await interaction.followup.send(embed=embed)
 
-# --- 5. List Pending Materials ---
-@client.tree.command(name="unappmats", description="[Mod Only] View pending materials")
+@client.tree.command(name="unappmats", description="[Mod Only] View pending")
 @app_commands.choices(category=[app_commands.Choice(name=c, value=c) for c in CATEGORIES])
 async def unappmats(interaction: discord.Interaction, category: str):
-    # Changed MOD_ROLES to mod
     await interaction.response.defer(ephemeral=False)
     if not any(role.id in mod for role in interaction.user.roles):
-        return await interaction.followup.send("❌ Access Denied: Staff Only", ephemeral=True)
-
+        return await interaction.followup.send("❌ Access Denied", ephemeral=True)
     materials = await list_materials_logic(client.db, category, status="pending")
     if not materials:
-        return await interaction.followup.send(f"✅ No pending items in **{category}**.", ephemeral=True)
-
+        return await interaction.followup.send(f"✅ No pending items.")
     list_text = "\n".join([f"`#{m['_id']}` **{m['title']}**\n🔗 {m['url']}" for m in materials])
-    embed = discord.Embed(title=f"⏳ {category} Pending List", description=list_text, color=discord.Color.orange())
+    embed = discord.Embed(title=f"⏳ {category} Pending", description=list_text, color=discord.Color.orange())
     await interaction.followup.send(embed=embed)
 
+# --- 6. 启动逻辑 ---
+async def start_bot():
+    token = os.getenv('DISCORD_TOKEN')
+    while True:
+        try:
+            print("正在尝试连接 Discord...")
+            await client.start(token)
+        except Exception as e:
+            print(f"❌ 连接失败: {e}，15秒后重试...")
+            await asyncio.sleep(15)
 
-
-# --- 启动 ---
 if __name__ == "__main__":
+    # 启动 Web 保活
     t = Thread(target=run_flask)
     t.daemon = True
     t.start()
-    token = os.getenv('DISCORD_TOKEN')
-    client.run(token)
+    
+    # 启动机器人异步循环
+    try:
+        asyncio.run(start_bot())
+    except KeyboardInterrupt:
+        pass