Made all datetime objects timezone aware

Author: Defelo

general/polls/cog.py

@@ -1,11 +1,11 @@
 import re
 import string
-from datetime import datetime
 from typing import Optional, Tuple
 
 from discord import Embed, Message, PartialEmoji, Member, Forbidden, Guild
 from discord.ext import commands
 from discord.ext.commands import Context, guild_only, CommandError
+from discord.utils import utcnow
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.embeds import EmbedLimits
@@ -53,7 +53,7 @@ async def send_poll(
     if any(len(str(option)) > EmbedLimits.FIELD_VALUE for option in options):
         raise CommandError(t.option_too_long(EmbedLimits.FIELD_VALUE))
 
-    embed = Embed(title=title, description=question, color=Colors.Polls, timestamp=datetime.utcnow())
+    embed = Embed(title=title, description=question, color=Colors.Polls, timestamp=utcnow())
     embed.set_author(name=str(ctx.author), icon_url=ctx.author.avatar_url)
     if allow_delete:
         embed.set_footer(text=t.created_by(ctx.author, ctx.author.id), icon_url=ctx.author.avatar_url)
@@ -216,7 +216,7 @@ async def team_yesno(self, ctx: Context, *, text: str):
         Starts a yes/no poll and shows, which teamler has not voted yet.
         """
 
-        embed = Embed(title=t.team_poll, description=text, color=Colors.Polls, timestamp=datetime.utcnow())
+        embed = Embed(title=t.team_poll, description=text, color=Colors.Polls, timestamp=utcnow())
         embed.set_author(name=str(ctx.author), icon_url=ctx.author.avatar_url)
 
         embed.add_field(name=tg.status, value=await self.get_reacted_teamlers(), inline=False)

general/voice_channel/cog.py

@@ -1,6 +1,5 @@
 import asyncio
 import random
-from datetime import datetime
 from os import getenv
 from pathlib import Path
 from typing import Optional, Union
@@ -25,6 +24,7 @@
 from discord.abc import Messageable
 from discord.ext import commands, tasks
 from discord.ext.commands import guild_only, Context, UserInputError, CommandError, Greedy
+from discord.utils import utcnow
 
 from PyDrocsid.async_thread import gather_any, GatherAnyException
 from PyDrocsid.cog import Cog
@@ -213,7 +213,7 @@ def prepare(self) -> bool:
         return bool(self.names)
 
     def _get_name_list(self, guild_id: int) -> str:
-        r = random.Random(f"{guild_id}{datetime.utcnow().date().isoformat()}")
+        r = random.Random(f"{guild_id}{utcnow().date().isoformat()}")
         return r.choice(sorted(self.names))
 
     def _random_channel_name(self, guild_id: int, avoid: set[str]) -> Optional[str]:
@@ -277,7 +277,7 @@ async def send_voice_msg(self, channel: DynChannel, title: str, msg: str, force_
                 text_channel,
                 title,
                 "",
-                datetime.utcnow().strftime("%d.%m.%Y %H:%M:%S"),
+                utcnow().strftime("%d.%m.%Y %H:%M:%S"),
                 msg,
                 colour=color,
                 force_new_embed=force_new_embed,

general/voice_channel/models.py

@@ -4,10 +4,11 @@
 from typing import Union, Optional
 from uuid import uuid4
 
-from sqlalchemy import Column, BigInteger, Boolean, DateTime, ForeignKey, String
+from discord.utils import utcnow
+from sqlalchemy import Column, BigInteger, Boolean, ForeignKey, String
 from sqlalchemy.orm import relationship
 
-from PyDrocsid.database import db
+from PyDrocsid.database import db, UTCDateTime
 
 
 class DynGroup(db.Base):
@@ -65,15 +66,15 @@ class DynChannelMember(db.Base):
     member_id: Union[Column, int] = Column(BigInteger)
     channel_id: Union[Column, int] = Column(BigInteger, ForeignKey("dynvoice_channel.channel_id"))
     channel: DynChannel = relationship("DynChannel", back_populates="members")
-    timestamp: Union[Column, datetime] = Column(DateTime)
+    timestamp: Union[Column, datetime] = Column(UTCDateTime)
 
     @staticmethod
     async def create(member_id: int, channel_id: int) -> DynChannelMember:
         member = DynChannelMember(
             id=str(uuid4()),
             member_id=member_id,
             channel_id=channel_id,
-            timestamp=datetime.utcnow(),
+            timestamp=utcnow(),
         )
         await db.add(member)
         return member

information/heartbeat/cog.py

@@ -1,8 +1,8 @@
-from datetime import datetime
 from typing import Optional
 
 from discord import User, Forbidden
 from discord.ext import tasks
+from discord.utils import utcnow
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.config import Config
@@ -36,7 +36,7 @@ async def status_loop(self):
                 t.online_status,
                 t.status_description(Config.NAME, Config.VERSION),
                 t.heartbeat,
-                datetime.utcnow().strftime("%d.%m.%Y %H:%M:%S UTC"),
+                utcnow().strftime("%d.%m.%Y %H:%M:%S UTC"),
             )
         except Forbidden:
             pass
@@ -49,7 +49,7 @@ async def on_ready(self):
                     t.online_status,
                     t.status_description(Config.NAME, Config.VERSION),
                     t.logged_in,
-                    datetime.utcnow().strftime("%d.%m.%Y %H:%M:%S UTC"),
+                    utcnow().strftime("%d.%m.%Y %H:%M:%S UTC"),
                     force_resend=True,
                     force_new_embed=not self.initialized,
                 )

information/inactivity/cog.py

@@ -13,6 +13,8 @@
 from PyDrocsid.database import db, db_wrapper
 from PyDrocsid.embeds import send_long_embed
 from PyDrocsid.translations import t
+from discord.utils import utcnow
+
 from .models import Activity
 from .permissions import InactivityPermission
 from .settings import InactivitySettings
@@ -35,15 +37,15 @@ def status_icon(status: Status) -> str:
 async def scan(ctx: Context, days: int):
     async def update_msg(m: Message, content):
         embed.description = content
-        embed.timestamp = datetime.utcnow()
+        embed.timestamp = utcnow()
         await ignore_message_edit(m)
         try:
             await m.edit(embed=embed)
         except NotFound:
             return await reply(ctx, embed=embed)
         return m
 
-    embed = Embed(title=t.scanning, timestamp=datetime.utcnow())
+    embed = Embed(title=t.scanning, timestamp=utcnow())
     message: list[Message] = [await reply(ctx, embed=embed)]
     guild: Guild = ctx.guild
     members: dict[Member, datetime] = {}
@@ -54,7 +56,7 @@ async def update_progress_message():
         while len(completed) < len(channels):
             content = t.scanning_channel(len(completed), len(channels), cnt=len(active))
             for a, d in active.items():
-                channel_age = (datetime.utcnow() - a.created_at).days
+                channel_age = (utcnow() - a.created_at).days
                 content += f"\n:small_orange_diamond: {a.mention} ({d} / {min(channel_age, days)})"
             message[0] = await update_msg(message[0], content)
             await asyncio.sleep(2)
@@ -63,7 +65,7 @@ async def update_members(c: TextChannel):
         active[c] = 0
 
         async for msg in c.history(limit=None, oldest_first=False):
-            s = (datetime.utcnow() - msg.created_at).total_seconds()
+            s = (utcnow() - msg.created_at).total_seconds()
             if s > days * 24 * 60 * 60:
                 break
             members[msg.author] = max(members.get(msg.author, msg.created_at), msg.created_at)
@@ -129,7 +131,7 @@ async def handle_get_user_status_entries(self, user_id) -> list[tuple[str, str]]
 
         if activity is None:
             status = t.status.inactive
-        elif (days := (datetime.utcnow() - activity.timestamp).days) >= inactive_days:
+        elif (days := (utcnow() - activity.timestamp).days) >= inactive_days:
             status = t.status.inactive_since(activity.timestamp.strftime("%d.%m.%Y %H:%M:%S"))
         else:
             status = t.status.active(cnt=days)
@@ -153,7 +155,7 @@ async def inactive(self, ctx: Context, days: Optional[int], *roles: Optional[Rol
         elif days not in range(1, 10001):
             raise CommandError(tg.invalid_duration)
 
-        now = datetime.utcnow()
+        now = utcnow()
 
         @db_wrapper
         async def load_member(m: Member) -> tuple[Member, Optional[datetime]]:

information/inactivity/models.py

@@ -3,15 +3,15 @@
 from datetime import datetime
 from typing import Union
 
-from PyDrocsid.database import db, db_wrapper
-from sqlalchemy import Column, BigInteger, DateTime
+from PyDrocsid.database import db, db_wrapper, UTCDateTime
+from sqlalchemy import Column, BigInteger
 
 
 class Activity(db.Base):
     __tablename__ = "activity"
 
     id: Union[Column, int] = Column(BigInteger, primary_key=True, unique=True)
-    timestamp: Union[Column, datetime] = Column(DateTime)
+    timestamp: Union[Column, datetime] = Column(UTCDateTime)
 
     @staticmethod
     async def create(object_id: int, timestamp: datetime) -> Activity:

information/user_info/models.py

@@ -3,23 +3,24 @@
 from datetime import datetime, timedelta
 from typing import Union, Optional
 
-from sqlalchemy import Column, Integer, BigInteger, DateTime, Text, Boolean
+from discord.utils import utcnow
+from sqlalchemy import Column, Integer, BigInteger, Text, Boolean
 
-from PyDrocsid.database import db, filter_by
+from PyDrocsid.database import db, filter_by, UTCDateTime
 
 
 class Join(db.Base):
     __tablename__ = "join"
     id: Union[Column, int] = Column(Integer, primary_key=True, unique=True, autoincrement=True)
     member: Union[Column, int] = Column(BigInteger)
     member_name: Union[Column, str] = Column(Text(collation="utf8mb4_bin"))
-    timestamp: Union[Column, datetime] = Column(DateTime)
+    timestamp: Union[Column, datetime] = Column(UTCDateTime)
     join_msg_channel_id: Union[Column, int] = Column(BigInteger, nullable=True)
     join_msg_id: Union[Column, int] = Column(BigInteger, nullable=True)
 
     @staticmethod
     async def create(member: int, member_name: str, timestamp: Optional[datetime] = None) -> Join:
-        row = Join(member=member, member_name=member_name, timestamp=timestamp or datetime.utcnow())
+        row = Join(member=member, member_name=member_name, timestamp=timestamp or utcnow())
         await db.add(row)
         await db.session.flush()
         return row
@@ -37,11 +38,11 @@ class Leave(db.Base):
     id: Union[Column, int] = Column(Integer, primary_key=True, unique=True, autoincrement=True)
     member: Union[Column, int] = Column(BigInteger)
     member_name: Union[Column, str] = Column(Text(collation="utf8mb4_bin"))
-    timestamp: Union[Column, datetime] = Column(DateTime)
+    timestamp: Union[Column, datetime] = Column(UTCDateTime)
 
     @staticmethod
     async def create(member: int, member_name: str) -> Leave:
-        row = Leave(member=member, member_name=member_name, timestamp=datetime.utcnow())
+        row = Leave(member=member, member_name=member_name, timestamp=utcnow())
         await db.add(row)
         return row
 
@@ -54,7 +55,7 @@ class UsernameUpdate(db.Base):
     member_name: Union[Column, str] = Column(Text(collation="utf8mb4_bin"))
     new_name: Union[Column, str] = Column(Text(collation="utf8mb4_bin"))
     nick: Union[Column, bool] = Column(Boolean)
-    timestamp: Union[Column, datetime] = Column(DateTime)
+    timestamp: Union[Column, datetime] = Column(UTCDateTime)
 
     @staticmethod
     async def create(member: int, member_name: str, new_name: str, nick: bool) -> UsernameUpdate:
@@ -63,7 +64,7 @@ async def create(member: int, member_name: str, new_name: str, nick: bool) -> Us
             member_name=member_name,
             new_name=new_name,
             nick=nick,
-            timestamp=datetime.utcnow(),
+            timestamp=utcnow(),
         )
         await db.add(row)
         return row
@@ -76,10 +77,10 @@ class Verification(db.Base):
     member: Union[Column, int] = Column(BigInteger)
     member_name: Union[Column, str] = Column(Text(collation="utf8mb4_bin"))
     accepted: Union[Column, bool] = Column(Boolean)
-    timestamp: Union[Column, datetime] = Column(DateTime)
+    timestamp: Union[Column, datetime] = Column(UTCDateTime)
 
     @staticmethod
     async def create(member: int, member_name: str, accepted: bool) -> Verification:
-        row = Verification(member=member, member_name=member_name, accepted=accepted, timestamp=datetime.utcnow())
+        row = Verification(member=member, member_name=member_name, accepted=accepted, timestamp=utcnow())
         await db.add(row)
         return row

integrations/reddit/models.py

@@ -3,9 +3,10 @@
 from datetime import datetime, timedelta
 from typing import Union
 
-from sqlalchemy import Column, String, BigInteger, DateTime
+from discord.utils import utcnow
+from sqlalchemy import Column, String, BigInteger
 
-from PyDrocsid.database import db, delete, filter_by
+from PyDrocsid.database import db, delete, filter_by, UTCDateTime
 
 
 class RedditChannel(db.Base):
@@ -25,17 +26,17 @@ class RedditPost(db.Base):
     __tablename__ = "reddit_post"
 
     post_id: Union[Column, str] = Column(String(16), primary_key=True, unique=True)
-    timestamp: Union[Column, datetime] = Column(DateTime)
+    timestamp: Union[Column, datetime] = Column(UTCDateTime)
 
     @staticmethod
     async def create(post_id: str) -> RedditPost:
-        row = RedditPost(post_id=post_id, timestamp=datetime.utcnow())
+        row = RedditPost(post_id=post_id, timestamp=utcnow())
         await db.add(row)
         return row
 
     @staticmethod
     async def clean():
-        drop_before_timestamp = datetime.utcnow() - timedelta(weeks=1)
+        drop_before_timestamp = utcnow() - timedelta(weeks=1)
         await db.exec(delete(RedditPost).filter(RedditPost.timestamp < drop_before_timestamp))
 
     @staticmethod

moderation/autoclear/cog.py

@@ -1,10 +1,11 @@
 import asyncio
-from datetime import datetime, timedelta
+from datetime import timedelta
 from typing import Optional
 
 from discord import TextChannel, Forbidden, Embed, Message, NotFound
 from discord.ext import commands, tasks
 from discord.ext.commands import Context, UserInputError, guild_only, CommandError
+from discord.utils import utcnow
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.command import docs
@@ -29,7 +30,7 @@ async def clear_channel(channel: TextChannel, minutes: int, limit: Optional[int]
 
     message: Message
     async for message in channel.history(
-        before=datetime.utcnow() - timedelta(minutes=minutes),
+        before=utcnow() - timedelta(minutes=minutes),
         limit=limit,
         oldest_first=True,
     ):