diff --git a/templates/image.html b/templates/image.html index 025ad69..e9a4c7a 100644 --- a/templates/image.html +++ b/templates/image.html @@ -1,17 +1,18 @@ {% extends 'base.html' %} {% block head %} @@ -26,10 +27,10 @@ - + {% endblock %} {% block body %} Redirecting you to the tweet in a moment. Or click here. -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/twitfix.py b/twitfix.py index c9db18a..1e9190d 100644 --- a/twitfix.py +++ b/twitfix.py @@ -755,6 +755,7 @@ def embed(video_link, vnf, image, raw=False): urlDesc = urllib.parse.quote(desc) urlLink = urllib.parse.quote(video_link) likeDisplay = "\n\nšŸ’– " + str(vnf["likes"]) + " šŸ” " + str(vnf["rts"]) + "\n" + imagecount = "Twitter" try: if vnf["type"] == "": @@ -779,15 +780,13 @@ def embed(video_link, vnf, image, raw=False): vnf["rts"] = 0 vnf["time"] = 0 print(" āž¤ [ X ] Failed QRT check - old VNF object") - appNamePost = "" + if vnf["type"] == "Text": # Change the template based on tweet type template = "text.html" if vnf["type"] == "Image": - print(" āž¤ [ T ] vnf type is Image") - if vnf["images"][4] != "1": - appNamePost = " - Image " + str(image+1) + "/" + str(vnf["images"][4]) - print(f" āž¤ [ T ] Setting appNamePost to {appNamePost}") image = vnf["images"][image] + if vnf["images"][4] != "1": + imagecount = "Twitter (" + vnf["images"][4] + " images in post)" if raw == True: template = "img.html" else: @@ -807,7 +806,7 @@ def embed(video_link, vnf, image, raw=False): if vnf["nsfw"] == True: color = "#800020" # Red - print(f'{appNamePost=}') + return render_template( template, likes=vnf["likes"], @@ -819,10 +818,11 @@ def embed(video_link, vnf, image, raw=False): vidurl=vnf["url"], desc=desc, pic=image, + imagecount=imagecount, user=vnf["uploader"], video_link=video_link, color=color, - appname=f"{config['config']['appname']}{appNamePost}", + appname=config['config']['appname'], repo=config["config"]["repo"], url=config["config"]["url"], urlDesc=urlDesc,