Merge pull request #1 from cbondurant/main

Shorten link and remove 500 errors
This commit is contained in:
Robin Universe 2021-07-03 21:36:36 -05:00 committed by GitHub
commit d2b1aa1adb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 9 deletions

View File

@ -1,20 +1,28 @@
from flask import Flask, render_template, url_for, request, redirect
from datetime import datetime
from flask import Flask, render_template
import youtube_dl
import requests
import psutil
import os
import re
ydl = youtube_dl.YoutubeDL({'outtmpl': '%(id)s.%(ext)s'})
app = Flask(__name__)
pathregex = re.compile("\\w{1,15}\\/status\\/\\d{19}")
@app.route('/<path:subpath>')
def twitfix(subpath):
if subpath.startswith('https://twitter.com'):
with ydl:
result = ydl.extract_info(subpath, download=False)
return render_template('index.html', vidurl=result['url'], tweet=result['description'], pic=result['thumbnail'], user=result['uploader'], tweeturl=subpath)
match = pathregex.search(subpath)
if match is not None:
twitter_url = subpath
if match.start() == 0:
twitter_url = "https://twitter.com/" + subpath
with ydl:
try:
result = ydl.extract_info(twitter_url, download=False)
except Exception: # Just to keep from 500s that are messy
return "Bad twitter link, try again"
return render_template('index.html', vidurl=result['url'], tweet=result['description'], pic=result['thumbnail'], user=result['uploader'], tweeturl=twitter_url)
else:
return "Please use a twitter link"