From 1793dd4175e769b25bd1fc74517b374f015abac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= <oliver.hnat@gmail.com>
Date: Thu, 3 Nov 2022 16:35:06 +0100
Subject: [PATCH 1/5] Added checking if filtered tweets has changed

---
 __pycache__/dashboard.cpython-310.pyc | Bin 1575 -> 2351 bytes
 dashboard.py                          |  55 +++++++++++++++++++++++++-
 dashboard_static/js/code.js           |   2 -
 dashboard_static/js/events.js         |  12 +++---
 sports.json                           |  15 -------
 5 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc
index 986186a6cd646aeb53e2fb7475c0e923fb29ab99..719b88d5dd17ac810ec7e16c2fbc7956d7674b4a 100644
GIT binary patch
literal 2351
zcmcgt&2Jnv6t_K|*~#o?oAfIbP6!ZMDzfUWhpIwqIUpdHQdPC6R+F)lOfx&4+TMI=
zD<P%VO8fx`CER-AU*Io5;%bRgFZ9ff1LZw$(q^iyxOGPJ=Gp%FJ^Ov?#l?)k^We{-
zI0o)H4$eLi48DNR)<7hYv?AZ(pH+0s1f$4DRV1SD=YmTvVwK4Fkjg}Mo{&Q-Ix>|D
zPl!krKU$F4F%{V+k=<XY=*pg4gq0rb=);b4aw+Usl+hhBSbhOI$$)zL8IX(C<;IQl
z#zs}vYUFm6a&}ED$=q(O>)gl@09;vkUe={6816lJkdNWJ1)qHnh=YqrCL_t8MsS6A
zN=8%?P?@Y9bZw)Jv)5MLp7U`~^Mb;j0TY?pQMDV@`B;grE5~ZIkrz%IGg~)kEFTwo
zQo8~3QQ`JHRnLe)6aVwg@UB(H4s})TD6>`PZg^YSZKs>zUC>fHHN3BKb8YyomXk_d
z8@k=nIb}X?jDDyJH+*%`)n?zvR=G*j2f>yD>9dTQ9xw%-;q*cN)xDQs;K-CXI;B%~
z2=5*8jIQB9$N3(RvK~Y}uJo=lKHkZziSqHJX_N`)pOG#I@w}+Y<}z>=4ZB3m1^69A
z-`~4BNJX}zt4i&!=T#-r4Xs_^vi00<s~MjHuflBNR9%-=bP7`zuq+a*i$WO@o5|+-
zet~8^eNYwN=N5eSIuJ*W=#(7O$J8<O<`XidhYUs$`1S0FzaC8~_&8o`2}UI-{0<6E
zflSE}IfkKGgu#FsG~6=?!reFRklv{B@w&`!egufWQASD*R(7?KcJ)T3i@dToftg|c
zPp2b0uXXwb3vm%7nTsIz4b29P|1r+50C~G)3<z{NWES1#aCNr!0*?vV6jiEztLRSv
z6MWkv1MWLbj&WE+%r#Z%FkBj+Y?KvDLiBXT%G!KW`NSwYsoWc9^>MhyhbR*BAfx^8
za%ynSV0^Zc6~h_b5FGs%cn5AkAJRkmm>v9n(3!F$aQ88#<Q}OPIC0VbWlHe9PineL
zP7thx_;d~;Y9X%ALGTvht2v0cg%EQPNei((2hnLErgIQ!3-NRgVxfijc@6@q?iq{y
zItS5hA%2^K=(P}koJD{y`03bjxrhaZ5*JUI>|cTSyG<VSA4jkP72YM&2qJQMgURzh
z1>B?Oq4-`{6G@3>+=%nCgka0}M^5dzk;&^#B`%fq$f%}*NgZna#EwcSuFRbdQZAfb
znn3kM{K}lkfNm|=!YEbGN`17cwCENZ61#-5t*nUQY=siNLf6ie>l5e!R-7yC=+Q(w
zb#k~6+MeSLMAVeZN4b<HfzXDmNuY6*x;D!=?07EA!U4@)?xRLGKK)wle`$<1o~v=`
zLaz7-Of%pHv%@SP!Q?TQkYH-fNGQ?$O;sxcXPx!Q0j$~|fn<zP2Km>coU)gUy-SY&
zkbw4#FQIOl(d=LT(p-f@4f;M(MK1b4R!<HN2A#Fj1e`DR*fXR2vVndwLZf3FhO)Hf
z<Is{r>kDnjcM3gj%1W6J&?4CEXLSY@ov~7|S1?t2V;mapO>6}AeIP06(Uhf>^CZq_
O+R5THN~0w0)BgZ=xDa>%

delta 494
zcmZvYze@u#6vyu+>91>hme#5jkq!<$T<RnuDx%oU#ia;Rk4suA+N-%h9a;tZCuCCG
z#Yr3;-Nn%%|AGI4gEi@iKfnk1<h_^g`zGW*f17cFY}U4P)Si9+J@(+tK&o|pW#Vx|
zF2X9LWDA;*mM>6Gr?ildVap{{guJYw*SU=Dy1*y&b_WW2k>X3Xg6q{tpi-d-y1jtY
zkQcs<BAF?R8Ve?wl23T8_^(73$mX9{G{`)Z<vA%`#P#TwUg5e%AC9a65<sDkh6pTy
z`iP>EHH2;Jz!_kDf+-QWkB2~GO+@22W8JAktv$<4?DCj)QADsav5&iLrm#op8|bEs
zRNV7LJLvG7DTyM~6W*aB?4&Jt+05ZkaF_6e&Uw<nxbaDYUtg$8<+NCbaZj*@=rJZ-
z-3yIv9N8oX1Q6I@e~=Nc$jju;a@ttr&0xY0PP*-5#%E1y+MsMuG5EP8`d&FoRzCqn
Clw|h+

diff --git a/dashboard.py b/dashboard.py
index 6fb5a52..3e356ac 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -13,7 +13,7 @@ root_content_path = 'dashboard_static'
 # the action will be called with the context and the event
 @event('init')
 def setup(ctx, e):
-    start_offline_tweets('sports1.txt', event_name="tweet", time_factor=0.1)
+    start_offline_tweets('sports1.txt', event_name="tweet", time_factor=1)
     ctx.count = 0
     # fire('sample', {'previous': 0.0})
 
@@ -40,7 +40,58 @@ def words(message):
 
 @event('tweet')
 def generate_tweet(ctx, e):
-    tweet = e.data
+    tweet = dict(e.data)
+    try:
+        try:
+            tweet.pop("id_str")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("display_text_range")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("in_reply_to_status_id")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("in_reply_to_status_id_str")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("in_reply_to_user_id")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("in_reply_to_user_id_str")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("in_reply_to_screen_name")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("geo")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("coordinates")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("place")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("contributors")
+        except KeyError:
+            pass
+        try:
+            tweet.pop("is_quote_status")
+        except KeyError:
+            pass
+    except:
+        pass
     # base sample on previous one
     # sample = clip(-100, e.data['previous'] + random.uniform(+5.0, -5.0), 100)
     # emit to outside world
diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js
index 64747fb..df51121 100644
--- a/dashboard_static/js/code.js
+++ b/dashboard_static/js/code.js
@@ -32,8 +32,6 @@ function tweetCell(tweet) {
             <div class="tweet-name">
                 <a class="tweet-nickname" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">${tweet.user.name}</a>
                 <a class="tweet-username" href = "https://www.twitter.com/${tweet.user.screen_name}" target = "_blank">@${tweet.user.screen_name}</a>
-                <!-- add tweet date called created_at-->
-                <p class="tweet-date">${tweet.created_at}</p>
             </div>
             <span class="tweet-text">${tweet.text}</span>
             <div class="tweet-interactions">
diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js
index 015b661..42f5928 100644
--- a/dashboard_static/js/events.js
+++ b/dashboard_static/js/events.js
@@ -51,7 +51,6 @@ let root = document.querySelector(":root")
 
 $(".logo").on("click", function() {
     if (root.style.getPropertyValue("--main-bg") === 'snow') {
-        console.log("IM here")
 		var audio = new Audio("../media/Chicken.mp3");
 		audio.play();
         root.style.setProperty('--main-medium-dark', '#1E1E1E');
@@ -74,16 +73,19 @@ $(".logo").on("click", function() {
 
 $(window).on("filter", function() {
     var parent = document.querySelector("#filtered")
-    parent.replaceChildren();
+    var lastTweet = parent.firstChild
 
     tweets = window.sessionStorage.getItem('tweets');
     tweets = JSON.parse(tweets);
     tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order);
     tweets = sortTweets(tweets, [filters.sorted, filters.order]);
     var displayTweets = tweets.reverse().slice(0, 20).reverse();
-    for (i = 0; i < Math.min(19, displayTweets.length); i++){
-        tweet = displayTweets[i];
-        parent.prepend(tweetCell(tweet));
+    if(tweetCell(displayTweets[0]) != lastTweet){
+        parent.replaceChildren();
+        for (i = 0; i < Math.min(19, displayTweets.length); i++){
+            tweet = displayTweets[i];
+            parent.prepend(tweetCell(tweet));
+        }
     }
 })
 
diff --git a/sports.json b/sports.json
index c0c9900..9b86beb 100644
--- a/sports.json
+++ b/sports.json
@@ -1,19 +1,9 @@
 {
     "created_at":"Sat Nov 16 12:51:41 +0000 2019",
     "id":1195685871556710402,
-    "id_str":"1195685871556710402",
     "text":"@BobGreenburg @ONeill_Coffee Congrats to the excellent football program at Wilmington. One classy organization!",
-    "display_text_range":[
-       29,
-       111
-    ],
     "source":"<a href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\">Twitter for iPhone<\/a>",
     "truncated":false,
-    "in_reply_to_status_id":1195545633685475333,
-    "in_reply_to_status_id_str":"1195545633685475333",
-    "in_reply_to_user_id":483881032,
-    "in_reply_to_user_id_str":"483881032",
-    "in_reply_to_screen_name":"BobGreenburg",
     "user":{
        "id":774718832212606976,
        "id_str":"774718832212606976",
@@ -55,11 +45,6 @@
        "follow_request_sent":null,
        "notifications":null
     },
-    "geo":null,
-    "coordinates":null,
-    "place":null,
-    "contributors":null,
-    "is_quote_status":false,
     "quote_count":0,
     "reply_count":0,
     "retweet_count":0,

From 7cee44e43d4c8a34b9ced982206fd5e11eb522a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= <oliver.hnat@gmail.com>
Date: Thu, 3 Nov 2022 16:40:16 +0100
Subject: [PATCH 2/5] changed time

---
 __pycache__/dashboard.cpython-310.pyc | Bin 2351 -> 2355 bytes
 dashboard.py                          |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc
index 719b88d5dd17ac810ec7e16c2fbc7956d7674b4a..429bc762c526141578c0f150fd166140f72c23be 100644
GIT binary patch
delta 335
zcmZ24v{{HZpO=@50SLA{NKRh7kynzDGkw-f5ZGxyS)0+Ck#ll7V;Up(<a3M>+?+sl
zMPPz!vLTZwqtIk`rfV`hKv7M`B7PvXlJOQ}IYb3inI&_C0Yt$q&f=2%g7W;Ll;R>`
zxIqwQAg(BoPysQ-CLd(B6~(G#vM`GyiYww-<QNq;*RgzN5`4)B)U3&Li!Cv^Br`v+
zNMLdkySlalQ1BLWaY>OTOA$NBbPf=~3L->61hSW|uzxY<1_=rQiCgT+`MCv|IjKcb
VAR%!Op#UPZK?Fh@)Sv%33;^6FLh%3q

delta 379
zcmdliv|flepO=@50SIF6CMPf4$ScXn`jQdIovhDj&B!%5n=y@%XYwV+2t|;hA~3-X
zWZhy(&dDqg1G0*lfP?^Jk?>@1rfV|1K#nG3kpPfd$#{#g9HIlFZL%$MgfT?HEzaVS
z{DSiQqLkty5ujRRWgsrdU=<KU97s&gW0soyh*?1ttIEmZERI@ej$;LztO(Rw43gnu
z<O4$%#v;YdO)Q_81dG^!!kSFC*b<XVGV}9_1Shw#t80Ta++r>+Dbi#q;sCOXI6(v}
zh!6!4NVZJA!T!aZ2P7yAByO=M=jRq==A;%$gM=hN1jw)=Z4iOb24-<jX67^i0MkE2
AzyJUM

diff --git a/dashboard.py b/dashboard.py
index 3e356ac..e832057 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -13,7 +13,7 @@ root_content_path = 'dashboard_static'
 # the action will be called with the context and the event
 @event('init')
 def setup(ctx, e):
-    start_offline_tweets('sports1.txt', event_name="tweet", time_factor=1)
+    start_offline_tweets('sports1.txt', event_name="tweet", time_factor=0.1)
     ctx.count = 0
     # fire('sample', {'previous': 0.0})
 

From 68b704c15f81633110cc17b1a2e7333347af48db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= <oliver.hnat@gmail.com>
Date: Thu, 3 Nov 2022 16:46:13 +0100
Subject: [PATCH 3/5] cache

---
 __pycache__/dashboard.cpython-310.pyc | Bin 2355 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 __pycache__/dashboard.cpython-310.pyc

diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc
deleted file mode 100644
index 429bc762c526141578c0f150fd166140f72c23be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2355
zcmcgty^kC<6t_K|*}2)h&E=a=1pz`!#I4e$hyqeVfq-j56vYCq=ElCw<Yvbc+k0Qy
zNJy795-kX!JE&68(9rQ0Akn%)N<(To3c`Ed3%Q9lqQj$kezt#p&wlUuJ-xh~5okaC
zUKBq7_XG#WTLgm-;I}mpNhGbvXV|lfPMBa6`KXFS6nZYW<RVsyjQ6QbWalB-r=lZM
zx%7~TRPlo)nH^G*jfw1jPeoVu<T9-EU`HQzoRBMF$FhuWlEKNRppy)!r|$weV_k0C
zNN;RZWvxbTTPbJP#EQ)A-F2NCIRbzy3(w2CbOpn`M-BNH{_F7D*MK;<h-5O7{80o~
zh-YL(B>|Pm+FsW-+Bkc8)$KSR2Q}kwzQ*?R`vWF2wWVq|s`H5wT~|)jXd^G2Him-S
z0W)YY9~XLBy8-i2;dVS#kBM1=`M*9H-m=Qrp{~j;W$xCw8{SZM)9Ge-3pCYE4ezMj
zTpoU^<+M_lhi<!cPMP-_qwlH04gbCDYP0KOtK78dgJ8>n^jStt7nlOi@Vp`a@7-5m
z;K+<PI-@hT58qAln6BYLC;1MLvK~Y}uJpDtKHkc!sq*o(X_N`)pA!ri&x@*T&H-o9
zxGU70f^IMR{Pv|mDzYtIRcd!VuPTvlXzc=*t><=A&G{5~6=oBs>bkU|Q<$=VWsz82
z6v~L$OvmfH1)BAFLsfX6>+stvKpZ)sGjd2DP{+`t56O(~GZ;nS+v6ktVl<=R=Xk9p
z7?q&#n<zL1G9w4%5Qe4)g8?-spnD8~xc#yn(yLWIS(o{>Hv#b{%1FuH`E6~aUA<cA
zBCqT<VCI<r(&@<73!Q$+LR<t%<}}ECNwYZ%b8q21dg0ZQ@dD^_cwKap!`0c^Q#>ZT
zsHjr)D@DHznBdzU8F1fea*V?oVy>x5hvCxrWTUKL5~8OwQP$>T<rAaqv~n+<)yLr)
zZ=gtwo{aXx$EmppLxb_zdaxMI=!W3vKfpV11A33{(+6zt*S*e+9e}$JDJ8c_y~K%&
zcF$3Q-yKrZZE}QQEyOzu5K#+pWdVY>5Faf-#4UtafJj=1%>{@~3o%=ONLz?U3lK{!
z#CHo2ka>?;?8gO&ZVU0t0z|Kc`0Y3Xe8HcO9hb|PU?_3%jLH55h`$@;i~fTMRv^o}
zWEMe0p4?#a)VBe5|4B%|r`JSMVk$S{lq@0G^4*bBJ8oq1daT6RvK|@LR4}PSzMtAr
zDaD0_(?QDV<4aS>zKB1+U^1Xv3$`#y)$>#zjg=PNLc_x@A#E!wVmMo&M6b}bGv)de
zYJe3dN;|qg)lMB9E`+w{cmokNrSefO<x@;I@M;n$9Hp)eX5~T0b6FM+Xzp?!HM;TX
z$7=UOW3=&HO-dKuijTlF18zF7$KVqQ8q68wu*A$sNYVYVs+EDW&THiWR_#|nGR7!_
z_t&GGvS*C_pB(=(0qq%ILESW?+28z`xdewA^nIj?T=apg9vvJEIxnXQIA7|CXGZyx
z2I|QOjgDm)($ZZYhmsshUnoPqQ|L)kR?57N7CDdPA`(<|%u2yt!BpwhNhrA2&@&cy
YrKCqwmQv1>IHPGNi_<8LlC)3%0cU9yCIA2c


From 21064b3d240c4a72301111920bb6b72bee54fb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= <oliver.hnat@gmail.com>
Date: Thu, 3 Nov 2022 16:55:45 +0100
Subject: [PATCH 4/5] maybe working sort

---
 dashboard_static/js/code.js   | 5 ++++-
 dashboard_static/js/events.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js
index df51121..faa2d2a 100644
--- a/dashboard_static/js/code.js
+++ b/dashboard_static/js/code.js
@@ -93,6 +93,7 @@ function searchForWords(searchWords, tweets){
 }
 
 function sortTweets(tweets, sort){
+    console.log(sort)
     if(typeof sort.sortby == 'undefined'){
         return tweets
     }
@@ -121,10 +122,12 @@ function sortTweets(tweets, sort){
             tweets.sort(function(a,b){return a.reply_count-b.reply_count})
         }
     }
-    if (sort.sortby == "date"){
+    if (sort.sortby == "time"){
         if(sort.order == 'asc'){
+            console.log("asc")
             tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)})
         } else{
+            console.log("desc")
             tweets.sort(function(a,b){return Date(a.created_at)-Date(b.reply_count)})
         }
     }
diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js
index 42f5928..50d0ea4 100644
--- a/dashboard_static/js/events.js
+++ b/dashboard_static/js/events.js
@@ -78,7 +78,7 @@ $(window).on("filter", function() {
     tweets = window.sessionStorage.getItem('tweets');
     tweets = JSON.parse(tweets);
     tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order);
-    tweets = sortTweets(tweets, [filters.sorted, filters.order]);
+    tweets = sortTweets(tweets, {"sortby":filters.sorted, "order":filters.order});
     var displayTweets = tweets.reverse().slice(0, 20).reverse();
     if(tweetCell(displayTweets[0]) != lastTweet){
         parent.replaceChildren();

From 8fb0b7d8f71c7af4acb319e9313178092f05d608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= <oliver.hnat@gmail.com>
Date: Thu, 3 Nov 2022 17:00:16 +0100
Subject: [PATCH 5/5] Fixed sort

---
 dashboard_static/js/code.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js
index f427f81..4759d6e 100644
--- a/dashboard_static/js/code.js
+++ b/dashboard_static/js/code.js
@@ -25,7 +25,6 @@ function showFeeds() {
 
 function tweetCell(tweet) {
     const date = new Date(tweet.created_at);
-    console.log(new Intl.DateTimeFormat('en-GB').format(date));
     var cell = document.createElement("div");
     cell.innerHTML =
     `<div class="tweet">
@@ -98,7 +97,6 @@ function searchForWords(searchWords, tweets){
 }
 
 function sortTweets(tweets, sort){
-    console.log(sort)
     if(typeof sort.sortby == 'undefined'){
         return tweets
     }
@@ -129,10 +127,8 @@ function sortTweets(tweets, sort){
     }
     if (sort.sortby == "time"){
         if(sort.order == 'asc'){
-            console.log("asc")
             tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)})
         } else{
-            console.log("desc")
             tweets.sort(function(a,b){return Date(a.created_at)-Date(b.reply_count)})
         }
     }