sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

0.3.1 #187

Merged
edraft merged 46 commits from 0.3.1 into master 2023-01-14 10:39:27 +01:00
Conversation 0 Commits 46 Files Changed 291 +177 -80
27 changed files with 177 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1ff70af72b - Show all commits

11
kdb-bot/src/bot_core/abc/client_utils_service_abc.py → kdb-bot/src/bot_core/abc/client_utils_abc.py
View File

@ -5,9 +5,12 @@ from cpl_query.extension import List
from discord.ext.commands import Context
from bot_data.model.user import User
from modules.base.configuration.base_server_settings import BaseServerSettings
from bot_data.model.user import User
class ClientUtilsServiceABC(ABC):
class ClientUtilsABC(ABC):
@abstractmethod
def __init__(self): pass
@ -36,5 +39,11 @@ class ClientUtilsServiceABC(ABC):
@abstractmethod
def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List: pass
@abstractmethod
def is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
self, created_at: datetime, user: User, settings: BaseServerSettings,
is_reaction: bool = False
) -> bool: pass
@abstractmethod
def get_ontime_for_user(self, user: User) -> float: pass

4
kdb-bot/src/bot_core/core_extension/core_extension.py
View File

@ -3,7 +3,7 @@ from cpl_core.configuration import ConfigurationABC
from cpl_core.dependency_injection import ServiceProviderABC
from cpl_translation import TranslatePipe
from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
from bot_core.abc.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
@ -23,7 +23,7 @@ class CoreExtension(ApplicationExtensionABC):
return
permissions: PermissionServiceABC = services.get_service(PermissionServiceABC)
client_utils: ClientUtilsServiceABC = services.get_service(ClientUtilsServiceABC)
client_utils: ClientUtilsABC = services.get_service(ClientUtilsABC)
message_service: MessageServiceABC = services.get_service(MessageServiceABC)
t: TranslatePipe = services.get_service(TranslatePipe)
CommandChecks.init(permissions, client_utils, message_service, t)

4
kdb-bot/src/bot_core/core_extension/core_extension_on_ready_event.py
View File

@ -5,7 +5,7 @@ from cpl_discord.events import OnReadyABC
from cpl_discord.service import DiscordBotServiceABC
from cpl_translation import TranslatePipe
from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
from bot_core.abc.client_utils_abc import ClientUtilsABC
class CoreExtensionOnReadyEvent(OnReadyABC):
@ -14,7 +14,7 @@ class CoreExtensionOnReadyEvent(OnReadyABC):
self,
logger: LoggerABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
t: TranslatePipe
):
OnReadyABC.__init__(self)

4
kdb-bot/src/bot_core/core_module.py
View File

@ -4,7 +4,7 @@ from cpl_core.environment import ApplicationEnvironmentABC
from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
from bot_core.abc.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.abc.module_abc import ModuleABC
from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
@ -24,7 +24,7 @@ class CoreModule(ModuleABC):
def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
services.add_transient(MessageServiceABC, MessageService)
services.add_transient(ClientUtilsServiceABC, ClientUtilsService)
services.add_transient(ClientUtilsABC, ClientUtilsService)
# pipes
services.add_transient(DateTimeOffsetPipe)

4
kdb-bot/src/bot_core/events/core_on_ready_event.py
View File

@ -3,7 +3,7 @@ from cpl_discord.events import OnReadyABC
from cpl_discord.service import DiscordBotServiceABC
from cpl_translation import TranslatePipe
from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
from bot_core.abc.client_utils_abc import ClientUtilsABC
class CoreOnReadyEvent(OnReadyABC):
@ -12,7 +12,7 @@ class CoreOnReadyEvent(OnReadyABC):
self,
logger: LoggerABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
t: TranslatePipe,
):
OnReadyABC.__init__(self)

6
kdb-bot/src/bot_core/helper/command_checks.py
View File

@ -4,7 +4,7 @@ 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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.exception.check_error import CheckError
from modules.permission.abc.permission_service_abc import PermissionServiceABC
@ -12,7 +12,7 @@ from modules.permission.abc.permission_service_abc import PermissionServiceABC
class CommandChecks:
_permissions: Optional[PermissionServiceABC] = None
_client_utils: Optional[ClientUtilsServiceABC] = None
_client_utils: Optional[ClientUtilsABC] = None
_message_service: Optional[MessageServiceABC] = None
_t: Optional[TranslatePipe] = None
@ -20,7 +20,7 @@ class CommandChecks:
def init(
cls,
permissions: PermissionServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
message_service: MessageServiceABC,
translate: TranslatePipe,
):

6
kdb-bot/src/bot_core/helper/event_checks.py
View File

@ -4,19 +4,19 @@ 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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.exception.check_error import CheckError
from modules.permission.abc.permission_service_abc import PermissionServiceABC
class EventChecks:
_client_utils: Optional[ClientUtilsServiceABC] = None
_client_utils: Optional[ClientUtilsABC] = None
@classmethod
def init(
cls,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
):
cls._client_utils = client_utils

64
kdb-bot/src/bot_core/service/client_utils_service.py
View File

@ -4,43 +4,50 @@ import discord
from cpl_core.configuration import ConfigurationABC
from cpl_core.database.context import DatabaseContextABC
from cpl_core.logging import LoggerABC
from cpl_core.time import TimeFormatSettings
from cpl_discord.service import DiscordBotServiceABC
from cpl_query.extension import List
from cpl_translation import TranslatePipe
from discord import app_commands
from discord.ext.commands import Context
from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
from bot_core.abc.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
from bot_data.abc.client_repository_abc import ClientRepositoryABC
from bot_data.abc.server_repository_abc import ServerRepositoryABC
from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC
from bot_data.model.user import User
from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
from modules.base.configuration.base_server_settings import BaseServerSettings
from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
from bot_data.model.user import User
class ClientUtilsService(ClientUtilsServiceABC):
class ClientUtilsService(ClientUtilsABC):
def __init__(
self,
config: ConfigurationABC,
logger: LoggerABC,
time_format: TimeFormatSettings,
bot: DiscordBotServiceABC,
servers: ServerRepositoryABC,
clients: ClientRepositoryABC,
umcphs: UserMessageCountPerHourRepositoryABC,
user_joined_vc: UserJoinedVoiceChannelRepositoryABC,
message_service: MessageServiceABC,
db: DatabaseContextABC,
t: TranslatePipe,
feature_flags: FeatureFlagsSettings
):
ClientUtilsServiceABC.__init__(self)
ClientUtilsABC.__init__(self)
self._config = config
self._logger = logger
self._time_format = time_format
self._bot = bot
self._servers = servers
self._umcphs = umcphs
self._clients = clients
self._user_joined_voice_channel = user_joined_vc
self._message_service = message_service
@ -84,6 +91,8 @@ class ClientUtilsService(ClientUtilsServiceABC):
async def check_if_bot_is_ready_yet_and_respond(self, ctx: Context) -> bool:
result = await self.check_if_bot_is_ready_yet()
if not result:
await self._message_service.send_ctx_msg(ctx, self._t.transform('common.errors.bot_not_ready_yet'),
without_tracking=True)
await self._message_service.send_ctx_msg(
ctx,
self._t.transform('common.errors.bot_not_ready_yet'),
@ -115,6 +124,51 @@ class ClientUtilsService(ClientUtilsServiceABC):
return _l.take(25)
def is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
self,
created_at: datetime,
user: User,
settings: BaseServerSettings,
is_reaction: bool = False
) -> bool:
umcph = None
try:
umcph = self._umcphs.find_user_message_count_per_hour_by_user_id_and_date(user.user_id, created_at)
if umcph is None:
self._umcphs.add_user_message_count_per_hour(UserMessageCountPerHour(
created_at.strftime(self._time_format.date_time_format),
created_at.hour,
0,
user
))
self._db.save_changes()
umcph = self._umcphs.get_user_message_count_per_hour_by_user_id_and_date(
user.user_id,
created_at
)
except Exception as e:
self._logger.error(__name__, f'Cannot add user message count per hour with id {umcph.id}', e)
return False
try:
if is_reaction:
umcph.xp_count += settings.xp_per_reaction
else:
umcph.xp_count += settings.xp_per_reaction
self._umcphs.update_user_message_count_per_hour(umcph)
self._db.save_changes()
except Exception as e:
self._logger.error(__name__, f'Cannot update user message count per hour with id {umcph.id}', e)
return False
if umcph.xp_count is None:
return False
return umcph.xp_count > settings.max_message_xp_per_hour
def get_ontime_for_user(self, user: User) -> float:
return self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id) \
.where(lambda x: x.leaved_on is not None and x.joined_on is not None) \

18
kdb-bot/src/bot_data/abc/user_message_count_per_hour_repository_abc.py
View File

@ -1,4 +1,5 @@
from abc import ABC, abstractmethod
from datetime import datetime
from typing import Optional
from cpl_query.extension import List
@ -10,22 +11,27 @@ class UserMessageCountPerHourRepositoryABC(ABC):
@abstractmethod
def __init__(self): pass
@abstractmethod
def get_user_message_count_per_hours(self) -> List[UserMessageCountPerHour]: pass
@abstractmethod
def find_user_message_count_per_hours_by_user_id(self, user_id: int) -> List[Optional[UserMessageCountPerHour]]: pass
def find_user_message_count_per_hour_by_user_id(self, user_id: int) -> Optional[UserMessageCountPerHour]: pass
@abstractmethod
def find_user_message_count_per_hours_by_user_id_and_active_hour(self, user_id: int) -> List[Optional[UserMessageCountPerHour]]: pass
def get_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
Optional[UserMessageCountPerHour]: pass
@abstractmethod
def find_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
Optional[UserMessageCountPerHour]: pass
@abstractmethod
def add_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass
@abstractmethod
def update_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass
@abstractmethod
def delete_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass

4
kdb-bot/src/bot_data/migration/user_message_count_per_hour_migration.py
View File

@ -19,9 +19,9 @@ class UserMessageCountPerHourMigration(MigrationABC):
str(f"""
CREATE TABLE IF NOT EXISTS `UserMessageCountPerHour` (
`Id` BIGINT NOT NULL AUTO_INCREMENT,
`Date` DATETIME(6) NOT NULL,
`Date` VARCHAR(255) NOT NULL,
`Hour` BIGINT,
`Count` BIGINT,
`XPCount` BIGINT,
`UserId` BIGINT,
`CreatedAt` DATETIME(6),
`LastModifiedAt` DATETIME(6),

5
kdb-bot/src/bot_data/model/level.py
View File

@ -29,6 +29,7 @@ class Level(TableABC):
@name.setter
def name(self, value: str):
self._modified_at = datetime.now().isoformat()
self._name = value
@property
@ -37,6 +38,7 @@ class Level(TableABC):
@color.setter
def color(self, value: str):
self._modified_at = datetime.now().isoformat()
self._color = value
@property
@ -45,6 +47,7 @@ class Level(TableABC):
@min_xp.setter
def min_xp(self, value: int):
self._modified_at = datetime.now().isoformat()
self._min_xp = value
@property
@ -53,6 +56,7 @@ class Level(TableABC):
@permissions.setter
def permissions(self, value: int):
self._modified_at = datetime.now().isoformat()
self._permissions = value
@property
@ -61,6 +65,7 @@ class Level(TableABC):
@server.setter
def server(self, value: Server):
self._modified_at = datetime.now().isoformat()
self._server = value
@staticmethod

30
kdb-bot/src/bot_data/model/user_message_count_per_hour.py
View File

@ -9,9 +9,9 @@ class UserMessageCountPerHour(TableABC):
def __init__(
self,
date: datetime,
date: str,
hour: int,
count: int,
xp_count: int,
user: User,
created_at: datetime = None,
modified_at: datetime = None,
@ -19,7 +19,7 @@ class UserMessageCountPerHour(TableABC):
self._id = id
self._date = date
self._hour = hour
self._count = count
self._xp_count = xp_count
self._user = user
TableABC.__init__(self)
@ -39,8 +39,13 @@ class UserMessageCountPerHour(TableABC):
return self._hour
@property
def count(self) -> int:
return self._count
def xp_count(self) -> int:
return self._xp_count
@xp_count.setter
def xp_count(self, value: int):
self._modified_at = datetime.now().isoformat()
self._xp_count = value
@property
def user(self) -> User:
@ -67,27 +72,26 @@ class UserMessageCountPerHour(TableABC):
""")
@staticmethod
def get_select_by_user_id_and_current_hour_string(id: int) -> str:
now = datetime.now()
date = f'{now.year}-{now.month}-{now.day}%'
def get_select_by_user_id_and_date_string(id: int, date: datetime) -> str:
date_str = f'{str(date.year).zfill(4)}-{str(date.month).zfill(2)}-{str(date.day).zfill(2)}%'
return str(f"""
SELECT * FROM `UserMessageCountPerHour`
WHERE `UserId` = {id}
AND `Date` LIKE '{date}'
AND `Hour` = {now.hour};
AND `Date` LIKE '{date_str}'
AND `Hour` = {date.hour};
""")
@property
def insert_string(self) -> str:
return str(f"""
INSERT INTO `UserMessageCountPerHour` (
`UserId`, `Date`, `JoinedOn`, `Count`, `CreatedAt`, `LastModifiedAt`
`UserId`, `Date`, `Hour`, `XPCount`, `CreatedAt`, `LastModifiedAt`
) VALUES (
{self._user.user_id},
'{self._date}',
{self._hour},
{self._count},
{self._xp_count},
'{self._created_at}',
'{self._modified_at}'
);
@ -97,7 +101,7 @@ class UserMessageCountPerHour(TableABC):
def udpate_string(self) -> str:
return str(f"""
UPDATE `UserMessageCountPerHour`
SET `Count` = '{self._count}',
SET `XPCount` = '{self._xp_count}',
`LastModifiedAt` = '{self._modified_at}'
WHERE `Id` = {self._id};
""")

30
kdb-bot/src/bot_data/service/user_joined_voice_channel_repository_service.py
View File

@ -1,3 +1,4 @@
from datetime import datetime
from typing import Optional
from cpl_core.database.context import DatabaseContextABC
@ -16,14 +17,12 @@ class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepository
logger: DatabaseLogger,
db_context: DatabaseContextABC,
users: UserRepositoryABC,
umcphs: UserMessageCountPerHourRepositoryABC,
):
UserMessageCountPerHourRepositoryABC.__init__(self)
self._logger = logger
self._context = db_context
self._users = users
self._umcphs = umcphs
@staticmethod
def _get_value_from_result(value: any) -> Optional[any]:
@ -53,7 +52,7 @@ class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepository
return umcphs
def find_user_message_count_per_hours_by_user_id(self, user_id: int) -> List[Optional[UserMessageCountPerHour]]:
def find_user_message_count_per_hour_by_user_id(self, user_id: int) -> List[Optional[UserMessageCountPerHour]]:
umcphs = List(UserMessageCountPerHour)
sql = UserMessageCountPerHour.get_select_by_user_id_string(user_id)
self._logger.trace(__name__, f'Send SQL command: {sql}')
@ -67,21 +66,22 @@ class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepository
return umcphs
def find_user_message_count_per_hours_by_user_id_and_active_hour(self, user_id: int) -> List[
Optional[UserMessageCountPerHour]
]:
umcphs = List(UserMessageCountPerHour)
sql = UserMessageCountPerHour.get_select_by_user_id_and_current_hour_string(user_id)
def get_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
Optional[UserMessageCountPerHour]:
sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(user_id, date)
self._logger.trace(__name__, f'Send SQL command: {sql}')
results = self._context.select(sql)
if results is None or len(results) == 0:
return umcphs
result = self._context.select(sql)[0]
return self._from_result(result)
for result in results:
self._logger.trace(__name__, f'Get user message count per hour with id {result[0]}')
umcphs.append(self._from_result(result))
def find_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
Optional[UserMessageCountPerHour]:
sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(user_id, date)
self._logger.trace(__name__, f'Send SQL command: {sql}')
result = self._context.select(sql)
if result is None or len(result) == 0:
return None
return umcphs
return self._from_result(result[0])
def add_user_message_count_per_hour(self, umcph: UserMessageCountPerHour):
self._logger.trace(__name__, f'Send SQL command: {umcph.insert_string}')

4
kdb-bot/src/modules/auto_role/command/auto_role_group.py
View File

@ -11,7 +11,7 @@ from discord import app_commands, Guild
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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
from bot_core.logging.command_logger import CommandLogger
@ -29,7 +29,7 @@ class AutoRoleGroup(DiscordCommandABC):
logger: CommandLogger,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe,
servers: ServerRepositoryABC,
auto_roles: AutoRoleRepositoryABC,

4
kdb-bot/src/modules/base/command/afk_command.py
View File

@ -6,7 +6,7 @@ from discord import VoiceChannel
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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
from bot_core.logging.command_logger import CommandLogger
@ -21,7 +21,7 @@ class AFKCommand(DiscordCommandABC):
config: ConfigurationABC,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe
):
DiscordCommandABC.__init__(self)

4
kdb-bot/src/modules/base/command/help_command.py
View File

@ -8,7 +8,7 @@ from discord import app_commands
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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
from bot_core.logging.command_logger import CommandLogger
@ -23,7 +23,7 @@ class HelpCommand(DiscordCommandABC):
logger: CommandLogger,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC
client_utils: ClientUtilsABC
):
DiscordCommandABC.__init__(self)

4
kdb-bot/src/modules/base/command/info_command.py
View File

@ -9,7 +9,7 @@ from discord.ext import commands
from discord.ext.commands import Context
import bot
from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
from bot_core.abc.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
from bot_core.logging.command_logger import CommandLogger
@ -23,7 +23,7 @@ class InfoCommand(DiscordCommandABC):
logger: CommandLogger,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe
):
DiscordCommandABC.__init__(self)

4
kdb-bot/src/modules/base/command/ping_command.py
View File

@ -5,7 +5,7 @@ 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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
from bot_core.logging.command_logger import CommandLogger
@ -22,7 +22,7 @@ class PingCommand(DiscordCommandABC):
logger: CommandLogger,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe,
permissions: PermissionServiceABC,
base_helper: BaseHelperABC,

4
kdb-bot/src/modules/base/command/purge_command.py
View File

@ -6,7 +6,7 @@ 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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.configuration.server_settings import ServerSettings
from bot_core.helper.command_checks import CommandChecks
@ -22,7 +22,7 @@ class PurgeCommand(DiscordCommandABC):
config: ConfigurationABC,
message_service: MessageServiceABC,
permissions: PermissionServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe
):
DiscordCommandABC.__init__(self)

4
kdb-bot/src/modules/base/command/user_group.py
View File

@ -10,7 +10,7 @@ from discord import app_commands
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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
from bot_core.logging.command_logger import CommandLogger
@ -31,7 +31,7 @@ class UserGroup(DiscordCommandABC):
logger: CommandLogger,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
permissions: PermissionServiceABC,
servers: ServerRepositoryABC,
db: DatabaseContextABC,

9
kdb-bot/src/modules/base/events/base_on_message_event.py
View File

@ -8,6 +8,7 @@ from cpl_discord.service import DiscordBotServiceABC
from bot_core.helper.event_checks import EventChecks
from bot_core.helper.log_message_helper import LogMessageHelper
from bot_core.logging.message_logger import MessageLogger
from bot_core.service.client_utils_service import ClientUtilsService
from bot_data.abc.client_repository_abc import ClientRepositoryABC
from bot_data.abc.server_repository_abc import ServerRepositoryABC
from bot_data.abc.user_repository_abc import UserRepositoryABC
@ -22,6 +23,7 @@ class BaseOnMessageEvent(OnMessageABC):
self,
logger: MessageLogger,
bhs: BaseHelperABC,
client_utils: ClientUtilsService,
db: DatabaseContextABC,
bot: DiscordBotServiceABC,
users: UserRepositoryABC,
@ -31,6 +33,8 @@ class BaseOnMessageEvent(OnMessageABC):
OnMessageABC.__init__(self)
self._logger = logger
self._base_helper = bhs
self._client_utils = client_utils
self._bot = bot
self._db = db
self._bot = bot
self._users = users
@ -64,6 +68,9 @@ class BaseOnMessageEvent(OnMessageABC):
return
settings: BaseServerSettings = self._base_helper.get_config(message.guild.id)
if self._client_utils.is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(message.created_at, user, settings):
return
old_xp = user.xp
user.xp += settings.xp_per_message
self._users.update_user(user)
@ -71,6 +78,8 @@ class BaseOnMessageEvent(OnMessageABC):
self._logger.debug(__name__, f'User {user} sent message. xp: from {old_xp} to {user.xp}')
@EventChecks.check_is_ready()
async def on_message(self, message: discord.Message):
self._logger.debug(__name__, f'Module {type(self)} started')

10
kdb-bot/src/modules/base/helper/base_reaction_handler.py
View File

@ -1,8 +1,11 @@
from datetime import datetime
from cpl_core.database.context import DatabaseContextABC
from cpl_core.logging import LoggerABC
from cpl_discord.service import DiscordBotServiceABC
from discord import RawReactionActionEvent
from bot_core.abc.client_utils_abc import ClientUtilsABC
from bot_core.helper.log_message_helper import LogMessageHelper
from bot_data.abc.server_repository_abc import ServerRepositoryABC
from bot_data.abc.user_repository_abc import UserRepositoryABC
@ -19,6 +22,7 @@ class BaseReactionHandler:
servers: ServerRepositoryABC,
users: UserRepositoryABC,
base_helper: BaseHelperABC,
client_utils: ClientUtilsABC,
db: DatabaseContextABC,
):
self._logger = logger
@ -26,6 +30,7 @@ class BaseReactionHandler:
self._servers = servers
self._users = users
self._base_helper = base_helper
self._client_utils = client_utils
self._db = db
async def handle(self, payload: RawReactionActionEvent, r_type=None) -> None:
@ -59,6 +64,11 @@ class BaseReactionHandler:
settings: BaseServerSettings = self._base_helper.get_config(guild.id)
if r_type == 'add':
if self._client_utils.is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
datetime.now(), user, settings, is_reaction=True
):
return
user.xp += settings.xp_per_reaction
self._users.update_user(user)
self._db.save_changes()

4
kdb-bot/src/modules/level/command/level_group.py
View File

@ -10,7 +10,7 @@ from discord import app_commands
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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
from bot_core.logging.command_logger import CommandLogger
@ -30,7 +30,7 @@ class LevelGroup(DiscordCommandABC):
logger: CommandLogger,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
permission_service: PermissionServiceABC,
translate: TranslatePipe,
db: DatabaseContextABC,

4
kdb-bot/src/modules/stats/command/stats_group.py
View File

@ -8,7 +8,7 @@ from discord import app_commands
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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
from bot_core.logging.command_logger import CommandLogger
@ -25,7 +25,7 @@ class StatsGroup(DiscordCommandABC):
self,
logger: CommandLogger,
message_service: MessageServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe,
permission_service: PermissionServiceABC,
statistic: StatisticService,

4
kdb-bot/src/modules/technician/command/log_command.py
View File

@ -13,7 +13,7 @@ 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.client_utils_abc import ClientUtilsABC
from bot_core.abc.custom_file_logger_abc import CustomFileLoggerABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.helper.command_checks import CommandChecks
@ -29,7 +29,7 @@ class LogCommand(DiscordCommandABC):
logging_settings: LoggingSettings,
services: ServiceProviderABC,
message_service: MessageServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe,
permissions: PermissionServiceABC,
time_format: TimeFormatSettings,

4
kdb-bot/src/modules/technician/command/restart_command.py
View File

@ -7,7 +7,7 @@ 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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.configuration.bot_settings import BotSettings
from bot_core.helper.command_checks import CommandChecks
@ -23,7 +23,7 @@ class RestartCommand(DiscordCommandABC):
config: ConfigurationABC,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe,
permissions: PermissionServiceABC,
settings: BotSettings

4
kdb-bot/src/modules/technician/command/shutdown_command.py
View File

@ -8,7 +8,7 @@ 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.client_utils_abc import ClientUtilsABC
from bot_core.abc.message_service_abc import MessageServiceABC
from bot_core.configuration.bot_settings import BotSettings
from bot_core.helper.command_checks import CommandChecks
@ -24,7 +24,7 @@ class ShutdownCommand(DiscordCommandABC):
config: ConfigurationABC,
message_service: MessageServiceABC,
bot: DiscordBotServiceABC,
client_utils: ClientUtilsServiceABC,
client_utils: ClientUtilsABC,
translate: TranslatePipe,
permissions: PermissionServiceABC,
settings: BotSettings