From 3f709776f276ecfc9f3222278e1998f987ec6ca9 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 7 May 2019 00:00:13 -0600
Subject: [PATCH 1/2] Update Timeline.vue and Profile.vue

---
 resources/assets/js/components/Profile.vue  | 14 +++++++++++---
 resources/assets/js/components/Timeline.vue | 15 +++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue
index 54dbc6a45..3c4bcc206 100644
--- a/resources/assets/js/components/Profile.vue
+++ b/resources/assets/js/components/Profile.vue
@@ -516,6 +516,7 @@ export default {
 	],
 	data() {
 		return {
+			ids: [],
 			profile: {},
 			user: {},
 			timeline: [],
@@ -568,6 +569,7 @@ export default {
 			.then(res => {
 				let data = res.data;
 				let ids = data.map(status => status.id);
+				this.ids = ids;
 				this.min_id = Math.max(...ids);
 				this.max_id = Math.min(...ids);
 				this.modalStatus = _.first(res.data);
@@ -601,9 +603,15 @@ export default {
 			}).then(res => {
 				if (res.data.length && this.loading == false) {
 					let data = res.data;
-					let ids = data.map(status => status.id);
-					this.max_id = Math.min(...ids);
-					this.timeline.push(...data);
+					let self = this;
+					data.forEach(d => {
+						if(self.ids.indexOf(d.id) == -1) {
+							self.timeline.push(d);
+							self.ids.push(d.id);
+						} 
+					});
+					this.min_id = Math.max(...this.ids);
+					this.max_id = Math.min(...this.ids);
 					$state.loaded();
 					this.loading = false;
 				} else {
diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index 203a415ae..2e11d3b37 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -430,6 +430,7 @@
 		props: ['scope'],
 		data() {
 			return {
+				ids: [],
 				config: {},
 				page: 2,
 				feed: [],
@@ -544,6 +545,7 @@
 					let data = res.data;
 					this.feed.push(...data);
 					let ids = data.map(status => status.id);
+					this.ids = ids;
 					this.min_id = Math.max(...ids);
 					this.max_id = Math.min(...ids);
 					$('.timeline .pagination').removeClass('d-none');
@@ -579,10 +581,15 @@
 				}).then(res => {
 					if (res.data.length && this.loading == false) {
 						let data = res.data;
-						this.feed.push(...data);
-						let ids = data.map(status => status.id);
-						this.min_id = Math.max(...ids);
-						this.max_id = Math.min(...ids);
+						let self = this;
+						data.forEach(d => {
+							if(self.ids.indexOf(d.id) == -1) {
+								self.feed.push(d);
+								self.ids.push(d.id);
+							} 
+						});
+						this.min_id = Math.max(...this.ids);
+						this.max_id = Math.min(...this.ids);
 						this.page += 1;
 						$state.loaded();
 						this.loading = false;

From 11145be445fd4ea9b46aa1f1ddb08f37ec02ba38 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 7 May 2019 00:00:40 -0600
Subject: [PATCH 2/2] Update compiled assets

---
 public/js/profile.js     | Bin 60778 -> 60861 bytes
 public/js/timeline.js    | Bin 63827 -> 63871 bytes
 public/mix-manifest.json | Bin 845 -> 845 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/profile.js b/public/js/profile.js
index 247ad4c860e28a0e4362ae8b0959cefe8f47ce47..1c91032c6f86a2060a026507c3ed7c776f3a7347 100644
GIT binary patch
delta 351
zcmaELi+S&D<_+!a%(-O+lM6UC_|1ad!<00wi}ms}GBx!QH#f7tWMl;kPPU&d#o}aC
zW;*$yQ0L}s&QMNf5NH1iPmZJ%i!@WC)Wpe+E9EBZtrS8PNLwk4ETE6z>{vN*^M0WQ
zCicvfVyoy_oz3>57R+owj%~iq=28hmrWD&^y_Cd~M4d$2RO@`bwEQC1#N-T(w9>rf
zlFa-(jS|gjT|-;jL_MG$z0ACn)C&JJjS?VFQ%y}HQLiL3H#H|SFIBIgv^WE(SO=mI
z!UL(&tku*>om?g%$C(N;LKDQBDIv!S=4}>{-l4!^1PqzY7pxyd!=1f($8;9K&0eb>
mh%#5CW=$^Sl-q2<Go5Mkxnm(rlkf1q1u`0$Hg})AuM7bBL41w?

delta 263
zcmdmcoB7o(<_+!an~$<TWn{4|4lbTtz^SphnM;Fnv!!S~)8_r+7R;OfOX)N5>Ll70
z>!l=?B<keZCQiO4CC`{TSy5U}IZsnlM<d@hRj(v7H#H|SFI7{optLwcFR`E?r&1$d
zCsQMF^Bvh83M^@fmd2ZB*gc5mFfp?*O-!+{+}tpWMUW}dV)Db2R+FC#3&15N7l_DB
zmK6~~6$lj(Mi$UVaF&Zq+}ynSp(t}mc-G{Gv*PT<8cGq77DkiLa&~S`K3L5GwtR9S
ar#gQsP>GVJb+KNaMy947&}k<hDgyvcJXo{<

diff --git a/public/js/timeline.js b/public/js/timeline.js
index a8f7ed6de55e4b87a69bc2edcf79bdd14350d3f1..882c0d05168791dc31d6320194e669eb54ee154a 100644
GIT binary patch
delta 364
zcmccoiTVF0<_(jWSq<H*ER`nb&y->b4$2OkTqxSLc@lFJ3$w3T%H;R#8vI~+P3vO4
zJdI3Ey~NEg*v|>EXQmWeMaSxF-X=AbjSa}L&DYuNsrZ&L!M0d0C9xz?C*L;JI#Dkz
zzsNN)IYT3@G%vX%Ge1wGM6+7g(AG9z52!~kGcP5z!aq%;1jy4=Q`5-TOG`~n(JLq|
z&HyUZfhdCTKq@qAHFZ)adnw9srh>F<f_S-#a;#w9=HtpHiY%5uM{oY`(&@=zoS1Bp
zW}Ixgc|zZ9E|#Ed*VM^|J1r;g7Z918J}VpIRl}X(aCMU>?2JNiKJ9cva2$5&BRJ)|
kRv<X)yQ2}DuHA8)FU^XUW63p(G6Gwsx~F>cojv6?0GU95UjP6A

delta 281
zcmezWiTUy;<_(jWH`}vBu`m}07f+tUp|P2XbH32#71C4LCQnq6-JGO!j&bsDRZd3h
z$yI8y9M)xtMGASg`IBXo<R`1E@lT$oBEXrasi~8ymz!8ISw~H7^Ia7~MV7quJfF=%
zZk?VSX{H9osm2B-ldZ4GZa&bzkBh~(JkNEqotP9$PDqHs<QTEe$#t{#Z2meoS`H#o
zC}=ske6}1y=iJ#*2+sf6ZU~O=9DM|*WzGr&$7F6af-`+?+~j~gJHW1*JeNaV6yyXY
cP3vO4JdI3Ey~J9b3bV?5pp4vRt-YZ(0Ao~N(*OVf

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index a358794367c544b778ad11da7d232aeca9958d0d..21b26edc27c1ff3e216e69b4dc3182544f3c7d2e 100644
GIT binary patch
delta 57
zcmX@hc9v~JIg^O7xk-{iqH&sWT57VPk%duWqN(ZRZl+ZdDaJ-7CMo8|iHVlU78Zt<
Mrk17_N?f&E0Qd3`4*&oF

delta 57
zcmX@hc9v~JIg?0|fk~>VfvKT^X-b+!nxVO6im~D3Zl+Zd76yh!#>NJwX{m|HCMikD
MMh1!IN?f&E0P4OFApigX