refactor: use timezone-aware datetime objects

Author: tigattack

guild_profiles/guild_profiles.py

@@ -1,7 +1,6 @@
 import logging
 import re
 from dataclasses import asdict, dataclass
-from datetime import datetime, timezone
 from pathlib import Path
 from typing import Type
 
@@ -251,7 +250,7 @@ async def create_profile_cmd(self, ctx: commands.GuildContext, name: str, icon_i
             # Create the profile
             profiles[profile_name] = {
                 "creator": ctx.author.id,
-                "created": int(datetime.now(timezone.utc).timestamp()),
+                "created": int(discord.utils.utcnow().timestamp()),
                 "icon_id": icon_id,
                 "banner_id": banner_id,
             }
@@ -541,7 +540,7 @@ async def create_asset_cmd(self, ctx: commands.GuildContext, name: str | None):
         asset = GuildAsset(
             name=name.lower(),
             creator=ctx.author.id,
-            created=int(datetime.now(timezone.utc).timestamp()),
+            created=int(discord.utils.utcnow().timestamp()),
             path=file_path,
         )
 

jail/jail.py

@@ -1,5 +1,4 @@
 import uuid
-from datetime import datetime
 from io import BytesIO
 from os import path
 from typing import Optional
@@ -28,7 +27,7 @@ def __init__(self, bot: Red, *args, **kwargs):
     @commands.group("jail", pass_context=True, invoke_without_command=True)
     async def _jail(self, ctx: commands.Context, member: discord.Member):
         """Jails the specified user."""
-        jail = await self.config.create_jail(ctx, int(datetime.utcnow().timestamp()), member)
+        jail = await self.config.create_jail(ctx, int(discord.utils.utcnow().timestamp()), member)
         if jail is None:
             await ctx.send("Sorry, there was an error with jail category. Make sure things are setup correctly!")
             return

notes/utils.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from typing import Callable, Iterable, List, Union
 
 import discord
@@ -23,7 +22,7 @@ def new(cls, ctx: commands.Context, note_id: int, member_id: int, message: str,
             message=message,
             reporter_id=ctx.author.id,
             reporter_name=ctx.author.name,
-            created_at=int(datetime.utcnow().timestamp()),
+            created_at=int(discord.utils.utcnow().timestamp()),
             deleted=False,
             is_warning=is_warning,
             _guild=ctx.guild,

purge/purge.py

@@ -1,7 +1,7 @@
 """discord red-bot purge"""
 
 import asyncio
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 import discord
 from croniter import croniter
@@ -50,7 +50,7 @@ async def check_purgeable_users(self):
                     continue
 
                 # Is it time to run?
-                cur_epoch = datetime.utcnow()
+                cur_epoch = discord.utils.utcnow()
                 last_run = await self.config.guild(guild).lastrun()
                 last_run = last_run or 0
                 crontab = await self.config.guild(guild).schedule()
@@ -104,7 +104,7 @@ async def _purge_users(self, guild: discord.Guild, title: str):
                 break
             users_kicked = new_list
 
-        data = discord.Embed(colour=discord.Colour.orange(), timestamp=datetime.utcnow())
+        data = discord.Embed(colour=discord.Colour.orange(), timestamp=discord.utils.utcnow())
         data.title = f"{title} Purge - Purged {len(users)}"
         data.description = users_kicked
 
@@ -141,7 +141,7 @@ async def get_purgeable_users(self, guild):
 
             # If user is not older than the minimum age, they're safe
             timelimit = await self.config.guild(guild).minage()
-            cutoff_date = datetime.utcnow() - timedelta(days=timelimit)
+            cutoff_date = discord.utils.utcnow() - timedelta(days=timelimit)
             if member.joined_at > cutoff_date:
                 continue
 
@@ -339,12 +339,12 @@ async def purge_status(self, ctx: commands.GuildContext):
 
         last_run_friendly = "Never"
         if purge_last_run is not None:
-            last_run = datetime.utcfromtimestamp(purge_last_run)
+            last_run = datetime.fromtimestamp(purge_last_run, tz=timezone.utc)
             last_run_friendly = last_run.strftime("%Y-%m-%d %H:%M:%SZ")
         data.add_field(name="Last Run", value=f"{last_run_friendly}")
 
         if (purge_last_run is not None or purge_enabled) and purge_schedule is not None:
-            next_date = croniter(purge_schedule, purge_last_run or datetime.utcnow()).get_next(datetime)
+            next_date = croniter(purge_schedule, purge_last_run or discord.utils.utcnow()).get_next(datetime)
             next_run_friendly = next_date.strftime("%Y-%m-%d %H:%M:%SZ")
 
             data.add_field(name="Next Run", value=f"{next_run_friendly}")

tags/tags.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from typing import Optional
 
 import discord
@@ -54,7 +53,7 @@ async def _tag(self, ctx: commands.Context, trigger: str):
         """Manage tags and aliases."""
         tag, alias = await self.config.get_tag_or_alias(ctx, trigger)
 
-        time = int(datetime.utcnow().timestamp())
+        time = int(discord.utils.utcnow().timestamp())
 
         if tag is None and alias is None:
             await ctx.send("That's not a valid tag or alias!")
@@ -162,7 +161,9 @@ async def _claim(self, ctx: commands.Context, trigger: str):
                         f"wants to transfer it to you."
                     )
                 else:
-                    await self.config.transfer_tag(ctx, trigger, ctx.author.id, "Claim", int(datetime.utcnow().timestamp()))
+                    await self.config.transfer_tag(
+                        ctx, trigger, ctx.author.id, "Claim", int(discord.utils.utcnow().timestamp())
+                    )
                     await ctx.send("Tag successfully claimed!")
         else:
             await ctx.send("Sorry, that isn't a valid tag so you can't claim it. Good news! You can create it!")
@@ -182,7 +183,7 @@ async def _transfer(self, ctx: commands.Context, trigger: str, member: discord.M
                 reason = f"Mod-initiated by {ctx.author.mention}"
             if allowable:
                 await self.config.transfer_tag(
-                    ctx, trigger, member.id, f"Transfer: {reason}", int(datetime.utcnow().timestamp())
+                    ctx, trigger, member.id, f"Transfer: {reason}", int(discord.utils.utcnow().timestamp())
                 )
                 await ctx.send("Tag successfully transferred!")
             else:
@@ -253,7 +254,7 @@ async def _alias_create(self, ctx: commands.Context, alias: str, tag: str):
             await ctx.send("You can't alias to another alias! That gets messy.")
             return
 
-        await self.config.create_alias(ctx, alias, tag, ctx.author.id, int(datetime.utcnow().timestamp()))
+        await self.config.create_alias(ctx, alias, tag, ctx.author.id, int(discord.utils.utcnow().timestamp()))
         await ctx.send("Alias created!")
 
     @_alias.command("delete")

tags/utils.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from typing import List, Optional
 
 import discord
@@ -93,7 +92,7 @@ async def set_log_transfers(self, ctx: commands.Context, log: bool):
         return self.config.guild(ctx.guild).log().uses.transfers(log)
 
     async def create_tag(self, ctx: commands.Context, trigger: str, content: str) -> Tag:
-        time = int(datetime.utcnow().timestamp())
+        time = int(discord.utils.utcnow().timestamp())
         tag = Tag.new(ctx, ctx.author.id, ctx.author.id, time, trigger, content)
         async with self.config.guild(ctx.guild).tags() as tags:
             tags[trigger] = tag.to_dict()

timeout/timeout.py

@@ -1,4 +1,3 @@
-import datetime
 import logging
 from typing import Optional
 
@@ -36,7 +35,7 @@ async def report_handler(self, ctx: commands.GuildContext, user: discord.Member,
 
         # Build embed
         embed = discord.Embed(
-            description=f"{user.mention} ({user.id})", color=(await ctx.embed_colour()), timestamp=datetime.datetime.utcnow()
+            description=f"{user.mention} ({user.id})", color=(await ctx.embed_colour()), timestamp=discord.utils.utcnow()
         )
         embed.add_field(name="Moderator", value=ctx.author.mention, inline=False)
         embed.add_field(name="Reason", value=action_info["reason"], inline=False)