Merge branch 'develop' into feature/color-picker

Author: Tert0

administration/roles/cog.py

@@ -1,12 +1,12 @@
 from typing import Optional, Union, Dict, List
 
-from discord import Role, Embed, Member, Status, Guild, NotFound, User, Forbidden
+from discord import Role, Embed, Member, Status, Guild, NotFound, User, Forbidden, Permissions
 from discord.ext import commands
 from discord.ext.commands import CommandError, Context, guild_only, UserInputError, Group
 
 from PyDrocsid.cog import Cog
 from PyDrocsid.command import reply, docs, optional_permissions
-from PyDrocsid.config import Contributor, Config
+from PyDrocsid.config import Config
 from PyDrocsid.converter import UserMemberConverter
 from PyDrocsid.database import db, select, filter_by
 from PyDrocsid.embeds import send_long_embed
@@ -18,6 +18,7 @@
 from .colors import Colors
 from .models import RoleAuth, PermaRole
 from .permissions import RolesPermission
+from ...contributor import Contributor
 from ...pubsub import send_to_changelog, send_alert
 
 tg = t.g
@@ -90,7 +91,7 @@ async def inner(_, ctx: Context, *, role: Role):
 
 
 class RolesCog(Cog, name="Roles"):
-    CONTRIBUTORS = [Contributor.Defelo]
+    CONTRIBUTORS = [Contributor.Defelo, Contributor.NekoFanatic]
 
     def __init__(self):
         super().__init__()
@@ -241,6 +242,42 @@ async def roles_add(self, ctx: Context, member: Member, *, role: Role):
         await member.add_roles(role)
         await ctx.message.add_reaction(name_to_emoji["white_check_mark"])
 
+    @roles.command(name="clone", aliases=["cl"])
+    @RolesPermission.roles_clone.check
+    @docs(t.commands.roles_clone)
+    async def roles_clone(self, ctx: Context, *, role: Role):
+        if not ctx.me.guild_permissions.manage_roles:
+            raise CommandError(t.clone_no_permission)
+
+        cloned_permissions = role.permissions.value & ctx.me.guild_permissions.value
+
+        missing_permissions = "\n".join(
+            f":small_blue_diamond: `{permission}`"
+            for permission, value in Permissions(role.permissions.value & ~ctx.me.guild_permissions.value)
+            if value
+        )
+
+        await ctx.guild.create_role(
+            name=role.name,
+            color=role.color,
+            permissions=Permissions(cloned_permissions),
+            hoist=role.hoist,
+            mentionable=role.mentionable,
+        )
+
+        if missing_permissions:
+            await send_long_embed(
+                ctx,
+                Embed(
+                    title=t.failed_to_clone_role_permissions,
+                    description=missing_permissions,
+                    color=Colors.MissingPermissions,
+                ),
+                paginate=True,
+            )
+
+        await ctx.message.add_reaction(name_to_emoji["white_check_mark"])
+
     @roles.command(name="remove", aliases=["r", "del", "d", "-"])
     @optional_permissions(RolesPermission.auth_write)
     @docs(t.commands.roles_remove)
@@ -361,7 +398,7 @@ async def roles_list(self, ctx: Context, *, role: Role):
             out.append(f":grey_question: <@{member_id}> (@{member_name}) :shield:")
 
         if out:
-            embed = Embed(title=t.member_list_cnt(len(out)), colour=0x256BE6, description="\n".join(out))
+            embed = Embed(title=t.member_list_cnt(role.name, cnt=len(out)), colour=0x256BE6, description="\n".join(out))
         else:
             embed = Embed(title=t.member_list, colour=0xCF0606, description=t.no_members)
         await send_long_embed(ctx, embed, paginate=True)

administration/roles/colors.py

@@ -3,3 +3,4 @@
 
 class Colors(MaterialColors):
     Roles = MaterialColors.blue["a700"]
+    MissingPermissions = MaterialColors.yellow["a700"]

administration/roles/permissions.py

@@ -14,3 +14,4 @@ def description(self) -> str:
     auth_read = auto()
     auth_write = auto()
     list_members = auto()
+    roles_clone = auto()

administration/roles/translations/en.yml

@@ -4,6 +4,7 @@ permissions:
   auth_read: read role assignment permissions
   auth_write: write role assignment permissions
   list_members: list role members
+  roles_clone: clones existing roles
 
 commands:
   roles: manage roles
@@ -12,6 +13,7 @@ commands:
   roles_auth_add: add a new role assignment authorization
   roles_auth_remove: remove a role assignment authorization
   roles_add: assign a role to a member
+  roles_clone: clone an existing role
   roles_remove: remove a role from a member
   roles_perma_add: assign a role permanently to a member
   roles_perma_unset: remove the perma flag from a member role
@@ -38,7 +40,9 @@ role_auth_removed: Role assignment authorization has been removed successfully.
 log_role_auth_removed: Role assignment authorization `@{}` -> `@{}` has been removed.
 role_not_authorized: You are not allowed to manage this role.
 member_list: Member List
-member_list_cnt: Member List ({})
+member_list_cnt:
+  one: "Member List of @{} ({cnt} Member)"
+  many: "Member List of @{} ({cnt} Members)"
 member_list_line: ":small_orange_diamond: {} ({})"
 no_members: No member was found with this role.
 role_already_assigned: Role has already been assigned to this member.
@@ -50,3 +54,5 @@ perma_reassigned: Perma role {} has been reassigned to {} ({}). If you want to r
 no_perma_roles: No permanent role assignments.
 perma_roles: Permanent Role Assignments
 could_not_reassign: Could not reassign perma role {} to {} ({}).
+clone_no_permission: I cannot clone this role because I don't have `manage_roles` permission on this server.
+failed_to_clone_role_permissions: ":warning: Could not clone following permissions:"

administration/sudo/cog.py

@@ -58,7 +58,7 @@ async def sudo(self, ctx: Context, *, cmd: str):
     @commands.command()
     @SudoPermission.clear_cache.check
     async def clear_cache(self, ctx: Context):
-        await redis.flushall()
+        await redis.flushdb()
         await ctx.message.add_reaction(name_to_emoji["white_check_mark"])
 
     @commands.command()

contributor.py

@@ -11,3 +11,4 @@ class Contributor(ContributorBase):
     Tristan = (277069925678317568, "MDQ6VXNlcjQ1MzMwNjY3")
     Tert0 = (621330363167539210, "MDQ6VXNlcjYyMDM2NDY0")
     MarcelCoding = (398895973490884608, "MDQ6VXNlcjM0ODE5NTI0")
+    NekoFanatic = (544956941643022356, "MDQ6VXNlcjgzODgzODQ5")

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,