Added *args and **kwargs support to discord bot and DI

This commit is contained in:
2023-01-12 08:57:01 +01:00
parent e0ca7c2ae6
commit 7f46fbe87a
6 changed files with 27 additions and 18 deletions

View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "2022",
"Minor": "12",
"Micro": "1"
"Micro": "1.post1"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,7 +16,7 @@
"LicenseName": "MIT",
"LicenseDescription": "MIT, see LICENSE for more details.",
"Dependencies": [
"cpl-core>=2022.12.1",
"cpl-core>=2022.12.1.post2",
"discord.py==2.1.0",
"cpl-query>=2022.12.2.post1"
],

View File

@@ -21,7 +21,9 @@ class DiscordBotService(DiscordBotServiceABC):
discord_bot_settings: DiscordBotSettings,
env: ApplicationEnvironmentABC,
logging_st: LoggingSettings,
discord_service: DiscordServiceABC
discord_service: DiscordServiceABC,
*args,
**kwargs
):
# services
self._config = config
@@ -34,7 +36,12 @@ class DiscordBotService(DiscordBotServiceABC):
self._discord_settings = self._get_settings(discord_bot_settings)
# setup super
DiscordBotServiceABC.__init__(self, command_prefix=self._discord_settings.prefix, help_command=None, intents=discord.Intents().all())
DiscordBotServiceABC.__init__(
self,
*args,
command_prefix=self._discord_settings.prefix, help_command=None, intents=discord.Intents().all(),
**kwargs
)
self._base = super(DiscordBotServiceABC, self)
@staticmethod
@@ -50,7 +57,9 @@ class DiscordBotService(DiscordBotServiceABC):
new_settings.from_dict({
'Token': env_token if token is None or token == '' else token,
'Prefix': ('! ' if self._is_string_invalid(env_prefix) else env_prefix) if self._is_string_invalid(prefix) else prefix
'Prefix':
('! ' if self._is_string_invalid(env_prefix) else env_prefix)
if self._is_string_invalid(prefix) else prefix
})
if new_settings.token is None or new_settings.token == '':
raise Exception('You have to configure discord token by appsettings or environment variables')

View File

@@ -8,8 +8,8 @@ from cpl_query.extension.list import List
class DiscordBotServiceABC(commands.Bot):
def __init__(self, **kwargs):
commands.Bot.__init__(self, **kwargs)
def __init__(self, *args, **kwargs):
commands.Bot.__init__(self, *args, **kwargs)
@abstractmethod
async def start_async(self): pass