From e9edd8ba37467b408cfacf0de3404e29fde6edda Mon Sep 17 00:00:00 2001 From: Mai <3327003-Mai-san@users.noreply.gitlab.com> Date: Thu, 10 Sep 2020 20:20:27 +0000 Subject: [PATCH 1/3] Channel names are not supposed to end with a dash, pretty ghetto way of doing it but I'm tired af --- litecord/schemas.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/litecord/schemas.py b/litecord/schemas.py index 3469784..96cbe97 100644 --- a/litecord/schemas.py +++ b/litecord/schemas.py @@ -158,6 +158,8 @@ class LitecordValidator(Validator): def _validate_type_channel_name(self, value: str) -> bool: # for now, we'll use the same validation for guild_name + if value.endswith("-"): + value[-1] = "" return self._validate_type_guild_name(value) def _validate_type_theme(self, value: str) -> bool: From fbc15219f7dcfeeb72e6c3ea721db7c9827d365b Mon Sep 17 00:00:00 2001 From: Mai <3327003-Mai-san@users.noreply.gitlab.com> Date: Thu, 10 Sep 2020 20:28:39 +0000 Subject: [PATCH 2/3] I am terrible at python jfc --- litecord/schemas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litecord/schemas.py b/litecord/schemas.py index 96cbe97..5a608b3 100644 --- a/litecord/schemas.py +++ b/litecord/schemas.py @@ -159,7 +159,7 @@ class LitecordValidator(Validator): def _validate_type_channel_name(self, value: str) -> bool: # for now, we'll use the same validation for guild_name if value.endswith("-"): - value[-1] = "" + value = value[:-1] return self._validate_type_guild_name(value) def _validate_type_theme(self, value: str) -> bool: From 549d5992fd90e561db63a5fdd4261f2c70f96837 Mon Sep 17 00:00:00 2001 From: Mai <3327003-Mai-san@users.noreply.gitlab.com> Date: Sat, 12 Sep 2020 05:07:51 +0000 Subject: [PATCH 3/3] Finally got things to work --- litecord/schemas.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/litecord/schemas.py b/litecord/schemas.py index 5a608b3..3df0c3b 100644 --- a/litecord/schemas.py +++ b/litecord/schemas.py @@ -158,8 +158,6 @@ class LitecordValidator(Validator): def _validate_type_channel_name(self, value: str) -> bool: # for now, we'll use the same validation for guild_name - if value.endswith("-"): - value = value[:-1] return self._validate_type_guild_name(value) def _validate_type_theme(self, value: str) -> bool: @@ -187,6 +185,12 @@ def validate(reqjson: Optional[Union[Dict, List]], schema: Dict,) -> Dict: if reqjson is None: raise BadRequest("No JSON provided") + try: + if schema["type"]["type"] == "channel_type" and reqjson["name"][-1] == "-": + reqjson["name"] = reqjson["name"][:-1] + except: + pass + try: valid = validator.validate(reqjson) except Exception: