From 1060dd23d5988b6f38467723380d4b37a36ebe7a Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 24 Jul 2021 23:37:44 -0600
Subject: [PATCH] Update RemotePost component, update likes reaction bar

---
 .../assets/js/components/PostComponent.vue    | 14 +++++++-------
 resources/assets/js/components/RemotePost.vue | 19 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index c401d7857..6395318af 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -222,13 +222,13 @@
 								</div>
 								<div class="reaction-counts mb-0">
 									<div v-if="status.liked_by.username && status.liked_by.username !== user.username" class="likes mb-1">
-						<span class="like-count">Liked by
-							<a class="font-weight-bold text-dark" :href="status.liked_by.url">{{status.liked_by.username}}</a>
-							<span v-if="status.liked_by.others == true">
-								and <span class="font-weight-bold text-dark cursor-pointer" @click="likesModal"><span v-if="status.liked_by.total_count_pretty">{{status.liked_by.total_count_pretty}}</span> others</span>
-							</span>
-						</span>
-					</div>
+										<span class="like-count">Liked by
+											<a class="font-weight-bold text-dark" :href="status.liked_by.url">{{status.liked_by.username}}</a>
+											<span v-if="status.liked_by.others == true">
+												and <span class="font-weight-bold text-dark cursor-pointer" @click="likesModal"><span v-if="status.liked_by.total_count_pretty">{{status.liked_by.total_count_pretty}}</span> others</span>
+											</span>
+										</span>
+									</div>
 								</div>
 								<div class="timestamp d-flex align-items-bottom justify-content-between">
 									<a v-bind:href="statusUrl" class="small text-muted" :title="status.created_at">
diff --git a/resources/assets/js/components/RemotePost.vue b/resources/assets/js/components/RemotePost.vue
index 5acefefcd..00b01960b 100644
--- a/resources/assets/js/components/RemotePost.vue
+++ b/resources/assets/js/components/RemotePost.vue
@@ -224,13 +224,15 @@
 									<h3 v-if="status.visibility == 'public'" v-bind:class="[reactions.bookmarked ? 'fas fa-bookmark text-warning m-0 mr-3 cursor-pointer' : 'far fa-bookmark m-0 mr-3 cursor-pointer']" title="Bookmark" v-on:click="bookmarkStatus"></h3>
 									<h3 v-if="status.visibility == 'public'" v-bind:class="[reactions.shared ? 'fas fa-retweet m-0 text-primary cursor-pointer' : 'fas fa-retweet m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus"></h3>
 								</div>
-								<div class="reaction-counts font-weight-bold mb-0">
-									<span style="cursor:pointer;" v-on:click="likesModal">
-										<span class="like-count">{{status.favourites_count || 0}}</span> likes
-									</span>
-									<span v-if="status.visibility == 'public'" class="float-right" style="cursor:pointer;" v-on:click="sharesModal">
-										<span class="share-count pl-4">{{status.reblogs_count || 0}}</span> shares
-									</span>
+								<div class="reaction-counts mb-0">
+									<div v-if="status.liked_by.username && status.liked_by.username !== user.username" class="likes mb-1">
+										<span class="like-count">Liked by
+											<a class="font-weight-bold text-dark" :href="status.liked_by.url">{{status.liked_by.username}}</a>
+											<span v-if="status.liked_by.others == true">
+												and <span class="font-weight-bold text-dark cursor-pointer" @click="likesModal"><span v-if="status.liked_by.total_count_pretty">{{status.liked_by.total_count_pretty}}</span> others</span>
+											</span>
+										</span>
+									</div>
 								</div>
 								<div class="timestamp pt-2 d-flex align-items-bottom justify-content-between">
 									<a v-bind:href="statusUrl" class="small text-muted" :title="status.created_at">
@@ -692,9 +694,6 @@ export default {
 					window.location.href = '/login?next=' + encodeURIComponent('/p/' + this.status.shortcode);
 					return;
 				}
-				if(this.status.favourites_count == 0) {
-					return;
-				}
 				if(this.likes.length) {
 					this.$refs.likesModal.show();
 					return;