velvox
/
litecord
mirror of https://gitlab.com/litecord/litecord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

schemas: fix GW_ACTIVITY schema 

- blueprints.guilds: use GUILD_CREATE schema
This commit is contained in:
Luna Mendes 2018-10-26 03:39:11 -03:00
parent aaa11be258
commit e8ebfe6eeb
2 changed files with 70 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litecord/blueprints/guilds.py
View File

@ -4,7 +4,7 @@ from ..auth import token_check
from ..snowflake import get_snowflake from ..snowflake import get_snowflake
from ..enums import ChannelType from ..enums import ChannelType
from ..errors import Forbidden, GuildNotFound, BadRequest from ..errors import Forbidden, GuildNotFound, BadRequest
from ..schemas import validate, GUILD_UPDATE from ..schemas import validate, GUILD_CREATE, GUILD_UPDATE
from .channels import channel_ack from .channels import channel_ack
from .checks import guild_check from .checks import guild_check
@ -160,7 +160,7 @@ async def create_guild():
the user creating it as the owner and the user creating it as the owner and
making them join.""" making them join."""
user_id = await token_check() user_id = await token_check()
j = await request.get_json() j = validate(await request.get_json(), GUILD_CREATE)
guild_id = get_snowflake() guild_id = get_snowflake()

121
litecord/schemas.py
View File

@ -32,7 +32,7 @@ class LitecordValidator(Validator):
return bool(USERNAME_REGEX.match(value)) return bool(USERNAME_REGEX.match(value))
def _validate_type_email(self, value: str) -> bool: def _validate_type_email(self, value: str) -> bool:
"""Validate against the username regex.""" """Validate against the email regex."""
return bool(EMAIL_REGEX.match(value)) return bool(EMAIL_REGEX.match(value))
def _validate_type_b64_icon(self, value: str) -> bool: def _validate_type_b64_icon(self, value: str) -> bool:
@ -114,7 +114,13 @@ def validate(reqjson: Union[Dict, List], schema: Dict,
""" """
validator = LitecordValidator(schema) validator = LitecordValidator(schema)
if not validator.validate(reqjson): try:
valid = validator.validate(reqjson)
except Exception:
log.exception('Error while validating')
raise Exception(f'Error while validating: {reqjson}')
if not valid:
errs = validator.errors errs = validator.errors
log.warning('Error validating doc {!r}: {!r}', reqjson, errs) log.warning('Error validating doc {!r}: {!r}', reqjson, errs)
@ -163,19 +169,25 @@ USER_UPDATE = {
} }
PARTIAL_ROLE_GUILD_CREATE = { PARTIAL_ROLE_GUILD_CREATE = {
'name': {'type': 'role_name'}, 'type': 'dict',
'color': {'type': 'number', 'default': 0}, 'schema': {
'hoist': {'type': 'boolean', 'default': False}, 'name': {'type': 'role_name'},
'color': {'type': 'number', 'default': 0},
'hoist': {'type': 'boolean', 'default': False},
# NOTE: no position on partial role (on guild create) # NOTE: no position on partial role (on guild create)
'permissions': {'coerce': Permissions, 'required': False}, 'permissions': {'coerce': Permissions, 'required': False},
'mentionable': {'type': 'boolean', 'default': False}, 'mentionable': {'type': 'boolean', 'default': False},
}
} }
PARTIAL_CHANNEL_GUILD_CREATE = { PARTIAL_CHANNEL_GUILD_CREATE = {
'name': {'type': 'channel_name'}, 'type': 'dict',
'type': {'type': 'channel_type'} 'schema': {
'name': {'type': 'channel_name'},
'type': {'type': 'channel_type'},
}
} }
GUILD_CREATE = { GUILD_CREATE = {
@ -244,57 +256,60 @@ MESSAGE_CREATE = {
GW_ACTIVITY = { GW_ACTIVITY = {
'name': {'type': 'string', 'required': True}, 'type': 'dict',
'type': {'type': 'activity_type', 'required': True}, 'schema': {
'name': {'type': 'string', 'required': True},
'type': {'type': 'activity_type', 'required': True},
'url': {'type': 'string', 'required': False, 'nullable': True}, 'url': {'type': 'string', 'required': False, 'nullable': True},
'timestamps': { 'timestamps': {
'type': 'dict', 'type': 'dict',
'required': False, 'required': False,
'schema': { 'schema': {
'start': {'type': 'number', 'required': True}, 'start': {'type': 'number', 'required': True},
'end': {'type': 'number', 'required': True}, 'end': {'type': 'number', 'required': False},
},
}, },
},
'application_id': {'type': 'snowflake', 'required': False, 'application_id': {'type': 'snowflake', 'required': False,
'nullable': False}, 'nullable': False},
'details': {'type': 'string', 'required': False, 'nullable': True}, 'details': {'type': 'string', 'required': False, 'nullable': True},
'state': {'type': 'string', 'required': False, 'nullable': True}, 'state': {'type': 'string', 'required': False, 'nullable': True},
'party': { 'party': {
'type': 'dict', 'type': 'dict',
'required': False, 'required': False,
'schema': { 'schema': {
'id': {'type': 'snowflake', 'required': False}, 'id': {'type': 'snowflake', 'required': False},
'size': {'type': 'list', 'required': False}, 'size': {'type': 'list', 'required': False},
} }
}, },
'assets': { 'assets': {
'type': 'dict', 'type': 'dict',
'required': False, 'required': False,
'schema': { 'schema': {
'large_image': {'type': 'snowflake', 'required': False}, 'large_image': {'type': 'snowflake', 'required': False},
'large_text': {'type': 'string', 'required': False}, 'large_text': {'type': 'string', 'required': False},
'small_image': {'type': 'snowflake', 'required': False}, 'small_image': {'type': 'snowflake', 'required': False},
'small_text': {'type': 'string', 'required': False}, 'small_text': {'type': 'string', 'required': False},
} }
}, },
'secrets': { 'secrets': {
'type': 'dict', 'type': 'dict',
'required': False, 'required': False,
'schema': { 'schema': {
'join': {'type': 'string', 'required': False}, 'join': {'type': 'string', 'required': False},
'spectate': {'type': 'string', 'required': False}, 'spectate': {'type': 'string', 'required': False},
'match': {'type': 'string', 'required': False}, 'match': {'type': 'string', 'required': False},
} }
}, },
'instance': {'type': 'boolean', 'required': False}, 'instance': {'type': 'boolean', 'required': False},
'flags': {'type': 'number', 'required': False}, 'flags': {'type': 'number', 'required': False},
}
} }
GW_STATUS_UPDATE = { GW_STATUS_UPDATE = {