Updated with new features

birthday/birthday.py

@@ -3,16 +3,20 @@ from redbot.core import commands, checks
 from redbot.core.bot import Red
 from redbot.core.config import Config
 from datetime import datetime, time, timedelta
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
+import random
 
 class Birthday(commands.Cog):
-    """A cog to assign a birthday role until midnight Pacific Time."""
+    """A cog to assign a birthday role until midnight in a specified timezone."""
 
     def __init__(self, bot: Red):
         self.bot = bot
         self.config = Config.get_conf(self, identifier=1234567890)
         default_guild = {
             "birthday_role": None,
-            "allowed_roles": []
+            "allowed_roles": [],
+            "timezone": "UTC",
+            "birthday_channel": None
         }
         self.config.register_guild(**default_guild)
         self.birthday_tasks = {}
@@ -45,9 +49,27 @@ class Birthday(commands.Cog):
                 allowed_roles.remove(role.id)
         await ctx.send(f"Removed {role.name} from the list of roles that can use the birthday command.")
 
+    @birthdayset.command()
+    @checks.is_owner()
+    async def timezone(self, ctx, tz: str):
+        """Set the timezone for the birthday role expiration."""
+        try:
+            ZoneInfo(tz)
+            await self.config.guild(ctx.guild).timezone.set(tz)
+            await ctx.send(f"Timezone set to {tz}")
+        except ZoneInfoNotFoundError:
+            await ctx.send(f"Invalid timezone: {tz}. Please use a valid IANA time zone identifier.")
+
+    @birthdayset.command()
+    @checks.is_owner()
+    async def channel(self, ctx, channel: discord.TextChannel):
+        """Set the channel for birthday announcements."""
+        await self.config.guild(ctx.guild).birthday_channel.set(channel.id)
+        await ctx.send(f"Birthday announcement channel set to {channel.mention}")
+
     @commands.command()
     async def birthday(self, ctx, member: discord.Member):
-        """Assign the birthday role to a user until midnight Pacific Time."""
+        """Assign the birthday role to a user until midnight in the set timezone."""
         # Check if the user has permission to use this command
         allowed_roles = await self.config.guild(ctx.guild).allowed_roles()
         if not any(role.id in allowed_roles for role in ctx.author.roles):
@@ -67,19 +89,38 @@ class Birthday(commands.Cog):
         except discord.Forbidden:
             return await ctx.send("I don't have permission to assign that role.")
 
-        await ctx.send(f"🎉 Happy Birthday, {member.mention}! You've been given the {birthday_role.name} role until midnight Pacific Time.")
+        timezone = await self.config.guild(ctx.guild).timezone()
+        
+        # Get the birthday announcement channel
+        birthday_channel_id = await self.config.guild(ctx.guild).birthday_channel()
+        if birthday_channel_id:
+            channel = self.bot.get_channel(birthday_channel_id)
+        else:
+            channel = ctx.channel
+
+        # Generate birthday message with random cakes (or pie)
+        cakes = random.randint(0, 5)
+        if cakes == 0:
+            message = f"🎉 Happy Birthday, {member.mention}! Sorry, out of cake today! Here's pie instead: 🥧"
+        else:
+            message = f"🎉 Happy Birthday, {member.mention}! Here's your cake{'s' if cakes > 1 else ''}: " + "🎂" * cakes
+
+        await channel.send(message)
 
         # Schedule role removal
-        utc_now = datetime.utcnow()
-        pacific_offset = timedelta(hours=-8)  # Pacific Standard Time offset
-        pacific_now = utc_now + pacific_offset
-        pacific_midnight = datetime.combine(pacific_now.date() + timedelta(days=1), time.min)
-        utc_midnight = pacific_midnight - pacific_offset
+        try:
+            tz = ZoneInfo(timezone)
+        except ZoneInfoNotFoundError:
+            await ctx.send(f"Warning: Invalid timezone set. Defaulting to UTC.")
+            tz = ZoneInfo("UTC")
+
+        now = datetime.now(tz)
+        midnight = datetime.combine(now.date() + timedelta(days=1), time.min).replace(tzinfo=tz)
 
         if ctx.guild.id in self.birthday_tasks:
             self.birthday_tasks[ctx.guild.id].cancel()
         
-        self.birthday_tasks[ctx.guild.id] = self.bot.loop.create_task(self.remove_birthday_role(ctx.guild, member, birthday_role, utc_midnight))
+        self.birthday_tasks[ctx.guild.id] = self.bot.loop.create_task(self.remove_birthday_role(ctx.guild, member, birthday_role, midnight))
 
     async def remove_birthday_role(self, guild, member, role, when):
         """Remove the birthday role at the specified time."""