From 96246aa9217774ddc88275ffba5bf1790317eda9 Mon Sep 17 00:00:00 2001
From: Dylan <dylanpdx@gmail.com>
Date: Sun, 15 May 2022 01:47:20 +0100
Subject: [PATCH] Squashed commit of the following:

commit fba1256efd3ce539f716e2f23b45c122c8422759
Author: Dylan <dylanpdx@gmail.com>
Date:   Sun May 15 01:42:22 2022 +0100

    Fixed infinite redirect(?)

commit 85c682ab111f575c8c517117f456cf354e9f5bf7
Author: Dylan <dylanpdx@gmail.com>
Date:   Sun May 15 01:15:15 2022 +0100

    Updated gitignore
---
 templates/image.html | 27 +++++++++-------------
 templates/index.html | 55 +++++++++++++++++++-------------------------
 templates/text.html  | 27 +++++++++-------------
 templates/video.html | 49 +++++++++++++++++----------------------
 twitfix.py           |  3 ++-
 5 files changed, 69 insertions(+), 92 deletions(-)

diff --git a/templates/image.html b/templates/image.html
index 7846217..43329c4 100644
--- a/templates/image.html
+++ b/templates/image.html
@@ -14,22 +14,17 @@
     {{ pfp }}     - URL of the posters PFP
  -->
 {% block head %}
-    <meta content="text/html; charset=UTF-8"        http-equiv="Content-Type" />
-    <meta content="{{ color }}"                     name="theme-color" />
-    <meta property="og:site_name"                   content="{{ appname }}"/>
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<meta content="{{ color }}" name="theme-color" />
+<meta property="og:site_name" content="{{ appname }}" />
 
-    <meta name="twitter:card"                       content="summary_large_image" />
-    <meta name="twitter:title"                      content="{{ user }} (@{{ screenName }})"  />
-    <meta name="twitter:image"                      content="{{ pic }}"   />
-    <meta name="twitter:image"                      content="{{ pic }}"   />
-    <meta name="twitter:creator"                    content="@{{ user }}" />
+<meta name="twitter:card" content="summary_large_image" />
+<meta name="twitter:title" content="{{ user }} (@{{ screenName }})" />
+<meta name="twitter:image" content="{{ pic }}" />
+<meta name="twitter:image" content="{{ pic }}" />
+<meta name="twitter:creator" content="@{{ user }}" />
 
-    <meta property="og:description"                 content="{{ desc }}"  />
- 
-    <!--<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ urlLink }}&ttype=photo" type="application/json+oembed" title="{{ user }}">-->
-    <meta http-equiv = "refresh" content = "0; url = {{ vidlink }}" />
-{% endblock %}
+<meta property="og:description" content="{{ desc }}" />
 
-{% block body %}
-Redirecting you to the tweet in a moment. <a href="{{ vidlink }}">Or click here.</a>
-{% endblock %}
+<!--<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ urlLink }}&ttype=photo" type="application/json+oembed" title="{{ user }}">-->
+<meta http-equiv="refresh" content="0; url = {{ tweetLink }}" /> {% endblock %} {% block body %} Redirecting you to the tweet in a moment. <a href="{{ tweetLink }}">Or click here.</a> {% endblock %}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 348f208..9630f82 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,37 +1,30 @@
-{% extends 'base.html' %}
+{% extends 'base.html' %} {% block head %}
+<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+<meta content="{{ color }}" name="theme-color" />
+<meta property="og:site_name" content="{{ appname }}">
 
-{% block head %}
-    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
-    <meta content="{{ color }}" name="theme-color" />
-    <meta property="og:site_name" content="{{ appname }}">
-
-    <meta name="twitter:card"                       content="player" />
-    <meta name="twitter:title"                      content="{{ user }}" />
-    <meta name="twitter:image"                      content="{{ pic }}" />
-    <!-- The line below breaks Telegram embeds if present but doesn't affect Discord embeds if removed
+<meta name="twitter:card" content="player" />
+<meta name="twitter:title" content="{{ user }}" />
+<meta name="twitter:image" content="{{ pic }}" />
+<!-- The line below breaks Telegram embeds if present but doesn't affect Discord embeds if removed
     <meta name="twitter:player"                     content="{{ vidurl }}" />
     <meta name="twitter:description"                content="{{ desc }}" />!-->
-    <meta name="twitter:player:width"               content="720" />
-    <meta name="twitter:player:height"              content="480" />
-    <meta name="twitter:player:stream"              content="{{ vidurl }}" />
-    <meta name="twitter:player:stream:content_type" content="video/mp4" /> 
+<meta name="twitter:player:width" content="720" />
+<meta name="twitter:player:height" content="480" />
+<meta name="twitter:player:stream" content="{{ vidurl }}" />
+<meta name="twitter:player:stream:content_type" content="video/mp4" />
 
-    
-    <meta property="og:url"                content="{{ vidlink }}" />
-    <meta property="og:video"              content="{{ vidurl }}" />
-    <meta property="og:video:secure_url"   content="{{ vidurl }}" />
-    <meta property="og:video:type"         content="video/mp4" />
-    <meta property="og:video:width"        content="720" />
-    <meta property="og:video:height"       content="480" />
-    <meta property="og:title"              content="{{ user }}" />
-    <!--<meta property="og:description"        content="{{ desc }}" />!-->
-    <meta property="og:image"              content="{{ pic }}" />
 
-        <!--!-->
-    <link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user={{ urlDesc }}&link={{ urlLink }}" type="application/json+oembed" title="{{ user }}">
-    <meta http-equiv = "refresh" content = "0; url = {{ vidlink }}" />
-{% endblock %}
+<meta property="og:url" content="{{ vidlink }}" />
+<meta property="og:video" content="{{ vidurl }}" />
+<meta property="og:video:secure_url" content="{{ vidurl }}" />
+<meta property="og:video:type" content="video/mp4" />
+<meta property="og:video:width" content="720" />
+<meta property="og:video:height" content="480" />
+<meta property="og:title" content="{{ user }}" />
+<!--<meta property="og:description"        content="{{ desc }}" />!-->
+<meta property="og:image" content="{{ pic }}" />
 
-{% block body %}
-Redirecting you to the tweet in a moment. <a href="{{ vidlink }}">Or click here.</a>
-{% endblock %}
+<!--!-->
+<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user={{ urlDesc }}&link={{ urlLink }}" type="application/json+oembed" title="{{ user }}">
+<meta http-equiv="refresh" content="0; url = {{ tweetLink }}" /> {% endblock %} {% block body %} Redirecting you to the tweet in a moment. <a href="{{ tweetLink }}">Or click here.</a> {% endblock %}
\ No newline at end of file
diff --git a/templates/text.html b/templates/text.html
index 95ea95d..7ba9511 100644
--- a/templates/text.html
+++ b/templates/text.html
@@ -18,22 +18,17 @@
     {{ time }}    - Time Created
  -->
 {% block head %}
-    <meta content="text/html; charset=UTF-8"        http-equiv="Content-Type" />
-    <meta content="{{ color }}"                     name="theme-color" />
-    <meta property="og:site_name"                   content="{{ appname }}"/>
-    <meta property="og:image"                       content="{{ pfp }}"   />
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<meta content="{{ color }}" name="theme-color" />
+<meta property="og:site_name" content="{{ appname }}" />
+<meta property="og:image" content="{{ pfp }}" />
 
-    <meta name="twitter:card"                       content="tweet"       />
-    <meta name="twitter:title"                      content="{{ user }} (@{{ screenName }})"  />
-    <meta name="twitter:image"                      content="{{ pic }}"   />
-    <meta name="twitter:creator"                    content="@{{ user }}" />
+<meta name="twitter:card" content="tweet" />
+<meta name="twitter:title" content="{{ user }} (@{{ screenName }})" />
+<meta name="twitter:image" content="{{ pic }}" />
+<meta name="twitter:creator" content="@{{ user }}" />
 
-    <meta property="og:description"                 content="{{ desc }}"  />
- 
-    <link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ urlLink }}&ttype=link" type="application/json+oembed" title="{{ user }}">
-    <meta http-equiv = "refresh" content = "0; url = {{ vidlink }}" />
-{% endblock %}
+<meta property="og:description" content="{{ desc }}" />
 
-{% block body %}
-Redirecting you to the tweet in a moment. <a href="{{ vidlink }}">Or click here.</a>
-{% endblock %}
+<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ urlLink }}&ttype=link" type="application/json+oembed" title="{{ user }}">
+<meta http-equiv="refresh" content="0; url = {{ tweetLink }}" /> {% endblock %} {% block body %} Redirecting you to the tweet in a moment. <a href="{{ tweetLink }}">Or click here.</a> {% endblock %}
\ No newline at end of file
diff --git a/templates/video.html b/templates/video.html
index f2c81a7..b99e0f3 100644
--- a/templates/video.html
+++ b/templates/video.html
@@ -1,31 +1,24 @@
-{% extends 'base.html' %}
+{% extends 'base.html' %} {% block head %}
+<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+<meta content="{{ color }}" name="theme-color" />
+<meta property="og:site_name" content="{{ appname }}">
 
-{% block head %}
-    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
-    <meta content="{{ color }}"  name="theme-color" />
-    <meta property="og:site_name" content="{{ appname }}">
+<meta name="twitter:card" content="player" />
+<meta name="twitter:title" content="{{ user }} (@{{ screenName }})" />
+<meta name="twitter:image" content="{{ pic }}" />
+<meta name="twitter:player:width" content="720" />
+<meta name="twitter:player:height" content="480" />
+<meta name="twitter:player:stream" content="{{ vidurl }}" />
+<meta name="twitter:player:stream:content_type" content="video/mp4" />
 
-    <meta name="twitter:card"                       content="player" />
-    <meta name="twitter:title"                      content="{{ user }} (@{{ screenName }})"  />
-    <meta name="twitter:image"                      content="{{ pic }}" />
-    <meta name="twitter:player:width"               content="720" />
-    <meta name="twitter:player:height"              content="480" />
-    <meta name="twitter:player:stream"              content="{{ vidurl }}" />
-    <meta name="twitter:player:stream:content_type" content="video/mp4" /> 
-    
-    <meta property="og:url"                content="{{ vidlink }}" />
-    <meta property="og:video"              content="{{ vidurl }}" />
-    <meta property="og:video:secure_url"   content="{{ vidurl }}" />
-    <meta property="og:video:type"         content="video/mp4" />
-    <meta property="og:video:width"        content="720" />
-    <meta property="og:video:height"       content="480" />
-    <meta name="twitter:title"             content="{{ user }} (@{{ screenName }})"  />
-    <meta property="og:image"              content="{{ pic }}" />
+<meta property="og:url" content="{{ vidlink }}" />
+<meta property="og:video" content="{{ vidurl }}" />
+<meta property="og:video:secure_url" content="{{ vidurl }}" />
+<meta property="og:video:type" content="video/mp4" />
+<meta property="og:video:width" content="720" />
+<meta property="og:video:height" content="480" />
+<meta name="twitter:title" content="{{ user }} (@{{ screenName }})" />
+<meta property="og:image" content="{{ pic }}" />
 
-    <link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user={{ urlDesc }}&link={{ urlLink }}&ttype=video" type="application/json+oembed" title="{{ user }}">
-    <meta http-equiv = "refresh" content = "0; url = {{ vidlink }}" />
-{% endblock %}
-
-{% block body %}
-Redirecting you to the tweet in a moment. <a href="{{ vidlink }}">Or click here.</a>
-{% endblock %}
+<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user={{ urlDesc }}&link={{ urlLink }}&ttype=video" type="application/json+oembed" title="{{ user }}">
+<meta http-equiv="refresh" content="0; url = {{ tweetLink }}" /> {% endblock %} {% block body %} Redirecting you to the tweet in a moment. <a href="{{ tweetLink }}">Or click here.</a> {% endblock %}
\ No newline at end of file
diff --git a/twitfix.py b/twitfix.py
index 9d273d0..a104f3e 100644
--- a/twitfix.py
+++ b/twitfix.py
@@ -465,7 +465,8 @@ def embed(video_link, vnf, image):
         url        = config['config']['url'], 
         urlDesc    = urlDesc, 
         urlUser    = urlUser, 
-        urlLink    = urlLink )
+        urlLink    = urlLink,
+        tweetLink  = vnf['tweet'] )
 
 def tweetType(tweet): # Are we dealing with a Video, Image, or Text tweet?
     if 'extended_entities' in tweet: