Update app.py

app.py

@@ -20,23 +20,20 @@ from pytz import timezone # for times
 import asyncio # check if used
 
 zurich_tz = timezone("Europe/Zurich")
-intents = discord.Intents.all()
-bot = commands.Bot(command_prefix='!', intents=intents)
-LOG_CHANNEL = bot.get_channel(1107006391547342910)
-print(f"LOG_CHANNEL: {LOG_CHANNEL}")
-# test = 1126516932527534111
-# bot-test = 1100458786826747945
 
 def convert_to_timezone(dt, tz):
     return dt.astimezone(tz).strftime("%Y-%m-%d %H:%M:%S %Z")
 
+DISCORD_TOKEN = os.environ.get("DISCORD_TOKEN", None)
+intents = discord.Intents.default()
+intents.message_content = True
+
+bot = commands.Bot(command_prefix='!', intents=intents)
 
 #rate_limiter = RateLimiter(max_calls=10, period=60)  # needs testing
 
 # todo
 '''
-Make sure only can post in #bot-test
-
 discord.gg / discord/invite (block completely, need to be cautious)
 attempted @everyone / @here pings, or trying to use those strings (ping @alerts)
 ping alerts for list of keywords 
@@ -52,86 +49,73 @@ ping alerts for list of keywords
 
 @bot.event
 async def on_message_edit(before, after):
-    try:
-        if before.author == bot.user:
-            return
-    
-        if before.content != after.content:
-            embed = Embed(color=Color.orange())
-            embed.set_author(name=f"{before.author}    ID: {before.author.id}", icon_url=before.author.avatar.url)
-            embed.title = "Message Edited"
-            embed.description = f"**Before:** {before.content or '*(empty message)*'}\n**After:** {after.content or '*(empty message)*'}"
-            embed.add_field(name="Author Username", value=before.author.name, inline=True)
-            embed.add_field(name="Channel", value=before.channel.mention, inline=True)
-            #embed.add_field(name="Message Created On", value=before.created_at.strftime("%Y-%m-%d %H:%M:%S UTC"), inline=True)
-            embed.add_field(name="Message Created On", value=convert_to_timezone(before.created_at, zurich_tz), inline=True)
-            embed.add_field(name="Message ID", value=before.id, inline=True)
-            embed.add_field(name="Message Jump URL", value=f"[Jump to message!](https://discord.com/channels/{before.guild.id}/{before.channel.id}/{before.id})", inline=True)
-    
-            if before.attachments:
-                attachment_urls = "\n".join([attachment.url for attachment in before.attachments])
-                embed.add_field(name="Attachments", value=attachment_urls, inline=False)
-    
-            #embed.set_footer(text=f"{datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S UTC')}")
-            embed.set_footer(text=f"{convert_to_timezone(datetime.utcnow(), zurich_tz)}")
-    
-            if LOG_CHANNEL is not None:
-                await LOG_CHANNEL.send(embed=embed)
-            else:
-                print("Log channel not found.")
-    except Exception as e:
-        print(f"Error: {e}")
-
-@bot.event
-async def on_message_delete(message):
-    try:    
-        if message.author == bot.user:
-            return
-    
-        embed = Embed(color=Color.red())
-        embed.set_author(name=f"{message.author}    ID: {message.author.id}", icon_url=message.author.avatar.url)
-        embed.title = "Message Deleted"
-        embed.description = message.content or "*(empty message)*"
-        embed.add_field(name="Author Username", value=message.author.name, inline=True)
-        embed.add_field(name="Channel", value=message.channel.mention, inline=True)
-        #embed.add_field(name="Message Created On", value=message.created_at.strftime("%Y-%m-%d %H:%M:%S UTC"), inline=True)
-        embed.add_field(name="Message Created On", value=convert_to_timezone(message.created_at, zurich_tz), inline=True)
-        embed.add_field(name="Message ID", value=message.id, inline=True)
-        embed.add_field(name="Message Jump URL", value=f"[Jump to message!](https://discord.com/channels/{message.guild.id}/{message.channel.id}/{message.id})", inline=True)
-    
-        if message.attachments:
-            attachment_urls = "\n".join([attachment.url for attachment in message.attachments])
+    if before.author == bot.user:
+        return
+
+    if before.content != after.content:
+        embed = Embed(color=Color.orange())
+        embed.set_author(name=f"{before.author}    ID: {before.author.id}", icon_url=before.author.avatar.url)
+        embed.title = "Message Edited"
+        embed.description = f"**Before:** {before.content or '*(empty message)*'}\n**After:** {after.content or '*(empty message)*'}"
+        embed.add_field(name="Author Username", value=before.author.name, inline=True)
+        embed.add_field(name="Channel", value=before.channel.mention, inline=True)
+        #embed.add_field(name="Message Created On", value=before.created_at.strftime("%Y-%m-%d %H:%M:%S UTC"), inline=True)
+        embed.add_field(name="Message Created On", value=convert_to_timezone(before.created_at, zurich_tz), inline=True)
+        embed.add_field(name="Message ID", value=before.id, inline=True)
+        embed.add_field(name="Message Jump URL", value=f"[Jump to message!](https://discord.com/channels/{before.guild.id}/{before.channel.id}/{before.id})", inline=True)
+
+        if before.attachments:
+            attachment_urls = "\n".join([attachment.url for attachment in before.attachments])
             embed.add_field(name="Attachments", value=attachment_urls, inline=False)
-    
+
         #embed.set_footer(text=f"{datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S UTC')}")
         embed.set_footer(text=f"{convert_to_timezone(datetime.utcnow(), zurich_tz)}")
-    
-        if LOG_CHANNEL is not None:
-            await LOG_CHANNEL.send(embed=embed)
-        else:
-            print("Log channel not found.")
-    except Exception as e:
-        print(f"Error: {e}")
-    
+
+        await bot.log_channel.send(embed=embed)
+
+@bot.event
+async def on_message_delete(message):
+    if message.author == bot.user:
+        return
+
+    embed = Embed(color=Color.red())
+    embed.set_author(name=f"{message.author}    ID: {message.author.id}", icon_url=message.author.avatar.url)
+    embed.title = "Message Deleted"
+    embed.description = message.content or "*(empty message)*"
+    embed.add_field(name="Author Username", value=message.author.name, inline=True)
+    embed.add_field(name="Channel", value=message.channel.mention, inline=True)
+    #embed.add_field(name="Message Created On", value=message.created_at.strftime("%Y-%m-%d %H:%M:%S UTC"), inline=True)
+    embed.add_field(name="Message Created On", value=convert_to_timezone(message.created_at, zurich_tz), inline=True)
+    embed.add_field(name="Message ID", value=message.id, inline=True)
+    embed.add_field(name="Message Jump URL", value=f"[Jump to message!](https://discord.com/channels/{message.guild.id}/{message.channel.id}/{message.id})", inline=True)
+
+    if message.attachments:
+        attachment_urls = "\n".join([attachment.url for attachment in message.attachments])
+        embed.add_field(name="Attachments", value=attachment_urls, inline=False)
+
+    #embed.set_footer(text=f"{datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S UTC')}")
+    embed.set_footer(text=f"{convert_to_timezone(datetime.utcnow(), zurich_tz)}")
+
+    await bot.log_channel.send(embed=embed)
 
 # nickname stuff
 @bot.event
 async def on_member_update(before, after):
     if before.nick != after.nick:
         embed = Embed(description=f'{before} changed their nickname to {after.nick}', color=Color.blue())
-        await LOG_CHANNEL.send(embed=embed)
+        await bot.log_channel.send(embed=embed)
 
 @bot.event
 async def on_member_ban(guild, user):
     # member banned from the guild
     embed = Embed(description=f'Member {user.mention} was banned from the guild', color=Color.red())
-    await LOG_CHANNEL.send(embed=embed)
+    await bot.log_channel.send(embed=embed)
 
 @bot.event
 async def on_member_unban(guild, user):
     # member unbanned from the guild
     embed = Embed(description=f'Member {user.mention} was unbanned from the guild', color=Color.green())
-    await LOG_CHANNEL.send(embed=embed)       
+    await bot.log_channel.send(embed=embed)       
 
 # admin stuff---------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -139,62 +123,63 @@ async def on_member_unban(guild, user):
 async def on_guild_channel_create(channel):
     # creating channels
     embed = Embed(description=f'Channel {channel.mention} was created', color=Color.green())
-    await LOG_CHANNEL.send(embed=embed)
+    await bot.log_channel.send(embed=embed)
 
 @bot.event
 async def on_guild_channel_delete(channel):
     # deleting channels, should ping @alerts for this
     embed = Embed(description=f'Channel {channel.name} ({channel.mention}) was deleted', color=Color.red())
-    await LOG_CHANNEL.send(embed=embed)
+    await bot.log_channel.send(embed=embed)
 
 @bot.event
 async def on_guild_role_create(role):
     # creating roles
     embed = Embed(description=f'Role {role.mention} was created', color=Color.green())
-    await LOG_CHANNEL.send(embed=embed)
+    await bot.log_channel.send(embed=embed)
 
 @bot.event
 async def on_guild_role_delete(role):
     # deleting roles, should ping @alerts for this
     embed = Embed(description=f'Role {role.name} ({role.mention}) was deleted', color=Color.red())
-    await LOG_CHANNEL.send(embed=embed)
+    await bot.log_channel.send(embed=embed)
 
 @bot.event
 async def on_guild_role_update(before, after):
     # editing roles, could expand this 
     if before.name != after.name:
         embed = Embed(description=f'Role {before.mention} was renamed to {after.name}', color=Color.orange())
-        await LOG_CHANNEL.send(embed=embed)
+        await bot.log_channel.send(embed=embed)
 
     if before.permissions.administrator != after.permissions.administrator:
         # changes involving the administrator permission / sensitive permissions (can help to prevent mistakes)
         certain_role_id = 1106995261487710411  # role to ping (@alerts)
         certain_role = after.guild.get_role(certain_role_id)
         embed = Embed(description=f'Role {after.mention} had its administrator permission {"enabled" if after.permissions.administrator else "disabled"}', color=Color.red())
-        await LOG_CHANNEL.send(content=certain_role.mention, embed=embed)  
+        await bot.log_channel.send(content=certain_role.mention, embed=embed)  
 
 @bot.event
 async def on_voice_state_update(member, before, after):
     if before.mute != after.mute:
         # muting members
         embed = Embed(description=f'{member} was {"muted" if after.mute else "unmuted"} in voice chat', color=Color.orange())
-        await LOG_CHANNEL.send(embed=embed)
+        await bot.log_channel.send(embed=embed)
 
     if before.deaf != after.deaf:
         # deafening members
         embed = Embed(description=f'{member} was {"deafened" if after.deaf else "undeafened"} in voice chat', color=Color.orange())
-        await LOG_CHANNEL.send(embed=embed)
+        await bot.log_channel.send(embed=embed)
 
 # bot stuff ---------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 # send messages
 #
-DISCORD_TOKEN = os.environ.get("DISCORD_TOKEN", None)
 
 @bot.event
 async def on_ready():
     print('Logged on as', bot.user)
+    bot.log_channel = bot.get_channel(1107006391547342910)
 
+        
 
 def run_bot():
     bot.run(DISCORD_TOKEN)