flifloo/BetterTwitFix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use JPEG for final combined img

Browse source
This commit is contained in:
Dylan 2022-05-25 01:20:27 +01:00
parent 39a9ffd512
commit b457760fae
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
twitfix.py
View file

@ -1,3 +1,4 @@
from weakref import finalize
from flask import Flask, render_template, request, redirect, abort, Response, send_from_directory, url_for, send_file, make_response, jsonify from flask import Flask, render_template, request, redirect, abort, Response, send_from_directory, url_for, send_file, make_response, jsonify
from flask_cors import CORS from flask_cors import CORS
import youtube_dl import youtube_dl
@ -133,6 +134,9 @@ def twitfix(sub_path):
if user_agent in generate_embed_user_agents: if user_agent in generate_embed_user_agents:
return embedCombined(twitter_url) return embedCombined(twitter_url)
else:
print(" ➤ [ R ] Redirect to " + twitter_url)
return redirect(twitter_url, 301)
elif request.url.endswith(".mp4") or request.url.endswith("%2Emp4"): elif request.url.endswith(".mp4") or request.url.endswith("%2Emp4"):
twitter_url = "https://twitter.com/" + sub_path twitter_url = "https://twitter.com/" + sub_path
@ -227,9 +231,10 @@ def rendercombined():
abort(400) abort(400)
finalImg= combineImg.genImageFromURL(imgs) finalImg= combineImg.genImageFromURL(imgs)
imgIo = BytesIO() imgIo = BytesIO()
finalImg.save(imgIo, 'PNG') finalImg = finalImg.convert("RGB")
finalImg.save(imgIo, 'JPEG',quality=70)
imgIo.seek(0) imgIo.seek(0)
return send_file(imgIo, mimetype='image/png') return send_file(imgIo, mimetype='image/jpeg')
def getDefaultTTL(): def getDefaultTTL():
return datetime.today().replace(microsecond=0) + timedelta(days=1) return datetime.today().replace(microsecond=0) + timedelta(days=1)
@ -568,7 +573,7 @@ def embedCombinedVnf(video_link,vnf):
user = vnf['uploader'], user = vnf['uploader'],
video_link = video_link, video_link = video_link,
color = color, color = color,
appname = config['config']['appname'], appname = config['config']['appname'] + " - View original tweet for full quality",
repo = config['config']['repo'], repo = config['config']['repo'],
url = config['config']['url'], url = config['config']['url'],
urlDesc = urlDesc, urlDesc = urlDesc,