kellya/matrix-webhook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Exit early after each request check

Browse source 
Keeps the "happy path" on the function's base indentation level.

Avoids carrying status and return value variables, pre-filled in
anticipation of an error, along.
This commit is contained in:
Jochen Kupperschmidt 2020-12-27 14:50:52 +01:00
parent 139ec1670c
commit 78b9533e2b
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
matrix_webhook.py
View file

@ -33,30 +33,33 @@ async def handler(request):
This one handles a POST, checks its content, and forwards it to the matrix room.
"""
data = await request.read()
try:
data = json.loads(data.decode())
status, ret = HTTPStatus.BAD_REQUEST, 'I need a json dict with text & key'
except json.decoder.JSONDecodeError:
data = {}
status, ret = HTTPStatus.BAD_REQUEST, 'This was not valid JSON'
if all(key in data for key in ['text', 'key']):
status, ret = HTTPStatus.UNAUTHORIZED, 'I need the good "key"'
if data['key'] == API_KEY:
status, ret = HTTPStatus.OK, 'OK'
room_id = str(request.rel_url)[1:]
content = {
"msgtype": "m.text",
"body": data['text'],
"format": "org.matrix.custom.html",
"formatted_body": markdown(data['text'], extensions=['extra']),
}
try:
await send_room_message(room_id, content)
except LocalProtocolError: # Connection lost, try another login
await CLIENT.login(MATRIX_PW)
await send_room_message(room_id, content)
return create_json_response(HTTPStatus.BAD_REQUEST, 'Invalid JSON')
return create_json_response(status, ret)
if not all(key in data for key in ['text', 'key']):
return create_json_response(HTTPStatus.BAD_REQUEST,
'Missing text and/or API key property')
if data['key'] != API_KEY:
return create_json_response(HTTPStatus.UNAUTHORIZED, 'Invalid API key')
room_id = str(request.rel_url)[1:]
content = {
"msgtype": "m.text",
"body": data['text'],
"format": "org.matrix.custom.html",
"formatted_body": markdown(data['text'], extensions=['extra']),
}
try:
await send_room_message(room_id, content)
except LocalProtocolError: # Connection lost, try another login
await CLIENT.login(MATRIX_PW)
await send_room_message(room_id, content)
return create_json_response(HTTPStatus.OK, 'OK')
def create_json_response(status, ret):