Merge pull request '0.3.1' (#187) from 0.3.1 into master

Reviewed-on: sh-edraft.de/kd_discord_bot#187
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>

kdb-bot/dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM python:3.10.6-alpine
+FROM python:3.10.4-alpine
 
 WORKDIR /app
 COPY ./dist/bot/build/kdb-bot/ .

kdb-bot/src/bot_api/bot-api.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/bot_core/bot-core.json

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

kdb-bot/src/bot_core/service/client_utils_service.py

@@ -182,8 +182,9 @@ class ClientUtilsService(ClientUtilsABC):
         return umcph.xp_count > settings.max_message_xp_per_hour
 
     def get_ontime_for_user(self, user: User) -> float:
-        return (
+        return round(
             self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)
             .where(lambda x: x.leaved_on is not None and x.joined_on is not None)
-            .sum(lambda join: round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2))
+            .sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600),
+            2,
         )

kdb-bot/src/bot_data/bot-data.json

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

kdb-bot/src/modules/auto_role/auto-role.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/base/base.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/base/events/base_on_voice_state_update_event.py

@@ -7,7 +7,6 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnVoiceStateUpdateABC
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -34,7 +33,6 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         users: UserRepositoryABC,
         user_joins: UserJoinedServerRepositoryABC,
         user_joins_vc: UserJoinedVoiceChannelRepositoryABC,
-        client_utils: ClientUtilsABC,
         db: DatabaseContextABC,
     ):
         OnVoiceStateUpdateABC.__init__(self)
@@ -46,7 +44,6 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         self._users = users
         self._user_joins = user_joins
         self._user_joins_vc = user_joins_vc
-        self._client_utils = client_utils
         self._db = db
 
         self._logger.info(__name__, f"Module {type(self)} loaded")
@@ -76,7 +73,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             join.leaved_on = datetime.now()
 
             # ontime as hours
-            ontime = self._client_utils.get_ontime_for_user(user)
+            ontime = round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2)
             old_xp = user.xp
             user.xp += round(ontime * settings.xp_per_ontime_hour)
 

kdb-bot/src/modules/boot_log/boot-log.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/database/database.json

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

kdb-bot/src/modules/level/level.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/permission/permission.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/stats/stats.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/src/modules/technician/technician.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "1"
     },
     "Author": "",
     "AuthorEmail": "",

kdb-bot/tools/get_version/get-version.json

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

kdb-bot/tools/post_build/post-build.json

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

kdb-bot/tools/set_version/set-version.json

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