cpl-workspace.json

@@ -6,7 +6,6 @@
       "gismo-cli": "src/gismo_cli/gismo-cli.json",
       "gismo-core": "src/gismo_core/gismo-core.json",
       "gismo-data": "src/gismo_data/gismo-data.json",
-      "modules-core": "src/modules_core/modules-core.json",
       "boot-log": "src/modules/boot_log/boot-log.json",
       "level-generator": "tools/level_generator/level-generator.json",
       "ontime-calculator": "tools/ontime_calculator/ontime-calculator.json",

src/gismo/gismo.json

@@ -47,7 +47,6 @@
     "ProjectReferences": [
       "../gismo_core/gismo-core.json",
       "../gismo_data/gismo-data.json",
-      "../modules_core/modules-core.json",
       "../modules/boot_log/boot-log.json",
       "../modules/base/base.json",
       "../modules/database/database.json"

src/gismo/main.py

@@ -43,3 +43,5 @@ if __name__ == '__main__':
 #       / )  )   ~ edraft
 #   ___// | /
 #   `--'  \_~-,
+
+# happy new year :)

src/gismo/startup.py

@@ -40,9 +40,9 @@ from modules.database.database import Database
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 from modules.permission.permission import Permission
 from modules.permission.service.permission_service import PermissionService
-from modules_core.abc.module_abc import ModuleABC
+from gismo_core.abc.module_abc import ModuleABC
-from modules_core.abc.module_service_abc import ModuleServiceABC
+from gismo_core.abc.module_service_abc import ModuleServiceABC
-from modules_core.service.module_service import ModuleService
+from gismo_core.service.module_service import ModuleService
 
 
 class Startup(StartupABC):

src/gismo_core/service/bot_service.py

@@ -8,8 +8,8 @@ from gismo_core.abc.bot_service_abc import BotServiceABC
 from gismo_core.configuration.bot_settings import BotSettings
 from gismo_core.configuration.discord_settings import DiscordSettings
 from gismo_core.configuration.server_settings import ServerSettings
-from modules_core.abc.module_service_abc import ModuleServiceABC
+from gismo_core.abc.module_service_abc import ModuleServiceABC
-from modules_core.service.module_service import ModuleService
+from gismo_core.service.module_service import ModuleService
 
 
 class BotService(BotServiceABC, commands.Bot):

src/gismo_core/service/module_service.py

@@ -11,54 +11,54 @@ from cpl_core.logging import LoggerABC
 from cpl_core.utils import String
 from cpl_query.extension import List
 from discord.ext import commands
-from modules_core.abc.events.on_bulk_message_delete_abc import OnBulkMessageDeleteABC
+from gismo_core.abc.events.on_bulk_message_delete_abc import OnBulkMessageDeleteABC
-from modules_core.abc.events.on_connect_abc import OnConnectABC
+from gismo_core.abc.events.on_connect_abc import OnConnectABC
-from modules_core.abc.events.on_disconnect_abc import OnDisconnectABC
+from gismo_core.abc.events.on_disconnect_abc import OnDisconnectABC
-from modules_core.abc.events.on_group_join_abc import OnGroupJoinABC
+from gismo_core.abc.events.on_group_join_abc import OnGroupJoinABC
-from modules_core.abc.events.on_group_remove_abc import OnGroupRemoveABC
+from gismo_core.abc.events.on_group_remove_abc import OnGroupRemoveABC
-from modules_core.abc.events.on_guild_available_abc import OnGuildAvailableABC
+from gismo_core.abc.events.on_guild_available_abc import OnGuildAvailableABC
-from modules_core.abc.events.on_guild_channel_create_abc import OnGuildChannelCreateABC
+from gismo_core.abc.events.on_guild_channel_create_abc import OnGuildChannelCreateABC
-from modules_core.abc.events.on_guild_channel_delete_abc import OnGuildChannelDeleteABC
+from gismo_core.abc.events.on_guild_channel_delete_abc import OnGuildChannelDeleteABC
-from modules_core.abc.events.on_guild_channel_pins_update_abc import OnGuildChannelPinsUpdateABC
+from gismo_core.abc.events.on_guild_channel_pins_update_abc import OnGuildChannelPinsUpdateABC
-from modules_core.abc.events.on_guild_channel_update_abc import OnGuildChannelUpdateABC
+from gismo_core.abc.events.on_guild_channel_update_abc import OnGuildChannelUpdateABC
-from modules_core.abc.events.on_guild_emojis_update_abc import OnGuildEmojisUpdateABC
+from gismo_core.abc.events.on_guild_emojis_update_abc import OnGuildEmojisUpdateABC
-from modules_core.abc.events.on_guild_integrations_update_abc import OnGuildIntegrationsUpdateABC
+from gismo_core.abc.events.on_guild_integrations_update_abc import OnGuildIntegrationsUpdateABC
-from modules_core.abc.events.on_guild_join_abc import OnGuildJoinABC
+from gismo_core.abc.events.on_guild_join_abc import OnGuildJoinABC
-from modules_core.abc.events.on_guild_remove_abc import OnGuildRemoveABC
+from gismo_core.abc.events.on_guild_remove_abc import OnGuildRemoveABC
-from modules_core.abc.events.on_guild_role_create_abc import OnGuildRoleCreateABC
+from gismo_core.abc.events.on_guild_role_create_abc import OnGuildRoleCreateABC
-from modules_core.abc.events.on_guild_role_delete_abc import OnGuildRoleDeleteABC
+from gismo_core.abc.events.on_guild_role_delete_abc import OnGuildRoleDeleteABC
-from modules_core.abc.events.on_guild_role_update_abc import OnGuildRoleUpdateABC
+from gismo_core.abc.events.on_guild_role_update_abc import OnGuildRoleUpdateABC
-from modules_core.abc.events.on_guild_unavailable_abc import OnGuildUnavailableABC
+from gismo_core.abc.events.on_guild_unavailable_abc import OnGuildUnavailableABC
-from modules_core.abc.events.on_guild_update_abc import OnGuildUpdateABC
+from gismo_core.abc.events.on_guild_update_abc import OnGuildUpdateABC
-from modules_core.abc.events.on_invite_create_abc import OnInviteCreateABC
+from gismo_core.abc.events.on_invite_create_abc import OnInviteCreateABC
-from modules_core.abc.events.on_invite_delete_abc import OnInviteDeleteABC
+from gismo_core.abc.events.on_invite_delete_abc import OnInviteDeleteABC
-from modules_core.abc.events.on_member_ban_abc import OnMemberBanABC
+from gismo_core.abc.events.on_member_ban_abc import OnMemberBanABC
-from modules_core.abc.events.on_member_join_abc import OnMemberJoinABC
+from gismo_core.abc.events.on_member_join_abc import OnMemberJoinABC
-from modules_core.abc.events.on_member_remove_abc import OnMemberRemoveABC
+from gismo_core.abc.events.on_member_remove_abc import OnMemberRemoveABC
-from modules_core.abc.events.on_member_unban_abc import OnMemberUnbanABC
+from gismo_core.abc.events.on_member_unban_abc import OnMemberUnbanABC
-from modules_core.abc.events.on_member_update_abc import OnMemberUpdateABC
+from gismo_core.abc.events.on_member_update_abc import OnMemberUpdateABC
-from modules_core.abc.events.on_message_abc import OnMessageABC
+from gismo_core.abc.events.on_message_abc import OnMessageABC
-from modules_core.abc.events.on_message_delete_abc import OnMessageDeleteABC
+from gismo_core.abc.events.on_message_delete_abc import OnMessageDeleteABC
-from modules_core.abc.events.on_message_edit_abc import OnMessageEditABC
+from gismo_core.abc.events.on_message_edit_abc import OnMessageEditABC
-from modules_core.abc.events.on_private_channel_create_abc import OnPrivateChannelCreateABC
+from gismo_core.abc.events.on_private_channel_create_abc import OnPrivateChannelCreateABC
-from modules_core.abc.events.on_private_channel_delete_abc import OnPrivateChannelDeleteABC
+from gismo_core.abc.events.on_private_channel_delete_abc import OnPrivateChannelDeleteABC
-from modules_core.abc.events.on_private_channel_pins_update_abc import OnPrivateChannelPinsUpdateABC
+from gismo_core.abc.events.on_private_channel_pins_update_abc import OnPrivateChannelPinsUpdateABC
-from modules_core.abc.events.on_private_channel_update_abc import OnPrivateChannelUpdateABC
+from gismo_core.abc.events.on_private_channel_update_abc import OnPrivateChannelUpdateABC
-from modules_core.abc.events.on_reaction_add_abc import OnReactionAddABC
+from gismo_core.abc.events.on_reaction_add_abc import OnReactionAddABC
-from modules_core.abc.events.on_reaction_clear_abc import OnReactionClearABC
+from gismo_core.abc.events.on_reaction_clear_abc import OnReactionClearABC
-from modules_core.abc.events.on_reaction_clear_emoji_abc import OnReactionClearEmojiABC
+from gismo_core.abc.events.on_reaction_clear_emoji_abc import OnReactionClearEmojiABC
-from modules_core.abc.events.on_reaction_remove_abc import OnReactionRemoveABC
+from gismo_core.abc.events.on_reaction_remove_abc import OnReactionRemoveABC
-from modules_core.abc.events.on_ready_abc import OnReadyABC
+from gismo_core.abc.events.on_ready_abc import OnReadyABC
-from modules_core.abc.events.on_relationship_add_abc import OnRelationshipAddABC
+from gismo_core.abc.events.on_relationship_add_abc import OnRelationshipAddABC
-from modules_core.abc.events.on_relationship_remove_abc import OnRelationshipRemoveABC
+from gismo_core.abc.events.on_relationship_remove_abc import OnRelationshipRemoveABC
-from modules_core.abc.events.on_relationship_update_abc import OnRelationshipUpdateABC
+from gismo_core.abc.events.on_relationship_update_abc import OnRelationshipUpdateABC
-from modules_core.abc.events.on_resume_abc import OnResumeABC
+from gismo_core.abc.events.on_resume_abc import OnResumeABC
-from modules_core.abc.events.on_typing_abc import OnTypingABC
+from gismo_core.abc.events.on_typing_abc import OnTypingABC
-from modules_core.abc.events.on_user_update_abc import OnUserUpdateABC
+from gismo_core.abc.events.on_user_update_abc import OnUserUpdateABC
-from modules_core.abc.events.on_voice_state_update_abc import OnVoiceStateUpdateABC
+from gismo_core.abc.events.on_voice_state_update_abc import OnVoiceStateUpdateABC
-from modules_core.abc.events.on_webhooks_update_abc import OnWebhooksUpdateABC
+from gismo_core.abc.events.on_webhooks_update_abc import OnWebhooksUpdateABC
-from modules_core.abc.module_abc import ModuleABC
+from gismo_core.abc.module_abc import ModuleABC
-from modules_core.abc.module_service_abc import ModuleServiceABC
+from gismo_core.abc.module_service_abc import ModuleServiceABC
 
 
 class _MetaCogABC(ABCMeta, commands.CogMeta): pass

src/modules/base/base.py

@@ -21,12 +21,12 @@ from gismo_data.model.user_joined_server import UserJoinedServer
 from gismo_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
 from modules.base.base_settings import BaseSettings
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
-from modules_core.abc.events.on_member_join_abc import OnMemberJoinABC
+from gismo_core.abc.events.on_member_join_abc import OnMemberJoinABC
-from modules_core.abc.events.on_member_remove_abc import OnMemberRemoveABC
+from gismo_core.abc.events.on_member_remove_abc import OnMemberRemoveABC
-from modules_core.abc.events.on_message_abc import OnMessageABC
+from gismo_core.abc.events.on_message_abc import OnMessageABC
-from modules_core.abc.events.on_voice_state_update_abc import \
+from gismo_core.abc.events.on_voice_state_update_abc import \
     OnVoiceStateUpdateABC
-from modules_core.abc.module_abc import ModuleABC
+from gismo_core.abc.module_abc import ModuleABC
 
 
 class Base(ModuleABC, OnMemberJoinABC, OnMemberRemoveABC, OnMessageABC, OnVoiceStateUpdateABC):

src/modules/boot_log/boot_log.py

@@ -9,8 +9,8 @@ from gismo_core.abc.bot_service_abc import BotServiceABC
 from gismo_core.abc.message_service_abc import MessageServiceABC
 from gismo_core.configuration.server_settings import ServerSettings
 from modules.boot_log.boot_log_settings import BootLogSettings
-from modules_core.abc.events.on_ready_abc import OnReadyABC
+from gismo_core.abc.events.on_ready_abc import OnReadyABC
-from modules_core.abc.module_abc import ModuleABC
+from gismo_core.abc.module_abc import ModuleABC
 
 
 class BootLog(ModuleABC, OnReadyABC):

src/modules/database/database.py

@@ -21,8 +21,8 @@ from gismo_data.model.user import User
 from gismo_data.model.user_joined_server import UserJoinedServer
 from gismo_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
 from gismo_data.service.user_repository_service import ServerRepositoryABC
-from modules_core.abc.events.on_ready_abc import OnReadyABC
+from gismo_core.abc.events.on_ready_abc import OnReadyABC
-from modules_core.abc.module_abc import ModuleABC
+from gismo_core.abc.module_abc import ModuleABC
 
 
 class Database(ModuleABC, OnReadyABC):

src/modules/permission/permission.py

@@ -4,9 +4,9 @@ from cpl_core.logging import LoggerABC
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 from modules.permission.configuration.permission_settings import \
     PermissionSettings
-from modules_core.abc.events.on_member_update_abc import OnMemberUpdateABC
+from gismo_core.abc.events.on_member_update_abc import OnMemberUpdateABC
-from modules_core.abc.events.on_ready_abc import OnReadyABC
+from gismo_core.abc.events.on_ready_abc import OnReadyABC
-from modules_core.abc.module_abc import ModuleABC
+from gismo_core.abc.module_abc import ModuleABC
 
 
 class Permission(ModuleABC, OnReadyABC, OnMemberUpdateABC):

src/modules_core/__init__.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-gismo sh-edraft Gismo
-~~~~~~~~~~~~~~~~~~~
-
-sh-edraft Dicord bot Gismo
-
-:copyright: (c) 2021 - 2022 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = 'modules_core'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de'
-__version__ = '0.3.0'
-
-from collections import namedtuple
-
-# imports
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0')

src/modules_core/abc/__init__.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-gismo sh-edraft Gismo
-~~~~~~~~~~~~~~~~~~~
-
-sh-edraft Dicord bot Gismo
-
-:copyright: (c) 2021 - 2022 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = 'modules_core.abc'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de'
-__version__ = '0.3.0'
-
-from collections import namedtuple
-
-# imports
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0')

src/modules_core/events_enum.py

@@ -1,6 +0,0 @@
-from enum import Enum
-
-
-class EventsEnum(Enum):
-
-    on_ready = 'on_ready'

src/modules_core/modules-core.json

@@ -1,44 +0,0 @@
-{
-  "ProjectSettings": {
-    "Name": "modules-core",
-    "Version": {
-      "Major": "0",
-      "Minor": "1",
-      "Micro": "0"
-    },
-    "Author": "Sven Heidemann",
-    "AuthorEmail": "sven.heidemann@sh-edraft.de",
-    "Description": "sh-edraft Gismo - Modules core",
-    "LongDescription": "sh-edraft Dicord bot Gismo - Modules core",
-    "URL": "https://www.sh-edraft.de",
-    "CopyrightDate": "2021 - 2022",
-    "CopyrightName": "sh-edraft.de",
-    "LicenseName": "MIT",
-    "LicenseDescription": "MIT, see LICENSE for more details.",
-    "Dependencies": [
-      "sh_cpl-core>=2021.11.0",
-      "sh_cpl-query>=2021.11.0"
-    ],
-    "PythonVersion": ">=3.9.2",
-    "PythonPath": {
-      "linux": "../../venv/bin/python"
-    },
-    "Classifiers": []
-  },
-  "BuildSettings": {
-    "ProjectType": "library",
-    "SourcePath": "",
-    "OutputPath": "../../dist",
-    "Main": "",
-    "EntryPoint": "",
-    "IncludePackageData": false,
-    "Included": [],
-    "Excluded": [
-      "*/__pycache__",
-      "*/logs",
-      "*/tests"
-    ],
-    "PackageData": {},
-    "ProjectReferences": []
-  }
-}

src/modules_core/service/__init__.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-gismo sh-edraft Gismo
-~~~~~~~~~~~~~~~~~~~
-
-sh-edraft Dicord bot Gismo
-
-:copyright: (c) 2021 - 2022 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = 'modules_core.service'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2021 - 2022 sh-edraft.de'
-__version__ = '0.3.0'
-
-from collections import namedtuple
-
-# imports
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0')