From fa60a6569d51d6eb71b2c37e1fd8be788a1fb24d Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 20 Jan 2020 12:12:53 +1000 Subject: [PATCH] less error spam --- app/webui.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/webui.py b/app/webui.py index eacd445..54ea180 100644 --- a/app/webui.py +++ b/app/webui.py @@ -76,7 +76,7 @@ def render_delete(): # should never happen ;) session['error'] = "An unknown error occurred." return redirect(url_for("render_delete"), 303) - + if bcrypt.checkpw(pw_hashed, data['password']): # passwords match, delete the account session['error'] = "succ ess" @@ -106,7 +106,7 @@ def render_delete(): c.close() mysql.connection.commit() - + # TODO: show a "deletion successful" message or something return redirect(url_for("do_signout"), 303) @@ -258,9 +258,12 @@ def push(id): 'privkey': int(bot[0].rstrip("\0")), 'auth': bot[1] } - push_object = client.push_subscription_decrypt_push(request.data, params, request.headers['Encryption'], request.headers['Crypto-Key']) - notification = client.notifications(id = push_object['notification_id']) - me = client.account_verify_credentials()['id'] + try: + push_object = client.push_subscription_decrypt_push(request.data, params, request.headers['Encryption'], request.headers['Crypto-Key']) + notification = client.notifications(id = push_object['notification_id']) + me = client.account_verify_credentials()['id'] + except: + return "Push failed - do we still have access to {}?".format(id) # first, check how many times the bot has posted in this thread. # if it's over 15, don't reply. @@ -329,7 +332,7 @@ def do_login(): if data == None: session['error'] = "Incorrect login information." return redirect(url_for("show_login_page"), 303) - + if bcrypt.checkpw(pw_hashed, data['password']): session['user_id'] = data['id'] return redirect(url_for("render_home"))