From 3748a6b969a0187cb6434ceb3757265f29454445 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Wed, 10 Feb 2021 16:56:49 +0000
Subject: [PATCH 1/6] Fix conversation switch lag

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 src/components/ChatView.vue                   | 11 +++-----
 .../ConversationsList/Conversation.vue        |  4 +++
 .../NewMessageForm/NewMessageForm.vue         | 26 ++++++++++++++-----
 src/components/TopBar/CallButton.vue          |  5 ++++
 src/init.js                                   |  6 +++++
 src/store/tokenStore.js                       | 19 ++++++++++++++
 6 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue
index 9668e6db84b..2f46fb72cf5 100644
--- a/src/components/ChatView.vue
+++ b/src/components/ChatView.vue
@@ -70,13 +70,6 @@ export default {
 		NewMessageForm,
 	},
 
-	props: {
-		token: {
-			type: String,
-			required: true,
-		},
-	},
-
 	data: function() {
 		return {
 			isDraggingOver: false,
@@ -109,6 +102,10 @@ export default {
 				return undefined
 			}
 		},
+
+		token() {
+			return this.$store.getters.getToken()
+		},
 	},
 
 	methods: {
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index 10c9588854b..dfd3da0dacd 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -115,6 +115,7 @@ import {
 } from '../../../services/conversationsService'
 import { generateUrl } from '@nextcloud/router'
 import { CONVERSATION, PARTICIPANT } from '../../../constants'
+import { EventBus } from '../../../services/EventBus'
 
 export default {
 	name: 'Conversation',
@@ -372,6 +373,9 @@ export default {
 
 		// forward click event
 		onClick(event) {
+			EventBus.$emit('conversationClicked', {
+				token: this.item.token,
+			})
 			this.$emit('click', event)
 		},
 	},
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index db372fad038..01e411a3bc3 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -40,6 +40,7 @@
 				<div
 					v-if="canUploadFiles || canShareFiles">
 					<Actions
+						ref="uploadMenu"
 						default-icon="icon-clip-add-file"
 						:aria-label="t('spreed', 'Share files to the conversation')"
 						:aria-haspopup="true">
@@ -59,11 +60,11 @@
 						</ActionButton>
 					</Actions>
 				</div>
-				<div
-					v-if="!isReadOnly">
+				<div>
 					<EmojiPicker @select="addEmoji">
 						<button
 							type="button"
+							disabled="disabled"
 							class="nc-button nc-button__main"
 							:aria-label="t('spreed', 'Add emoji')"
 							:aria-haspopup="true">
@@ -86,7 +87,7 @@
 						ref="advancedInput"
 						v-model="text"
 						:token="token"
-						:active-input="!isReadOnly"
+						:active-input="!disabled"
 						:placeholder-text="placeholderText"
 						:aria-label="placeholderText"
 						@update:contentEditable="contentEditableToParsed"
@@ -94,7 +95,7 @@
 						@files-pasted="handlePastedFiles" />
 				</div>
 				<button
-					:disabled="isReadOnly"
+					:disabled="disabled"
 					type="submit"
 					:aria-label="t('spreed', 'Send message')"
 					class="nc-button nc-button__main"
@@ -175,12 +176,13 @@ export default {
 			}
 		},
 
-		isReadOnly() {
+		disabled() {
 			return this.conversation.readOnly === CONVERSATION.STATE.READ_ONLY
+			|| !this.currentConversationIsJoined
 		},
 
 		placeholderText() {
-			return this.isReadOnly
+			return this.disabled
 				? t('spreed', 'This conversation has been locked')
 				: t('spreed', 'Write message, @ to mention someone …')
 		},
@@ -194,7 +196,7 @@ export default {
 		},
 
 		canShareFiles() {
-			return !this.currentUserIsGuest && !this.isReadOnly
+			return !this.currentUserIsGuest
 		},
 
 		canUploadFiles() {
@@ -207,6 +209,16 @@ export default {
 		attachmentFolderFreeSpace() {
 			return this.$store.getters.getAttachmentFolderFreeSpace()
 		},
+
+		currentConversationIsJoined() {
+			return this.$store.getters.currentConversationIsJoined
+		},
+	},
+
+	watch: {
+		disabled(newValue) {
+			this.$refs.uploadMenu.$refs.menuButton.disabled = newValue
+		},
 	},
 
 	mounted() {
diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue
index 2d8eb5657e3..834ecef262b 100644
--- a/src/components/TopBar/CallButton.vue
+++ b/src/components/TopBar/CallButton.vue
@@ -98,6 +98,7 @@ export default {
 				|| this.isBlockedByLobby
 				|| this.conversation.readOnly
 				|| this.isNextcloudTalkHashDirty
+				|| !this.currentConversationIsJoined
 		},
 
 		leaveCallLabel() {
@@ -164,6 +165,10 @@ export default {
 			return this.conversation.readOnly === CONVERSATION.STATE.READ_WRITE
 				&& this.isInCall
 		},
+
+		currentConversationIsJoined() {
+			return this.$store.getters.currentConversationIsJoined
+		},
 	},
 
 	methods: {
diff --git a/src/init.js b/src/init.js
index f7f71df64e6..46088b462f9 100644
--- a/src/init.js
+++ b/src/init.js
@@ -24,6 +24,7 @@
 // entry points
 
 import store from './store'
+import { EventBus } from './services/EventBus'
 
 if (!window.OCA.Talk) {
 	window.OCA.Talk = {}
@@ -46,3 +47,8 @@ window.OCA.Talk.registerMessageAction = ({ label, callback, icon }) => {
 	}
 	store.dispatch('addMessageAction', messageAction)
 }
+
+EventBus.$on('Signaling::joinRoom', (payload) => {
+	const token = payload[0]
+	store.dispatch('handleRoomJoined', token)
+})
diff --git a/src/store/tokenStore.js b/src/store/tokenStore.js
index 585129d6747..627962cffd0 100644
--- a/src/store/tokenStore.js
+++ b/src/store/tokenStore.js
@@ -23,6 +23,14 @@
 const state = {
 	token: '',
 	fileIdForToken: null,
+	/**
+	 * The joining of a room with the signaling server always lags
+	 * behind the "joining" of it in talk's UI. For this reason we
+	 * might have a  window of time in which we might be in
+	 * conversation B in talk's UI while still leaving conversation
+	 * A in the signaling server.
+	 **/
+	lastJoinedConversationToken: '',
 }
 
 const getters = {
@@ -32,6 +40,9 @@ const getters = {
 	getFileIdForToken: (state) => () => {
 		return state.fileIdForToken
 	},
+	currentConversationIsJoined() {
+		return state.lastJoinedConversationToken === state.token
+	},
 }
 
 const mutations = {
@@ -56,6 +67,10 @@ const mutations = {
 		state.token = newToken
 		state.fileIdForToken = newFileId
 	},
+
+	updateLastJoinedConversationToken(state, { token }) {
+		state.lastJoinedConversationToken = token
+	},
 }
 
 const actions = {
@@ -80,6 +95,10 @@ const actions = {
 	updateTokenAndFileIdForToken(context, { newToken, newFileId }) {
 		context.commit('updateTokenAndFileIdForToken', { newToken, newFileId })
 	},
+
+	handleRoomJoined({ commit }, token) {
+		commit('updateLastJoinedConversationToken', { token })
+	},
 }
 
 export default { state, mutations, getters, actions }

From 1bb6959235365fb906433a392e01005e9ee15af4 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Tue, 16 Feb 2021 10:02:49 +0000
Subject: [PATCH 2/6] Fix emoji button disabled state

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 src/components/NewMessageForm/NewMessageForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 01e411a3bc3..10d8af8c1d4 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -64,7 +64,7 @@
 					<EmojiPicker @select="addEmoji">
 						<button
 							type="button"
-							disabled="disabled"
+							:disabled="disabled"
 							class="nc-button nc-button__main"
 							:aria-label="t('spreed', 'Add emoji')"
 							:aria-haspopup="true">

From 8c8cc77381711aa8384413727002a1fd3af7cce2 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Tue, 16 Feb 2021 10:03:17 +0000
Subject: [PATCH 3/6] Fix advancedinput placeholder text

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 .../NewMessageForm/NewMessageForm.vue           | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 10d8af8c1d4..56ecd2c10ac 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -176,15 +176,22 @@ export default {
 			}
 		},
 
-		disabled() {
+		isReadOnly() {
 			return this.conversation.readOnly === CONVERSATION.STATE.READ_ONLY
-			|| !this.currentConversationIsJoined
+		},
+
+		disabled() {
+			return this.isReadOnly || !this.currentConversationIsJoined
 		},
 
 		placeholderText() {
-			return this.disabled
-				? t('spreed', 'This conversation has been locked')
-				: t('spreed', 'Write message, @ to mention someone …')
+			if (this.isReadonly) {
+				return t('spreed', 'This conversation has been locked')
+			} else if (!this.currentConversationIsJoined) {
+				return t('spreed', 'Joining conversation …')
+			} else {
+				return t('spreed', 'Write message, @ to mention someone …')
+			}
 		},
 
 		messageToBeReplied() {

From 5ce1942b3bb134d21205a80eb554856819478b55 Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Wed, 24 Feb 2021 11:34:27 +0000
Subject: [PATCH 4/6] Remove unused event

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 src/components/LeftSidebar/ConversationsList/Conversation.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index dfd3da0dacd..10c9588854b 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -115,7 +115,6 @@ import {
 } from '../../../services/conversationsService'
 import { generateUrl } from '@nextcloud/router'
 import { CONVERSATION, PARTICIPANT } from '../../../constants'
-import { EventBus } from '../../../services/EventBus'
 
 export default {
 	name: 'Conversation',
@@ -373,9 +372,6 @@ export default {
 
 		// forward click event
 		onClick(event) {
-			EventBus.$emit('conversationClicked', {
-				token: this.item.token,
-			})
 			this.$emit('click', event)
 		},
 	},

From 25f2921a1eb43c49bf2ebf7bd8413b0e321d782e Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Wed, 24 Feb 2021 15:29:25 +0000
Subject: [PATCH 5/6] Handle disabled actions button in vue lib

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 src/components/NewMessageForm/NewMessageForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 56ecd2c10ac..293f8e9ae9b 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -41,6 +41,7 @@
 					v-if="canUploadFiles || canShareFiles">
 					<Actions
 						ref="uploadMenu"
+						:disabled="disabled"
 						default-icon="icon-clip-add-file"
 						:aria-label="t('spreed', 'Share files to the conversation')"
 						:aria-haspopup="true">

From b089fc872e3e9a32255219420c8f829fd33f883c Mon Sep 17 00:00:00 2001
From: Marco Ambrosini <marcoambrosini@pm.me>
Date: Wed, 24 Feb 2021 15:31:34 +0000
Subject: [PATCH 6/6] Improve action name

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
---
 src/init.js             | 2 +-
 src/store/tokenStore.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/init.js b/src/init.js
index 46088b462f9..c92b366f79b 100644
--- a/src/init.js
+++ b/src/init.js
@@ -50,5 +50,5 @@ window.OCA.Talk.registerMessageAction = ({ label, callback, icon }) => {
 
 EventBus.$on('Signaling::joinRoom', (payload) => {
 	const token = payload[0]
-	store.dispatch('handleRoomJoined', token)
+	store.dispatch('updateLastJoinedConversationToken', token)
 })
diff --git a/src/store/tokenStore.js b/src/store/tokenStore.js
index 627962cffd0..29a78534904 100644
--- a/src/store/tokenStore.js
+++ b/src/store/tokenStore.js
@@ -96,7 +96,7 @@ const actions = {
 		context.commit('updateTokenAndFileIdForToken', { newToken, newFileId })
 	},
 
-	handleRoomJoined({ commit }, token) {
+	updateLastJoinedConversationToken({ commit }, token) {
 		commit('updateLastJoinedConversationToken', { token })
 	},
 }