From 42fd876fe46dbdaa51031a32a2cf789502231eed Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Thu, 4 Jan 2024 08:52:56 +0100
Subject: [PATCH 1/4] Eslint fix

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../Message/MessageButtonsBar/MessageButtonsBar.vue             | 2 +-
 src/store/conversationsStore.js                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index a96d3c03ed1..56f85102d7f 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -289,8 +289,8 @@ import MessageForwarder from './MessageForwarder.vue'
 import { PARTICIPANT, CONVERSATION, ATTENDEE } from '../../../../../constants.js'
 import { getMessageReminder, removeMessageReminder, setMessageReminder } from '../../../../../services/remindersService.js'
 import { copyConversationLinkToClipboard } from '../../../../../services/urlService.js'
-import { useReactionsStore } from '../../../../../stores/reactions.js'
 import { useIntegrationsStore } from '../../../../../stores/integrations.js'
+import { useReactionsStore } from '../../../../../stores/reactions.js'
 
 const EmojiIndex = new EmojiIndexFactory(data)
 const supportReminders = getCapabilities()?.spreed?.features?.includes('remind-me-later')
diff --git a/src/store/conversationsStore.js b/src/store/conversationsStore.js
index efef245d91a..0c778772491 100644
--- a/src/store/conversationsStore.js
+++ b/src/store/conversationsStore.js
@@ -66,8 +66,8 @@ import {
 } from '../services/recordingService.js'
 import { talkBroadcastChannel } from '../services/talkBroadcastChannel.js'
 import { useChatExtrasStore } from '../stores/chatExtras.js'
-import { useTalkHashStore } from '../stores/talkHash.js'
 import { useReactionsStore } from '../stores/reactions.js'
+import { useTalkHashStore } from '../stores/talkHash.js'
 
 const DUMMY_CONVERSATION = {
 	token: '',

From d55ce12868405f2a20465d4e947977e7428f09e6 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Thu, 4 Jan 2024 09:45:15 +0100
Subject: [PATCH 2/4] Refactor(Mixin): Migrate getParticipants mixin to
 composable

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../Participants/ParticipantsTab.vue          |  34 ++--
 src/components/TopBar/TopBar.vue              |  23 +--
 src/composables/useGetParticipants.js         | 152 ++++++++++++++++++
 src/mixins/getParticipants.js                 | 130 ---------------
 4 files changed, 177 insertions(+), 162 deletions(-)
 create mode 100644 src/composables/useGetParticipants.js
 delete mode 100644 src/mixins/getParticipants.js

diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue
index acdece449ea..57b0bdb5d71 100644
--- a/src/components/RightSidebar/Participants/ParticipantsTab.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue
@@ -66,6 +66,7 @@
 
 <script>
 import debounce from 'debounce'
+import { toRefs } from 'vue'
 
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showError } from '@nextcloud/dialogs'
@@ -82,9 +83,9 @@ import Hint from '../../Hint.vue'
 import SearchBox from '../../LeftSidebar/SearchBox/SearchBox.vue'
 import SelectPhoneNumber from '../../SelectPhoneNumber.vue'
 
+import { useGetParticipants } from '../../../composables/useGetParticipants.js'
 import { useIsInCall } from '../../../composables/useIsInCall.js'
 import { useSortParticipants } from '../../../composables/useSortParticipants.js'
-import getParticipants from '../../../mixins/getParticipants.js'
 import { searchPossibleConversations } from '../../../services/conversationsService.js'
 import { EventBus } from '../../../services/EventBus.js'
 import { addParticipant } from '../../../services/participantsService.js'
@@ -108,9 +109,11 @@ export default {
 		SelectPhoneNumber,
 	},
 
-	mixins: [getParticipants],
-
 	props: {
+		isActive: {
+			type: Boolean,
+			required: true,
+		},
 		canSearch: {
 			type: Boolean,
 			required: true,
@@ -121,13 +124,22 @@ export default {
 		},
 	},
 
-	setup() {
+	setup(props) {
+		const { isActive } = toRefs(props)
 		const { sortParticipants } = useSortParticipants()
 		const isInCall = useIsInCall()
+		const {
+			participantsInitialised,
+			cancelableGetParticipants,
+			initialiseGetParticipants,
+		} = useGetParticipants(isActive)
 
 		return {
 			sortParticipants,
 			isInCall,
+			participantsInitialised,
+			cancelableGetParticipants,
+			initialiseGetParticipants,
 		}
 	},
 
@@ -181,7 +193,7 @@ export default {
 			return this.searchText !== ''
 		},
 		noResults() {
-			return this.searchResults === []
+			return this.searchResults.length === 0
 		},
 	},
 
@@ -189,20 +201,14 @@ export default {
 		searchText(value) {
 			this.isFocused = !!value
 		},
-
-		isActive(value) {
-			if (value && this.pendingChanges) {
-				this.debounceUpdateParticipants()
-			}
-		}
 	},
 
 	beforeMount() {
 		EventBus.$on('route-change', this.abortSearch)
 		subscribe('user_status:status.updated', this.updateUserStatus)
 
-		// Initialises the get participants mixin
-		this.initialiseGetParticipantsMixin()
+		// Initialises the get participants composable
+		this.initialiseGetParticipants()
 	},
 
 	beforeDestroy() {
@@ -211,8 +217,6 @@ export default {
 
 		this.cancelSearchPossibleConversations()
 		this.cancelSearchPossibleConversations = null
-
-		this.stopGetParticipantsMixin()
 	},
 
 	methods: {
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 04cf6938594..826ca0a4b54 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -164,8 +164,8 @@ import TopBarMenu from './TopBarMenu.vue'
 import BreakoutRoomsEditor from '../BreakoutRoomsEditor/BreakoutRoomsEditor.vue'
 import ConversationIcon from '../ConversationIcon.vue'
 
+import { useGetParticipants } from '../../composables/useGetParticipants.js'
 import { CONVERSATION } from '../../constants.js'
-import getParticipants from '../../mixins/getParticipants.js'
 import BrowserStorage from '../../services/BrowserStorage.js'
 import { getStatusMessage } from '../../utils/userStatus.js'
 import { localCallParticipantModel, localMediaModel } from '../../utils/webrtc/index.js'
@@ -194,10 +194,7 @@ export default {
 		MessageText,
 	},
 
-	mixins: [
-		richEditor,
-		getParticipants,
-	],
+	mixins: [richEditor],
 
 	props: {
 		isInCall: {
@@ -214,6 +211,10 @@ export default {
 		},
 	},
 
+	setup() {
+		useGetParticipants()
+	},
+
 	data: () => {
 		return {
 			unreadNotificationHandle: null,
@@ -344,18 +345,6 @@ export default {
 				this.notifyUnreadMessages(null)
 			}
 		},
-
-		isOneToOneConversation: {
-			immediate: true,
-			// Group conversations have mixin in RightSidebar, so should work only for one-to-one
-			handler(newValue) {
-				if (newValue) {
-					this.initialiseGetParticipantsMixin()
-				} else {
-					this.stopGetParticipantsMixin()
-				}
-			},
-		},
 	},
 
 	mounted() {
diff --git a/src/composables/useGetParticipants.js b/src/composables/useGetParticipants.js
new file mode 100644
index 00000000000..4670469f94b
--- /dev/null
+++ b/src/composables/useGetParticipants.js
@@ -0,0 +1,152 @@
+/**
+ * @copyright Copyright (c) 2024 Dorra Jaouad <dorra.jaoued1@gmail.com>
+ *
+ * @author Dorra Jaouad <dorra.jaoued1@gmail.com>
+ * @author Marco Ambrosini <marcoambrosini@icloud.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+import debounce from 'debounce'
+import { ref, nextTick, computed, watch, onBeforeUnmount } from 'vue'
+
+import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+
+import { useIsInCall } from './useIsInCall.js'
+import { useStore } from './useStore.js'
+import { CONVERSATION } from '../constants.js'
+import { EventBus } from '../services/EventBus.js'
+
+/**
+ * @param {import('vue').Ref} isActive whether the participants tab is active
+ */
+export function useGetParticipants(isActive = ref(true)) {
+
+	// Encapsulation
+	const store = useStore()
+	const token = computed(() => store.getters.getToken())
+	const conversation = computed(() => store.getters.conversation(token.value))
+	const isInCall = useIsInCall()
+	const isOneToOneConversation = computed(() => conversation.value?.type === CONVERSATION.TYPE.ONE_TO_ONE)
+	let fetchingParticipants = false
+	let pendingChanges = true
+
+	// Exposed
+	const participantsInitialised = ref(false)
+
+	/**
+	 * Initialise the get participants functionality
+	 *
+	 */
+	function initialiseGetParticipants() {
+		EventBus.$on('route-change', onRouteChange)
+		EventBus.$on('joined-conversation', onJoinedConversation)
+
+		// FIXME this works only temporary until signaling is fixed to be only on the calls
+		// Then we have to search for another solution. Maybe the room list which we update
+		// periodically gets a hash of all online sessions?
+		EventBus.$on('signaling-participant-list-changed', debounceUpdateParticipants)
+		subscribe('guest-promoted', onJoinedConversation)
+	}
+
+	/**
+	 * Stop the get participants functionality
+	 *
+	 */
+	function stopGetParticipants() {
+		EventBus.$off('route-change', onRouteChange)
+		EventBus.$off('joined-conversation', onJoinedConversation)
+		EventBus.$off('signaling-participant-list-changed', debounceUpdateParticipants)
+		unsubscribe('guest-promoted', onJoinedConversation)
+	}
+
+	const onRouteChange = () => {
+		participantsInitialised.value = store.getters.participantsList(token.value).length > 1
+	}
+
+	const onJoinedConversation = () => {
+		if (isOneToOneConversation.value) {
+			cancelableGetParticipants()
+		} else {
+			nextTick(() => debounceUpdateParticipants())
+		}
+	}
+
+	const debounceUpdateParticipants = () => {
+		if (!isActive.value && !isInCall.value) {
+			// Update is ignored but there is a flag to force the participants update
+			pendingChanges = true
+			return
+		}
+
+		if (store.getters.windowIsVisible() && (isInCall.value || !conversation.value?.hasCall)) {
+			debounceFastUpdateParticipants()
+		} else {
+			debounceSlowUpdateParticipants()
+		}
+	    pendingChanges = false
+	}
+
+	const cancelableGetParticipants = async () => {
+		const isInLobby = store.getters.isInLobby
+		const isModeratorOrUser = store.getters.isModeratorOrUser
+		if (fetchingParticipants || token.value === '' || isInLobby || !isModeratorOrUser) {
+			return
+		}
+
+		fetchingParticipants = true
+		debounceFastUpdateParticipants.clear()
+		debounceSlowUpdateParticipants.clear()
+
+		const response = await store.dispatch('fetchParticipants', { token: token.value })
+		if (response) {
+			participantsInitialised.value = true
+		}
+		fetchingParticipants = false
+	}
+
+	const debounceFastUpdateParticipants = debounce(
+		cancelableGetParticipants, 3000)
+	const debounceSlowUpdateParticipants = debounce(
+		cancelableGetParticipants, 15000)
+
+	// Group conversations have composable in RightSidebar, so should work only for one-to-one
+	watch(isOneToOneConversation, (newValue) => {
+		if (newValue) {
+			initialiseGetParticipants()
+		} else {
+			stopGetParticipants()
+		}
+	}, { immediate: true })
+
+	watch(isActive, (newValue) => {
+		if (newValue && pendingChanges) {
+			debounceUpdateParticipants()
+		}
+	})
+
+	onBeforeUnmount(
+		() => {
+			stopGetParticipants()
+		}
+	)
+
+	return {
+		participantsInitialised,
+		initialiseGetParticipants,
+		cancelableGetParticipants,
+	}
+}
diff --git a/src/mixins/getParticipants.js b/src/mixins/getParticipants.js
deleted file mode 100644
index 63979d079d4..00000000000
--- a/src/mixins/getParticipants.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * @copyright Copyright (c) 2019 Marco Ambrosini <marcoambrosini@icloud.com>
- *
- * @author Marco Ambrosini <marcoambrosini@icloud.com>
- *
- * @license AGPL-3.0-or-later
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-import debounce from 'debounce'
-
-import { subscribe, unsubscribe } from '@nextcloud/event-bus'
-
-import { EventBus } from '../services/EventBus.js'
-
-const getParticipants = {
-
-	data() {
-		return {
-			participantsInitialised: false,
-			fetchingParticipants: false,
-			pendingChanges: false,
-			debounceFastUpdateParticipants: null,
-			debounceSlowUpdateParticipants: null,
-		}
-	},
-
-	props: {
-		isActive: {
-			type: Boolean,
-			default: true,
-		},
-	},
-
-	created() {
-		this.debounceFastUpdateParticipants = debounce(function() {
-			this.cancelableGetParticipants()
-		}, 3000)
-
-		this.debounceSlowUpdateParticipants = debounce(function() {
-			this.cancelableGetParticipants()
-		}, 15000)
-	},
-
-	methods: {
-		initialiseGetParticipantsMixin() {
-			EventBus.$on('route-change', this.onRouteChange)
-			EventBus.$on('joined-conversation', this.onJoinedConversation)
-
-			// FIXME this works only temporary until signaling is fixed to be only on the calls
-			// Then we have to search for another solution. Maybe the room list which we update
-			// periodically gets a hash of all online sessions?
-			EventBus.$on('signaling-participant-list-changed', this.debounceUpdateParticipants)
-
-			subscribe('guest-promoted', this.onJoinedConversation)
-		},
-
-		stopGetParticipantsMixin() {
-			EventBus.$off('route-change', this.onRouteChange)
-			EventBus.$off('joined-conversation', this.onJoinedConversation)
-			EventBus.$off('signaling-participant-list-changed', this.debounceUpdateParticipants)
-
-			unsubscribe('guest-promoted', this.onJoinedConversation)
-		},
-
-		onRouteChange() {
-			// Reset participantsInitialised when there is only the current user in the participant list
-			this.participantsInitialised = this.$store.getters.participantsList(this.token).length > 1
-		},
-		/**
-		 * If the conversation has been joined, we get the participants
-		 */
-		onJoinedConversation() {
-			this.$nextTick(() => {
-				this.debounceUpdateParticipants()
-			})
-		},
-
-		debounceUpdateParticipants() {
-			if (!this.isActive && !this.isInCall) {
-				// Update is ignored but there is a flag to force the participants update
-				this.pendingChanges = true
-				return
-			}
-
-			// this.conversation is provided by component, where mixin is used
-			if (this.$store.getters.windowIsVisible()
-				&& (this.isInCall || !this.conversation?.hasCall)) {
-				this.debounceFastUpdateParticipants()
-			} else {
-				this.debounceSlowUpdateParticipants()
-			}
-			this.pendingChanges = false
-		},
-
-		async cancelableGetParticipants() {
-			const isInLobby = this.$store.getters.isInLobby
-			const isModeratorOrUser = this.$store.getters.isModeratorOrUser
-			if (this.fetchingParticipants || this.token === '' || isInLobby || !isModeratorOrUser) {
-				return
-			}
-
-			this.fetchingParticipants = true
-
-			// Clear previously requested updates
-			this.debounceFastUpdateParticipants.clear()
-			this.debounceSlowUpdateParticipants.clear()
-
-			const response = await this.$store.dispatch('fetchParticipants', { token: this.token })
-			if (response) {
-				this.participantsInitialised = true
-			}
-			this.fetchingParticipants = false
-		},
-	},
-}
-
-export default getParticipants

From a5fed86c933d3aff352d60b66d4f581fc7355874 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Sat, 6 Jan 2024 14:25:48 +0100
Subject: [PATCH 3/4] Make listeners exclusive to TopBar only

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../Participants/ParticipantsTab.vue          |  7 +-----
 src/composables/useGetParticipants.js         | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue
index 57b0bdb5d71..d5b65a60ffb 100644
--- a/src/components/RightSidebar/Participants/ParticipantsTab.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue
@@ -131,15 +131,13 @@ export default {
 		const {
 			participantsInitialised,
 			cancelableGetParticipants,
-			initialiseGetParticipants,
-		} = useGetParticipants(isActive)
+		} = useGetParticipants(isActive, false)
 
 		return {
 			sortParticipants,
 			isInCall,
 			participantsInitialised,
 			cancelableGetParticipants,
-			initialiseGetParticipants,
 		}
 	},
 
@@ -206,9 +204,6 @@ export default {
 	beforeMount() {
 		EventBus.$on('route-change', this.abortSearch)
 		subscribe('user_status:status.updated', this.updateUserStatus)
-
-		// Initialises the get participants composable
-		this.initialiseGetParticipants()
 	},
 
 	beforeDestroy() {
diff --git a/src/composables/useGetParticipants.js b/src/composables/useGetParticipants.js
index 4670469f94b..689ebbbd2c4 100644
--- a/src/composables/useGetParticipants.js
+++ b/src/composables/useGetParticipants.js
@@ -21,7 +21,7 @@
  *
  */
 import debounce from 'debounce'
-import { ref, nextTick, computed, watch, onBeforeUnmount } from 'vue'
+import { ref, nextTick, computed, watch, onBeforeUnmount, onMounted } from 'vue'
 
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
@@ -32,8 +32,9 @@ import { EventBus } from '../services/EventBus.js'
 
 /**
  * @param {import('vue').Ref} isActive whether the participants tab is active
+ * @param {boolean} isTopBar whether the component is the top bar
  */
-export function useGetParticipants(isActive = ref(true)) {
+export function useGetParticipants(isActive = ref(true), isTopBar = true) {
 
 	// Encapsulation
 	const store = useStore()
@@ -48,7 +49,7 @@ export function useGetParticipants(isActive = ref(true)) {
 	const participantsInitialised = ref(false)
 
 	/**
-	 * Initialise the get participants functionality
+	 * Initialise the get participants listeners
 	 *
 	 */
 	function initialiseGetParticipants() {
@@ -63,7 +64,7 @@ export function useGetParticipants(isActive = ref(true)) {
 	}
 
 	/**
-	 * Stop the get participants functionality
+	 * Stop the get participants listeners
 	 *
 	 */
 	function stopGetParticipants() {
@@ -123,14 +124,11 @@ export function useGetParticipants(isActive = ref(true)) {
 	const debounceSlowUpdateParticipants = debounce(
 		cancelableGetParticipants, 15000)
 
-	// Group conversations have composable in RightSidebar, so should work only for one-to-one
-	watch(isOneToOneConversation, (newValue) => {
-		if (newValue) {
+	onMounted(() => {
+		if (isTopBar) {
 			initialiseGetParticipants()
-		} else {
-			stopGetParticipants()
 		}
-	}, { immediate: true })
+	})
 
 	watch(isActive, (newValue) => {
 		if (newValue && pendingChanges) {
@@ -138,15 +136,14 @@ export function useGetParticipants(isActive = ref(true)) {
 		}
 	})
 
-	onBeforeUnmount(
-		() => {
+	onBeforeUnmount(() => {
+		if (isTopBar) {
 			stopGetParticipants()
 		}
-	)
+	})
 
 	return {
 		participantsInitialised,
-		initialiseGetParticipants,
 		cancelableGetParticipants,
 	}
 }

From 2f497e44f6e7b2745c71321efd95dccdc1df8f6f Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Mon, 8 Jan 2024 15:09:18 +0100
Subject: [PATCH 4/4] Fix(ParticipantsStore): Add a getter to the store

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../Participants/ParticipantsTab.vue          | 10 ++++----
 src/composables/useGetParticipants.js         | 15 +-----------
 src/store/participantsStore.js                | 23 +++++++++++++++++++
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue
index d5b65a60ffb..ad7a3338d73 100644
--- a/src/components/RightSidebar/Participants/ParticipantsTab.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue
@@ -128,15 +128,11 @@ export default {
 		const { isActive } = toRefs(props)
 		const { sortParticipants } = useSortParticipants()
 		const isInCall = useIsInCall()
-		const {
-			participantsInitialised,
-			cancelableGetParticipants,
-		} = useGetParticipants(isActive, false)
+		const { cancelableGetParticipants } = useGetParticipants(isActive, false)
 
 		return {
 			sortParticipants,
 			isInCall,
-			participantsInitialised,
 			cancelableGetParticipants,
 		}
 	},
@@ -154,6 +150,10 @@ export default {
 	},
 
 	computed: {
+		participantsInitialised() {
+			return this.$store.getters.participantsInitialised(this.token)
+		},
+
 		participants() {
 			return this.$store.getters.participantsList(this.token).slice().sort(this.sortParticipants)
 		},
diff --git a/src/composables/useGetParticipants.js b/src/composables/useGetParticipants.js
index 689ebbbd2c4..4bc3f64983a 100644
--- a/src/composables/useGetParticipants.js
+++ b/src/composables/useGetParticipants.js
@@ -45,15 +45,11 @@ export function useGetParticipants(isActive = ref(true), isTopBar = true) {
 	let fetchingParticipants = false
 	let pendingChanges = true
 
-	// Exposed
-	const participantsInitialised = ref(false)
-
 	/**
 	 * Initialise the get participants listeners
 	 *
 	 */
 	function initialiseGetParticipants() {
-		EventBus.$on('route-change', onRouteChange)
 		EventBus.$on('joined-conversation', onJoinedConversation)
 
 		// FIXME this works only temporary until signaling is fixed to be only on the calls
@@ -68,16 +64,11 @@ export function useGetParticipants(isActive = ref(true), isTopBar = true) {
 	 *
 	 */
 	function stopGetParticipants() {
-		EventBus.$off('route-change', onRouteChange)
 		EventBus.$off('joined-conversation', onJoinedConversation)
 		EventBus.$off('signaling-participant-list-changed', debounceUpdateParticipants)
 		unsubscribe('guest-promoted', onJoinedConversation)
 	}
 
-	const onRouteChange = () => {
-		participantsInitialised.value = store.getters.participantsList(token.value).length > 1
-	}
-
 	const onJoinedConversation = () => {
 		if (isOneToOneConversation.value) {
 			cancelableGetParticipants()
@@ -112,10 +103,7 @@ export function useGetParticipants(isActive = ref(true), isTopBar = true) {
 		debounceFastUpdateParticipants.clear()
 		debounceSlowUpdateParticipants.clear()
 
-		const response = await store.dispatch('fetchParticipants', { token: token.value })
-		if (response) {
-			participantsInitialised.value = true
-		}
+		await store.dispatch('fetchParticipants', { token: token.value })
 		fetchingParticipants = false
 	}
 
@@ -143,7 +131,6 @@ export function useGetParticipants(isActive = ref(true), isTopBar = true) {
 	})
 
 	return {
-		participantsInitialised,
 		cancelableGetParticipants,
 	}
 }
diff --git a/src/store/participantsStore.js b/src/store/participantsStore.js
index b8e22728ac8..178424777cd 100644
--- a/src/store/participantsStore.js
+++ b/src/store/participantsStore.js
@@ -85,6 +85,8 @@ const state = {
 	},
 	speaking: {
 	},
+	initialised: {
+	},
 	/**
 	 * Stores the cancel function returned by `cancelableFetchParticipants`,
 	 * which allows to cancel the previous request for participants
@@ -204,6 +206,19 @@ const getters = {
 		return null
 	},
 
+	/**
+	 * Gets the initialisation status of the participants for a conversation.
+	 * This is used to determine if the participants have been fetched for a
+	 * conversation or not.
+	 *
+	 * @param {object} state - the state object.
+	 * param {string} token - the conversation token.
+	 * @return {boolean} - The initialisation status of the participants.
+	 */
+	participantsInitialised: (state) => (token) => {
+		return state.initialised[token]
+	},
+
 	/**
 	 * Replaces the legacy getParticipant getter. Returns a callback function in which you can
 	 * pass in the token and attendeeId as arguments to get the participant object.
@@ -316,6 +331,10 @@ const mutations = {
 		}
 	},
 
+	setParticipantsInitialised(state, { token, initialised }) {
+		Vue.set(state.initialised, token, initialised)
+	},
+
 	setInCall(state, { token, sessionId, flags }) {
 		if (flags === PARTICIPANT.CALL_FLAG.DISCONNECTED) {
 			if (state.inCall[token] && state.inCall[token][sessionId]) {
@@ -507,6 +526,7 @@ const actions = {
 		const attendee = getters.findParticipant(token, participant)
 		if (!attendee) {
 			commit('addParticipant', { token, participant })
+			commit('setParticipantsInitialised', { token, initialised: false })
 		}
 	},
 
@@ -647,6 +667,9 @@ const actions = {
 				}
 			})
 
+			if (context.state.initialised[token] === false) {
+				context.commit('setParticipantsInitialised', { token, initialised: true })
+			}
 			// Discard current cancel function
 			context.commit('setCancelFetchParticipants', null)