Merge branch 'develop' into patch-5

Author: Defelo

general/news/cog.py

@@ -143,7 +143,7 @@ async def news_send(
 
         content = ""
         send_embed = Embed(title=t.news, description=message, colour=Colors.News)
-        send_embed.set_footer(text=t.sent_by(ctx.author, ctx.author.id), icon_url=ctx.author.avatar_url)
+        send_embed.set_footer(text=t.sent_by(ctx.author, ctx.author.id), icon_url=ctx.author.display_avatar.url)
 
         if authorization.notification_role_id is not None:
             role: Optional[Role] = ctx.guild.get_role(authorization.notification_role_id)

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,10 +53,10 @@ 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.set_author(name=str(ctx.author), icon_url=ctx.author.avatar_url)
+    embed = Embed(title=title, description=question, color=Colors.Polls, timestamp=utcnow())
+    embed.set_author(name=str(ctx.author), icon_url=ctx.author.display_avatar.url)
     if allow_delete:
-        embed.set_footer(text=t.created_by(ctx.author, ctx.author.id), icon_url=ctx.author.avatar_url)
+        embed.set_footer(text=t.created_by(ctx.author, ctx.author.id), icon_url=ctx.author.display_avatar.url)
 
     if len(set(map(lambda x: x.emoji, options))) < len(options):
         raise CommandError(t.option_duplicated)
@@ -216,8 +216,8 @@ 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.set_author(name=str(ctx.author), icon_url=ctx.author.avatar_url)
+        embed = Embed(title=t.team_poll, description=text, color=Colors.Polls, timestamp=utcnow())
+        embed.set_author(name=str(ctx.author), icon_url=ctx.author.display_avatar.url)
 
         embed.add_field(name=tg.status, value=await self.get_reacted_teamlers(), inline=False)
 

general/utils/cog.py

@@ -74,7 +74,7 @@ async def encode(self, ctx: Context, *, user: UserMemberConverter):
         user: Union[User, Member]
 
         embed = Embed(color=Colors.Utils)
-        embed.set_author(name=str(user), icon_url=user.avatar_url)
+        embed.set_author(name=str(user), icon_url=user.display_avatar.url)
         embed.add_field(name=t.username, value=str(user.name.encode())[2:-1], inline=False)
         if isinstance(user, Member) and user.nick:
             embed.add_field(name=t.nickname, value=str(user.nick.encode())[2:-1], 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/server_info/cog.py

@@ -35,7 +35,8 @@ async def server(self, ctx: Context):
 
         guild: Guild = ctx.guild
         embed = Embed(title=guild.name, description=t.info_description, color=Colors.ServerInformation)
-        embed.set_thumbnail(url=guild.icon_url)
+        if guild.icon:
+            embed.set_thumbnail(url=guild.icon.url)
         created = guild.created_at.date()
         embed.add_field(name=t.creation_date, value=f"{created.day}.{created.month}.{created.year}")
         online_count = sum([m.status != Status.offline for m in guild.members])

information/user_info/cog.py

@@ -31,7 +31,7 @@
 )
 from discord.ext import commands
 from discord.ext.commands import Context, UserInputError, CommandError, max_concurrency, guild_only
-from discord.utils import snowflake_time
+from discord.utils import snowflake_time, utcnow
 
 from .colors import Colors
 from .models import Join, Leave, UsernameUpdate, Verification
@@ -219,7 +219,7 @@ async def userinfo(self, ctx: Context, user: Optional[Union[User, int]] = None):
         if isinstance(user, int):
             embed.set_author(name=str(user))
         else:
-            embed.set_author(name=f"{user} ({user_id})", icon_url=user.avatar_url)
+            embed.set_author(name=f"{user} ({user_id})", icon_url=user.display_avatar.url)
 
         for response in await get_user_info_entries(user_id):
             for name, value in response:
@@ -294,7 +294,7 @@ async def userlogs(self, ctx: Context, user: Optional[Union[User, int]] = None):
         if isinstance(user, int):
             embed.set_author(name=str(user))
         else:
-            embed.set_author(name=f"{user} ({user_id})", icon_url=user.avatar_url)
+            embed.set_author(name=f"{user} ({user_id})", icon_url=user.display_avatar.url)
         for row in out:
             name = row[0].strftime("%d.%m.%Y %H:%M:%S")
             value = row[1]
@@ -326,8 +326,10 @@ async def joined(self, ctx: Context, member: Member = None):
 
         embed = Embed(
             title=t.userinfo,
-            description=f"{member.mention} {date_diff_to_str(datetime.today(), ts)}",
+            description=f"{member.mention} {date_diff_to_str(utcnow(), ts)}",
+            color=Colors.joined,
         )
+        embed.set_author(name=str(member), icon_url=member.display_avatar.url)
         await reply(ctx, embed=embed)
 
     @commands.command()