From 49121fd179db7ed485531743e823e70b6c2e4f04 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 7 Nov 2023 17:56:57 +0100 Subject: [PATCH 1/3] Probably fixed server stats #432 --- bot/src/bot_graphql/graphql/server.gql | 2 +- bot/src/bot_graphql/queries/server_query.py | 2 +- .../queries/server_statistic_query.py | 173 ++++++++++-------- web/src/app/models/graphql/queries.model.ts | 25 ++- 4 files changed, 109 insertions(+), 93 deletions(-) diff --git a/bot/src/bot_graphql/graphql/server.gql b/bot/src/bot_graphql/graphql/server.gql index 9849f6ab..be603f3a 100644 --- a/bot/src/bot_graphql/graphql/server.gql +++ b/bot/src/bot_graphql/graphql/server.gql @@ -38,7 +38,7 @@ type Server implements TableWithHistoryQuery { config: ServerConfig hasFeatureFlag(flag: String): FeatureFlag -# statistic(date: String): ServerStatistic + statistic(date: String): ServerStatistic createdAt: String modifiedAt: String diff --git a/bot/src/bot_graphql/queries/server_query.py b/bot/src/bot_graphql/queries/server_query.py index 6f2abb1c..14033101 100644 --- a/bot/src/bot_graphql/queries/server_query.py +++ b/bot/src/bot_graphql/queries/server_query.py @@ -108,7 +108,7 @@ class ServerQuery(DataQueryWithHistoryABC): "hasFeatureFlag", lambda server, *_, **kwargs: self._resolve_has_feature_flag(server, *_, **kwargs), ) - # self.set_field("statistic", lambda server, *_, **kwargs: ServerStatistics(server, kwargs)) + self.set_field("statistic", lambda server, *_, **kwargs: ServerStatistics(server, kwargs)) @staticmethod def resolve_id(server: Server, *_): diff --git a/bot/src/bot_graphql/queries/server_statistic_query.py b/bot/src/bot_graphql/queries/server_statistic_query.py index 7fa4d9c1..661d8142 100644 --- a/bot/src/bot_graphql/queries/server_statistic_query.py +++ b/bot/src/bot_graphql/queries/server_statistic_query.py @@ -1,6 +1,9 @@ import datetime +from typing import Optional from cpl_core.configuration import ConfigurationABC +from cpl_core.database.context import DatabaseContextABC +from cpl_core.type import R, T from bot_data.abc.achievement_repository_abc import AchievementRepositoryABC from bot_data.abc.user_joined_game_server_repository_abc import UserJoinedGameServerRepositoryABC @@ -8,7 +11,6 @@ from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoic from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC from bot_data.abc.user_repository_abc import UserRepositoryABC from bot_data.abc.user_warnings_repository_abc import UserWarningsRepositoryABC -from bot_data.model.server_config import ServerConfig from bot_graphql.abc.query_abc import QueryABC @@ -22,10 +24,13 @@ class ServerStatisticQuery(QueryABC): user_messages: UserMessageCountPerHourRepositoryABC, user_warnings: UserWarningsRepositoryABC, achievements: AchievementRepositoryABC, + db: DatabaseContextABC, ): QueryABC.__init__(self, "ServerStatistic") self._config = config + self._db = db + self._users = users self._user_joined_voice_channels = user_joined_voice_channels self._user_joined_game_servers = user_joined_game_servers @@ -44,7 +49,7 @@ class ServerStatisticQuery(QueryABC): ) self.set_field("userCount", lambda server, *_: self._users.get_users_by_server_id(server.server.id).count()) - self.set_field("activeUserCount", self._resolve_active_count) + self.set_field("activeUserCount", self._resolve_active_user_count) self.set_field("userJoinedVoiceChannelCount", self._resolve_voice_channel_count) self.set_field("userJoinedVoiceChannelOntime", self._resolve_voice_channel_ontime) @@ -56,6 +61,93 @@ class ServerStatisticQuery(QueryABC): self.set_field("activityScore", self._resolve_activity_score) + def _resolve_active_user_count(self, server, *_): + return self._users.get_users_by_server_id(server.server.id).where(lambda x: not x.left_server).count() + + def _cast_query_result(self, query: str, r_type: T) -> Optional[R]: + results = self._db.select(query) + if len(results) == 0 or len(results[0]) == 0: + return None + result = results[0][0] + default = None + if r_type is int or r_type is float: + default = 0 + elif r_type is str: + default = "" + + return r_type(result) if result is not None else default + + def _resolve_achievements(self, server, *_): + query = f""" + SELECT Count(UserGotAchievements.CreatedAt) FROM UserGotAchievements + INNER JOIN Achievements ON UserGotAchievements.AchievementId = Achievements.Id + INNER JOIN Users ON UserGotAchievements.UserId = Users.UserId + WHERE Users.ServerId = {server.server.id} + AND UserGotAchievements.CreatedAt >= "{self._get_date(**server.kwargs)}"; + """ + return self._cast_query_result(query, int) + + def _resolve_message_count(self, server, *_): + query = f""" + SELECT SUM( + UserMessageCountPerHour.XPCount / ( + SELECT XpPerMessage + FROM CFG_Server + WHERE ServerId = {server.server.id} + ) + ) + FROM UserMessageCountPerHour + INNER JOIN Users ON UserMessageCountPerHour.UserId = Users.UserId + WHERE Users.ServerId = {server.server.id} + AND UserMessageCountPerHour.CreatedAt >= "{self._get_date(**server.kwargs)}"; + """ + return self._cast_query_result(query, int) + + def _resolve_voice_channel_count(self, server, *_): + query = f""" + SELECT Count(UserJoinedVoiceChannel.CreatedAt) FROM UserJoinedVoiceChannel + INNER JOIN Users ON UserJoinedVoiceChannel.UserId = Users.UserId + WHERE Users.ServerId = {server.server.id} + AND UserJoinedVoiceChannel.CreatedAt >= "{self._get_date(**server.kwargs)}"; + """ + return self._cast_query_result(query, int) + + def _resolve_voice_channel_ontime(self, server, *_): + query = f""" + SELECT ROUND(SUM(TIME_TO_SEC(TIMEDIFF(UserJoinedVoiceChannel.LeavedOn, UserJoinedVoiceChannel.JoinedOn)) / 3600),{server.server.id}) FROM UserJoinedVoiceChannel + INNER JOIN Users ON UserJoinedVoiceChannel.UserId = Users.UserId + WHERE Users.ServerId = {server.server.id} + AND UserJoinedVoiceChannel.CreatedAt >= "{self._get_date(**server.kwargs)}"; + """ + return self._cast_query_result(query, float) + + def _resolve_game_server_count(self, server, *_): + query = f""" + SELECT Count(UserJoinedGameServer.CreatedAt) FROM UserJoinedGameServer + INNER JOIN Users ON UserJoinedGameServer.UserId = Users.UserId + WHERE Users.ServerId = {server.server.id} + AND UserJoinedGameServer.CreatedAt >= "{self._get_date(**server.kwargs)}"; + """ + return self._cast_query_result(query, int) + + def _resolve_game_server_ontime(self, server, *_): + query = f""" + SELECT ROUND(SUM(TIME_TO_SEC(TIMEDIFF(UserJoinedGameServer.LeavedOn, UserJoinedGameServer.JoinedOn)) / 3600),{server.server.id}) FROM UserJoinedGameServer + INNER JOIN Users ON UserJoinedGameServer.UserId = Users.UserId + WHERE Users.ServerId = {server.server.id} + AND UserJoinedGameServer.CreatedAt >= "{self._get_date(**server.kwargs)}"; + """ + return self._cast_query_result(query, float) + + def _resolve_user_warning_count(self, server, *_): + query = f""" + SELECT COUNT(UserWarnings.CreatedAt) FROM UserWarnings + INNER JOIN Users ON UserWarnings.UserId = Users.UserId + WHERE Users.ServerId = {server.server.id} + AND UserWarnings.CreatedAt >= "{self._get_date(**server.kwargs)}"; + """ + return self._cast_query_result(query, int) + def _resolve_activity_score(self, server, *_): days = (datetime.date.today() - self._get_date(**server.kwargs)).days return int( @@ -69,87 +161,12 @@ class ServerStatisticQuery(QueryABC): + self._resolve_game_server_ontime(server, *_) - self._resolve_user_warning_count(server, *_) ) - / self._resolve_active_count(server, *_) + / self._resolve_active_user_count(server, *_) ) / days * 1000 ) - def _resolve_message_count(self, server, *_): - settings: ServerConfig = self._config.get_configuration(f"ServerConfig_{server.server.discord_id}") - return ( - self._user_messages.get_user_message_count_per_hours() - .where( - lambda x: x.user.server.id == server.server.id - and x.created_at.date() >= self._get_date(**server.kwargs) - ) - .sum(lambda x: x.xp_count / settings.xp_per_message) - ) - - def _resolve_active_count(self, server, *_): - return self._users.get_users_by_server_id(server.server.id).where(lambda x: not x.left_server).count() - - def _resolve_voice_channel_count(self, server, *_): - return ( - self._user_joined_voice_channels.get_user_joined_voice_channels() - .where( - lambda x: x.user.server.id == server.server.id - and x.created_at.date() >= self._get_date(**server.kwargs) - ) - .count() - ) - - def _resolve_voice_channel_ontime(self, server, *_): - return ( - self._user_joined_voice_channels.get_user_joined_voice_channels() - .where( - lambda x: x.user.server.id == server.server.id - and x.created_at.date() >= self._get_date(**server.kwargs) - ) - .sum(lambda x: x.time) - ) - - def _resolve_game_server_count(self, server, *_): - return ( - self._user_joined_game_servers.get_user_joined_game_servers() - .where( - lambda x: x.user.server.id == server.server.id - and x.created_at.date() >= self._get_date(**server.kwargs) - ) - .count() - ) - - def _resolve_game_server_ontime(self, server, *_): - return ( - self._user_joined_game_servers.get_user_joined_game_servers() - .where( - lambda x: x.user.server.id == server.server.id - and x.created_at.date() >= self._get_date(**server.kwargs) - ) - .sum(lambda x: x.time) - ) - - def _resolve_user_warning_count(self, server, *_): - return ( - self._user_warnings.get_user_warnings() - .where( - lambda x: x.user.server.id == server.server.id - and x.created_at.date() >= self._get_date(**server.kwargs) - ) - .count() - ) - - def _resolve_achievements(self, server, *_): - return ( - self._achievements.get_achievements_by_server_id(server.server.id) - .select_many(lambda x: self._achievements.get_user_got_achievements_by_achievement_id(x.id)) - .where( - lambda x: x.user.server.id == server.server.id - and x.created_at.date() >= self._get_date(**server.kwargs) - ) - .count() - ) - def _get_date(self, **kwargs) -> datetime.date: if "date" not in kwargs: return datetime.date.today() - datetime.timedelta(days=7) diff --git a/web/src/app/models/graphql/queries.model.ts b/web/src/app/models/graphql/queries.model.ts index 0b4c97cb..09e582d5 100644 --- a/web/src/app/models/graphql/queries.model.ts +++ b/web/src/app/models/graphql/queries.model.ts @@ -92,23 +92,22 @@ export class Queries { receivedCommandCount movedUsersCount } + statistic { + achievementsAchieved + messageCount + userCount + activeUserCount + userJoinedVoiceChannelCount + userJoinedVoiceChannelOntime + userJoinedGameServerCount + userJoinedGameServerOntime + userWarningCount + activityScore + } } } `; - // statistic { - // achievementsAchieved - // messageCount - // userCount - // activeUserCount - // userJoinedVoiceChannelCount - // userJoinedVoiceChannelOntime - // userJoinedGameServerCount - // userJoinedGameServerOntime - // userWarningCount - // activityScore - // } - static hasServerFeatureFlag = ` query HasServerFeatureFlag($filter: ServerFilter, $flag: String) { servers(filter: $filter) { From b15c3b7fa328738f445a39cfb5d9e9ab455d5c20 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 7 Nov 2023 18:01:23 +0100 Subject: [PATCH 2/3] Set version 1.2.1 --- bot/src/bot/__init__.py | 4 ++-- bot/src/bot/bot.json | 2 +- bot/src/bot/extension/__init__.py | 4 ++-- bot/src/bot_api/__init__.py | 4 ++-- bot/src/bot_api/abc/__init__.py | 4 ++-- bot/src/bot_api/bot-api.json | 2 +- bot/src/bot_api/configuration/__init__.py | 4 ++-- bot/src/bot_api/controller/__init__.py | 4 ++-- bot/src/bot_api/event/__init__.py | 4 ++-- bot/src/bot_api/exception/__init__.py | 4 ++-- bot/src/bot_api/filter/__init__.py | 4 ++-- bot/src/bot_api/filter/discord/__init__.py | 4 ++-- bot/src/bot_api/logging/__init__.py | 4 ++-- bot/src/bot_api/model/__init__.py | 4 ++-- bot/src/bot_api/model/discord/__init__.py | 4 ++-- bot/src/bot_api/route/__init__.py | 4 ++-- bot/src/bot_api/service/__init__.py | 4 ++-- bot/src/bot_api/transformer/__init__.py | 4 ++-- bot/src/bot_core/__init__.py | 4 ++-- bot/src/bot_core/abc/__init__.py | 4 ++-- bot/src/bot_core/bot-core.json | 2 +- bot/src/bot_core/configuration/__init__.py | 4 ++-- bot/src/bot_core/core_extension/__init__.py | 4 ++-- bot/src/bot_core/events/__init__.py | 4 ++-- bot/src/bot_core/exception/__init__.py | 4 ++-- bot/src/bot_core/helper/__init__.py | 4 ++-- bot/src/bot_core/logging/__init__.py | 4 ++-- bot/src/bot_core/pipes/__init__.py | 4 ++-- bot/src/bot_core/service/__init__.py | 4 ++-- bot/src/bot_data/__init__.py | 4 ++-- bot/src/bot_data/abc/__init__.py | 4 ++-- bot/src/bot_data/bot-data.json | 2 +- bot/src/bot_data/migration/__init__.py | 4 ++-- bot/src/bot_data/model/__init__.py | 4 ++-- bot/src/bot_data/service/__init__.py | 4 ++-- bot/src/bot_graphql/__init__.py | 4 ++-- bot/src/bot_graphql/abc/__init__.py | 4 ++-- bot/src/bot_graphql/bot-graphql.json | 2 +- bot/src/bot_graphql/filter/__init__.py | 4 ++-- bot/src/bot_graphql/model/__init__.py | 4 ++-- bot/src/bot_graphql/mutations/__init__.py | 4 ++-- bot/src/bot_graphql/queries/__init__.py | 4 ++-- bot/src/bot_graphql/queries/discord/__init__.py | 4 ++-- bot/src/modules/achievements/__init__.py | 4 ++-- bot/src/modules/achievements/achievements.json | 6 +++--- bot/src/modules/achievements/commands/__init__.py | 4 ++-- bot/src/modules/achievements/events/__init__.py | 4 ++-- bot/src/modules/achievements/model/__init__.py | 4 ++-- bot/src/modules/auto_role/__init__.py | 4 ++-- bot/src/modules/auto_role/auto-role.json | 2 +- bot/src/modules/auto_role/command/__init__.py | 4 ++-- bot/src/modules/auto_role/events/__init__.py | 4 ++-- bot/src/modules/auto_role/helper/__init__.py | 4 ++-- bot/src/modules/base/__init__.py | 4 ++-- bot/src/modules/base/base.json | 2 +- bot/src/modules/base/command/__init__.py | 4 ++-- bot/src/modules/base/events/__init__.py | 4 ++-- bot/src/modules/base/forms/__init__.py | 4 ++-- bot/src/modules/base/helper/__init__.py | 4 ++-- bot/src/modules/base/model/__init__.py | 4 ++-- bot/src/modules/base/service/__init__.py | 4 ++-- bot/src/modules/base/thread/__init__.py | 4 ++-- bot/src/modules/boot_log/__init__.py | 4 ++-- bot/src/modules/boot_log/boot-log.json | 2 +- bot/src/modules/config/__init__.py | 4 ++-- bot/src/modules/config/config.json | 6 +++--- bot/src/modules/config/events/__init__.py | 4 ++-- bot/src/modules/config/service/__init__.py | 4 ++-- bot/src/modules/database/__init__.py | 4 ++-- bot/src/modules/database/database.json | 2 +- bot/src/modules/level/__init__.py | 4 ++-- bot/src/modules/level/command/__init__.py | 4 ++-- bot/src/modules/level/configuration/__init__.py | 4 ++-- bot/src/modules/level/events/__init__.py | 4 ++-- bot/src/modules/level/level.json | 2 +- bot/src/modules/level/service/__init__.py | 4 ++-- bot/src/modules/permission/__init__.py | 4 ++-- bot/src/modules/permission/abc/__init__.py | 4 ++-- bot/src/modules/permission/permission.json | 2 +- bot/src/modules/permission/service/__init__.py | 4 ++-- bot/src/modules/short_role_name/__init__.py | 4 ++-- bot/src/modules/short_role_name/events/__init__.py | 4 ++-- bot/src/modules/short_role_name/service/__init__.py | 4 ++-- bot/src/modules/short_role_name/short-role-name.json | 6 +++--- bot/src/modules/special_offers/__init__.py | 4 ++-- bot/src/modules/special_offers/special-offers.json | 6 +++--- bot/src/modules/technician/__init__.py | 4 ++-- bot/src/modules/technician/command/__init__.py | 4 ++-- bot/src/modules/technician/technician.json | 2 +- bot/tools/checks/checks.json | 2 +- bot/tools/get_version/get-version.json | 2 +- bot/tools/post_build/post-build.json | 2 +- bot/tools/set_version/set-version.json | 2 +- web/package.json | 4 ++-- web/src/assets/version.json | 4 ++-- 95 files changed, 178 insertions(+), 178 deletions(-) diff --git a/bot/src/bot/__init__.py b/bot/src/bot/__init__.py index 17f979c1..66492481 100644 --- a/bot/src/bot/__init__.py +++ b/bot/src/bot/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot/bot.json b/bot/src/bot/bot.json index 2db04199..fc54fc03 100644 --- a/bot/src/bot/bot.json +++ b/bot/src/bot/bot.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/bot/extension/__init__.py b/bot/src/bot/extension/__init__.py index 56d79a66..6e06c4c1 100644 --- a/bot/src/bot/extension/__init__.py +++ b/bot/src/bot/extension/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot.extension" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/__init__.py b/bot/src/bot_api/__init__.py index 6a63c058..b184402c 100644 --- a/bot/src/bot_api/__init__.py +++ b/bot/src/bot_api/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/abc/__init__.py b/bot/src/bot_api/abc/__init__.py index 2133612b..3a5ba57d 100644 --- a/bot/src/bot_api/abc/__init__.py +++ b/bot/src/bot_api/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/bot-api.json b/bot/src/bot_api/bot-api.json index a4529c34..8a7c4b87 100644 --- a/bot/src/bot_api/bot-api.json +++ b/bot/src/bot_api/bot-api.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/bot_api/configuration/__init__.py b/bot/src/bot_api/configuration/__init__.py index 36ddf985..56302478 100644 --- a/bot/src/bot_api/configuration/__init__.py +++ b/bot/src/bot_api/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/controller/__init__.py b/bot/src/bot_api/controller/__init__.py index 71f6b6d6..edcd5576 100644 --- a/bot/src/bot_api/controller/__init__.py +++ b/bot/src/bot_api/controller/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.controller" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/event/__init__.py b/bot/src/bot_api/event/__init__.py index 9b08b3f9..32143bf9 100644 --- a/bot/src/bot_api/event/__init__.py +++ b/bot/src/bot_api/event/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.event" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/exception/__init__.py b/bot/src/bot_api/exception/__init__.py index 472e48c6..8417333d 100644 --- a/bot/src/bot_api/exception/__init__.py +++ b/bot/src/bot_api/exception/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.exception" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/filter/__init__.py b/bot/src/bot_api/filter/__init__.py index 4629177d..4872be0f 100644 --- a/bot/src/bot_api/filter/__init__.py +++ b/bot/src/bot_api/filter/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.filter" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/filter/discord/__init__.py b/bot/src/bot_api/filter/discord/__init__.py index 81083cb5..e021de24 100644 --- a/bot/src/bot_api/filter/discord/__init__.py +++ b/bot/src/bot_api/filter/discord/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/logging/__init__.py b/bot/src/bot_api/logging/__init__.py index 28229873..8a9a8373 100644 --- a/bot/src/bot_api/logging/__init__.py +++ b/bot/src/bot_api/logging/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.logging" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/model/__init__.py b/bot/src/bot_api/model/__init__.py index 428e3ced..7f0d1116 100644 --- a/bot/src/bot_api/model/__init__.py +++ b/bot/src/bot_api/model/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.model" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/model/discord/__init__.py b/bot/src/bot_api/model/discord/__init__.py index 0b731ed3..7916a455 100644 --- a/bot/src/bot_api/model/discord/__init__.py +++ b/bot/src/bot_api/model/discord/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/route/__init__.py b/bot/src/bot_api/route/__init__.py index 81792f2e..e7485a60 100644 --- a/bot/src/bot_api/route/__init__.py +++ b/bot/src/bot_api/route/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.route" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/service/__init__.py b/bot/src/bot_api/service/__init__.py index 234af1ca..0a5bb2c5 100644 --- a/bot/src/bot_api/service/__init__.py +++ b/bot/src/bot_api/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_api/transformer/__init__.py b/bot/src/bot_api/transformer/__init__.py index f1f8e791..934740e5 100644 --- a/bot/src/bot_api/transformer/__init__.py +++ b/bot/src/bot_api/transformer/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_api.transformer" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/__init__.py b/bot/src/bot_core/__init__.py index 762b31f9..9697a829 100644 --- a/bot/src/bot_core/__init__.py +++ b/bot/src/bot_core/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/abc/__init__.py b/bot/src/bot_core/abc/__init__.py index 09549563..b5bb27ab 100644 --- a/bot/src/bot_core/abc/__init__.py +++ b/bot/src/bot_core/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/bot-core.json b/bot/src/bot_core/bot-core.json index 9cf7075d..4cd4141c 100644 --- a/bot/src/bot_core/bot-core.json +++ b/bot/src/bot_core/bot-core.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/bot_core/configuration/__init__.py b/bot/src/bot_core/configuration/__init__.py index 609f8642..69f1cb6c 100644 --- a/bot/src/bot_core/configuration/__init__.py +++ b/bot/src/bot_core/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/core_extension/__init__.py b/bot/src/bot_core/core_extension/__init__.py index 3ce1acb8..c995ae74 100644 --- a/bot/src/bot_core/core_extension/__init__.py +++ b/bot/src/bot_core/core_extension/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.core_extension" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/events/__init__.py b/bot/src/bot_core/events/__init__.py index a0543256..1924190f 100644 --- a/bot/src/bot_core/events/__init__.py +++ b/bot/src/bot_core/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/exception/__init__.py b/bot/src/bot_core/exception/__init__.py index 8e7daf7e..fe85c817 100644 --- a/bot/src/bot_core/exception/__init__.py +++ b/bot/src/bot_core/exception/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.exception" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/helper/__init__.py b/bot/src/bot_core/helper/__init__.py index b597c6fd..99171d59 100644 --- a/bot/src/bot_core/helper/__init__.py +++ b/bot/src/bot_core/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/logging/__init__.py b/bot/src/bot_core/logging/__init__.py index 1622cb57..c1b4c53e 100644 --- a/bot/src/bot_core/logging/__init__.py +++ b/bot/src/bot_core/logging/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.logging" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/pipes/__init__.py b/bot/src/bot_core/pipes/__init__.py index 9b035bbb..bd5f25f4 100644 --- a/bot/src/bot_core/pipes/__init__.py +++ b/bot/src/bot_core/pipes/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.pipes" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_core/service/__init__.py b/bot/src/bot_core/service/__init__.py index 74bbfed6..7a69b0e2 100644 --- a/bot/src/bot_core/service/__init__.py +++ b/bot/src/bot_core/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_core.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_data/__init__.py b/bot/src/bot_data/__init__.py index dba7fc2c..f731036c 100644 --- a/bot/src/bot_data/__init__.py +++ b/bot/src/bot_data/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_data" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_data/abc/__init__.py b/bot/src/bot_data/abc/__init__.py index 4341c756..5aeb87ae 100644 --- a/bot/src/bot_data/abc/__init__.py +++ b/bot/src/bot_data/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_data.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_data/bot-data.json b/bot/src/bot_data/bot-data.json index 8300b491..e4c1a314 100644 --- a/bot/src/bot_data/bot-data.json +++ b/bot/src/bot_data/bot-data.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/bot_data/migration/__init__.py b/bot/src/bot_data/migration/__init__.py index fb9a7c01..c8b32e03 100644 --- a/bot/src/bot_data/migration/__init__.py +++ b/bot/src/bot_data/migration/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_data.migration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_data/model/__init__.py b/bot/src/bot_data/model/__init__.py index fc71a463..71aedfc0 100644 --- a/bot/src/bot_data/model/__init__.py +++ b/bot/src/bot_data/model/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_data.model" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_data/service/__init__.py b/bot/src/bot_data/service/__init__.py index d393f1f1..176cd53b 100644 --- a/bot/src/bot_data/service/__init__.py +++ b/bot/src/bot_data/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_data.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/__init__.py b/bot/src/bot_graphql/__init__.py index 963709cb..f8a95b47 100644 --- a/bot/src/bot_graphql/__init__.py +++ b/bot/src/bot_graphql/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/abc/__init__.py b/bot/src/bot_graphql/abc/__init__.py index 31668cc0..ec2093d8 100644 --- a/bot/src/bot_graphql/abc/__init__.py +++ b/bot/src/bot_graphql/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/bot-graphql.json b/bot/src/bot_graphql/bot-graphql.json index 552f4f7d..127d63f1 100644 --- a/bot/src/bot_graphql/bot-graphql.json +++ b/bot/src/bot_graphql/bot-graphql.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/bot_graphql/filter/__init__.py b/bot/src/bot_graphql/filter/__init__.py index 0d5e9d05..bf5d90f1 100644 --- a/bot/src/bot_graphql/filter/__init__.py +++ b/bot/src/bot_graphql/filter/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/model/__init__.py b/bot/src/bot_graphql/model/__init__.py index 5ba9978f..803f8367 100644 --- a/bot/src/bot_graphql/model/__init__.py +++ b/bot/src/bot_graphql/model/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.model" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/mutations/__init__.py b/bot/src/bot_graphql/mutations/__init__.py index 180b6b7b..1a3c88a4 100644 --- a/bot/src/bot_graphql/mutations/__init__.py +++ b/bot/src/bot_graphql/mutations/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/queries/__init__.py b/bot/src/bot_graphql/queries/__init__.py index 9cdf0a5a..4fe38bb3 100644 --- a/bot/src/bot_graphql/queries/__init__.py +++ b/bot/src/bot_graphql/queries/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/bot_graphql/queries/discord/__init__.py b/bot/src/bot_graphql/queries/discord/__init__.py index 662e0b21..960e29db 100644 --- a/bot/src/bot_graphql/queries/discord/__init__.py +++ b/bot/src/bot_graphql/queries/discord/__init__.py @@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries.discord" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/achievements/__init__.py b/bot/src/modules/achievements/__init__.py index 865470f0..f578bc02 100644 --- a/bot/src/modules/achievements/__init__.py +++ b/bot/src/modules/achievements/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.achievements" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/achievements/achievements.json b/bot/src/modules/achievements/achievements.json index 64851517..7e33abca 100644 --- a/bot/src/modules/achievements/achievements.json +++ b/bot/src/modules/achievements/achievements.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", @@ -16,10 +16,10 @@ "LicenseName": "MIT", "LicenseDescription": "MIT, see LICENSE for more details.", "Dependencies": [ - "cpl-core>=1.2.0" + "cpl-core>=1.2.1" ], "DevDependencies": [ - "cpl-cli>=1.2.0" + "cpl-cli>=1.2.1" ], "PythonVersion": ">=3.10.4", "PythonPath": {}, diff --git a/bot/src/modules/achievements/commands/__init__.py b/bot/src/modules/achievements/commands/__init__.py index 1294f61b..884a3111 100644 --- a/bot/src/modules/achievements/commands/__init__.py +++ b/bot/src/modules/achievements/commands/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.achievements.commands" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/achievements/events/__init__.py b/bot/src/modules/achievements/events/__init__.py index a7e73387..b4f96bee 100644 --- a/bot/src/modules/achievements/events/__init__.py +++ b/bot/src/modules/achievements/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.achievements.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/achievements/model/__init__.py b/bot/src/modules/achievements/model/__init__.py index 3887011a..cdbeac0c 100644 --- a/bot/src/modules/achievements/model/__init__.py +++ b/bot/src/modules/achievements/model/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.achievements.model" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/auto_role/__init__.py b/bot/src/modules/auto_role/__init__.py index 17736b45..d11930e5 100644 --- a/bot/src/modules/auto_role/__init__.py +++ b/bot/src/modules/auto_role/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.auto_role" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/auto_role/auto-role.json b/bot/src/modules/auto_role/auto-role.json index 81afa64e..e4eddd07 100644 --- a/bot/src/modules/auto_role/auto-role.json +++ b/bot/src/modules/auto_role/auto-role.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/auto_role/command/__init__.py b/bot/src/modules/auto_role/command/__init__.py index 8044c8a1..1fe315c6 100644 --- a/bot/src/modules/auto_role/command/__init__.py +++ b/bot/src/modules/auto_role/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/auto_role/events/__init__.py b/bot/src/modules/auto_role/events/__init__.py index 9309ac26..d34b344f 100644 --- a/bot/src/modules/auto_role/events/__init__.py +++ b/bot/src/modules/auto_role/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/auto_role/helper/__init__.py b/bot/src/modules/auto_role/helper/__init__.py index a35ecba7..580db0e2 100644 --- a/bot/src/modules/auto_role/helper/__init__.py +++ b/bot/src/modules/auto_role/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/__init__.py b/bot/src/modules/base/__init__.py index e21909e8..c649efab 100644 --- a/bot/src/modules/base/__init__.py +++ b/bot/src/modules/base/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/base.json b/bot/src/modules/base/base.json index 18cc6283..18ef4f37 100644 --- a/bot/src/modules/base/base.json +++ b/bot/src/modules/base/base.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/base/command/__init__.py b/bot/src/modules/base/command/__init__.py index f5ed1fc1..7a9c0a1b 100644 --- a/bot/src/modules/base/command/__init__.py +++ b/bot/src/modules/base/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/events/__init__.py b/bot/src/modules/base/events/__init__.py index b1bc682c..020ed3d9 100644 --- a/bot/src/modules/base/events/__init__.py +++ b/bot/src/modules/base/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/forms/__init__.py b/bot/src/modules/base/forms/__init__.py index 1c884422..0a8781ff 100644 --- a/bot/src/modules/base/forms/__init__.py +++ b/bot/src/modules/base/forms/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.forms" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/helper/__init__.py b/bot/src/modules/base/helper/__init__.py index ebb8d084..b59dd097 100644 --- a/bot/src/modules/base/helper/__init__.py +++ b/bot/src/modules/base/helper/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.helper" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/model/__init__.py b/bot/src/modules/base/model/__init__.py index 55bb1b35..d6ac8c87 100644 --- a/bot/src/modules/base/model/__init__.py +++ b/bot/src/modules/base/model/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.model" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/service/__init__.py b/bot/src/modules/base/service/__init__.py index 6a949706..791482a7 100644 --- a/bot/src/modules/base/service/__init__.py +++ b/bot/src/modules/base/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/base/thread/__init__.py b/bot/src/modules/base/thread/__init__.py index df1ac34b..2c6f2300 100644 --- a/bot/src/modules/base/thread/__init__.py +++ b/bot/src/modules/base/thread/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.base.thread" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/boot_log/__init__.py b/bot/src/modules/boot_log/__init__.py index f1a9cdf7..c2d14ab6 100644 --- a/bot/src/modules/boot_log/__init__.py +++ b/bot/src/modules/boot_log/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.boot_log" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/boot_log/boot-log.json b/bot/src/modules/boot_log/boot-log.json index 4a62d1ac..80ef02e0 100644 --- a/bot/src/modules/boot_log/boot-log.json +++ b/bot/src/modules/boot_log/boot-log.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/config/__init__.py b/bot/src/modules/config/__init__.py index af1aee22..9664fe8d 100644 --- a/bot/src/modules/config/__init__.py +++ b/bot/src/modules/config/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.config" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/config/config.json b/bot/src/modules/config/config.json index cd8a4e09..0d906dd7 100644 --- a/bot/src/modules/config/config.json +++ b/bot/src/modules/config/config.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", @@ -16,10 +16,10 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=1.2.0" + "cpl-core>=1.2.1" ], "DevDependencies": [ - "cpl-cli>=1.2.0" + "cpl-cli>=1.2.1" ], "PythonVersion": ">=3.10.4", "PythonPath": { diff --git a/bot/src/modules/config/events/__init__.py b/bot/src/modules/config/events/__init__.py index 81b9f17e..37230170 100644 --- a/bot/src/modules/config/events/__init__.py +++ b/bot/src/modules/config/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.config.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/config/service/__init__.py b/bot/src/modules/config/service/__init__.py index 049525d1..9321e1f2 100644 --- a/bot/src/modules/config/service/__init__.py +++ b/bot/src/modules/config/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.config.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/database/__init__.py b/bot/src/modules/database/__init__.py index fce928b7..5e8236ae 100644 --- a/bot/src/modules/database/__init__.py +++ b/bot/src/modules/database/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.database" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/database/database.json b/bot/src/modules/database/database.json index 3c617eb0..69981814 100644 --- a/bot/src/modules/database/database.json +++ b/bot/src/modules/database/database.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/src/modules/level/__init__.py b/bot/src/modules/level/__init__.py index 9a54c17e..6e872df3 100644 --- a/bot/src/modules/level/__init__.py +++ b/bot/src/modules/level/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/command/__init__.py b/bot/src/modules/level/command/__init__.py index f1e31901..590d9373 100644 --- a/bot/src/modules/level/command/__init__.py +++ b/bot/src/modules/level/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/configuration/__init__.py b/bot/src/modules/level/configuration/__init__.py index a7104b3f..3fa73004 100644 --- a/bot/src/modules/level/configuration/__init__.py +++ b/bot/src/modules/level/configuration/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level.configuration" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/events/__init__.py b/bot/src/modules/level/events/__init__.py index e6c57145..60e6f1ae 100644 --- a/bot/src/modules/level/events/__init__.py +++ b/bot/src/modules/level/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/level/level.json b/bot/src/modules/level/level.json index f4d7e68f..7b325033 100644 --- a/bot/src/modules/level/level.json +++ b/bot/src/modules/level/level.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/level/service/__init__.py b/bot/src/modules/level/service/__init__.py index cda7dc5f..a542a667 100644 --- a/bot/src/modules/level/service/__init__.py +++ b/bot/src/modules/level/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.level.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/permission/__init__.py b/bot/src/modules/permission/__init__.py index a0fc4fc7..a674424a 100644 --- a/bot/src/modules/permission/__init__.py +++ b/bot/src/modules/permission/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.permission" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/permission/abc/__init__.py b/bot/src/modules/permission/abc/__init__.py index 6379f88e..449399d1 100644 --- a/bot/src/modules/permission/abc/__init__.py +++ b/bot/src/modules/permission/abc/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.permission.abc" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/permission/permission.json b/bot/src/modules/permission/permission.json index 3a708347..887ac6f8 100644 --- a/bot/src/modules/permission/permission.json +++ b/bot/src/modules/permission/permission.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", diff --git a/bot/src/modules/permission/service/__init__.py b/bot/src/modules/permission/service/__init__.py index db82db07..b4ec2913 100644 --- a/bot/src/modules/permission/service/__init__.py +++ b/bot/src/modules/permission/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.permission.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/short_role_name/__init__.py b/bot/src/modules/short_role_name/__init__.py index 46278ac8..bd18f91d 100644 --- a/bot/src/modules/short_role_name/__init__.py +++ b/bot/src/modules/short_role_name/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.short_role_name" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/short_role_name/events/__init__.py b/bot/src/modules/short_role_name/events/__init__.py index eb81e544..2ad2ae9f 100644 --- a/bot/src/modules/short_role_name/events/__init__.py +++ b/bot/src/modules/short_role_name/events/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.short_role_name.events" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/short_role_name/service/__init__.py b/bot/src/modules/short_role_name/service/__init__.py index c5716cd3..8594d0c7 100644 --- a/bot/src/modules/short_role_name/service/__init__.py +++ b/bot/src/modules/short_role_name/service/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.short_role_name.service" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/short_role_name/short-role-name.json b/bot/src/modules/short_role_name/short-role-name.json index 805e3d18..145c3767 100644 --- a/bot/src/modules/short_role_name/short-role-name.json +++ b/bot/src/modules/short_role_name/short-role-name.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", @@ -16,10 +16,10 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=1.2.0" + "cpl-core>=1.2.1" ], "DevDependencies": [ - "cpl-cli>=1.2.0" + "cpl-cli>=1.2.1" ], "PythonVersion": ">=3.10.4", "PythonPath": { diff --git a/bot/src/modules/special_offers/__init__.py b/bot/src/modules/special_offers/__init__.py index 2470352b..dc595cbf 100644 --- a/bot/src/modules/special_offers/__init__.py +++ b/bot/src/modules/special_offers/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.special_offers" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/special_offers/special-offers.json b/bot/src/modules/special_offers/special-offers.json index 9d35ce51..67b5c4e0 100644 --- a/bot/src/modules/special_offers/special-offers.json +++ b/bot/src/modules/special_offers/special-offers.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", @@ -16,10 +16,10 @@ "LicenseName": "", "LicenseDescription": "", "Dependencies": [ - "cpl-core>=1.2.0" + "cpl-core>=1.2.1" ], "DevDependencies": [ - "cpl-cli>=1.2.0" + "cpl-cli>=1.2.1" ], "PythonVersion": ">=3.10.4", "PythonPath": { diff --git a/bot/src/modules/technician/__init__.py b/bot/src/modules/technician/__init__.py index 7e184291..ebd9ac77 100644 --- a/bot/src/modules/technician/__init__.py +++ b/bot/src/modules/technician/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.technician" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/technician/command/__init__.py b/bot/src/modules/technician/command/__init__.py index ef7939c0..06c38c29 100644 --- a/bot/src/modules/technician/command/__init__.py +++ b/bot/src/modules/technician/command/__init__.py @@ -15,7 +15,7 @@ __title__ = "modules.technician.command" __author__ = "Sven Heidemann" __license__ = "MIT" __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" -__version__ = "1.2.0" +__version__ = "1.2.1" from collections import namedtuple @@ -23,4 +23,4 @@ from collections import namedtuple # imports: VersionInfo = namedtuple("VersionInfo", "major minor micro") -version_info = VersionInfo(major="1", minor="2", micro="0") +version_info = VersionInfo(major="1", minor="2", micro="1") diff --git a/bot/src/modules/technician/technician.json b/bot/src/modules/technician/technician.json index 24080baa..4d6cc0b4 100644 --- a/bot/src/modules/technician/technician.json +++ b/bot/src/modules/technician/technician.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "", "AuthorEmail": "", diff --git a/bot/tools/checks/checks.json b/bot/tools/checks/checks.json index c95779e7..74e4eeec 100644 --- a/bot/tools/checks/checks.json +++ b/bot/tools/checks/checks.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/tools/get_version/get-version.json b/bot/tools/get_version/get-version.json index bf6aa56f..1a3aaeed 100644 --- a/bot/tools/get_version/get-version.json +++ b/bot/tools/get_version/get-version.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/tools/post_build/post-build.json b/bot/tools/post_build/post-build.json index 97cd72d1..4f8a7613 100644 --- a/bot/tools/post_build/post-build.json +++ b/bot/tools/post_build/post-build.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/bot/tools/set_version/set-version.json b/bot/tools/set_version/set-version.json index 0c2e47ff..d60391ab 100644 --- a/bot/tools/set_version/set-version.json +++ b/bot/tools/set_version/set-version.json @@ -4,7 +4,7 @@ "Version": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" }, "Author": "Sven Heidemann", "AuthorEmail": "sven.heidemann@sh-edraft.de", diff --git a/web/package.json b/web/package.json index 3ed303f5..79ef61b9 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "web", - "version": "1.2.0", + "version": "1.2.1", "scripts": { "ng": "ng", "update-version": "ts-node update-version.ts", @@ -53,4 +53,4 @@ "tslib": "^2.4.1", "typescript": "~4.9.5" } -} \ No newline at end of file +} diff --git a/web/src/assets/version.json b/web/src/assets/version.json index 3ae731e3..d77aca46 100644 --- a/web/src/assets/version.json +++ b/web/src/assets/version.json @@ -2,6 +2,6 @@ "WebVersion": { "Major": "1", "Minor": "2", - "Micro": "0" + "Micro": "1" } -} \ No newline at end of file +} From 804aa0b9b853ef96aaddee3006aa4eacaedd49b8 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 7 Nov 2023 18:15:41 +0100 Subject: [PATCH 3/3] Fixed some histories --- bot/src/bot_data/model/user.py | 4 ++-- bot/src/bot_data/model/user_history.py | 9 +++++++++ bot/src/bot_graphql/graphql/user.gql | 3 +++ bot/src/bot_graphql/queries/user_history_query.py | 3 +++ web/src/app/models/graphql/queries.model.ts | 1 - 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/bot/src/bot_data/model/user.py b/bot/src/bot_data/model/user.py index c5766eb6..5d8ac8c2 100644 --- a/bot/src/bot_data/model/user.py +++ b/bot/src/bot_data/model/user.py @@ -82,11 +82,11 @@ class User(TableABC): self._reaction_count = value @property - def birthday(self) -> Optional[datetime]: + def birthday(self) -> Optional[date]: return self._birthday @birthday.setter - def birthday(self, value: Optional[datetime]): + def birthday(self, value: Optional[date]): self._birthday = value @property diff --git a/bot/src/bot_data/model/user_history.py b/bot/src/bot_data/model/user_history.py index 357c854a..eebd1d8f 100644 --- a/bot/src/bot_data/model/user_history.py +++ b/bot/src/bot_data/model/user_history.py @@ -1,3 +1,6 @@ +from datetime import date +from typing import Optional + from cpl_core.dependency_injection import ServiceProviderABC from cpl_query.extension import List @@ -11,6 +14,7 @@ class UserHistory(HistoryTableABC): xp: int, message_count: int, reaction_count: int, + birthday: Optional[date], server: int, deleted: bool, date_from: str, @@ -24,6 +28,7 @@ class UserHistory(HistoryTableABC): self._xp = xp self._message_count = message_count self._reaction_count = reaction_count + self._birthday = birthday self._server = server self._deleted = deleted @@ -50,6 +55,10 @@ class UserHistory(HistoryTableABC): def reaction_count(self) -> int: return self._reaction_count + @property + def birthday(self) -> Optional[date]: + return self._birthday + @property def server(self) -> int: return self._server diff --git a/bot/src/bot_graphql/graphql/user.gql b/bot/src/bot_graphql/graphql/user.gql index 9ffff9a2..f05ee950 100644 --- a/bot/src/bot_graphql/graphql/user.gql +++ b/bot/src/bot_graphql/graphql/user.gql @@ -37,6 +37,9 @@ type UserHistory implements HistoryTableQuery { id: ID discordId: String xp: Int + messageCount: Int + reactionCount: Int + birthday: String server: ID diff --git a/bot/src/bot_graphql/queries/user_history_query.py b/bot/src/bot_graphql/queries/user_history_query.py index 14d3867b..75970bff 100644 --- a/bot/src/bot_graphql/queries/user_history_query.py +++ b/bot/src/bot_graphql/queries/user_history_query.py @@ -9,6 +9,9 @@ class UserHistoryQuery(HistoryQueryABC): self.set_field("id", self.resolve_id) self.set_field("discordId", self.resolve_discord_id) self.set_field("xp", self.resolve_xp) + self.set_field("messageCount", lambda x, *_: x.message_count) + self.set_field("reactionCount", lambda x, *_: x.reaction_count) + self.set_field("birthday", lambda x, *_: None if x.birthday is None else x.birthday.strftime("%d.%m.%Y")) self.set_field("server", self.resolve_server) @staticmethod diff --git a/web/src/app/models/graphql/queries.model.ts b/web/src/app/models/graphql/queries.model.ts index 09e582d5..e44e3aab 100644 --- a/web/src/app/models/graphql/queries.model.ts +++ b/web/src/app/models/graphql/queries.model.ts @@ -268,7 +268,6 @@ export class Queries { id shortName roleId - roleName position server deleted