Match twitter_url before checking user agent
This commit is contained in:
parent
4053f6373d
commit
63570ea84b
1 changed files with 7 additions and 8 deletions
15
twitfix.py
15
twitfix.py
|
@ -54,19 +54,18 @@ def oembedend():
|
||||||
@app.route('/<path:subpath>')
|
@app.route('/<path:subpath>')
|
||||||
def twitfix(subpath):
|
def twitfix(subpath):
|
||||||
user_agent = request.headers.get('user-agent')
|
user_agent = request.headers.get('user-agent')
|
||||||
if user_agent in discord_user_agents:
|
match = pathregex.search(subpath)
|
||||||
|
if match is not None:
|
||||||
|
twitter_url = subpath
|
||||||
|
|
||||||
match = pathregex.search(subpath)
|
if match.start() == 0:
|
||||||
if match is not None:
|
twitter_url = "https://twitter.com/" + subpath
|
||||||
twitter_url = subpath
|
|
||||||
|
|
||||||
if match.start() == 0:
|
|
||||||
twitter_url = "https://twitter.com/" + subpath
|
|
||||||
|
|
||||||
|
if user_agent in discord_user_agents:
|
||||||
res = embedVideo(twitter_url)
|
res = embedVideo(twitter_url)
|
||||||
return res
|
return res
|
||||||
else:
|
else:
|
||||||
return render_template('default.html', message="This doesn't seem to be a twitter link, try /other/ to see if other kinds of video link works? (experimental)")
|
return redirect(twitter_url, 301)
|
||||||
else:
|
else:
|
||||||
return redirect("https://twitter.com/" + subpath, 301)
|
return redirect("https://twitter.com/" + subpath, 301)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue