From a0e7c4d573cb002ac07568d91ce21e7f064e077c Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 24 May 2020 16:54:47 -0600
Subject: [PATCH 1/4] Added New Post notification to Timeline

---
 resources/assets/js/components/Timeline.vue | 75 ++++++++++++++++++++-
 1 file changed, 73 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index f70c69e36..db80c08c4 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -1,6 +1,11 @@
 <template>
 <div class="container" style="">
 	<div v-if="layout === 'feed'" class="row">
+		<div v-if="morePostsAvailable == true" class="col-12 mt-5 pt-3 mb-3 fixed-top">
+			<p class="text-center">
+				<button class="btn btn-dark px-4 rounded-pill font-weight-bold shadow" @click="syncNewPosts">Load New Posts</button>
+			</p>
+		</div>
 		<div :class="[modes.distractionFree ? 'col-md-8 col-lg-8 offset-md-2 px-0 mb-sm-3 timeline order-2 order-md-1':'col-md-8 col-lg-8 px-0 mb-sm-3 timeline order-2 order-md-1']">
 			<div v-if="config.features.stories">
 				<story-component v-if="config.features.stories"></story-component>
@@ -74,7 +79,7 @@
 					</div>
 
 					<div class="card mb-sm-4 status-card card-md-rounded-0 shadow-none border">
-						<div v-if="!modes.distractionFree" class="card-header d-inline-flex align-items-center bg-white">
+						<div v-if="!modes.distractionFree && status" class="card-header d-inline-flex align-items-center bg-white">
 							<img v-bind:src="status.account.avatar" width="38px" height="38px" class="cursor-pointer" style="border-radius: 38px;" @click="profileUrl(status)" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
 							<!-- <div v-if="hasStory" class="has-story has-story-sm cursor-pointer shadow-sm" @click="profileUrl(status)">
 								<img class="rounded-circle box-shadow" :src="status.account.avatar" width="32px" height="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
@@ -628,6 +633,12 @@
 				ctxEmbedShowCaption: true,
 				ctxEmbedShowLikes: false,
 				ctxEmbedCompactMode: false,
+				morePostsAvailable: false,
+				mpCount: 0,
+				mpData: false,
+				mpInterval: 15000,
+				mpEnabled: false,
+				mpPoller: null
 			}
 		},
 		watch: {
@@ -761,6 +772,7 @@
 						this.fetchHashtagPosts();
 					}
 					// this.fetchStories();
+					this.rtw();
 				}).catch(err => {
 					swal(
 						'Oops, something went wrong',
@@ -1488,7 +1500,66 @@
 				.then(res => {
 					this.userStory = res.data;
 				})
+			},
+
+			// real time watcher
+			rtw() {
+				this.mpPoller = setInterval(() => {
+					let apiUrl = false;
+					this.mpCount++;
+					if(this.mpCount > 10) {
+						this.mpInterval = 30000;
+					}
+					if(this.mpCount > 50) {
+						this.mpInterval = (5 * 60 * 1000);
+					}
+					switch(this.scope) {
+						case 'home':
+						apiUrl = '/api/pixelfed/v1/timelines/home';
+						break;
+
+						case 'local':
+						apiUrl = '/api/pixelfed/v1/timelines/public';
+						break;
+
+						case 'network':
+						apiUrl = '/api/pixelfed/v1/timelines/network';
+						break;
+					}
+					axios.get(apiUrl, {
+						params: {
+							max_id: 0,
+							limit: 20
+						}
+					}).then(res => {
+						let self = this;
+						let data = res.data.filter(d => {
+							return d.id > self.min_id
+						});
+						let ids = data.map(status => status.id);
+						let max = Math.max(...ids).toString();
+						let newer = max > this.min_id;
+						if(newer) {
+							this.morePostsAvailable = true;
+							this.mpData = data;
+						}
+					});
+				}, this.mpInterval);
+			},
+
+			syncNewPosts() {
+				let self = this;
+				let data = this.mpData;
+				let ids = data.map(s => s.id);
+				this.min_id = Math.max(...ids).toString();
+				this.max_id = Math.min(...ids).toString();
+				this.feed.unshift(...data);
+				this.morePostsAvailable = false;
+				this.mpData = null;
 			}
-		}
+		},
+		beforeDestroy () {
+			clearInterval(this.mpInterval);
+		},
 	}
 </script>
\ No newline at end of file

From dc7a59b1d544d9541ba0d0fdfb43d9c3626bc6d7 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 24 May 2020 16:56:55 -0600
Subject: [PATCH 2/4] Update compiled assets

---
 public/js/timeline.js    | Bin 125111 -> 126390 bytes
 public/mix-manifest.json | Bin 1939 -> 1939 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/timeline.js b/public/js/timeline.js
index c9be823aa482e5adf9a92a599a82ed12546da7cc..edb45d9241319e9b8c88098f2389320063d7b171 100644
GIT binary patch
delta 1457
zcmZuxO>7%Q6xK`Qn56k>P>a)6^&hR-CF{*PPNLdoBl3eN>W?B-ZYi{lX1(Khll89I
zo!AMHi3A9UL<M4`u7o(yQ<Wl6Dhqs}C{%#j3nd3G<q%aWLMmL!1%yCiY$uD=aGBX}
z=9}+*@4cC=Zg{`=$@_lFGca~69;OfX9H@BV&9=7iU>@0Z+&YWqG}_a<0wYdf9~`V)
z_5S=sTF9Fgo-%D>j}?)oBSpu_P)x`dCd_$*BqjDWi3n<}y<iY*6_K8d4dXc5dCsWu
z)yC$Osq5HE8uPkddDp+u?iGk=krGEy+)uwhGEup~*+Q$pmK=n^w@h-HE#?c2W3r9O
zwmQdU=Zy@}OoQW>ipUCLITTCTC5>cq9AQW5*82OI{?_+sOo~M6TiY6P91rnLgy9{8
zwm2SU40<f`U56y-T3#c`L5YT*I@l%?L6b4PD24VCQBy|^F|QfZnp)<00m&M@vbWFq
z6+^r8>@4hG7KwS9Seh}z@uSR9o!M}+qq1^Hs(Y$cRMvQ=S7sI(b=Y>!mj!##$ehBZ
zdRLN<)Pe|D-a1iJ5sVh*bjwi3E+$3SpY|^sJl|w%D+F3#Imjmw$<<tns8G-sxf&E~
z?vVo=X#~k)tn%W#Vdu0g**ZZO9kWU_T>MXtG2v{JL%DV#%4I>pS;n2jHnGgb=BzS0
zM%H%r+>UCLS;;wr3zPm4mCEVszL+etGVh2>e@Of2`b*xvJc$km3nUs3<`p(%wFRt3
ziCMV(8uZb%*FE&(_d1+?Z$l`fB5N*KScnb<Eq2*eMk{E#9?Y5siI%W7lOs{Z)YYJ!
zL#kN{3#O4=%II2VE=k1Z9<l6RCgOCF3!gBN8f2{t)_WJ`FF0!};G=n^z4Ax8*bN~%
z_Ns4JB!X*hoq_=#8aUTpSyOww&gU!eIK4rAm3wo)o%bf<iK8Q`>b%$ihbj+ml{#C~
zlBL(*_01pit)Nip?l>qF`|j;lC{cOS&&KncC)v`qO@9lND!1?5f3p7Oo$DS*I2U$9
zz*T)?H+<-V!=3QF3#?9%T(H^+t1dX#1^?OlvI}f?XQUfOU9i**H(fB<18=!tqX+J|
z;OZW@<bqT$9It-r0o&tg^cndAf!fQrW!CxnAB;~KqQTj`h{^)v%oZu*RIl~IA(nXc
z)&L9vl$?Jg*w3IZ2CqPiB0HBx;c)e{LHOMRigV>Ce88rm1kAAMqXclERKHEYU%=+|
z6hvwYzdQq{8BEFWj)%c-#^DH?9*o0RY;|=4RBxBUg<^b?jS`<MIR}ozpS4hT&cZ--
m;skunRH~j+aNo;<JV*m(aOw<v@)(o(`y!}J22I16m45+dE$ngt

delta 631
zcmdmXn|=F5_6gRk+RhO!N|QedNU;=#n0rm;7wlwH(s%SQ28(TsYGGqEn=U8CD7|?(
z`%|&a59Ka$PTs67GP%KmbMtkLZ92TQwK|Em8hIK@A!TKW(`!T+O{TBwW;CAM7wNV6
zc~m{$WV?Ea$#x~OlN<V2roUrm<k-9<Q;>b~k7C8mcMIOeup3(@nI@YgZoYVS3J(j&
zjL8BQ<fch6a*BdorfHq0m#0yzsh3!*6KYVD19Iu+=3BWejOCL*-g9Cs-)wUKBnxBG
z<bRLlfTZjbU!YL-6FDZvq|IH=o+z{Alm=!@UVGDbyQ(0g5-Y@$Yj0XkU(LlR53_vw
zMJ~o!a8407qdS~)fSb{P59-EPh3c5Rn3Cxq*D;Dt7v^E?g{xZ5!wC1ubS_@TVz^8T
zFQXltbCQ?w5S%lKkFgETk>_VT59fU4M>4uofYF;(sYE-gY;vNwJSbqcZxUk^0eW`(
zaT7)pM#iM+e@q!Afm|^&#zID>a@*-W&WtMC*P1haVr49!zQC4o5|A>sV@wB9v+Wo)
z7|XXGv19zj2&DHrFsgw}c;?6$4CGolF?O&5xrf~uRe{t?cgB4{(G?zyDeS!E8j6OR
zRzT7~(<*7YWB}t2kX7em81=V11u`B4nzEfGnDGfa(2|!?jHy7be>CH24xll=lNnQh
L#w4ULhIIk}>Y>ql

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 5251933753b032fb240b5ca9bacb6084ef7386bc..697ddbfe7146437d0765ee562327c4558348fb76 100644
GIT binary patch
delta 32
mcmbQtKbe0+HM>NbNt&UBk$IxIX`-o-1rV8;SSoSVasdFAMhGJS

delta 32
ncmbQtKbe0+HM>M|iczAeVTzHtiE&zTnnj95Vp_5iS1lI+qP+=Y


From 46ba0ee52fadcecd505b2bb926a89bc5e5af409f Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 24 May 2020 16:57:58 -0600
Subject: [PATCH 3/4] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40730935c..06efcef18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Custom content warnings for remote posts ([6afc61a4](https://github.com/pixelfed/pixelfed/commit/6afc61a4))
 - Thai translations ([74cd536](https://github.com/pixelfed/pixelfed/commit/74cd536))
 - Added Bookmarks to v1 api ([99cb48c5](https://github.com/pixelfed/pixelfed/commit/99cb48c5))
+- Added New Post notification to Timeline ([a0e7c4d5](https://github.com/pixelfed/pixelfed/commit/a0e7c4d5))
 
 ### Updated
 - Updated PostComponent, fix remote urls ([42716ccc](https://github.com/pixelfed/pixelfed/commit/42716ccc))

From b2259860deb2a7413a830b6a61d4733757140e45 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sun, 24 May 2020 17:03:09 -0600
Subject: [PATCH 4/4] Update local timeline view

---
 resources/views/timeline/local.blade.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/resources/views/timeline/local.blade.php b/resources/views/timeline/local.blade.php
index 3013aa8f0..47d8572e9 100644
--- a/resources/views/timeline/local.blade.php
+++ b/resources/views/timeline/local.blade.php
@@ -2,14 +2,22 @@
 
 @section('content')
 
-<timeline scope="local" layout="feed"></timeline>
-
 <noscript>
 	<div class="container">
 		<p class="pt-5 text-center lead">Please enable javascript to view this content.</p>
 	</div>
 </noscript>
 
+<timeline scope="local" layout="feed"></timeline>
+
+<div class="modal pr-0" tabindex="-1" role="dialog" id="composeModal">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<compose-modal></compose-modal>
+		</div>
+	</div>
+</div>
+
 @endsection
 
 @push('scripts')