|
@@ -214,8 +214,8 @@ def api_get(url_path):
|
|
|
return result
|
|
return result
|
|
|
|
|
|
|
|
|
|
|
|
|
-@app.route('/api/request/<path:url_path>', methods=["POST"])
|
|
|
|
|
-def api_post(url_path):
|
|
|
|
|
|
|
+@app.route('/api/request/send_chat/<string:language>', methods=["POST"])
|
|
|
|
|
+def api_send_chat(language):
|
|
|
"""Check key"""
|
|
"""Check key"""
|
|
|
if 'Authorization' not in request.headers:
|
|
if 'Authorization' not in request.headers:
|
|
|
return abort(403)
|
|
return abort(403)
|
|
@@ -225,32 +225,32 @@ def api_post(url_path):
|
|
|
if not key or not key.active:
|
|
if not key or not key.active:
|
|
|
return abort(403)
|
|
return abort(403)
|
|
|
|
|
|
|
|
|
|
+ if 'message' not in request.json:
|
|
|
|
|
+ return abort(400)
|
|
|
|
|
+
|
|
|
|
|
+ message = request.json['message']
|
|
|
|
|
+
|
|
|
log = Log()
|
|
log = Log()
|
|
|
log.date_time = datetime.now()
|
|
log.date_time = datetime.now()
|
|
|
log.key_id = key.id
|
|
log.key_id = key.id
|
|
|
- log.request_type = 'POST'
|
|
|
|
|
- log.request_url = url_path
|
|
|
|
|
|
|
+ log.request_type = 'CHAT'
|
|
|
|
|
+ log.request_url = language
|
|
|
db.session.add(log)
|
|
db.session.add(log)
|
|
|
db.session.commit()
|
|
db.session.commit()
|
|
|
|
|
|
|
|
- if request.json:
|
|
|
|
|
- data = request.json
|
|
|
|
|
- else:
|
|
|
|
|
- data = {}
|
|
|
|
|
-
|
|
|
|
|
alt = request.args.get('alt')
|
|
alt = request.args.get('alt')
|
|
|
if alt:
|
|
if alt:
|
|
|
- result = alt_rrclient.post(url_path, data=data)
|
|
|
|
|
|
|
+ alt_rrclient.send_chat(language, message)
|
|
|
else:
|
|
else:
|
|
|
- result = rrclient.post(url_path, data=data)
|
|
|
|
|
|
|
+ rrclient.send_chat(language, message)
|
|
|
|
|
|
|
|
log.succes = True
|
|
log.succes = True
|
|
|
db.session.commit()
|
|
db.session.commit()
|
|
|
- return result
|
|
|
|
|
|
|
+ return json.dumps(True)
|
|
|
|
|
|
|
|
|
|
|
|
|
-@app.route('/api/send_chat/<string:language>', methods=["POST"])
|
|
|
|
|
-def api_send_chat(language):
|
|
|
|
|
|
|
+@app.route('/api/request/<path:url_path>', methods=["POST"])
|
|
|
|
|
+def api_post(url_path):
|
|
|
"""Check key"""
|
|
"""Check key"""
|
|
|
if 'Authorization' not in request.headers:
|
|
if 'Authorization' not in request.headers:
|
|
|
return abort(403)
|
|
return abort(403)
|
|
@@ -260,25 +260,25 @@ def api_send_chat(language):
|
|
|
if not key or not key.active:
|
|
if not key or not key.active:
|
|
|
return abort(403)
|
|
return abort(403)
|
|
|
|
|
|
|
|
- if 'message' not in request.json:
|
|
|
|
|
- return abort(400)
|
|
|
|
|
-
|
|
|
|
|
- message = request.json['message']
|
|
|
|
|
-
|
|
|
|
|
log = Log()
|
|
log = Log()
|
|
|
log.date_time = datetime.now()
|
|
log.date_time = datetime.now()
|
|
|
log.key_id = key.id
|
|
log.key_id = key.id
|
|
|
- log.request_type = 'CHAT'
|
|
|
|
|
- log.request_url = language
|
|
|
|
|
|
|
+ log.request_type = 'POST'
|
|
|
|
|
+ log.request_url = url_path
|
|
|
db.session.add(log)
|
|
db.session.add(log)
|
|
|
db.session.commit()
|
|
db.session.commit()
|
|
|
|
|
|
|
|
|
|
+ if request.json:
|
|
|
|
|
+ data = request.json
|
|
|
|
|
+ else:
|
|
|
|
|
+ data = {}
|
|
|
|
|
+
|
|
|
alt = request.args.get('alt')
|
|
alt = request.args.get('alt')
|
|
|
if alt:
|
|
if alt:
|
|
|
- alt_rrclient.send_chat(language, message)
|
|
|
|
|
|
|
+ result = alt_rrclient.post(url_path, data=data)
|
|
|
else:
|
|
else:
|
|
|
- rrclient.send_chat(language, message)
|
|
|
|
|
|
|
+ result = rrclient.post(url_path, data=data)
|
|
|
|
|
|
|
|
log.succes = True
|
|
log.succes = True
|
|
|
db.session.commit()
|
|
db.session.commit()
|
|
|
- return json.dumps(True)
|
|
|
|
|
|
|
+ return result
|