Begin work on code refactor. Issues this will most likely solve when finished: #201, #195, #115, #20,
This commit is contained in:
Dylan
@ -1,25 +1,10 @@
|
||||
{% extends 'base.html' %}
|
||||
<!--
|
||||
{{ color }} - Custom Color Code set in the TwitFix Config
|
||||
{{ appname }} - Custom Appname set in the TwitFix Config
|
||||
{{ user }} - Username of the Source Tweet
|
||||
{{ pic }} - Thumbnail Image for a given video
|
||||
{{ vidlink }} - Direct link back to the source tweet
|
||||
{{ vidurl }} - Direct MP4 link to the video contained in the tweet
|
||||
{{ desc }} - Tweet Text
|
||||
{{ url }} - Base URL of the site hosting TwitFix
|
||||
{{ urlDesc }} - HTTP Encoded Tweet Text
|
||||
{{ urlUser }} - HTTP Encoded Username
|
||||
{{ urlLink }} - HTTP Encoded source link
|
||||
{{ 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 name="twitter:card" content="summary_large_image" />
|
||||
<meta name="twitter:title" content="{{ user }} (@{{ screenName }}) {% if verified %}☑️{% else %}{% endif %}" />
|
||||
|
||||
{% include 'tweetCommon.html' %}
|
||||
|
||||
<meta name="twitter:image" content="{{ pic[0] }}" />
|
||||
|
||||
{% if pic[1] %}
|
||||
@ -34,9 +19,9 @@
|
||||
<meta name="twitter:image" content="{{ pic[3] }}" />
|
||||
{% endif %}
|
||||
|
||||
<meta name="twitter:creator" content="@{{ user }}" />
|
||||
<meta name="twitter:creator" content="@{{ tweet['user_name'] }}" />
|
||||
|
||||
<meta property="og:description" content="{{ desc }}" />
|
||||
|
||||
<link rel="alternate" href="{{ url }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ tweetLink }}&ttype=photo&provider={{ appname }}" type="application/json+oembed" title="{{ user }}">
|
||||
<link rel="alternate" href="{{ host }}/oembed.json?desc={{ urlUser }}&user=Twitter&link={{ tweetLink }}&ttype=photo&provider={{ appname }}" type="application/json+oembed" title="{{ tweet['user_name'] }}">
|
||||
<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 %}
|
||||
@ -1,16 +1,16 @@
|
||||
{% extends 'base.html' %} {% block head %}
|
||||
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
|
||||
|
||||
<meta name="twitter:player:stream" content="{{ vidurl }}" />
|
||||
<meta name="twitter:player:stream" content="{{ media['url'] }}" />
|
||||
<meta name="twitter:player:stream:content_type" content="video/mp4" />
|
||||
<meta name="twitter:player:width" content="{{ videoSize['width'] }}" />
|
||||
<meta name="twitter:player:height" content="{{ videoSize['height'] }}" />
|
||||
<meta property="og:url" content="{{ vidurl }}" />
|
||||
<meta property="og:video" content="{{ vidurl }}" />
|
||||
<meta property="og:video:secure_url" content="{{ vidurl }}" />
|
||||
<meta name="twitter:player:width" content="{{ media['size']['width'] }}" />
|
||||
<meta name="twitter:player:height" content="{{ media['size']['height'] }}" />
|
||||
<meta property="og:url" content="{{ media['url'] }}" />
|
||||
<meta property="og:video" content="{{ media['url'] }}" />
|
||||
<meta property="og:video:secure_url" content="{{ media['url'] }}" />
|
||||
<meta property="og:video:type" content="video/mp4" />
|
||||
<meta property="og:video:width" content="{{ videoSize['width'] }}" />
|
||||
<meta property="og:video:height" content="{{ videoSize['height'] }}" />
|
||||
<meta property="og:video:width" content="{{ media['size']['width'] }}" />
|
||||
<meta property="og:video:height" content="{{ media['size']['height'] }}" />
|
||||
<meta name="twitter:card" content="player" />
|
||||
|
||||
<meta http-equiv="refresh" content="0; url = {{ vidurl }}" /> {% endblock %} {% block body %} Redirecting you to the video in a moment. <a href="{{ vidurl }}">Or click here.</a> {% endblock %}
|
||||
<meta http-equiv="refresh" content="0; url = {{ media['url'] }}" /> {% endblock %} {% block body %} Redirecting you to the video in a moment. <a href="{{ media['url'] }}">Or click here.</a> {% endblock %}
|
||||
@ -1,28 +0,0 @@
|
||||
<script>
|
||||
function androidOrIOS() {
|
||||
const userAgent = navigator.userAgent;
|
||||
if(/android/i.test(userAgent)){
|
||||
return 'android';
|
||||
}
|
||||
if(/iPad|iPhone|iPod/i.test(userAgent)){
|
||||
return 'ios';
|
||||
}
|
||||
return 'unknown';
|
||||
}
|
||||
|
||||
function redirect() {
|
||||
const os = androidOrIOS();
|
||||
if(os === 'android'){
|
||||
window.location.href = 'twitter://status?status_id=1674915987789950982';
|
||||
window.location.href = 'https://twitter.com/pdxdylan/status/1674915987789950982'
|
||||
}
|
||||
if(os === 'ios'){
|
||||
window.location.href = 'twitter://status?id=1674915987789950982';
|
||||
setTimeout(() => {
|
||||
window.location.href = 'https://twitter.com/pdxdylan/status/1674915987789950982'
|
||||
}, 100);
|
||||
}
|
||||
}
|
||||
|
||||
redirect();
|
||||
</script>
|
||||
@ -1,30 +1,9 @@
|
||||
{% extends 'base.html' %}
|
||||
<!--
|
||||
{{ color }} - Custom Color Code set in the TwitFix Config
|
||||
{{ appname }} - Custom Appname set in the TwitFix Config
|
||||
{{ user }} - Username of the Source Tweet
|
||||
{{ pic }} - Thumbnail Image for a given video
|
||||
{{ vidlink }} - Direct link back to the source tweet
|
||||
{{ vidurl }} - Direct MP4 link to the video contained in the tweet
|
||||
{{ desc }} - Tweet Text
|
||||
{{ url }} - Base URL of the site hosting TwitFix
|
||||
{{ urlDesc }} - HTTP Encoded Tweet Text
|
||||
{{ urlUser }} - HTTP Encoded Username
|
||||
{{ urlLink }} - HTTP Encoded source link
|
||||
{{ pfp }} - URL of the posters PFP
|
||||
{{ screenName }} - Users base username
|
||||
{{ rts }} - Retweet Count
|
||||
{{ likes }} - Like Count
|
||||
{{ 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 name="twitter:card" content="tweet" />
|
||||
<meta name="twitter:title" content="{{ user }} (@{{ screenName }}) {% if verified %}☑️{% else %}{% endif %}" />
|
||||
{% include 'tweetCommon.html' %}
|
||||
<meta name="twitter:image" content="{{ pic[0] }}" />
|
||||
<meta name="twitter:creator" content="@{{ user }}" />
|
||||
|
||||
|
||||
5
templates/tweetCommon.html
Normal file
5
templates/tweetCommon.html
Normal file
@ -0,0 +1,5 @@
|
||||
<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:title" content="{{ tweet['user_name'] }} (@{{ tweet['user_screen_name'] }})" />
|
||||
@ -1,10 +1,8 @@
|
||||
{% 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 }}">
|
||||
|
||||
|
||||
<meta name="twitter:card" content="player" />
|
||||
<meta name="twitter:title" content="{{ user }} (@{{ screenName }}) {% if verified %}☑️{% else %}{% endif %}" />
|
||||
{% include 'tweetCommon.html' %}
|
||||
<meta name="twitter:image" content="{{ pic }}" />
|
||||
<meta name="twitter:player:width" content="{{ videoSize['width'] }}" />
|
||||
<meta name="twitter:player:height" content="{{ videoSize['height'] }}" />
|
||||
@ -17,7 +15,6 @@
|
||||
<meta property="og:video:type" content="video/mp4" />
|
||||
<meta property="og:video:width" content="{{ videoSize['width'] }}" />
|
||||
<meta property="og:video:height" content="{{ videoSize['height'] }}" />
|
||||
<meta name="twitter:title" content="{{ user }} (@{{ screenName }}) {% if verified %}☑️{% else %}{% endif %}" />
|
||||
<meta property="og:image" content="{{ pic[0] }}" />
|
||||
<meta property="og:description" content="{{ desc }}" />
|
||||
|
||||
|
||||
Reference in New Issue
Block a user