Update main.py

main.py

@@ -6,7 +6,6 @@ from datetime import datetime
 import logging
 from flask import Flask
 from threading import Thread
-import aiohttp
 
 # Setup logging
 logging.basicConfig(
@@ -23,7 +22,7 @@ def home():
     return "hey, bot started✅"
 
 def run_web():
-    app.run(host='0.0.0.0', port=7860)
+    app.run(host='0.0.0.0', port=3000)
 
 # Start web server in a thread
 web_thread = Thread(target=run_web)
@@ -36,31 +35,25 @@ if not TOKEN:
 
 # Bot intents
 intents = discord.Intents.default()
-intents.message_content = True
+intents.message_content = True  # Required for reading message content
 intents.members = True
 intents.presences = True
 
-# Create bot instance with proxy support
+# Create bot instance
 bot = commands.Bot(
     command_prefix='!',
     intents=intents,
-    help_command=None,
+    help_command=None,  # Custom help command
     case_insensitive=True
 )
 
-# Set up proxy for Discord connection (if behind firewall)
-async def setup_proxy():
-    proxy = os.getenv('HTTP_PROXY') or os.getenv('HTTPS_PROXY')
-    if proxy:
-        bot.http.proxy = proxy
-        logger.info(f"Using proxy: {proxy}")
-
 # Event: Bot ready
 @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,
@@ -69,8 +62,10 @@ 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(
@@ -81,26 +76,34 @@ async def status_update():
         status=discord.Status.online
     )
 
+# 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)
 
 # ==================== 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(
@@ -123,6 +126,7 @@ 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:",
@@ -130,6 +134,7 @@ 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'],
@@ -152,6 +157,7 @@ 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"""
@@ -165,6 +171,7 @@ async def ping_command(ctx):
     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"""
@@ -189,6 +196,7 @@ async def info_command(ctx):
     
     await ctx.send(embed=embed)
 
+# Server Info Command
 @bot.command(name='serverinfo', aliases=['server', 'guildinfo'])
 async def serverinfo_command(ctx):
     """Show server information"""
@@ -213,6 +221,7 @@ async def serverinfo_command(ctx):
     
     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"""
@@ -242,6 +251,7 @@ async def userinfo_command(ctx, member: discord.Member = None):
     
     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"""
@@ -258,12 +268,14 @@ async def avatar_command(ctx, member: discord.Member = None):
     
     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()
     await ctx.send(message)
 
+# Embed Command
 @bot.command(name='embed', aliases=['em'])
 async def embed_command(ctx, *, message: str):
     """Create a custom embed"""
@@ -275,6 +287,7 @@ 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"""
@@ -291,6 +304,7 @@ 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"""
@@ -328,6 +342,7 @@ async def eightball_command(ctx, *, question: str):
     
     await ctx.send(embed=embed)
 
+# Coin Flip Command
 @bot.command(name='coinflip', aliases=['flip', 'coin'])
 async def coinflip_command(ctx):
     """Flip a coin"""
@@ -344,6 +359,7 @@ async def coinflip_command(ctx):
     
     await ctx.send(embed=embed)
 
+# Invite Command
 @bot.command(name='invite', aliases=['addbot'])
 async def invite_command(ctx):
     """Get bot invite link"""
@@ -371,6 +387,7 @@ async def invite_command(ctx):
     
     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):
@@ -388,6 +405,7 @@ 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"""
@@ -398,10 +416,11 @@ async def uptime_command(ctx):
     )
     await ctx.send(embed=embed)
 
+# Error Handler
 @bot.event
 async def on_command_error(ctx, error):
     if isinstance(error, commands.CommandNotFound):
-        return
+        return  # Ignore unknown commands
     
     elif isinstance(error, commands.MissingRequiredArgument):
         embed = discord.Embed(
@@ -436,6 +455,7 @@ async def on_command_error(ctx, error):
         )
         await ctx.send(embed=embed)
 
+# Helper function: Get uptime
 start_time = datetime.now()
 
 def get_uptime():