Merge branch 'master' into 1.0.0-fix
# Conflicts: # kdb-bot/src/bot/__init__.py # kdb-bot/src/bot/bot.json # kdb-bot/src/bot/config # kdb-bot/src/bot/extension/__init__.py # kdb-bot/src/bot_api/__init__.py # kdb-bot/src/bot_api/abc/__init__.py # kdb-bot/src/bot_api/bot-api.json # kdb-bot/src/bot_api/configuration/__init__.py # kdb-bot/src/bot_api/controller/__init__.py # kdb-bot/src/bot_api/event/__init__.py # kdb-bot/src/bot_api/exception/__init__.py # kdb-bot/src/bot_api/filter/__init__.py # kdb-bot/src/bot_api/filter/discord/__init__.py # kdb-bot/src/bot_api/logging/__init__.py # kdb-bot/src/bot_api/model/__init__.py # kdb-bot/src/bot_api/model/discord/__init__.py # kdb-bot/src/bot_api/route/__init__.py # kdb-bot/src/bot_api/service/__init__.py # kdb-bot/src/bot_api/transformer/__init__.py # kdb-bot/src/bot_core/__init__.py # kdb-bot/src/bot_core/abc/__init__.py # kdb-bot/src/bot_core/bot-core.json # kdb-bot/src/bot_core/configuration/__init__.py # kdb-bot/src/bot_core/core_extension/__init__.py # kdb-bot/src/bot_core/events/__init__.py # kdb-bot/src/bot_core/exception/__init__.py # kdb-bot/src/bot_core/helper/__init__.py # kdb-bot/src/bot_core/logging/__init__.py # kdb-bot/src/bot_core/pipes/__init__.py # kdb-bot/src/bot_core/service/__init__.py # kdb-bot/src/bot_data/__init__.py # kdb-bot/src/bot_data/abc/__init__.py # kdb-bot/src/bot_data/bot-data.json # kdb-bot/src/bot_data/migration/__init__.py # kdb-bot/src/bot_data/model/__init__.py # kdb-bot/src/bot_data/service/__init__.py # kdb-bot/src/bot_graphql/__init__.py # kdb-bot/src/bot_graphql/abc/__init__.py # kdb-bot/src/bot_graphql/filter/__init__.py # kdb-bot/src/bot_graphql/mutations/__init__.py # kdb-bot/src/modules/auto_role/__init__.py # kdb-bot/src/modules/auto_role/auto-role.json # kdb-bot/src/modules/auto_role/command/__init__.py # kdb-bot/src/modules/auto_role/events/__init__.py # kdb-bot/src/modules/auto_role/helper/__init__.py # kdb-bot/src/modules/base/__init__.py # kdb-bot/src/modules/base/abc/__init__.py # kdb-bot/src/modules/base/base.json # kdb-bot/src/modules/base/command/__init__.py # kdb-bot/src/modules/base/configuration/__init__.py # kdb-bot/src/modules/base/events/__init__.py # kdb-bot/src/modules/base/events/base_on_voice_state_update_event.py # kdb-bot/src/modules/base/helper/__init__.py # kdb-bot/src/modules/base/model/__init__.py # kdb-bot/src/modules/base/service/__init__.py # kdb-bot/src/modules/base/thread/__init__.py # kdb-bot/src/modules/boot_log/__init__.py # kdb-bot/src/modules/boot_log/boot-log.json # kdb-bot/src/modules/boot_log/configuration/__init__.py # kdb-bot/src/modules/database/__init__.py # kdb-bot/src/modules/database/database.json # kdb-bot/src/modules/level/__init__.py # kdb-bot/src/modules/level/command/__init__.py # kdb-bot/src/modules/level/configuration/__init__.py # kdb-bot/src/modules/level/events/__init__.py # kdb-bot/src/modules/level/level.json # kdb-bot/src/modules/level/service/__init__.py # kdb-bot/src/modules/permission/__init__.py # kdb-bot/src/modules/permission/abc/__init__.py # kdb-bot/src/modules/permission/configuration/__init__.py # kdb-bot/src/modules/permission/events/__init__.py # kdb-bot/src/modules/permission/permission.json # kdb-bot/src/modules/permission/service/__init__.py # kdb-bot/src/modules/stats/service/__init__.py # kdb-bot/src/modules/stats/stats.json # kdb-bot/src/modules/technician/__init__.py # kdb-bot/src/modules/technician/command/__init__.py # kdb-bot/src/modules/technician/technician.json # kdb-bot/tools/get_version/get-version.json # kdb-bot/tools/post_build/post-build.json # kdb-bot/tools/set_version/set-version.json
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
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_core.logging.message_logger import MessageLogger
|
||||
from bot_data.abc.server_repository_abc import ServerRepositoryABC
|
||||
from bot_data.abc.user_repository_abc import UserRepositoryABC
|
||||
from modules.base.abc.base_helper_abc import BaseHelperABC
|
||||
@@ -16,7 +16,7 @@ from modules.base.configuration.base_server_settings import BaseServerSettings
|
||||
class BaseReactionHandler:
|
||||
def __init__(
|
||||
self,
|
||||
logger: LoggerABC,
|
||||
logger: MessageLogger,
|
||||
bot: DiscordBotServiceABC,
|
||||
servers: ServerRepositoryABC,
|
||||
users: UserRepositoryABC,
|
||||
|
Reference in New Issue
Block a user