From 02bf6b4eb0bad360302961bd5026358cfb60858c Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 23 Oct 2019 13:01:12 +0200
Subject: [PATCH] Sort conversations by favorite and last activity

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../Navigation/ConversationsList/Conversation.vue   |  7 ++++++-
 .../ConversationsList/ConversationsList.vue         | 13 ++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/Navigation/ConversationsList/Conversation.vue b/src/components/Navigation/ConversationsList/Conversation.vue
index 0859796f6..5376c9429 100644
--- a/src/components/Navigation/ConversationsList/Conversation.vue
+++ b/src/components/Navigation/ConversationsList/Conversation.vue
@@ -21,7 +21,7 @@
 
 <template>
 	<AppContentListItem
-		:title="item.displayName"
+		:title="conversationName"
 		:to="{ name: 'conversation', params: { token: item.token }}"
 		@click.prevent.exact="joinConversation(item.token)">
 		<ConversationIcon
@@ -132,6 +132,11 @@ export default {
 		}
 	},
 	computed: {
+		conversationName() {
+			// FIXME this is just for demonstration, instead the yellow star
+			// FIXME should be added on top of the ConversationIcon
+			return (this.item.isFavorite ? 'FAVORITE' : '') + this.item.displayName
+		},
 		linkToConversation() {
 			return window.location.protocol + '//' + window.location.host + generateUrl('/call/' + this.item.token)
 		},
diff --git a/src/components/Navigation/ConversationsList/ConversationsList.vue b/src/components/Navigation/ConversationsList/ConversationsList.vue
index 3fce535e7..3ca4adbf6 100644
--- a/src/components/Navigation/ConversationsList/ConversationsList.vue
+++ b/src/components/Navigation/ConversationsList/ConversationsList.vue
@@ -22,7 +22,7 @@
 <template>
 	<ul class="conversations">
 		<Conversation
-			v-for="item of conversationsList"
+			v-for="item of sortedConversationsList"
 			:key="item.id"
 			:item="item" />
 	</ul>
@@ -41,8 +41,8 @@ export default {
 		conversationsList() {
 			return this.$store.getters.conversationsList
 		},
-		conversations() {
-			return this.$store.getters.conversations
+		sortedConversationsList() {
+			return this.conversationsList.slice().sort(this.sortConversations)
 		}
 	},
 	beforeMount() {
@@ -55,6 +55,13 @@ export default {
 		}, 30000)
 	},
 	methods: {
+		sortConversations(conversation1, conversation2) {
+			if (conversation1.isFavorite !== conversation2.isFavorite) {
+				return conversation1.isFavorite ? -1 : 1
+			}
+
+			return conversation2.lastActivity - conversation1.lastActivity
+		},
 		handleInput(payload) {
 			const selectedConversationToken = payload.token
 			this.joinConversation(selectedConversationToken)