Ebola-Chan/kd_discord_bot
1
0
Fork 0
forked from sh-edraft.de/sh_discord_bot
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request '0.3 - Admins können keine anderen Benutzer zu Admin machen (#88)' (#112) from #88 into 0.3

Browse Source 
Reviewed-on: sh-edraft.de/kd_discord_bot#112
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #88
This commit is contained in:
Ebola-Chan
2022-11-14 21:10:35 +01:00
parent 87435614db cebdc1b860
commit d2968e0652
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kdb-bot/src/bot_api/json_processor.py
View File

@@ -1,3 +1,4 @@
import enum
from inspect import signature, Parameter from inspect import signature, Parameter
from cpl_core.utils import String from cpl_core.utils import String
@@ -28,6 +29,9 @@ class JSONProcessor:
if isinstance(value, dict): if isinstance(value, dict):
value = JSONProcessor.process(parameter.annotation, value) value = JSONProcessor.process(parameter.annotation, value)
if issubclass(parameter.annotation, enum.Enum):
value = parameter.annotation(value)
args.append(value) args.append(value)
elif parameter.default != Parameter.empty: elif parameter.default != Parameter.empty:

2
kdb-bot/src/bot_api/model/auth_user_dto.py
View File

@@ -85,7 +85,7 @@ class AuthUserDTO(DtoABC):
self._email = values['email'] self._email = values['email']
self._password = values['password'] self._password = values['password']
self._is_confirmed = values['isConfirmed'] self._is_confirmed = values['isConfirmed']
self._auth_role = values['authRole'] self._auth_role = AuthRoleEnum(values['authRole'])
def to_dict(self) -> dict: def to_dict(self) -> dict:
return { return {

4
kdb-bot/src/bot_api/model/update_auth_user_dto.py
View File

@@ -33,8 +33,8 @@ class UpdateAuthUserDTO(DtoABC):
return self._change_password return self._change_password
def from_dict(self, values: dict): def from_dict(self, values: dict):
self._auth_user = values['authUser'] self._auth_user = AuthUserDTO().from_dict(values['authUser'])
self._new_auth_user = values['newAuthUser'] self._new_auth_user = AuthUserDTO().from_dict(values['newAuthUser'])
self._change_password = False if 'changePassword' not in values else bool(values['changePassword']) self._change_password = False if 'changePassword' not in values else bool(values['changePassword'])
def to_dict(self) -> dict: def to_dict(self) -> dict: