Moved admin & moderator commands to base module

kdb-bot/src/modules/base/base_module.py

@@ -11,6 +11,10 @@ from modules.base.command.afk_command import AFKCommand
 from modules.base.command.help_command import HelpCommand
 from modules.base.command.info_command import InfoCommand
 from modules.base.command.ping_command import PingCommand
+from modules.base.command.purge_command import PurgeCommand
+from modules.base.command.restart_command import RestartCommand
+from modules.base.command.shutdown_command import ShutdownCommand
+from modules.base.command.user_group import UserGroup
 from modules.base.events.base_on_command_error_event import BaseOnCommandErrorEvent
 from modules.base.events.base_on_command_event import BaseOnCommandEvent
 from modules.base.events.base_on_member_join_event import BaseOnMemberJoinEvent
@@ -35,6 +39,11 @@ class BaseModule(ModuleABC):
         self._dc.add_command(HelpCommand)
         self._dc.add_command(InfoCommand)
         self._dc.add_command(PingCommand)
+
+        self._dc.add_command(RestartCommand)
+        self._dc.add_command(ShutdownCommand)
+        self._dc.add_command(PurgeCommand)
+        self._dc.add_command(UserGroup)
         # events
         self._dc.add_event(DiscordEventTypesEnum.on_command.value, BaseOnCommandEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_command_error.value, BaseOnCommandErrorEvent)

kdb-bot/src/modules/base/command/purge_command.py

@@ -0,0 +1,61 @@
+import asyncio
+
+from cpl_core.configuration import ConfigurationABC
+from cpl_discord.command import DiscordCommandABC
+from cpl_translation import TranslatePipe
+from discord.ext import commands
+from discord.ext.commands import Context
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.configuration.server_settings import ServerSettings
+from bot_core.logging.command_logger import CommandLogger
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
+
+
+class PurgeCommand(DiscordCommandABC):
+
+    def __init__(
+            self,
+            logger: CommandLogger,
+            config: ConfigurationABC,
+            message_service: MessageServiceABC,
+            permissions: PermissionServiceABC,
+            client_utils: ClientUtilsServiceABC,
+            translate: TranslatePipe
+    ):
+        DiscordCommandABC.__init__(self)
+
+        self._logger = logger
+        self._config = config
+        self._message_service = message_service
+        self._permissions = permissions
+        self._client_utils = client_utils
+        self._t = translate
+
+        self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
+
+    @commands.hybrid_command()
+    @commands.guild_only()
+    async def purge(self, ctx: Context):
+        self._logger.debug(__name__, f'Received command purge {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+
+        self._client_utils.received_command(ctx.guild.id)
+        server_settings: ServerSettings = self._config.get_configuration(f'ServerSettings_{ctx.guild.id}')
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished purge command')
+            return
+
+        await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.moderator.purge_message'))
+        await asyncio.sleep(server_settings.message_delete_timer)
+        try:
+            await ctx.channel.purge()
+        except Exception as e:
+            self._logger.error(__name__, f'Cannot purge channel {ctx.channel.id}', e)
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.bot_has_no_permission_message'))
+
+        self._logger.trace(__name__, f'Finished purge command')

kdb-bot/src/modules/base/command/restart_command.py

@@ -0,0 +1,64 @@
+import asyncio
+
+import discord
+from cpl_core.configuration import ConfigurationABC
+from cpl_discord.command import DiscordCommandABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslatePipe
+from discord.ext import commands
+from discord.ext.commands import Context
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.configuration.bot_settings import BotSettings
+from bot_core.logging.command_logger import CommandLogger
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
+
+
+class RestartCommand(DiscordCommandABC):
+
+    def __init__(
+            self,
+            logger: CommandLogger,
+            config: ConfigurationABC,
+            message_service: MessageServiceABC,
+            bot: DiscordBotServiceABC,
+            client_utils: ClientUtilsServiceABC,
+            translate: TranslatePipe,
+            permissions: PermissionServiceABC,
+            settings: BotSettings
+    ):
+        DiscordCommandABC.__init__(self)
+
+        self._logger = logger
+        self._config = config
+        self._message_service = message_service
+        self._bot = bot
+        self._client_utils = client_utils
+        self._t = translate
+        self._permissions = permissions
+        self._settings = settings
+
+        self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
+
+    @commands.hybrid_command()
+    @commands.guild_only()
+    async def restart(self, ctx: Context):
+        self._logger.debug(__name__, f'Received command restart {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished restart command')
+            return
+
+        self._config.add_configuration('IS_RESTART', 'true')
+        await self._client_utils.presence_game('common.presence.restart')
+        await asyncio.sleep(self._settings.wait_for_restart)
+        await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.admin.restart_message'))
+        await self._bot.stop_async()
+
+        self._logger.trace(__name__, f'Finished restart command')

kdb-bot/src/modules/base/command/shutdown_command.py

@@ -0,0 +1,63 @@
+import asyncio
+
+import discord
+from cpl_core.configuration import ConfigurationABC
+from cpl_discord.command import DiscordCommandABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslatePipe
+from discord.ext import commands
+from discord.ext.commands import Context
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.configuration.bot_settings import BotSettings
+from bot_core.logging.command_logger import CommandLogger
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
+
+
+class ShutdownCommand(DiscordCommandABC):
+
+    def __init__(
+            self,
+            logger: CommandLogger,
+            config: ConfigurationABC,
+            message_service: MessageServiceABC,
+            bot: DiscordBotServiceABC,
+            client_utils: ClientUtilsServiceABC,
+            translate: TranslatePipe,
+            permissions: PermissionServiceABC,
+            settings: BotSettings
+    ):
+        DiscordCommandABC.__init__(self)
+
+        self._logger = logger
+        self._config = config
+        self._message_service = message_service
+        self._bot = bot
+        self._client_utils = client_utils
+        self._t = translate
+        self._permissions = permissions
+        self._settings = settings
+
+        self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
+
+    @commands.hybrid_command()
+    @commands.guild_only()
+    async def shutdown(self, ctx: Context):
+        self._logger.debug(__name__, f'Received command shutdown {ctx}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished shutdown command')
+            return
+
+        await self._client_utils.presence_game('common.presence.shutdown')
+        await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.admin.shutdown_message'))
+        await asyncio.sleep(self._settings.wait_for_shutdown)
+        await self._bot.stop_async()
+
+        self._logger.trace(__name__, f'Finished shutdown command')

kdb-bot/src/modules/base/command/user_group.py

@@ -0,0 +1,111 @@
+from typing import Optional
+
+import discord
+from cpl_core.configuration import ConfigurationABC
+from cpl_discord.command import DiscordCommandABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslatePipe
+from discord.ext import commands
+from discord.ext.commands import Context
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.logging.command_logger import CommandLogger
+from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
+from bot_data.abc.user_repository_abc import UserRepositoryABC
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
+
+
+class UserGroup(DiscordCommandABC):
+
+    def __init__(
+            self,
+            config: ConfigurationABC,
+            logger: CommandLogger,
+            message_service: MessageServiceABC,
+            bot: DiscordBotServiceABC,
+            client_utils: ClientUtilsServiceABC,
+            permissions: PermissionServiceABC,
+            servers: ServerRepositoryABC,
+            users: UserRepositoryABC,
+            user_joined_servers: UserJoinedServerRepositoryABC,
+            translate: TranslatePipe,
+            date: DateTimeOffsetPipe
+    ):
+        DiscordCommandABC.__init__(self)
+
+        self._config = config
+        self._logger = logger
+        self._message_service = message_service
+        self._bot = bot
+        self._client_utils = client_utils
+        self._permissions = permissions
+        self._servers = servers
+        self._users = users
+        self._user_joined_servers = user_joined_servers
+        self._t = translate
+        self._date = date
+
+        self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
+
+    @commands.hybrid_group()
+    @commands.guild_only()
+    async def user(self, ctx: Context):
+        pass
+
+    @user.command()
+    @commands.guild_only()
+    async def info(self, ctx: Context, member: Optional[discord.Member] = None, *, wait: int = None):
+        self._logger.debug(__name__, f'Received command user-info {ctx}:{member},{wait}')
+        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
+            return
+        self._client_utils.received_command(ctx.guild.id)
+
+        if not self._permissions.is_member_moderator(ctx.author):
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            self._logger.trace(__name__, f'Finished purge command')
+            return
+
+        if member is None or not isinstance(member, discord.Member):
+            member = ctx.author
+
+        server = self._servers.find_server_by_discord_id(ctx.guild.id)
+        user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
+        joins = self._user_joined_servers.get_user_joined_servers_by_user_id(user.user_id)
+
+        embed = discord.Embed(
+            title=member.name,
+            description=member.name,
+            color=int('ef9d0d', 16)
+        )
+
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.id'), value=member.id)
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.name'), value=member.name)
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.discord_join'), value=self._date.transform(member.created_at), inline=False)
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.last_join'), value=self._date.transform(member.joined_at), inline=False)
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.xp'), value=str(user.xp))
+
+        roles = ''
+        for role in member.roles:
+            roles += f'{role.name}\n'
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.roles'), value=roles, inline=False)
+
+        joins_string = ''
+        for join in joins:
+            joins_string += f'{self._date.transform(join.joined_on)}\n'
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.joins'), value=joins_string)
+
+        lefts_string = ''
+        for join in joins:
+            if join.leaved_on is None:
+                if lefts_string == '':
+                    lefts_string = '/'
+                continue
+            lefts_string += f'{self._date.transform(join.leaved_on)}\n'
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.lefts'), value=lefts_string)
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.warnings'), value=self._t.transform('common.not_implemented_yet'), inline=False)
+
+        await self._message_service.send_ctx_msg(ctx, embed, wait_before_delete=wait)
+        self._logger.trace(__name__, f'Finished user-info command')