From a851fe587bf41faab13951e31561465511cc8fdb Mon Sep 17 00:00:00 2001
From: Dylan <dylanpdx@gmail.com>
Date: Mon, 31 Mar 2025 01:36:23 +0100
Subject: [PATCH] Misc refactoring; Icons based on media type

---
 static/richEmbed/gif.png   | Bin 0 -> 2525 bytes
 static/richEmbed/image.png | Bin 0 -> 2682 bytes
 static/richEmbed/text.png  | Bin 0 -> 1911 bytes
 static/richEmbed/video.png | Bin 0 -> 784 bytes
 templates/tweetCommon.html |   8 +++
 twitfix.py                 | 108 ++++++++++++++++++-------------------
 6 files changed, 61 insertions(+), 55 deletions(-)
 create mode 100644 static/richEmbed/gif.png
 create mode 100644 static/richEmbed/image.png
 create mode 100644 static/richEmbed/text.png
 create mode 100644 static/richEmbed/video.png

diff --git a/static/richEmbed/gif.png b/static/richEmbed/gif.png
new file mode 100644
index 0000000000000000000000000000000000000000..36cf9e13a3b526e75765879910f2193fe9ca9ce3
GIT binary patch
literal 2525
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
b7WIo{;df0<*(vd?Z*3I8&Jo*W>!0x-&fRo;

literal 0
HcmV?d00001

diff --git a/static/richEmbed/image.png b/static/richEmbed/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..e687144c31f36aa6f1e98f3e09d208ea10cb5e4c
GIT binary patch
literal 2682
zcmb7GYdF*I8~@toG)Bqf5OOw!M4J2@n=m=eA<3~hB*VlUGC4JJOb+p@QPPr<4Vjc?
z2%#oPPDP8gln8|tzx~&n|Eu4N|NptJ&vQSY`@XOHe(_w-bANK(T<l>`MJNCOFh>Uz
zMqtzbKukoi_gDrG35-x2#@-faWbIiH5J<R<vkd?=U6$Ai78Y=Eyu-;j000yIK<E{&
zwnpHTkGJ!Q_lOCLPYga63b+MFM8_Mr*m>?fWME`qA~Sm@OOPWK>f;#Z><s7$&SC=m
zS+6}x1r<jeQ8u1Q0pF^UU-%!D?{lj6&AbJv$JpL?H-}B_-BeGwg=szJsCo776h#aU
zv+=z2uobnVrs?7Bz}L@QT7Ts{XdPq3Hyy)Z9#(T-q;yt?vfeX{xi7wTbk4tgK~7n2
z=dymkAe+U_m?b`4T3WJ1KWZ?nm(kTrXSxePilBS(o<K$|NNf+>`omoSWG}n}`9Foo
z5K;nx;K-6<tchr91dDcwbid6aJy)E7P7o*ldNUmo{i26NMZ*EcSEy!1cS5eIZUiIK
z*>3wiHqX&-^In+;AVpLxINPaohc%o-h&%i>j}T_s-rEj*KT5YdI8#<8CvQmL%GQB)
zzzvPHD6p&TOXB1rAzDnr@1K>h-;nh{Pv~U^t%f#Ni;=oJe5QD@`veP;zI~3_A9vwe
zZ&Ir3z&<0l@cd#)V+v#!@<2R$Uqu~Iv_85&`&&$Np72}PSKYz~1`=IkAKe1DvtiAV
z^@LD#>W5v^^=rp`-X~`!;K#uD5_^Q44&e(LAhVr%gaT`BQY3Q<Fa9ib{tBf(ZXS!E
z#uA`DFsH<gM7Auxe100#KbWc_c3o;3MmH*;4Q&Z0DC6W9b+v{TE9T3ngCk|<Kg8_s
z=z9D`2*>?JH~i_Q7T(Q3UF|-<o4&i@6R~@FTBI-X6D4W+?8GRs=4jJcdFe{&(EW7V
zbdAHdtB{6rM2PoWdE&Z{hv({dUjV<Cn$I_-(32E?pD|H@o6JCgqPeC?Z989)-$%Tf
z(NIHSAm>}*ysF0_Q_dni4jR$3E`2L8<nP>6hFY>#Hq`>K@1kSpwpTUSi?hx~VCs%l
zZ6~Qx&s_F>py;XzYZ<?_W8yxBl|Js>g~TRMCQBesnKdO|kYxy<6Qw(8QsFoyxzRmi
zG6~Ufx+iA24wPyZ8cXT_jvY7*S@wr1Y4sv^snL|RsDP^Q0f*PfWk+8KeOomDG6-q?
zTIJO>t5V#~kag9AmQW@k-tF#)y*E*o335zfCZ}8s$=}<;FJ5s6X3>gu&!ea5{2&4O
z+d=&R_$jlsBt~pzS~X1K!DEHFTu#Y}^hD4HEpo`{JM{=-ylL?WJ)*k8b0=|8=($Hp
z-$IV}w$7qDBAgis4jxuF@4`8PVxJnGwEOM_Nb32AHjA5PSwM7DC9z~{Y2BEddF({Q
zNcMh1^u1?zxJ=j+Q7d76+QJ&Ls|ijpOp|3yn;!BLL%Q^RR}M#uN9Q<qC$_~e<Zi#u
zm{;^byCr!RQ!T6u)uY*sv5Q+0#S>)L#+;W%C#_ZlSN86Vyw_~B>jBV>#8oBsCgb%{
zBkNWbdv@wja290|&e#ABNo8|pMCddbQw0|Pm25tVWxra9I3%o^$>zWv?8Sg0Kfv7f
zeAc(%mY{;&4J*n8#>4`R&p8`WP^_Odo5^cvNeiC41#^6~tzY_*CT%%HBTzq=soWGr
zCLk736L{HVE#`MxRgh@cr|wnTf%ApP&VZrW-Lu2bYY}%U*`|vcF&%E=$~x)DySQTj
zhm-@)L*A(6wFpXHWs0zUEKds|s0kmx%ALilwlq=ok2jq^;tPb1poXmWxbOp3cj_9G
zQ|l3-N$B;HW_sx&CTDnl51x&>cJmI=s^;JU+IQHQaKmV)`@omIth6^}4Kz+1a7`j0
z&8Jy`#^2UFrJ$F-=d?b5@yt<~>^kY_`7L?Bw&%mQPhMJ1_FpZ(38K9U8Hzd52rP33
zIi<%DS^7z>CY}I7@!=LV*u3rImg1(Q4kh{!MRSwoMMGb_3A&`lN_+OFPnrfV;gR@y
z=79DGU$L1!17&#njz}ICrBw22;mMEJyhY(8Y+k;{1>;jPxO{99W|dL{0zPiN8#xj*
z6uuEC8_vX4WME_WpKxNxb`*);&A^5n=vSjXsD*u6sEwm_t{rbmea1^3pZ{xolt<r5
zq;@58-*bpk33&tBV*6A8xCvkipWGF6h`Z|;pPWCg-G%dLbj}zy9bK(L20oW?Z!?<}
z7d&HD&1f3QUnYvyV?9!yw0y<`rxI&<>Yw(JY|ReF>{!#9nf8a$&WRSU><UnN+-BvZ
z_tK5w-tcP|)Z3A1*@%<DLtGPT+;@v*2f9p$46vugtRPFq68oqeI~OX;FAb7vSgJDZ
z2#Dm-SHRpKiTj3lMoC-LN?iNqTW|-=yf5TI0g01M0$bi8U%t|!&Wd@nnjG2Y`MpX~
z)9iiOU~m3?U=P?ZANh02YO0ttEb8E=F=xD6BbixtkY-C|hA$oNMGdvBfD2gsZrS@n
z{m+Zn!-JA*w+ZWd=@K@pWPaQf4>GNSI(^+uO^JEumThfa;ia{&!ZF@U#7t~u?lZax
zOQBrwoh8HiX4G9LB{xo6Q{WwRc!|FA0F*m1NonESP>ph2)xagHk^{m0-8#3Q%_&!5
z{sul&zQ6M33GsT-;2HTP(#BTCyroC;K@>&_$GhP)qa**r7g{a`u(-`sS7$^I8c7=7
ze&RL=>q;@?h8J_9#=|zn={a>Q!*Yx;&>#0|fP+bP1=V7GtKZ~y<(7v%cBOBrtD28C
zl_3C^*>ekt0k|zE{Gb$#go#!lt~<&1^hWW$Q1Z9UJgYjd9u#(4?t=}plXn{HgGJYD
zuF!*y8yF0j|AaV(W?8dcCz|k3L3I3cRL1s-wsefF(Y1>4aiw4-{w<eW_fM!|n88eZ
z^95>YhU;4%hb@^lg{lg)@DdM_B=alg%b|!<zz8(Zr=?D;*C-SkB)(^MP%(`H8I-lw
z3LZwM-ctnYR^R-$@xD)JBJ9^D-i~61BXC02-;@L14vPKjTNiqZ9yH<zQ;~k+L5$n6
zMHQYA1^;za-$utG>pgTppTB(h7)Te)qJ+dm!_3yF<P`rLLeG(s(`4#x7m0o^Y3oOg
zRxc0uOxxTLVm=O5rZkO(sv*V2vwUl1e@B~~<5)!<aG}0RVoGJ!rb=yoDZ1=-!(F#h
zBCuVKX`<;&oj%ckCwV?}=p#}6szJIC734Tr_gj<yOI{;h56DzyTAjuHXwyT>(TUu&
za|?dJMZN5mzxw!ValhVGN#ziXGYGv$jIY1@7%y2Y$|&VaAZ7YmiGKh1Cv~LcFl`Qo
zZz2bbrGI*FV1@-9^d;SoT*SBt<#ql)66jxq)6IoZZrUVw=IlCVx$cj~bF_0oHQEMc
F{s-T)*oXiC

literal 0
HcmV?d00001

diff --git a/static/richEmbed/text.png b/static/richEmbed/text.png
new file mode 100644
index 0000000000000000000000000000000000000000..e67672a99d10973f4f65d54d611b3c9b51021dad
GIT binary patch
literal 1911
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

literal 0
HcmV?d00001

diff --git a/static/richEmbed/video.png b/static/richEmbed/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff264802b8373434c39db195dae5a2c9f6495ccd
GIT binary patch
literal 784
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85o#1fH0%_5&pG6L5ULAh?3y^w370~qEv=}#LT=BJwMkF1yemk
zJrkk(%bI~|_);T0(|mmyw18|5AO?X;!IK#nn9@C6978JN-rlkA_X(6>fAI0SvW5s3
zXKPbSpNr#GD=sb8xw<A+@($}2l`eX$(0GyKs<?3Zg%>YsScIOx*|&Ye%wEId_ZI5!
zKdbED^Zj1V#+iSfJ@a`sZzdze5;%GGws>(-baZs#k^Q%B+~`>R@om3n5Z8n`Oe)J6
zPHH+7VP~$bm9Efu_Hz=q>fxUUXZ*k1KjXd9;h#^I{W06Hl_}>~jmYNE^WN{?$(-AF
zbdJxm_09S2QRRD|q%Fz5#&B|LScC9HxgE?Z<t9e{v0LWpRSK+p-D0j<S{Qw~=bBif
zeX?A~&fDu}y#BKNf9gH;DZe<My*>9(zD@jL(3#c>wFxJ`gfwKUe!aWxolezt%ji#9
zM(^*&U$u7jHNL|b7VcfN>522nrzhgtf=rzmr-ff<GcBF?eP!H>i69@X-YvS>8|tOU
zzod3<uD!;{>fy(D?DLi<St*~=S&l6N`uadc-jqE(GAqTa7Jzs=`dr`T&o6agoD|&f
zL?ofKKe@~k#D02Jy*2BVU0d*1r+%RDSI2ATRiAssxql1#Usmy9E2pjK1J{!unARCr
z+lubFeSDJk#O|+$WDf5;lm_(t^=QVn=O3=kOx>ez8T`rM)7~ZTICqF=y5&ndM+NQw
zzP|4`FyML><CSbHgkH`vbtqaZnsCGC=B{7Ng6EZDvwx~5W%1?D-@0-3G5;fLk`6K%
wwBJ4G;|6h}f+fgLVAmos;ZY7_+%ld0m(543&}Ff-_%D#4r>mdKI;Vst08$-7W&i*H

literal 0
HcmV?d00001

diff --git a/templates/tweetCommon.html b/templates/tweetCommon.html
index 4c03f51..d70fc84 100644
--- a/templates/tweetCommon.html
+++ b/templates/tweetCommon.html
@@ -8,7 +8,15 @@
 <link type="application/activity+json" href="{{ activityLink|safe }}" />
 {% endif %}
 
+{% if sicon %}
+<!-- Video icon created by Rizki Ahmad Fauzi - Flaticon -->
+<!-- Picture and Text icon created by Freepik - Flaticon -->
+<!-- Gif file icons created by Grand Iconic - Flaticon -->
+<link rel="apple-touch-icon" sizes="128x128" href="/{{ sicon }}.png">
+{% else %}
 <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+{% endif %}
+
 <script src="/openInApp.js"></script>
 <script>document.addEventListener('DOMContentLoaded',function(){openTweet('{{ tweet["tweetID"] }}')})</script>
 <style>
diff --git a/twitfix.py b/twitfix.py
index 3d6ce09..cc1f093 100644
--- a/twitfix.py
+++ b/twitfix.py
@@ -36,6 +36,10 @@ staticFiles = { # TODO: Use flask static files instead of this
     "preferences": {"mime": "text/html","path": "preferences.html"},
     "style.css": {"mime": "text/css","path": "style.css"},
     "Roboto-Regular.ttf": {"mime": "font/ttf","path": "Roboto-Regular.ttf"},
+    "gif.png": {"mime": "image/png","path": "richEmbed/gif.png"},
+    "video.png": {"mime": "image/png","path": "richEmbed/video.png"},
+    "image.png": {"mime": "image/png","path": "richEmbed/image.png"},
+    "text.png": {"mime": "image/png","path": "richEmbed/text.png"},
 }
 
 generate_embed_user_agents = [
@@ -91,9 +95,7 @@ def generateActivityLink(tweetData,media=None,mediatype=None):
         if tweetData['qrt'] is not None:
             content += f"<blockquote><b>QRT: <a href=\"{tweetData['qrtURL']}\">{tweetData['qrt']['user_screen_name']}</a></b><br>{tweetData['qrt']['text']}</blockquote>"
         if tweetData['pollData'] is not None:
-            content += "<p>"
-            for option in tweetData['pollData']:
-                content += f"<p>{option['text']}: {option['votes']} votes</p>"
+            content += f"<p>{msgs.genPollDisplay(tweetData['pollData'])}</p>"
             content += "</p>"
         content = content.replace("\n","<br>")
         if media is not None:
@@ -112,16 +114,18 @@ def generateActivityLink(tweetData,media=None,mediatype=None):
         log.error("Error generating activity link: "+str(e))
         return None
 
+def getAppName(tweetData,appnameSuffix=""):
+    appName = config['config']['appname']+appnameSuffix
+    if 'Discord' not in user_agent:
+        appName = msgs.formatProvider(config['config']['appname']+appnameSuffix,tweetData)
+    return appName
+
 def renderImageTweetEmbed(tweetData,image,appnameSuffix=""):
     qrt = tweetData['qrt']
     embedDesc = msgs.formatEmbedDesc("Image",tweetData['text'],qrt,tweetData['pollData'])
 
     if image.startswith("https://pbs.twimg.com") and "?" not in image:
         image = f"{image}?name=orig"
-
-    appName = config['config']['appname']+appnameSuffix
-    if 'Discord' not in user_agent:
-        appName = msgs.formatProvider(config['config']['appname']+appnameSuffix,tweetData)
     
     return render_template("image.html",
                     tweet=tweetData,
@@ -130,8 +134,9 @@ def renderImageTweetEmbed(tweetData,image,appnameSuffix=""):
                     desc=embedDesc,
                     urlEncodedDesc=urllib.parse.quote(embedDesc),
                     tweetLink=f'https://twitter.com/{tweetData["user_screen_name"]}/status/{tweetData["tweetID"]}',
-                    appname=appName,
+                    appname=getAppName(tweetData,appnameSuffix),
                     color=config['config']['color'],
+                    sicon="image",
                     activityLink=generateActivityLink(tweetData,image,"image/png")
                     )
 
@@ -154,6 +159,7 @@ def renderVideoTweetEmbed(tweetData,mediaInfo,appnameSuffix=""):
                     tweetLink=f'https://twitter.com/{tweetData["user_screen_name"]}/status/{tweetData["tweetID"]}',
                     appname=appName,
                     color=config['config']['color'],
+                    sicon="video",
                     #activityLink=generateActivityLink(tweetData,mediaInfo['url'],"video/mp4") # this is broken on Discord's end
                     )
 
@@ -161,29 +167,22 @@ def renderTextTweetEmbed(tweetData,appnameSuffix=""):
     qrt = tweetData['qrt']
     embedDesc = msgs.formatEmbedDesc("Text",tweetData['text'],qrt,tweetData['pollData'])
 
-    appName = config['config']['appname']+appnameSuffix
-    if 'Discord' not in user_agent:
-        appName = msgs.formatProvider(config['config']['appname']+appnameSuffix,tweetData)
-
     return render_template("text.html",
                     tweet=tweetData,
                     host=config['config']['url'],
                     desc=embedDesc,
                     urlEncodedDesc=urllib.parse.quote(embedDesc),
                     tweetLink=f'https://twitter.com/{tweetData["user_screen_name"]}/status/{tweetData["tweetID"]}',
-                    appname=appName,
+                    appname=getAppName(tweetData,appnameSuffix),
                     color=config['config']['color'],
-                    activityLink=generateActivityLink(tweetData)
+                    activityLink=generateActivityLink(tweetData),
+                    sicon="text"
                     )
 
 def renderArticleTweetEmbed(tweetData,appnameSuffix=""):
     articlePreview=tweetData['article']["title"]+"\n\n"+tweetData['article']["preview_text"]+"…"
     embedDesc = msgs.formatEmbedDesc("Image",articlePreview,None,None)
 
-    appName = config['config']['appname']+appnameSuffix
-    if 'Discord' not in user_agent:
-        appName = msgs.formatProvider(config['config']['appname']+appnameSuffix,tweetData)
-
     return render_template("image.html",
                     tweet=tweetData,
                     pic=[tweetData['article']["image"]],
@@ -191,8 +190,9 @@ def renderArticleTweetEmbed(tweetData,appnameSuffix=""):
                     desc=embedDesc,
                     urlEncodedDesc=urllib.parse.quote(embedDesc),
                     tweetLink=f'https://twitter.com/{tweetData["user_screen_name"]}/status/{tweetData["tweetID"]}',
-                    appname=appName,
-                    color=config['config']['color']
+                    appname=getAppName(tweetData,appnameSuffix),
+                    color=config['config']['color'],
+                    sicon="image"
                     )
 
 def renderUserEmbed(userData,appnameSuffix=""):
@@ -237,32 +237,31 @@ def activity():
 
     attachmentsRaw = []
     for attachment in attachments:
-        print(attachment)
         attachmentsRaw.append({
             "type": "Document",
             "mediaType": attachment["type"],
             "url": attachment["url"]
-        })
+    })
 
     return {
-	"id": "https://x.com/i/status/"+tweetId,
-	"type": "Note",
-	"summary": None,
-	"inReplyTo": None,
-	"published": publishedDate,
-	"url": "https://x.com/i/status/"+tweetId,
-	"attributedTo": userAttrTo,
-	"content": content,
-	"attachment": attachmentsRaw,
-	"likes": {
-		"type": "Collection",
-		"totalItems": int(likes)
-	},
-	"shares": {
-		"type": "Collection",
-		"totalItems": int(retweets)
-	},
-}
+        "id": "https://x.com/i/status/"+tweetId,
+        "type": "Note",
+        "summary": None,
+        "inReplyTo": None,
+        "published": publishedDate,
+        "url": "https://x.com/i/status/"+tweetId,
+        "attributedTo": userAttrTo,
+        "content": content,
+        "attachment": attachmentsRaw,
+        "likes": {
+            "type": "Collection",
+            "totalItems": int(likes)
+        },
+        "shares": {
+            "type": "Collection",
+            "totalItems": int(retweets)
+        },
+    }
 
 @app.route('/user.json')
 def userJson():
@@ -272,21 +271,20 @@ def userJson():
     pfp = request.args.get("pfp", None)
 
     return {
-	"id": "https://x.com/"+screen_name,
-	"type": "Person",
-	"preferredUsername": screen_name,
-	"name": name,
-	"summary": "",
-	"url": "https://x.com/"+screen_name,
-	"memorial": False,
-	"tag": [],
-	"attachment": [],
-	"icon": {
-		"type": "Image",
-		"mediaType": "image/jpeg",
-		"url": pfp
-	},
-}
+        "id": "https://x.com/"+screen_name,
+        "type": "Person",
+        "preferredUsername": screen_name,
+        "name": name,
+        "summary": "",
+        "url": "https://x.com/"+screen_name,
+        "tag": [],
+        "attachment": [],
+        "icon": {
+            "type": "Image",
+            "mediaType": "image/jpeg",
+            "url": pfp
+        },
+    }
 
 def getTweetData(twitter_url,include_txt="false",include_rtf="false"):
     cachedVNF = getVnfFromLinkCache(twitter_url)