From 194a895485cb25ba4014fcc5566e838b9cd259ca Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 4 May 2019 20:53:36 -0600
Subject: [PATCH 1/2] Update Timeline.vue

---
 resources/assets/js/components/Timeline.vue | 251 +++++++++++---------
 1 file changed, 140 insertions(+), 111 deletions(-)

diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index 5756de680..b987aaaea 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -8,125 +8,156 @@
 						<span class="sr-only">Loading...</span>
 					</div>
 				</div>
-				<div class="card mb-sm-4 status-card card-md-rounded-0" :data-status-id="status.id" v-for="(status, index) in feed" :key="`${index}-${status.id}`">
-
-					<div class="card-header d-inline-flex align-items-center bg-white">
-						<img v-bind:src="status.account.avatar" width="32px" height="32px" style="border-radius: 32px;">
-						<a class="username font-weight-bold pl-2 text-dark" v-bind:href="status.account.url">
-							{{status.account.username}}
-						</a>
-						<div class="text-right" style="flex-grow:1;">
-							<button class="btn btn-link text-dark no-caret dropdown-toggle py-0" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
-								<span class="fas fa-ellipsis-v fa-lg text-muted"></span>
-							</button>
-							<div class="dropdown-menu dropdown-menu-right">
-								<a class="dropdown-item font-weight-bold" :href="status.url">Go to post</a>
-								<!-- <a class="dropdown-item font-weight-bold" href="#">Share</a>
-								<a class="dropdown-item font-weight-bold" href="#">Embed</a> -->
-								<span v-if="statusOwner(status) == false">
-									<a class="dropdown-item font-weight-bold" :href="reportUrl(status)">Report</a>
-									<a class="dropdown-item font-weight-bold" v-on:click="muteProfile(status)">Mute Profile</a>
-									<a class="dropdown-item font-weight-bold" v-on:click="blockProfile(status)">Block Profile</a>
-								</span>
-								<span v-if="statusOwner(status) == true">
-									<a class="dropdown-item font-weight-bold text-danger" v-on:click="deletePost(status)">Delete</a>
-								</span>
-								<span v-if="profile.is_admin == true && modes.mod == true">
-									<div class="dropdown-divider"></div>
-									<a v-if="!statusOwner(status)" class="dropdown-item font-weight-bold text-danger" v-on:click="deletePost(status)">Delete</a>
-									<div class="dropdown-divider"></div>
-									<h6 class="dropdown-header">Mod Tools</h6>
-									<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'autocw')">
-										<p class="mb-0" data-toggle="tooltip" data-placement="bottom" title="Adds a CW to every post made by this account.">Enforce CW</p>
-									</a>
-									<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'noautolink')">
-										<p class="mb-0" title="Do not transform mentions, hashtags or urls into HTML.">No Autolinking</p>
-									</a>
-									<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'unlisted')">
-										<p class="mb-0" title="Removes account from public/network timelines.">Unlisted Posts</p>
-									</a>
-									<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'disable')">
-										<p class="mb-0" title="Temporarily disable account until next time user log in.">Disable Account</p>
-									</a>
-									<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'suspend')">
-										<p class="mb-0" title="This prevents any new interactions, without deleting existing data.">Suspend Account</p>
-									</a>
-
-								</span>
+				<div :data-status-id="status.id" v-for="(status, index) in feed" :key="`${index}-${status.id}`">
+					<div v-if="index == 2 && showSuggestions == true" class="card mb-sm-4 status-card card-md-rounded-0">
+						<div class="card-header d-flex align-items-center justify-content-between bg-white border-0 pb-0">
+							<h6 class="text-muted font-weight-bold mb-0">Suggestions For You</h6>
+							<span class="cursor-pointer text-muted" v-on:click="hideSuggestions"><i class="fas fa-times"></i></span>
+						</div>
+						<div class="card-body row">
+							<div class="col-12 col-md-4 mb-3" v-for="(rec, index) in suggestions">
+								<div class="card">
+									<div class="card-body text-center pt-3">
+										<p class="mb-0">
+											<a :href="'/'+rec.username">
+												<img :src="rec.avatar" class="img-fluid rounded-circle cursor-pointer" width="45px" height="45px">
+											</a>
+										</p>
+										<div class="py-3">
+											<p class="font-weight-bold text-dark cursor-pointer mb-0">
+												<a :href="'/'+rec.username" class="text-decoration-none text-dark">
+													{{rec.username}}
+												</a>
+											</p>
+											<p class="small text-muted mb-0">{{rec.message}}</p>
+										</div>
+										<p class="mb-0">
+											<a class="btn btn-primary btn-block font-weight-bold py-0" href="#" @click.prevent="expRecFollow(rec.id, index)">Follow</a>
+										</p>
+									</div>
+								</div>
 							</div>
 						</div>
 					</div>
+					<div v-else class="card mb-sm-4 status-card card-md-rounded-0">
+						<div class="card-header d-inline-flex align-items-center bg-white">
+							<img v-bind:src="status.account.avatar" width="32px" height="32px" style="border-radius: 32px;">
+							<a class="username font-weight-bold pl-2 text-dark" v-bind:href="status.account.url">
+								{{status.account.username}}
+							</a>
+							<div class="text-right" style="flex-grow:1;">
+								<button class="btn btn-link text-dark no-caret dropdown-toggle py-0" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
+									<span class="fas fa-ellipsis-v fa-lg text-muted"></span>
+								</button>
+								<div class="dropdown-menu dropdown-menu-right">
+									<a class="dropdown-item font-weight-bold" :href="status.url">Go to post</a>
+									<!-- <a class="dropdown-item font-weight-bold" href="#">Share</a>
+									<a class="dropdown-item font-weight-bold" href="#">Embed</a> -->
+									<span v-if="statusOwner(status) == false">
+										<a class="dropdown-item font-weight-bold" :href="reportUrl(status)">Report</a>
+										<a class="dropdown-item font-weight-bold" v-on:click="muteProfile(status)">Mute Profile</a>
+										<a class="dropdown-item font-weight-bold" v-on:click="blockProfile(status)">Block Profile</a>
+									</span>
+									<span v-if="statusOwner(status) == true">
+										<a class="dropdown-item font-weight-bold text-danger" v-on:click="deletePost(status)">Delete</a>
+									</span>
+									<span v-if="profile.is_admin == true && modes.mod == true">
+										<div class="dropdown-divider"></div>
+										<a v-if="!statusOwner(status)" class="dropdown-item font-weight-bold text-danger" v-on:click="deletePost(status)">Delete</a>
+										<div class="dropdown-divider"></div>
+										<h6 class="dropdown-header">Mod Tools</h6>
+										<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'autocw')">
+											<p class="mb-0" data-toggle="tooltip" data-placement="bottom" title="Adds a CW to every post made by this account.">Enforce CW</p>
+										</a>
+										<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'noautolink')">
+											<p class="mb-0" title="Do not transform mentions, hashtags or urls into HTML.">No Autolinking</p>
+										</a>
+										<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'unlisted')">
+											<p class="mb-0" title="Removes account from public/network timelines.">Unlisted Posts</p>
+										</a>
+										<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'disable')">
+											<p class="mb-0" title="Temporarily disable account until next time user log in.">Disable Account</p>
+										</a>
+										<a class="dropdown-item font-weight-bold" v-on:click="moderatePost(status, 'suspend')">
+											<p class="mb-0" title="This prevents any new interactions, without deleting existing data.">Suspend Account</p>
+										</a>
 
-					<div class="postPresenterContainer">
-						<div v-if="status.pf_type === 'photo'" class="w-100">
-							<photo-presenter :status="status" v-on:lightbox="lightbox"></photo-presenter>
+									</span>
+								</div>
+							</div>
 						</div>
 
-						<div v-else-if="status.pf_type === 'video'" class="w-100">
-							<video-presenter :status="status"></video-presenter>
+						<div class="postPresenterContainer">
+							<div v-if="status.pf_type === 'photo'" class="w-100">
+								<photo-presenter :status="status" v-on:lightbox="lightbox"></photo-presenter>
+							</div>
+
+							<div v-else-if="status.pf_type === 'video'" class="w-100">
+								<video-presenter :status="status"></video-presenter>
+							</div>
+
+							<div v-else-if="status.pf_type === 'photo:album'" class="w-100">
+								<photo-album-presenter :status="status" v-on:lightbox="lightbox"></photo-album-presenter>
+							</div>
+
+							<div v-else-if="status.pf_type === 'video:album'" class="w-100">
+								<video-album-presenter :status="status"></video-album-presenter>
+							</div>
+
+							<div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
+								<mixed-album-presenter :status="status" v-on:lightbox="lightbox"></mixed-album-presenter>
+							</div>
+
+							<div v-else class="w-100">
+								<p class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+							</div>
 						</div>
 
-						<div v-else-if="status.pf_type === 'photo:album'" class="w-100">
-							<photo-album-presenter :status="status" v-on:lightbox="lightbox"></photo-album-presenter>
+						<div class="card-body">
+							<div class="reactions my-1">
+								<h3 v-bind:class="[status.favourited ? 'fas fa-heart text-danger pr-3 m-0 cursor-pointer' : 'far fa-heart pr-3 m-0 like-btn cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></h3>
+								<h3 v-if="!status.comments_disabled" class="far fa-comment pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3>
+								<h3 v-bind:class="[status.reblogged ? 'far fa-share-square pr-3 m-0 text-primary cursor-pointer' : 'far fa-share-square pr-3 m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></h3>
+							</div>
+
+							<div class="likes font-weight-bold" v-if="expLc(status) == true">
+								<span class="like-count">{{status.favourites_count}}</span> {{status.favourites_count == 1 ? 'like' : 'likes'}}
+							</div>
+							<div class="caption">
+								<p class="mb-2 read-more" style="overflow: hidden;">
+									<span class="username font-weight-bold">
+										<bdi><a class="text-dark" :href="status.account.url">{{status.account.username}}</a></bdi>
+									</span>
+									<span v-html="status.content"></span>
+								</p>
+							</div>
+							<div class="comments" v-if="status.id == replyId && !status.comments_disabled">
+								<p class="mb-0 d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;" v-for="(reply, index) in replies">
+									<span>
+										<a class="text-dark font-weight-bold mr-1" :href="reply.account.url">{{reply.account.username}}</a>
+										<span v-html="reply.content"></span>
+									</span>
+									<span class="mb-0" style="min-width:38px">
+										<span v-on:click="likeStatus(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger':'far fa-heart fa-sm text-lighter']"></i></span>
+										<post-menu :status="reply" :profile="profile" size="sm" :modal="'true'" :feed="feed" class="d-inline-flex pl-2"></post-menu>
+									</span>
+								</p>
+							</div>
+							<div class="timestamp mt-2">
+								<p class="small text-uppercase mb-0">
+									<a :href="status.url" class="text-muted">
+										<timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
+									</a>
+								</p>
+							</div>
 						</div>
 
-						<div v-else-if="status.pf_type === 'video:album'" class="w-100">
-							<video-album-presenter :status="status"></video-album-presenter>
+						<div class="card-footer bg-white" v-if="status.id == replyId">
+							<form class="" v-on:submit.prevent="commentSubmit(status, $event)">
+								<input type="hidden" name="item" value="">
+								<input class="form-control status-reply-input" name="comment" placeholder="Add a comment…" autocomplete="off">
+							</form>
 						</div>
-
-						<div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
-							<mixed-album-presenter :status="status" v-on:lightbox="lightbox"></mixed-album-presenter>
-						</div>
-
-						<div v-else class="w-100">
-							<p class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
-						</div>
-					</div>
-
-					<div class="card-body">
-						<div class="reactions my-1">
-							<h3 v-bind:class="[status.favourited ? 'fas fa-heart text-danger pr-3 m-0 cursor-pointer' : 'far fa-heart pr-3 m-0 like-btn cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></h3>
-							<h3 v-if="!status.comments_disabled" class="far fa-comment pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3>
-							<h3 v-bind:class="[status.reblogged ? 'far fa-share-square pr-3 m-0 text-primary cursor-pointer' : 'far fa-share-square pr-3 m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></h3>
-						</div>
-
-						<div class="likes font-weight-bold" v-if="expLc(status) == true">
-							<span class="like-count">{{status.favourites_count}}</span> {{status.favourites_count == 1 ? 'like' : 'likes'}}
-						</div>
-						<div class="caption">
-							<p class="mb-2 read-more" style="overflow: hidden;">
-								<span class="username font-weight-bold">
-									<bdi><a class="text-dark" :href="status.account.url">{{status.account.username}}</a></bdi>
-								</span>
-								<span v-html="status.content"></span>
-							</p>
-						</div>
-						<div class="comments" v-if="status.id == replyId && !status.comments_disabled">
-							<p class="mb-0 d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;" v-for="(reply, index) in replies">
-								<span>
-									<a class="text-dark font-weight-bold mr-1" :href="reply.account.url">{{reply.account.username}}</a>
-									<span v-html="reply.content"></span>
-								</span>
-								<span class="mb-0" style="min-width:38px">
-									<span v-on:click="likeStatus(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger':'far fa-heart fa-sm text-lighter']"></i></span>
-									<post-menu :status="reply" :profile="profile" size="sm" :modal="'true'" :feed="feed" class="d-inline-flex pl-2"></post-menu>
-								</span>
-							</p>
-						</div>
-						<div class="timestamp mt-2">
-							<p class="small text-uppercase mb-0">
-								<a :href="status.url" class="text-muted">
-									<timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
-								</a>
-							</p>
-						</div>
-					</div>
-
-					<div class="card-footer bg-white" v-if="status.id == replyId">
-						<form class="" v-on:submit.prevent="commentSubmit(status, $event)">
-							<input type="hidden" name="item" value="">
-							<input class="form-control status-reply-input" name="comment" placeholder="Add a comment…" autocomplete="off">
-						</form>
 					</div>
 				</div>
 				<div v-if="modes.infinite == true && !loading && feed.length > 0">
@@ -480,9 +511,7 @@
 					this.max_id = Math.min(...ids);
 					$('.timeline .pagination').removeClass('d-none');
 					this.loading = false;
-					if(window.outerWidth > 767) {
-						this.expRec();
-					}
+					this.expRec();
 				}).catch(err => {
 				});
 			},

From b25ee4523796285253c548dea302846da891f62a Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 4 May 2019 20:53:55 -0600
Subject: [PATCH 2/2] Update compiled assets

---
 public/js/timeline.js    | Bin 59521 -> 60927 bytes
 public/mix-manifest.json | Bin 845 -> 845 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/timeline.js b/public/js/timeline.js
index 01c0320f68bf98b22363e3db046ddb931ba7dd70..c4a7305b395be75ccfb52d0f1c9e1a0f9c3efc78 100644
GIT binary patch
delta 668
zcmZ9KO=uHA6vqj>wO>@W+K<?hbXeLnA=#M5SZyWPKwY&5L298@TFvf`NocaOJ3HI7
zg-`_%EE2>=(PKT>i&Rqfpx{Lh-g;1Pe&EN=gHn3&Ry5fbsxmwtKW5(h&!6{hzU6*@
z<SO?$K0am?Al1?1Z1KF$X%Zib{H5_?!dV-A;(=uub;Xm(bRaO0OtPqzCB<<&lff3t
z5#54UGu@!b{Xoq=STzR_QZiC8n`0O$gld>dF=QxGOe{sNSV1v62<B2(0$nFMlZrT(
z$udbHc?}iz-mvJ^xuE!$0FntsQ^XdbGUbII%PmJ#n_7fQ2Fd9RQ^fE*lL|J&8r-H9
zM@bQOXsS&md1)YyYN?<}iJHJMFik&%)uVODU{y*fUKsh>046>Rx7Z<A!5#2<uF;Pu
zv2_h=lA5Dx9;1H+VcqhzCypEQVkGMt7#3YBm7sMZz#9vDonO8Xz}T$sOw-x_I=E(G
zgfXbFXf^8K3+siM>E<Ta#_qM(4g-1A>V9yPwZZ8{p;2MFq~wV@3l|pqpz^*G?%87p
zr$e<<3PoboGz=TrZcybwZ6MC3EO_9<*@(lRTM?WGlS}nZ+qIpZ20VyQswdKMNWS(t
zgEuys-Fd@yYkzzGO!%T0I%P%mU^)~{mm(8GiCNfQA98x{e)l-f%HITD3!hKa_64?h
z(dk}&*K$B~%Rnf1@wTlmK(u@Zey%^?g=#Up;r#omzqrf$Fv-jNu*UZ}kDq=T`UCk|
B^56gf

delta 232
zcmex=o4N5K^M*;xtokXbAxe|qZwlwINK7*{Pckr>?6)}z!P&6c4Z-=hS#|S7W(`^K
z^31%H{Bphg(vsAo@XVBw3_Ei(b2YWiI~8Uqu_Ojt=x+{nUd=dpt(V2*|1OG?U)&bk
z{Lf2<ak7k$)@Bc%$pV}2#?-QJj!F3~4>x>se9Jj*mQYKRY@ll_H!qv;f{`W4B_(I_
zLVa=eVhtsbLnm8{bZzdR^gw_WWQWpZ!wKsAAT>&w*2Q{x8i|^EiJNm4OYu!M-n3)0
I@|HW60KI)z8~^|S

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index b7b4f1bd0f13e795e49fb44d4e0038ba3c1679a7..30c548c5cb7d483a0837c83a94b4b34cd221b17e 100644
GIT binary patch
delta 32
ncmX@hc9v~}DYHass!>XsnYp2bVPa}(qJ@b?Vv3;>S1lI+r{)Pw

delta 32
ncmX@hc9v~}DYJx`sj;Prp_#d9vZZ0FrKNFdvXP+@S1lI+lt&0U