Update main.py

main.py

@@ -2,42 +2,70 @@ import discord
 from discord.ext import commands, tasks
 import os
 import asyncio
-from datetime import datetime
+import threading
 import logging
+from datetime import datetime
+from flask import Flask
+import requests
 
-# Setup logging
+# ==================== LOGGING ====================
 logging.basicConfig(
     level=logging.INFO,
     format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
 )
 logger = logging.getLogger('discord_bot')
 
-# Bot configuration
+# ==================== FLASK WEB SERVER ====================
+app = Flask(__name__)
+
+@app.route('/')
+def home():
+    return {
+        "status": "online",
+        "bot": bot.user.name if bot.is_ready() else "starting",
+        "servers": len(bot.guilds) if bot.is_ready() else 0,
+        "timestamp": datetime.now().isoformat()
+    }
+
+@app.route('/health')
+def health():
+    return {"status": "healthy", "bot_ready": bot.is_ready()}
+
+def run_flask():
+    port = int(os.environ.get("PORT", 7860))
+    app.run(host='0.0.0.0', port=port, debug=False, use_reloader=False)
+
+# ==================== BOT CONFIGURATION ====================
 TOKEN = os.getenv('DISCORD_TOKEN')
 if not TOKEN:
+    logger.error("❌ DISCORD_TOKEN not found in environment variables!")
     raise ValueError("DISCORD_TOKEN environment variable is required!")
 
-# Bot intents
+# Bot intents - ALL REQUIRED INTENTS MUST BE ENABLED IN DEVELOPER PORTAL
 intents = discord.Intents.default()
-intents.message_content = True  # Required for reading message content
+intents.message_content = True
 intents.members = True
 intents.presences = True
+intents.guilds = True
+intents.messages = True
+intents.reactions = True
 
-# Create bot instance
 bot = commands.Bot(
     command_prefix='!',
     intents=intents,
-    help_command=None,  # Custom help command
+    help_command=None,
     case_insensitive=True
 )
 
-# Event: Bot ready
+# Uptime tracking
+start_time = datetime.now()
+
+# ==================== EVENTS ====================
 @bot.event
 async def on_ready():
     logger.info(f'✅ Bot logged in as {bot.user.name} ({bot.user.id})')
     logger.info(f'🌐 Connected to {len(bot.guilds)} guilds')
     
-    # Set bot status
     await bot.change_presence(
         activity=discord.Activity(
             type=discord.ActivityType.watching,
@@ -46,48 +74,37 @@ async def on_ready():
         status=discord.Status.online
     )
     
-    # Start background tasks
     status_update.start()
 
-# Background task: Update status every 5 minutes
-@tasks.loop(minutes=5)
-async def status_update():
-    await bot.change_presence(
-        activity=discord.Activity(
-            type=discord.ActivityType.watching,
-            name=f"{len(bot.guilds)} servers | !help"
-        ),
-        status=discord.Status.online
-    )
+@bot.event
+async on_connect():
+    logger.info("🔗 Connected to Discord gateway")
+
+@bot.event
+async def on_disconnect():
+    logger.warning("⚠️ Disconnected from Discord gateway")
+
+@bot.event
+async def on_resumed():
+    logger.info("🔄 Session resumed")
 
-# Event: When bot joins a new guild
 @bot.event
 async def on_guild_join(guild):
     logger.info(f'➕ Joined guild: {guild.name} ({guild.id})')
 
-# Event: When bot leaves a guild
 @bot.event
 async def on_guild_remove(guild):
     logger.info(f'➖ Left guild: {guild.name} ({guild.id})')
 
-# Event: Handle messages (for non-command messages)
 @bot.event
-async def on_message(message):
-    # Ignore bot messages
-    if message.author.bot:
-        return
-    
-    # Process commands
-    await bot.process_commands(message)
+async def on_error(event, *args, **kwargs):
+    logger.error(f"❌ Error in event {event}: {args} {kwargs}")
 
 # ==================== COMMANDS ====================
-
-# Help Command
 @bot.command(name='help', aliases=['h', 'commands'])
 async def help_command(ctx, command_name: str = None):
     """Show help information"""
     if command_name:
-        # Show specific command help
         command = bot.get_command(command_name)
         if command:
             embed = discord.Embed(
@@ -110,7 +127,6 @@ async def help_command(ctx, command_name: str = None):
         else:
             await ctx.send(f"❌ Command `!{command_name}` not found!")
     else:
-        # Show all commands
         embed = discord.Embed(
             title="🤖 Bot Commands",
             description="Here are all available commands:",
@@ -118,7 +134,6 @@ async def help_command(ctx, command_name: str = None):
             timestamp=datetime.now()
         )
         
-        # Categorize commands
         categories = {
             "General": ['help', 'ping', 'info', 'serverinfo', 'userinfo'],
             "Fun": ['say', 'embed', 'poll', '8ball', 'coinflip'],
@@ -141,7 +156,6 @@ async def help_command(ctx, command_name: str = None):
         embed.set_footer(text=f"Use !help <command> for more details | Prefix: !")
         await ctx.send(embed=embed)
 
-# Ping Command
 @bot.command(name='ping', aliases=['latency'])
 async def ping_command(ctx):
     """Check bot latency"""
@@ -149,19 +163,18 @@ async def ping_command(ctx):
     
     embed = discord.Embed(
         title="🏓 Pong!",
-        description=f"**Latency:** `{latency}ms`\n**API Latency:** `{round(bot.latency * 1000)}ms`",
+        description=f"**Latency:** `{latency}ms`",
         color=discord.Color.green() if latency < 200 else discord.Color.orange() if latency < 500 else discord.Color.red()
     )
     embed.set_footer(text=f"Requested by {ctx.author.name}")
     await ctx.send(embed=embed)
 
-# Info Command
 @bot.command(name='info', aliases=['botinfo', 'about'])
 async def info_command(ctx):
     """Show bot information"""
     embed = discord.Embed(
         title="🤖 Bot Information",
-        description="A Discord bot powered by discord.py",
+        description="A Discord bot powered by discord.py on Hugging Face",
         color=discord.Color.blue(),
         timestamp=datetime.now()
     )
@@ -170,17 +183,14 @@ async def info_command(ctx):
     embed.add_field(name="Bot ID", value=bot.user.id, inline=True)
     embed.add_field(name="Servers", value=len(bot.guilds), inline=True)
     embed.add_field(name="Users", value=sum(g.member_count for g in bot.guilds), inline=True)
-    embed.add_field(name="Library", value="discord.py", inline=True)
-    embed.add_field(name="Python Version", value="3.10+", inline=True)
-    embed.add_field(name="Created", value=bot.user.created_at.strftime("%Y-%m-%d"), inline=True)
+    embed.add_field(name="Library", value="discord.py v2.3+", inline=True)
     embed.add_field(name="Uptime", value=get_uptime(), inline=True)
     
     embed.set_thumbnail(url=bot.user.avatar.url if bot.user.avatar else bot.user.default_avatar.url)
-    embed.set_footer(text="Made with ❤️ using discord.py")
+    embed.set_footer(text="Running on Hugging Face Spaces")
     
     await ctx.send(embed=embed)
 
-# Server Info Command
 @bot.command(name='serverinfo', aliases=['server', 'guildinfo'])
 async def serverinfo_command(ctx):
     """Show server information"""
@@ -198,14 +208,12 @@ async def serverinfo_command(ctx):
     embed.add_field(name="Channels", value=f"{len(guild.text_channels)} Text | {len(guild.voice_channels)} Voice", inline=True)
     embed.add_field(name="Roles", value=len(guild.roles), inline=True)
     embed.add_field(name="Created", value=guild.created_at.strftime("%Y-%m-%d"), inline=True)
-    embed.add_field(name="Boost Level", value=f"Level {guild.premium_tier} ({guild.premium_subscription_count} boosts)", inline=True)
     
     if guild.icon:
         embed.set_thumbnail(url=guild.icon.url)
     
     await ctx.send(embed=embed)
 
-# User Info Command
 @bot.command(name='userinfo', aliases=['whois', 'profile'])
 async def userinfo_command(ctx, member: discord.Member = None):
     """Show user information"""
@@ -220,46 +228,40 @@ async def userinfo_command(ctx, member: discord.Member = None):
     embed.add_field(name="Username", value=member.name, inline=True)
     embed.add_field(name="Display Name", value=member.display_name, inline=True)
     embed.add_field(name="ID", value=member.id, inline=True)
-    embed.add_field(name="Joined Server", value=member.joined_at.strftime("%Y-%m-%d %H:%M") if member.joined_at else "Unknown", inline=True)
-    embed.add_field(name="Account Created", value=member.created_at.strftime("%Y-%m-%d %H:%M"), inline=True)
+    embed.add_field(name="Joined Server", value=member.joined_at.strftime("%Y-%m-%d") if member.joined_at else "Unknown", inline=True)
+    embed.add_field(name="Account Created", value=member.created_at.strftime("%Y-%m-%d"), inline=True)
     embed.add_field(name="Status", value=str(member.status).title(), inline=True)
     embed.add_field(name="Top Role", value=member.top_role.mention, inline=True)
-    embed.add_field(name="Bot?", value="Yes" if member.bot else "No", inline=True)
     
     roles = [role.mention for role in member.roles if role != ctx.guild.default_role]
     if roles:
         embed.add_field(name=f"Roles ({len(roles)})", value=" ".join(roles[:10]) + ("..." if len(roles) > 10 else ""), inline=False)
     
     embed.set_thumbnail(url=member.avatar.url if member.avatar else member.default_avatar.url)
-    embed.set_footer(text=f"Requested by {ctx.author.name}")
-    
     await ctx.send(embed=embed)
 
-# Avatar Command
 @bot.command(name='avatar', aliases=['av', 'pfp'])
 async def avatar_command(ctx, member: discord.Member = None):
     """Show user's avatar"""
     member = member or ctx.author
+    avatar_url = member.avatar.url if member.avatar else member.default_avatar.url
     
     embed = discord.Embed(
         title=f"🖼️ {member.name}'s Avatar",
         color=discord.Color.blue()
     )
-    
-    avatar_url = member.avatar.url if member.avatar else member.default_avatar.url
     embed.set_image(url=avatar_url)
-    embed.add_field(name="Links", value=f"[PNG]({member.avatar.url if member.avatar else member.default_avatar.url}) | [WEBP]({member.avatar.url if member.avatar else member.default_avatar.url})", inline=False)
-    
     await ctx.send(embed=embed)
 
-# Say Command
 @bot.command(name='say', aliases=['echo'])
 async def say_command(ctx, *, message: str):
     """Make the bot say something"""
-    await ctx.message.delete()
+    try:
+        await ctx.message.delete()
+    except:
+        pass
     await ctx.send(message)
 
-# Embed Command
 @bot.command(name='embed', aliases=['em'])
 async def embed_command(ctx, *, message: str):
     """Create a custom embed"""
@@ -271,7 +273,6 @@ async def embed_command(ctx, *, message: str):
     embed.set_author(name=ctx.author.name, icon_url=ctx.author.avatar.url if ctx.author.avatar else ctx.author.default_avatar.url)
     await ctx.send(embed=embed)
 
-# Poll Command
 @bot.command(name='poll', aliases=['vote'])
 async def poll_command(ctx, *, question: str):
     """Create a poll"""
@@ -288,76 +289,43 @@ async def poll_command(ctx, *, question: str):
     await poll_message.add_reaction("👎")
     await poll_message.add_reaction("🤷")
 
-# 8Ball Command
 @bot.command(name='8ball', aliases=['magic8ball', 'ask'])
 async def eightball_command(ctx, *, question: str):
     """Ask the magic 8-ball"""
     import random
-    
     responses = [
-        "🎱 It is certain.",
-        "🎱 It is decidedly so.",
-        "🎱 Without a doubt.",
-        "🎱 Yes definitely.",
-        "🎱 You may rely on it.",
-        "🎱 As I see it, yes.",
-        "🎱 Most likely.",
-        "🎱 Outlook good.",
-        "🎱 Yes.",
-        "🎱 Signs point to yes.",
-        "🎱 Reply hazy, try again.",
-        "🎱 Ask again later.",
-        "🎱 Better not tell you now.",
-        "🎱 Cannot predict now.",
-        "🎱 Concentrate and ask again.",
-        "🎱 Don't count on it.",
-        "🎱 My reply is no.",
-        "🎱 My sources say no.",
-        "🎱 Outlook not so good.",
-        "🎱 Very doubtful."
+        "🎱 It is certain.", "🎱 It is decidedly so.", "🎱 Without a doubt.",
+        "🎱 Yes definitely.", "🎱 You may rely on it.", "🎱 As I see it, yes.",
+        "🎱 Most likely.", "🎱 Outlook good.", "🎱 Yes.",
+        "🎱 Reply hazy, try again.", "🎱 Ask again later.", "🎱 Cannot predict now.",
+        "🎱 Don't count on it.", "🎱 My reply is no.", "🎱 Very doubtful."
     ]
     
-    embed = discord.Embed(
-        title="🎱 Magic 8-Ball",
-        color=discord.Color.purple()
-    )
+    embed = discord.Embed(title="🎱 Magic 8-Ball", color=discord.Color.purple())
     embed.add_field(name="Question", value=question, inline=False)
     embed.add_field(name="Answer", value=random.choice(responses), inline=False)
-    
     await ctx.send(embed=embed)
 
-# Coin Flip Command
 @bot.command(name='coinflip', aliases=['flip', 'coin'])
 async def coinflip_command(ctx):
     """Flip a coin"""
     import random
-    
-    result = random.choice(["Heads", "Tails"])
-    emoji = "🪙" if result == "Heads" else "🪙"
+    result = random.choice(["Heads 🪙", "Tails 🪙"])
     
     embed = discord.Embed(
-        title=f"{emoji} Coin Flip",
+        title="🪙 Coin Flip",
         description=f"**Result:** {result}",
         color=discord.Color.gold()
     )
-    
     await ctx.send(embed=embed)
 
-# Invite Command
 @bot.command(name='invite', aliases=['addbot'])
 async def invite_command(ctx):
     """Get bot invite link"""
     permissions = discord.Permissions(
-        send_messages=True,
-        embed_links=True,
-        read_messages=True,
-        read_message_history=True,
-        add_reactions=True,
-        use_external_emojis=True,
-        attach_files=True,
-        manage_messages=True,
-        connect=True,
-        speak=True
+        send_messages=True, embed_links=True, read_messages=True,
+        read_message_history=True, add_reactions=True, use_external_emojis=True,
+        attach_files=True, manage_messages=True
     )
     
     invite_url = discord.utils.oauth_url(bot.user.id, permissions=permissions)
@@ -367,15 +335,12 @@ async def invite_command(ctx):
         description=f"[Click here to invite me!]({invite_url})",
         color=discord.Color.green()
     )
-    embed.add_field(name="Bot ID", value=bot.user.id, inline=False)
-    
     await ctx.send(embed=embed)
 
-# Clear Command
 @bot.command(name='clear', aliases=['purge', 'clean'])
 @commands.has_permissions(manage_messages=True)
 async def clear_command(ctx, amount: int = 5):
-    """Clear messages (requires Manage Messages permission)"""
+    """Clear messages"""
     if amount < 1 or amount > 100:
         await ctx.send("❌ Please specify a number between 1 and 100!")
         return
@@ -389,7 +354,6 @@ async def clear_command(ctx, amount: int = 5):
     await asyncio.sleep(3)
     await msg.delete()
 
-# Uptime Command
 @bot.command(name='uptime', aliases=['up'])
 async def uptime_command(ctx):
     """Show bot uptime"""
@@ -400,16 +364,16 @@ async def uptime_command(ctx):
     )
     await ctx.send(embed=embed)
 
-# Error Handler
+# ==================== ERROR HANDLER ====================
 @bot.event
 async def on_command_error(ctx, error):
     if isinstance(error, commands.CommandNotFound):
-        return  # Ignore unknown commands
+        return
     
     elif isinstance(error, commands.MissingRequiredArgument):
         embed = discord.Embed(
             title="❌ Missing Argument",
-            description=f"Missing required argument: `{error.param.name}`\nUse `!help {ctx.command.name}` for usage info.",
+            description=f"Missing: `{error.param.name}`\nUse `!help {ctx.command.name}` for usage.",
             color=discord.Color.red()
         )
         await ctx.send(embed=embed)
@@ -417,7 +381,7 @@ async def on_command_error(ctx, error):
     elif isinstance(error, commands.MissingPermissions):
         embed = discord.Embed(
             title="❌ Missing Permissions",
-            description=f"You need `{', '.join(error.missing_permissions)}` permission to use this command.",
+            description=f"You need: `{', '.join(error.missing_permissions)}`",
             color=discord.Color.red()
         )
         await ctx.send(embed=embed)
@@ -425,7 +389,7 @@ async def on_command_error(ctx, error):
     elif isinstance(error, commands.MemberNotFound):
         embed = discord.Embed(
             title="❌ User Not Found",
-            description="The specified user was not found.",
+            description="User not found.",
             color=discord.Color.red()
         )
         await ctx.send(embed=embed)
@@ -434,14 +398,24 @@ async def on_command_error(ctx, error):
         logger.error(f"Command error: {error}")
         embed = discord.Embed(
             title="❌ Error",
-            description="An unexpected error occurred. Please try again later.",
+            description="An error occurred. Please try again.",
             color=discord.Color.red()
         )
         await ctx.send(embed=embed)
 
-# Helper function: Get uptime
-start_time = datetime.now()
+# ==================== BACKGROUND TASKS ====================
+@tasks.loop(minutes=5)
+async def status_update():
+    if bot.is_ready():
+        await bot.change_presence(
+            activity=discord.Activity(
+                type=discord.ActivityType.watching,
+                name=f"{len(bot.guilds)} servers | !help"
+            ),
+            status=discord.Status.online
+        )
 
+# ==================== HELPER FUNCTIONS ====================
 def get_uptime():
     delta = datetime.now() - start_time
     days = delta.days
@@ -449,20 +423,39 @@ def get_uptime():
     minutes, seconds = divmod(remainder, 60)
     
     parts = []
-    if days > 0:
-        parts.append(f"{days}d")
-    if hours > 0:
-        parts.append(f"{hours}h")
-    if minutes > 0:
-        parts.append(f"{minutes}m")
+    if days > 0: parts.append(f"{days}d")
+    if hours > 0: parts.append(f"{hours}h")
+    if minutes > 0: parts.append(f"{minutes}m")
     parts.append(f"{seconds}s")
     
     return " ".join(parts)
 
-# Run the bot
-if __name__ == "__main__":
+# ==================== MAIN ====================
+def main():
+    # Start Flask web server in background thread
+    flask_thread = threading.Thread(target=run_flask, daemon=True)
+    flask_thread.start()
+    logger.info("🌐 Flask web server started on port 7860")
+    
+    # Keep-alive ping (optional - prevents free tier sleep)
+    def keep_alive():
+        while True:
+            try:
+                requests.get("http://localhost:7860/health", timeout=5)
+            except:
+                pass
+            asyncio.sleep(300)  # Every 5 minutes
+    
+    keep_alive_thread = threading.Thread(target=keep_alive, daemon=True)
+    keep_alive_thread.start()
+    
+    # Run Discord bot (blocking)
+    logger.info("🤖 Starting Discord bot...")
     try:
-        bot.run(TOKEN)
+        bot.run(TOKEN, reconnect=True)
     except Exception as e:
-        logger.error(f"Failed to start bot: {e}")
+        logger.error(f"Bot crashed: {e}")
         raise
+
+if __name__ == "__main__":
+    main()