heckyel/yt-local
0
0
Fork 0
Code Issues Pull Requests Releases Activity

comments.js: include error in reply html rather than using an alert

Browse Source
This commit is contained in:
James Taylor
2020-10-20 18:24:41 -07:00
parent 95f2f027ea
commit c696db3e84
4 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
youtube/__init__.py
View File

@@ -1,5 +1,6 @@
from youtube import util
import flask
from flask import request
import settings
import traceback
import re
@@ -55,6 +56,7 @@ def timestamps(text):
@yt_app.errorhandler(500)
def error_page(e):
slim = request.args.get('slim', False) # whether it was an ajax request
if (exc_info()[0] == util.FetchError
and exc_info()[1].code == '429'
and settings.route_tor
@@ -64,8 +66,8 @@ def error_page(e):
' using the New Identity button in the Tor Browser.')
if exc_info()[1].ip:
error_message += ' Exit node IP address: ' + exc_info()[1].ip
return flask.render_template('error.html', error_message=error_message), 502
return flask.render_template('error.html', traceback=traceback.format_exc()), 500
return flask.render_template('error.html', error_message=error_message, slim=slim), 502
return flask.render_template('error.html', traceback=traceback.format_exc(), slim=slim), 500
font_choices = {
0: 'initial',