From abfc9fe7f8079c0e98ebdcd43bcf15cd2a2df686 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Mon, 14 Oct 2019 23:50:22 -0600
Subject: [PATCH] Update Timeline.vue component, use formatted counts,
 util.emoji and increase pagination limit to 5

---
 resources/assets/js/components/Timeline.vue | 27 +++++++--------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index 6de709a0..fa2cc0b0 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -203,19 +203,6 @@
 
 						<div v-if="status.id == replyId && !status.comments_disabled" class="card-footer bg-white px-2 py-0">
 							<ul class="nav align-items-center emoji-reactions" style="overflow-x: scroll;flex-wrap: unset;">
-								<li class="nav-item" v-on:click="emojiReaction(status)">😂</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">💯</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">❤️</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">🙌</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">👏</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">👌</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">😍</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">😯</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">😢</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">😅</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">😁</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">🙂</li>
-								<li class="nav-item" v-on:click="emojiReaction(status)">😎</li>
 								<li class="nav-item" v-on:click="emojiReaction(status)" v-for="e in emoji">{{e}}</li>
 							</ul>
 						</div>
@@ -274,15 +261,15 @@
 						<div class="card-footer bg-transparent border-0 mt-2 py-1">
 							<div class="d-flex justify-content-between text-center">
 								<span class="cursor-pointer" @click="redirect(profile.url)">
-									<p class="mb-0 font-weight-bold">{{profile.statuses_count}}</p>
+									<p class="mb-0 font-weight-bold">{{formatCount(profile.statuses_count)}}</p>
 									<p class="mb-0 small text-muted">Posts</p>
 								</span>
 								<span class="cursor-pointer" @click="redirect(profile.url+'?md=followers')">
-									<p class="mb-0 font-weight-bold">{{profile.followers_count}}</p>
+									<p class="mb-0 font-weight-bold">{{formatCount(profile.followers_count)}}</p>
 									<p class="mb-0 small text-muted">Followers</p>
 								</span>
 								<span class="cursor-pointer" @click="redirect(profile.url+'?md=following')">
-									<p class="mb-0 font-weight-bold">{{profile.following_count}}</p>
+									<p class="mb-0 font-weight-bold">{{formatCount(profile.following_count)}}</p>
 									<p class="mb-0 small text-muted">Following</p>
 								</span>
 							</div>
@@ -502,7 +489,7 @@
 				showReadMore: true,
 				replyStatus: {},
 				replyText: '',
-				emoji: ['😀','🤣','😃','😄','😆','😉','😊','😋','😘','😗','😙','😚','🤗','🤩','🤔','🤨','😐','😑','😶','🙄','😏','😣','😥','😮','🤐','😪','😫','😴','😌','😛','😜','😝','🤤','😒','😓','😔','😕','🙃','🤑','😲','🙁','😖','😞','😟','😤','😭','😦','😧','😨','😩','🤯','😬','😰','😱','😳','🤪','😵','😡','😠','🤬','😷','🤒','🤕','🤢','🤮','🤧','😇','🤠','🤡','🤥','🤫','🤭','🧐','🤓','😈','👿','👹','👺','💀','👻','👽','🤖','💩','😺','😸','😹','😻','😼','😽','🙀','😿','😾','🤲','👐','🤝','👍','👎','👊','✊','🤛','🤜','🤞','✌️','🤟','🤘','👈','👉','👆','👇','☝️','✋','🤚','🖐','🖖','👋','🤙','💪','🖕','✍️','🙏','💍','💄','💋','👄','👅','👂','👃','👣','👁','👀','🧠','🗣','👤','👥'],
+				emoji: window.App.util.emoji,
 				showHashtagPosts: false,
 				hashtagPosts: [],
 				hashtagPostsName: '',
@@ -592,7 +579,7 @@
 				axios.get(apiUrl, {
 					params: {
 						max_id: this.max_id,
-						limit: 4
+						limit: 5
 					}
 				}).then(res => {
 					let data = res.data;
@@ -1311,6 +1298,10 @@
 			hideTips() {
 				this.showTips = false;
 				window.localStorage.setItem('metro-tips', false);
+			},
+
+			formatCount(count) {
+				return App.util.format.count(count);
 			}
 
 		}