src/cpl_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .startup_abc import StartupABC
 from .startup_extension_abc import StartupExtensionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -35,4 +35,4 @@ from .validator_abc import ValidatorABC
 from .variable_argument import VariableArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/console/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/cpl-core.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "12",
-      "Micro": "1.post2"
+      "Micro": "1.post1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",

src/cpl_core/database/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .database_settings import DatabaseSettings
 from .table_abc import TableABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/database/connection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/database/context/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/dependency_injection/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/dependency_injection/service_provider.py

@@ -57,7 +57,7 @@ class ServiceProvider(ServiceProviderABC):
 
         # raise Exception(f'Service {parameter.annotation} not found')
 
-    def _get_services(self, t: type, *args, **kwargs) -> list[Optional[object]]:
+    def _get_services(self, t: type) -> list[Optional[object]]:
         implementations = []
         for descriptor in self._service_descriptors:
             if descriptor.service_type == t or issubclass(descriptor.service_type, t):
@@ -65,7 +65,7 @@ class ServiceProvider(ServiceProviderABC):
                     implementations.append(descriptor.implementation)
                     continue
 
-                implementation = self.build_service(descriptor.service_type, *args, **kwargs)
+                implementation = self.build_service(descriptor.service_type)
                 if descriptor.lifetime == ServiceLifetimeEnum.singleton:
                     descriptor.implementation = implementation
 
@@ -102,7 +102,7 @@ class ServiceProvider(ServiceProviderABC):
 
         return params
 
-    def build_service(self, service_type: type, *args, **kwargs) -> object:
+    def build_service(self, service_type: type) -> object:
         for descriptor in self._service_descriptors:
             if descriptor.service_type == service_type or issubclass(descriptor.service_type, service_type):
                 if descriptor.implementation is not None:
@@ -115,7 +115,7 @@ class ServiceProvider(ServiceProviderABC):
         sig = signature(service_type.__init__)
         params = self.build_by_signature(sig)
 
-        return service_type(*params, *args, **kwargs)
+        return service_type(*params)
 
     def set_scope(self, scope: ScopeABC):
         self._scope = scope
@@ -124,7 +124,7 @@ class ServiceProvider(ServiceProviderABC):
         sb = ScopeBuilder(ServiceProvider(copy.deepcopy(self._service_descriptors), self._configuration, self._database_context))
         return sb.build()
 
-    def get_service(self, service_type: T, *args, **kwargs) -> Optional[T]:
+    def get_service(self, service_type: T) -> Optional[T]:
         result = self._find_service(service_type)
 
         if result is None:
@@ -133,13 +133,13 @@ class ServiceProvider(ServiceProviderABC):
         if result.implementation is not None:
             return result.implementation
 
-        implementation = self.build_service(service_type, *args, **kwargs)
+        implementation = self.build_service(service_type)
         if result.lifetime == ServiceLifetimeEnum.singleton or result.lifetime == ServiceLifetimeEnum.scoped and self._scope is not None:
             result.implementation = implementation
 
         return implementation
 
-    def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[T]]:
+    def get_services(self, service_type: T) -> list[Optional[T]]:
         implementations = []
 
         if typing.get_origin(service_type) != list:

src/cpl_core/dependency_injection/service_provider_abc.py

@@ -25,7 +25,7 @@ class ServiceProviderABC(ABC):
         pass
 
     @abstractmethod
-    def build_service(self, service_type: type, *args, **kwargs) -> object:
+    def build_service(self, service_type: type) -> object:
         r"""Creates instance of given type
 
         Parameter
@@ -61,7 +61,7 @@ class ServiceProviderABC(ABC):
         pass
 
     @abstractmethod
-    def get_service(self, instance_type: T, *args, **kwargs) -> Optional[T]:
+    def get_service(self, instance_type: T) -> Optional[T]:
         r"""Returns instance of given type
 
         Parameter
@@ -76,7 +76,7 @@ class ServiceProviderABC(ABC):
         pass
 
     @abstractmethod
-    def get_services(self, service_type: T, *args, **kwargs) -> list[Optional[T]]:
+    def get_services(self, service_type: T) -> list[Optional[T]]:
         r"""Returns instance of given type
 
         Parameter

src/cpl_core/environment/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/mailing/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/pipes/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.pipes'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -30,4 +30,4 @@ from .to_camel_case_pipe import ToCamelCasePipe
 from .to_snake_case_pipe import ToSnakeCasePipe
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/time/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_core/utils/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_core.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post2'
+__version__ = '2022.12.1.post1'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post2')
+version_info = VersionInfo(major='2022', minor='12', micro='1.post1')

src/cpl_discord/.cpl/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -55,4 +55,4 @@ def get_discord_collection(services: 'ServiceCollectionABC') -> 'DiscordCollecti
 # build-ignore-end
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/application/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .discord_bot_application_abc import DiscordBotApplicationABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .discord_command_abc import DiscordCommandABC
 from .discord_commands_meta import DiscordCogMeta
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .discord_bot_settings import DiscordBotSettings
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/container/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord.container'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -31,4 +31,4 @@ from .thread import Thread
 from .voice_channel import VoiceChannel
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/cpl-discord.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2022",
       "Minor": "12",
-      "Micro": "1.post1"
+      "Micro": "1"
     },
     "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.post2",
+      "cpl-core>=2022.12.1",
       "discord.py==2.1.0",
       "cpl-query>=2022.12.2.post1"
     ],

src/cpl_discord/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord.events'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -69,4 +69,4 @@ from .on_voice_state_update_abc import OnVoiceStateUpdateABC
 from .on_webhooks_update_abc import OnWebhooksUpdateABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/helper/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord.helper'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from collections import namedtuple
 from .to_containers_converter import ToContainersConverter
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'cpl_discord.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 - 2023 sh-edraft.de'
-__version__ = '2022.12.1.post1'
+__version__ = '2022.12.1'
 
 from collections import namedtuple
 
@@ -29,4 +29,4 @@ from .discord_service import DiscordService
 from .discord_service_abc import DiscordServiceABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2022', minor='12', micro='1.post1')
+version_info = VersionInfo(major='2022', minor='12', micro='1')

src/cpl_discord/service/discord_bot_service.py

@@ -21,9 +21,7 @@ class DiscordBotService(DiscordBotServiceABC):
             discord_bot_settings: DiscordBotSettings,
             env: ApplicationEnvironmentABC,
             logging_st: LoggingSettings,
-            discord_service: DiscordServiceABC,
+            discord_service: DiscordServiceABC
-            *args,
-            **kwargs
     ):
         # services
         self._config = config
@@ -36,12 +34,7 @@ class DiscordBotService(DiscordBotServiceABC):
         self._discord_settings = self._get_settings(discord_bot_settings)
 
         # setup super
-        DiscordBotServiceABC.__init__(
+        DiscordBotServiceABC.__init__(self, command_prefix=self._discord_settings.prefix, help_command=None, intents=discord.Intents().all())
-            self,
-            *args,
-            command_prefix=self._discord_settings.prefix, help_command=None, intents=discord.Intents().all(),
-            **kwargs
-        )
         self._base = super(DiscordBotServiceABC, self)
 
     @staticmethod
@@ -57,9 +50,7 @@ class DiscordBotService(DiscordBotServiceABC):
 
         new_settings.from_dict({
             'Token': env_token if token is None or token == '' else token,
-            'Prefix':
+            'Prefix': ('! ' if self._is_string_invalid(env_prefix) else env_prefix) if self._is_string_invalid(prefix) else 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')

src/cpl_discord/service/discord_bot_service_abc.py

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