From f4855adce8e46609c0f59673dae4882b18355462 Mon Sep 17 00:00:00 2001 From: Morgan McMillian Date: Tue, 8 May 2018 17:58:43 -0700 Subject: [PATCH] remove broken invite code issue #31 --- appservice.py | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/appservice.py b/appservice.py index fb6f035..95a7fc6 100644 --- a/appservice.py +++ b/appservice.py @@ -166,33 +166,15 @@ def on_receive_events(transaction): if event['content']['membership'] == 'invite' and 'is_direct' in event['content'] and event['content']['is_direct'] == True: logging.info('>> GOT PRIVATE INVITE') - # cmdbot.on_invite(event) - # addadminrm = MatrixAdminRooms(matrix_id=event['sender'], room_id=event['room_id']) - # db.session.add(addadminrm) - # db.session.commit() + elif event['content']['membership'] == 'invite': logging.info('>> GOT ROOM INVITE') - txId += 1 - url = app.config['MATRIX_HOST'] - url += '/_matrix/client/r0/join/' + event['room_id'] - url += "?access_token=" + app.config['MATRIX_AS_TOKEN'] - r = requests.post(url, headers={"Content-Type": "application/json"}, - data=json.dumps({})) + elif event['content']['membership'] == 'leave': adminrm = MatrixAdminRooms.query.filter_by(room_id=event['room_id']).first() - if adminrm: - logging.info('>> GOT LEAVE') - txId += 1 - url = app.config['MATRIX_HOST'] - url += '/_matrix/client/r0/rooms/' + event['room_id'] + "/leave" - url += "?access_token=" + app.config['MATRIX_AS_TOKEN'] - r = requests.post(url, headers={"Content-Type": "application/json"}, - data=json.dumps({})) - if r.status_code == 200: - db.session.delete(adminrm) - db.session.commit() + return jsonify({})