From 15489ec5ec0f2232b5e0496abecc006f783d0c63 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Wed, 27 Sep 2023 15:26:01 +0200
Subject: [PATCH 1/9] Add note to self creation service

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 docs/constants.md                    | 1 +
 src/constants.js                     | 1 +
 src/services/conversationsService.js | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/docs/constants.md b/docs/constants.md
index f5c4b21057c..92f2f499166 100644
--- a/docs/constants.md
+++ b/docs/constants.md
@@ -8,6 +8,7 @@
 * `3` Public
 * `4` Changelog
 * `5` Former "One to one" (When a user is deleted from the server or removed from all their conversations, `1` "One to one" rooms are converted to this type)
+* `6` Note to self 
 
 ### Object types
 
diff --git a/src/constants.js b/src/constants.js
index b453316e6a7..150421afc40 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -72,6 +72,7 @@ export const CONVERSATION = {
 		PUBLIC: 3,
 		CHANGELOG: 4,
 		ONE_TO_ONE_FORMER: 5,
+		NOTE_TO_SELF: 6,
 	},
 
 	BREAKOUT_ROOM_MODE: {
diff --git a/src/services/conversationsService.js b/src/services/conversationsService.js
index 2f84b4e9242..28d5a718931 100644
--- a/src/services/conversationsService.js
+++ b/src/services/conversationsService.js
@@ -61,6 +61,14 @@ const searchListedConversations = async function({ searchText }, options) {
 	}))
 }
 
+/**
+ * Generate note-to-self conversation
+ *
+ */
+const fetchNoteToSelfConversation = async function() {
+	return axios.get(generateOcsUrl('apps/spreed/api/v4/room/note-to-self'))
+}
+
 /**
  * Fetch possible conversations
  *
@@ -438,6 +446,7 @@ const deleteConversationAvatar = async function(token) {
 export {
 	fetchConversations,
 	fetchConversation,
+	fetchNoteToSelfConversation,
 	searchListedConversations,
 	searchPossibleConversations,
 	createOneToOneConversation,

From f3cd81578ef3c1409701bed95e1138b0b2c6204d Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Wed, 27 Sep 2023 15:28:45 +0200
Subject: [PATCH 2/9] Adjust the UI options based on capabilities

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../ConversationSettingsDialog.vue              | 17 +++++++++++------
 .../ConversationsList/Conversation.vue          |  2 +-
 src/components/TopBar/CallButton.vue            |  1 +
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue
index 8a174ef30cd..2086b80219b 100644
--- a/src/components/ConversationSettings/ConversationSettingsDialog.vue
+++ b/src/components/ConversationSettings/ConversationSettingsDialog.vue
@@ -36,7 +36,8 @@
 
 		<template v-if="!isBreakoutRoom">
 			<!-- Notifications settings and devices preview screen -->
-			<NcAppSettingsSection id="notifications"
+			<NcAppSettingsSection v-if="!isNoteToSelf"
+				id="notifications"
 				:title="t('spreed', 'Personal')">
 				<NcCheckboxRadioSwitch :checked.sync="showMediaSettings"
 					type="switch">
@@ -49,8 +50,8 @@
 			<NcAppSettingsSection v-if="canFullModerate"
 				id="conversation-settings"
 				:title="t('spreed', 'Moderation')">
-				<ListableSettings :token="token" />
-				<LinkShareSettings ref="linkShareSettings" />
+				<ListableSettings v-if="!isNoteToSelf" :token="token" />
+				<LinkShareSettings v-if="!isNoteToSelf" ref="linkShareSettings" />
 				<ExpirationSettings :token="token" can-full-moderate />
 			</NcAppSettingsSection>
 			<NcAppSettingsSection v-else
@@ -60,7 +61,7 @@
 			</NcAppSettingsSection>
 
 			<!-- Meeting: lobby and sip -->
-			<NcAppSettingsSection v-if="canFullModerate"
+			<NcAppSettingsSection v-if="canFullModerate && !isNoteToSelf"
 				id="meeting"
 				:title="t('spreed', 'Meeting')">
 				<LobbySettings :token="token" />
@@ -68,7 +69,7 @@
 			</NcAppSettingsSection>
 
 			<!-- Conversation permissions -->
-			<NcAppSettingsSection v-if="canFullModerate"
+			<NcAppSettingsSection v-if="canFullModerate && !isNoteToSelf"
 				id="permissions"
 				:title="t('spreed', 'Permissions')">
 				<ConversationPermissionsSettings :token="token" />
@@ -99,7 +100,7 @@
 			<NcAppSettingsSection v-if="canLeaveConversation || canDeleteConversation"
 				id="dangerzone"
 				:title="t('spreed', 'Danger zone')">
-				<LockingSettings :token="token" />
+				<LockingSettings v-if="canFullModerate && !isNoteToSelf" :token="token" />
 				<DangerZone :conversation="conversation"
 					:can-leave-conversation="canLeaveConversation"
 					:can-delete-conversation="canDeleteConversation" />
@@ -173,6 +174,10 @@ export default {
 			return this.conversation.canEnableSIP
 		},
 
+		isNoteToSelf() {
+			return this.conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF
+		},
+
 		token() {
 			return this.$store.getters.getConversationSettingsToken()
 				|| this.$store.getters.getToken()
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index 89cc2ee294c..05f94899a59 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -80,7 +80,7 @@
 				</template>
 				{{ t('spreed', 'Conversation settings') }}
 			</NcActionButton>
-			<NcActionButton v-if="canLeaveConversation"
+			<NcActionButton v-if="canLeaveConversation && !isNoteToSelf"
 				:close-after-click="true"
 				@click="leaveConversation">
 				<template #icon>
diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue
index 22b3efb2fd4..de642fde3d3 100644
--- a/src/components/TopBar/CallButton.vue
+++ b/src/components/TopBar/CallButton.vue
@@ -254,6 +254,7 @@ export default {
 
 		showStartCallButton() {
 			return this.callEnabled
+				&& this.conversation.type !== CONVERSATION.TYPE.NOTE_TO_SELF
 				&& this.conversation.readOnly === CONVERSATION.STATE.READ_WRITE
 				&& !this.isInCall
 		},

From e3399d4a1ed77d85fb84c294709feebdbe7edde3 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Wed, 27 Sep 2023 15:29:42 +0200
Subject: [PATCH 3/9] Add the restore note self conversation button

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 src/components/LeftSidebar/LeftSidebar.vue | 32 ++++++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index 0e7f40eb3d0..46ea0709984 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -90,6 +90,15 @@
 						{{ t('spreed','Create a new conversation') }}
 					</NcActionButton>
 
+					<NcActionButton v-if="!hasNoteToSelf"
+						close-after-click
+						@click="restoreNoteToSelfConversation">
+						<template #icon>
+							<Note :size="20" />
+						</template>
+						{{ t('spreed','New Personal Note') }}
+					</NcActionButton>
+
 					<NcActionButton close-after-click
 						@click="showModalListConversations">
 						<template #icon>
@@ -239,6 +248,7 @@ import FilterIcon from 'vue-material-design-icons/Filter.vue'
 import FilterRemoveIcon from 'vue-material-design-icons/FilterRemove.vue'
 import List from 'vue-material-design-icons/FormatListBulleted.vue'
 import MessageBadge from 'vue-material-design-icons/MessageBadge.vue'
+import Note from 'vue-material-design-icons/NoteEditOutline.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 
 import { showError } from '@nextcloud/dialogs'
@@ -267,6 +277,7 @@ import { CONVERSATION } from '../../constants.js'
 import BrowserStorage from '../../services/BrowserStorage.js'
 import {
 	createPrivateConversation,
+	fetchNoteToSelfConversation,
 	searchPossibleConversations,
 	searchListedConversations,
 } from '../../services/conversationsService.js'
@@ -303,6 +314,7 @@ export default {
 		ChatPlus,
 		List,
 		DotsVertical,
+		Note,
 	},
 
 	mixins: [
@@ -396,6 +408,10 @@ export default {
 			return this.searchText !== ''
 		},
 
+		hasNoteToSelf() {
+			return this.conversationsList.filter(conversation => conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF).length
+		},
+
 		sourcesWithoutResults() {
 			return !this.searchResultsUsers.length
 				|| !this.searchResultsGroups.length
@@ -616,9 +632,7 @@ export default {
 			}
 		},
 
-		async createConversation(name) {
-			const response = await createPrivateConversation(name)
-			const conversation = response.data.ocs.data
+		addAndOpenConversation(conversation) {
 			this.$store.dispatch('addConversation', conversation)
 			this.abortSearch()
 			this.$router.push({
@@ -627,6 +641,18 @@ export default {
 			}).catch(err => console.debug(`Error while pushing the new conversation's route: ${err}`))
 		},
 
+		async createConversation(name) {
+			const response = await createPrivateConversation(name)
+			const conversation = response.data.ocs.data
+			this.addAndOpenConversation(conversation)
+		},
+
+		async restoreNoteToSelfConversation() {
+			const response = await fetchNoteToSelfConversation()
+			const conversation = response.data.ocs.data
+			this.addAndOpenConversation(conversation)
+		},
+
 		hasOneToOneConversationWith(userId) {
 			return !!this.conversationsList.find(conversation => conversation.type === CONVERSATION.TYPE.ONE_TO_ONE && conversation.name === userId)
 		},

From 82c9a7d1790e1ccbb7cd60b34fe900953de17cf5 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Wed, 27 Sep 2023 16:47:10 +0200
Subject: [PATCH 4/9] Add the option to forward a message to Note-To-Self
 conversation.

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../MessageButtonsBar/MessageButtonsBar.vue   | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 61c5c10c770..b517c1b16eb 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -111,6 +111,14 @@
 						</template>
 						{{ t('spreed', 'Go to file') }}
 					</NcActionLink>
+					<NcActionButton v-if="canForwardMessage && !isInNoteToSelf"
+						close-after-click
+						@click="forwardToNote">
+						<template #icon>
+							<Note :size="16" />
+						</template>
+						{{ t('spreed', 'Add to Note') }}
+					</NcActionButton>
 					<NcActionButton v-if="canForwardMessage"
 						close-after-click
 						@click.stop="openForwarder">
@@ -242,6 +250,7 @@
 <script>
 import { frequently, EmojiIndex as EmojiIndexFactory } from 'emoji-mart-vue-fast'
 import data from 'emoji-mart-vue-fast/data/all.json'
+import cloneDeep from 'lodash/cloneDeep.js'
 
 import AccountIcon from 'vue-material-design-icons/Account.vue'
 import AlarmIcon from 'vue-material-design-icons/Alarm.vue'
@@ -256,6 +265,7 @@ import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 import EmoticonOutline from 'vue-material-design-icons/EmoticonOutline.vue'
 import EyeOffOutline from 'vue-material-design-icons/EyeOffOutline.vue'
 import File from 'vue-material-design-icons/File.vue'
+import Note from 'vue-material-design-icons/NoteEditOutline.vue'
 import OpenInNewIcon from 'vue-material-design-icons/OpenInNew.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import Reply from 'vue-material-design-icons/Reply.vue'
@@ -311,6 +321,7 @@ export default {
 		EmoticonOutline,
 		EyeOffOutline,
 		File,
+		Note,
 		OpenInNewIcon,
 		Plus,
 		Reply,
@@ -536,6 +547,10 @@ export default {
 				&& this.messageParameters?.object?.type === 'talk-poll'
 		},
 
+		isInNoteToSelf() {
+			return this.conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF
+		},
+
 		canForwardMessage() {
 			return !this.isCurrentGuest
 				&& !this.isFileShare
@@ -702,6 +717,54 @@ export default {
 			this.$emit('update:isReactionsMenuOpen', true)
 		},
 
+		async forwardToNote() {
+			const NoteToSelf = this.$store.getters.conversationsList.filter(conversation => conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF)[0]
+			const messageToBeForwarded = cloneDeep(this.messageObject)
+			// Overwrite the Note-To-Self conversation token
+			messageToBeForwarded.token = NoteToSelf.token
+
+			if (messageToBeForwarded.parent) {
+				delete messageToBeForwarded.parent
+			}
+
+			if (messageToBeForwarded.message === '{object}' && messageToBeForwarded.messageParameters.object) {
+				const richObject = messageToBeForwarded.messageParameters.object
+				try {
+					await this.$store.dispatch('forwardRichObject', {
+						token: this.token,
+						richObject: {
+							objectId: richObject.id,
+							objectType: richObject.type,
+							metaData: JSON.stringify(richObject),
+							referenceId: '',
+						},
+					})
+					showSuccess(t('spreed', 'Message added to Note to self'))
+				} catch (error) {
+					console.error('Error while adding message to Note', error)
+					showError(t('spreed', 'Error while adding message to Note'))
+				}
+				return
+			}
+
+			// If there are mentions in the message to be forwarded, replace them in the message
+			// text.
+			if (this.mentions) {
+				for (const mention in this.mentions) {
+					messageToBeForwarded.message = messageToBeForwarded.message.replace(`{${mention}}`, '@' + this.mentions[mention].name)
+				}
+			}
+
+			try {
+				await this.$store.dispatch('forwardMessage', { messageToBeForwarded })
+				showSuccess(t('spreed', 'Message added to Note to self'))
+			} catch (error) {
+				console.error('Error while adding message to Note', error)
+				showError(t('spreed', 'Error while adding message to Note'))
+			}
+
+		},
+
 		openForwarder() {
 			this.$emit('update:isForwarderOpen', true)
 		},

From f08b8e392f8c4eccb7ca928df3e31a306ac9af2f Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Thu, 28 Sep 2023 22:29:45 +0200
Subject: [PATCH 5/9] Hide the participant tab and new wording for toast
 messages. + Post review fixes

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../ConversationsList/Conversation.vue        |  2 +-
 .../MessageButtonsBar/MessageButtonsBar.vue   | 22 ++++++++++++-------
 src/components/RightSidebar/RightSidebar.vue  | 19 +++++++++++++++-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index 05f94899a59..89cc2ee294c 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -80,7 +80,7 @@
 				</template>
 				{{ t('spreed', 'Conversation settings') }}
 			</NcActionButton>
-			<NcActionButton v-if="canLeaveConversation && !isNoteToSelf"
+			<NcActionButton v-if="canLeaveConversation"
 				:close-after-click="true"
 				@click="leaveConversation">
 				<template #icon>
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index b517c1b16eb..d771bb388d3 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -117,7 +117,7 @@
 						<template #icon>
 							<Note :size="16" />
 						</template>
-						{{ t('spreed', 'Add to Note') }}
+						{{ t('spreed', 'Note to self') }}
 					</NcActionButton>
 					<NcActionButton v-if="canForwardMessage"
 						close-after-click
@@ -287,6 +287,7 @@ import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 import Forwarder from './Forwarder.vue'
 
 import { PARTICIPANT, CONVERSATION, ATTENDEE } from '../../../../../constants.js'
+import { fetchNoteToSelfConversation } from '../../../../../services/conversationsService.js'
 import { getMessageReminder, removeMessageReminder, setMessageReminder } from '../../../../../services/remindersService.js'
 import { copyConversationLinkToClipboard } from '../../../../../services/urlService.js'
 
@@ -718,7 +719,12 @@ export default {
 		},
 
 		async forwardToNote() {
-			const NoteToSelf = this.$store.getters.conversationsList.filter(conversation => conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF)[0]
+			let NoteToSelf = this.$store.getters.conversationsList.filter(conversation => conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF)?.[0]
+			if (!NoteToSelf) {
+				const response = await fetchNoteToSelfConversation()
+				NoteToSelf = response.data.ocs.data
+				this.$store.dispatch('addConversation', NoteToSelf)
+			}
 			const messageToBeForwarded = cloneDeep(this.messageObject)
 			// Overwrite the Note-To-Self conversation token
 			messageToBeForwarded.token = NoteToSelf.token
@@ -739,10 +745,10 @@ export default {
 							referenceId: '',
 						},
 					})
-					showSuccess(t('spreed', 'Message added to Note to self'))
+					showSuccess(t('spreed', 'Message forwarded to "Note to self"'))
 				} catch (error) {
-					console.error('Error while adding message to Note', error)
-					showError(t('spreed', 'Error while adding message to Note'))
+					console.error('Error while forwarding message to "Note to self"', error)
+					showError(t('spreed', 'Error while forwarding message to "Note to self"'))
 				}
 				return
 			}
@@ -757,10 +763,10 @@ export default {
 
 			try {
 				await this.$store.dispatch('forwardMessage', { messageToBeForwarded })
-				showSuccess(t('spreed', 'Message added to Note to self'))
+				showSuccess(t('spreed', 'Message forwarded to "Note to self"'))
 			} catch (error) {
-				console.error('Error while adding message to Note', error)
-				showError(t('spreed', 'Error while adding message to Note'))
+				console.error('Error while forwarding message to "Note to self"', error)
+				showError(t('spreed', 'Error while forwarding message to "Note to self"'))
 			}
 
 		},
diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 93e876896b2..ddb2291d765 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -41,7 +41,7 @@
 			</template>
 			<ChatView :is-visible="opened" />
 		</NcAppSidebarTab>
-		<NcAppSidebarTab v-if="(getUserId || isModeratorOrUser) && !isOneToOne"
+		<NcAppSidebarTab v-if="showParticipantsTab"
 			id="participants"
 			ref="participantsTab"
 			:order="2"
@@ -266,6 +266,14 @@ export default {
 				&& (this.breakoutRoomsConfigured || this.conversation.breakoutRoomMode === CONVERSATION.BREAKOUT_ROOM_MODE.FREE || this.conversation.objectType === 'room')
 		},
 
+		showParticipantsTab() {
+			return (this.getUserId || this.isModeratorOrUser) && !this.isOneToOne && !this.isNoteToSelf
+		},
+
+		isNoteToSelf() {
+			return this.conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF
+		},
+
 		breakoutRoomsText() {
 			return t('spreed', 'Breakout rooms')
 		},
@@ -294,6 +302,15 @@ export default {
 			}
 		},
 
+		isNoteToSelf: {
+			immediate: true,
+			handler(value) {
+				if (value) {
+					this.activeTab = 'shared-items'
+				}
+			},
+		},
+
 		isOneToOne: {
 			immediate: true,
 			handler(value) {

From 63dfe53782f58df80d3f85e8496dec7b94c743ea Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Fri, 29 Sep 2023 12:12:33 +0200
Subject: [PATCH 6/9] Move forwardMessage to the store

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 .../Message/MessageButtonsBar/Forwarder.vue   | 59 ++---------------
 .../MessageButtonsBar/MessageButtonsBar.vue   | 47 +-------------
 src/store/messagesStore.js                    | 65 ++++++++++++++-----
 3 files changed, 55 insertions(+), 116 deletions(-)

diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
index e9f1e807f03..e44e05051d0 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
@@ -68,7 +68,6 @@
 </template>
 
 <script>
-import cloneDeep from 'lodash/cloneDeep.js'
 
 import Check from 'vue-material-design-icons/Check.vue'
 
@@ -128,70 +127,22 @@ export default {
 			return this.$store.getters?.conversation(this.selectedConversationToken).displayName
 		},
 
-		/**
-		 * Object containing all the mentions in the message that will be forwarded
-		 *
-		 * @return {object} mentions.
-		 */
-		mentions() {
-			const mentions = {}
-			for (const key in this.messageObject.messageParameters) {
-				if (key.startsWith('mention')) {
-					mentions[key] = this.messageObject.messageParameters[key]
-				}
-			}
-			return mentions
-		},
 	},
 
 	methods: {
 		async setSelectedConversationToken(token) {
 			this.selectedConversationToken = token
-			const messageToBeForwarded = cloneDeep(this.messageObject)
-			// Overwrite the selected conversation token
-			messageToBeForwarded.token = token
-
-			if (messageToBeForwarded.parent) {
-				delete messageToBeForwarded.parent
-			}
-
-			if (messageToBeForwarded.message === '{object}' && messageToBeForwarded.messageParameters.object) {
-				const richObject = messageToBeForwarded.messageParameters.object
-				try {
-					const response = await this.$store.dispatch('forwardRichObject', {
-						token,
-						richObject: {
-							objectId: richObject.id,
-							objectType: richObject.type,
-							metaData: JSON.stringify(richObject),
-							referenceId: '',
-						},
-					})
-					this.showForwardedConfirmation = true
-					this.forwardedMessageID = response.data.ocs.data.id
-				} catch (error) {
-					console.error('Error while forwarding message', error)
-					showError(t('spreed', 'Error while forwarding message'))
-				}
-				return
-			}
-
-			// If there are mentions in the message to be forwarded, replace them in the message
-			// text.
-			if (this.mentions !== {}) {
-				for (const mention in this.mentions) {
-					messageToBeForwarded.message = messageToBeForwarded.message.replace(`{${mention}}`, '@' + this.mentions[mention].name)
-				}
-			}
 			try {
-				const response = await this.$store.dispatch('forwardMessage', { messageToBeForwarded })
-				this.showForwardedConfirmation = true
+				const response = await this.$store.dispatch('forwardMessage', {
+					targetToken: this.selectedConversationToken,
+					messageToBeForwarded: this.messageObject,
+				 })
 				this.forwardedMessageID = response.data.ocs.data.id
+				this.showForwardedConfirmation = true
 			} catch (error) {
 				console.error('Error while forwarding message', error)
 				showError(t('spreed', 'Error while forwarding message'))
 			}
-
 		},
 
 		openConversation() {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index d771bb388d3..d3af548ec3c 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -250,7 +250,6 @@
 <script>
 import { frequently, EmojiIndex as EmojiIndexFactory } from 'emoji-mart-vue-fast'
 import data from 'emoji-mart-vue-fast/data/all.json'
-import cloneDeep from 'lodash/cloneDeep.js'
 
 import AccountIcon from 'vue-material-design-icons/Account.vue'
 import AlarmIcon from 'vue-material-design-icons/Alarm.vue'
@@ -287,7 +286,6 @@ import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 import Forwarder from './Forwarder.vue'
 
 import { PARTICIPANT, CONVERSATION, ATTENDEE } from '../../../../../constants.js'
-import { fetchNoteToSelfConversation } from '../../../../../services/conversationsService.js'
 import { getMessageReminder, removeMessageReminder, setMessageReminder } from '../../../../../services/remindersService.js'
 import { copyConversationLinkToClipboard } from '../../../../../services/urlService.js'
 
@@ -719,56 +717,13 @@ export default {
 		},
 
 		async forwardToNote() {
-			let NoteToSelf = this.$store.getters.conversationsList.filter(conversation => conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF)?.[0]
-			if (!NoteToSelf) {
-				const response = await fetchNoteToSelfConversation()
-				NoteToSelf = response.data.ocs.data
-				this.$store.dispatch('addConversation', NoteToSelf)
-			}
-			const messageToBeForwarded = cloneDeep(this.messageObject)
-			// Overwrite the Note-To-Self conversation token
-			messageToBeForwarded.token = NoteToSelf.token
-
-			if (messageToBeForwarded.parent) {
-				delete messageToBeForwarded.parent
-			}
-
-			if (messageToBeForwarded.message === '{object}' && messageToBeForwarded.messageParameters.object) {
-				const richObject = messageToBeForwarded.messageParameters.object
-				try {
-					await this.$store.dispatch('forwardRichObject', {
-						token: this.token,
-						richObject: {
-							objectId: richObject.id,
-							objectType: richObject.type,
-							metaData: JSON.stringify(richObject),
-							referenceId: '',
-						},
-					})
-					showSuccess(t('spreed', 'Message forwarded to "Note to self"'))
-				} catch (error) {
-					console.error('Error while forwarding message to "Note to self"', error)
-					showError(t('spreed', 'Error while forwarding message to "Note to self"'))
-				}
-				return
-			}
-
-			// If there are mentions in the message to be forwarded, replace them in the message
-			// text.
-			if (this.mentions) {
-				for (const mention in this.mentions) {
-					messageToBeForwarded.message = messageToBeForwarded.message.replace(`{${mention}}`, '@' + this.mentions[mention].name)
-				}
-			}
-
 			try {
-				await this.$store.dispatch('forwardMessage', { messageToBeForwarded })
+				await this.$store.dispatch('forwardMessage', { messageToBeForwarded: this.messageObject })
 				showSuccess(t('spreed', 'Message forwarded to "Note to self"'))
 			} catch (error) {
 				console.error('Error while forwarding message to "Note to self"', error)
 				showError(t('spreed', 'Error while forwarding message to "Note to self"'))
 			}
-
 		},
 
 		openForwarder() {
diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index 020300ad6eb..750b9ac8d99 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -21,6 +21,7 @@
  */
 import Hex from 'crypto-js/enc-hex.js'
 import SHA256 from 'crypto-js/sha256.js'
+import cloneDeep from 'lodash/cloneDeep.js'
 import Vue from 'vue'
 
 import { showError } from '@nextcloud/dialogs'
@@ -28,7 +29,9 @@ import { showError } from '@nextcloud/dialogs'
 import {
 	ATTENDEE,
 	CHAT,
+	CONVERSATION,
 } from '../constants.js'
+import { fetchNoteToSelfConversation } from '../services/conversationsService.js'
 import {
 	deleteMessage,
 	updateLastReadMessage,
@@ -1256,30 +1259,60 @@ const actions = {
 	},
 
 	/**
-	 * Posts a simple text message to a room
+	 * Forwards message to a conversation. By default , the message is forwarded to Note to self.
 	 *
 	 * @param {object} context default store context;
 	 * will be forwarded;
 	 * @param {object} data the wrapping object;
+	 * @param {object} data.targetToken the conversation token to where the message will be forwarded;
 	 * @param {object} data.messageToBeForwarded the message object;
 	 */
-	async forwardMessage(context, { messageToBeForwarded }) {
-		const response = await postNewMessage(messageToBeForwarded, { silent: false })
-		return response
-	},
+	async forwardMessage(context, { targetToken, messageToBeForwarded }) {
+		const message = cloneDeep(messageToBeForwarded)
+
+		// when there is no token provided, the message will be forwarded to the Note to self conversation
+		if (!targetToken) {
+			let noteToSelf = context.getters.conversationsList.find(conversation => conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF)
+			// If Note to self doesn't exist, it will be regenerated
+			if (!noteToSelf) {
+				const response = await fetchNoteToSelfConversation()
+				noteToSelf = response.data.ocs.data
+				context.dispatch('addConversation', noteToSelf)
+			}
+			targetToken = noteToSelf.token
+		}
+		// Overwrite with the target conversation token
+		message.token = targetToken
+		if (message.parent) {
+			delete message.parent
+		}
+
+		if (message.message === '{object}' && message.messageParameters.object) {
+			const richObject = message.messageParameters.object
+			const response = await postRichObjectToConversation(
+				targetToken,
+				{
+					objectId: richObject.id,
+					objectType: richObject.type,
+					metaData: JSON.stringify(richObject),
+					referenceId: '',
+				},
+			)
+			return response
+		}
 
-	/**
-	 * Posts a simple text message to a room
-	 *
-	 * @param {object} context default store context;
-	 * will be forwarded;
-	 * @param {object} data the wrapping object;
-	 * @param {string} data.token token of the target conversation
-	 * @param {object} data.richObject the rich object;
-	 */
-	async forwardRichObject(context, { token, richObject }) {
-		const response = await postRichObjectToConversation(token, richObject)
+		// If there are mentions in the message to be forwarded, replace them in the message
+		// text.
+		for (const key in message.messageParameters) {
+			if (key.startsWith('mention')) {
+				const mention = message.messageParameters[key]
+				message.message = message.message.replace(`{${key}}`, `@'${mention.name}'`)
+			}
+		}
+
+		const response = await postNewMessage(message, { silent: true })
 		return response
+
 	},
 
 	/**

From 2385122f0bd6957be350196b2c3da01944833e52 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Fri, 29 Sep 2023 12:16:05 +0200
Subject: [PATCH 7/9] Renaming and condition refactoring

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 src/components/LeftSidebar/LeftSidebar.vue   | 10 +++++-----
 src/components/RightSidebar/RightSidebar.vue | 15 +++------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index 46ea0709984..7ea2c31e6d2 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -96,7 +96,7 @@
 						<template #icon>
 							<Note :size="20" />
 						</template>
-						{{ t('spreed','New Personal Note') }}
+						{{ t('spreed','New personal note') }}
 					</NcActionButton>
 
 					<NcActionButton close-after-click
@@ -409,7 +409,7 @@ export default {
 		},
 
 		hasNoteToSelf() {
-			return this.conversationsList.filter(conversation => conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF).length
+			return this.conversationsList.find(conversation => conversation.type === CONVERSATION.TYPE.NOTE_TO_SELF)
 		},
 
 		sourcesWithoutResults() {
@@ -632,7 +632,7 @@ export default {
 			}
 		},
 
-		addAndOpenConversation(conversation) {
+		switchToConversation(conversation) {
 			this.$store.dispatch('addConversation', conversation)
 			this.abortSearch()
 			this.$router.push({
@@ -644,13 +644,13 @@ export default {
 		async createConversation(name) {
 			const response = await createPrivateConversation(name)
 			const conversation = response.data.ocs.data
-			this.addAndOpenConversation(conversation)
+			this.switchToConversation(conversation)
 		},
 
 		async restoreNoteToSelfConversation() {
 			const response = await fetchNoteToSelfConversation()
 			const conversation = response.data.ocs.data
-			this.addAndOpenConversation(conversation)
+			this.switchToConversation(conversation)
 		},
 
 		hasOneToOneConversationWith(userId) {
diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index ddb2291d765..97df245eb2d 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -285,7 +285,7 @@ export default {
 				this.conversationName = this.conversation.displayName
 			}
 
-			if (newConversation.token === oldConversation.token || this.isOneToOne) {
+			if (newConversation.token === oldConversation.token || !this.showParticipantsTab) {
 				return
 			}
 
@@ -302,19 +302,10 @@ export default {
 			}
 		},
 
-		isNoteToSelf: {
+		showParticipantsTab: {
 			immediate: true,
 			handler(value) {
-				if (value) {
-					this.activeTab = 'shared-items'
-				}
-			},
-		},
-
-		isOneToOne: {
-			immediate: true,
-			handler(value) {
-				if (value) {
+				if (!value) {
 					this.activeTab = 'shared-items'
 				}
 			},

From f2dc533139e3735f72567826f937683429deb68e Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Tue, 3 Oct 2023 12:48:20 +0200
Subject: [PATCH 8/9] Add tests to MessagesStore

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 src/store/messagesStore.spec.js | 187 ++++++++++++++++++++++++++++++++
 1 file changed, 187 insertions(+)

diff --git a/src/store/messagesStore.spec.js b/src/store/messagesStore.spec.js
index 1c0514dd21d..d4436cd18f2 100644
--- a/src/store/messagesStore.spec.js
+++ b/src/store/messagesStore.spec.js
@@ -10,6 +10,9 @@ import { showError } from '@nextcloud/dialogs'
 import {
 	ATTENDEE, CHAT,
 } from '../constants.js'
+import {
+	fetchNoteToSelfConversation,
+} from '../services/conversationsService.js'
 import {
 	deleteMessage,
 	updateLastReadMessage,
@@ -17,6 +20,7 @@ import {
 	getMessageContext,
 	lookForNewMessages,
 	postNewMessage,
+	postRichObjectToConversation,
 } from '../services/messagesService.js'
 import { useGuestNameStore } from '../stores/guestName.js'
 import { generateOCSErrorResponse, generateOCSResponse } from '../test-helpers.js'
@@ -31,6 +35,11 @@ jest.mock('../services/messagesService', () => ({
 	getMessageContext: jest.fn(),
 	lookForNewMessages: jest.fn(),
 	postNewMessage: jest.fn(),
+	postRichObjectToConversation: jest.fn(),
+}))
+
+jest.mock('../services/conversationsService', () => ({
+	fetchNoteToSelfConversation: jest.fn(),
 }))
 
 jest.mock('../utils/cancelableRequest')
@@ -1778,4 +1787,182 @@ describe('messagesStore', () => {
 			expect(store.getters.hasMoreMessagesToLoad(TOKEN)).toBe(false)
 		})
 	})
+
+	describe('Forward a message', () => {
+		let conversations
+		let message1
+		let messageToBeForwarded
+		let targetToken
+		let messageExpected
+
+		beforeEach(() => {
+			localVue = createLocalVue()
+			localVue.use(Vuex)
+
+			testStoreConfig = cloneDeep(storeConfig)
+			// eslint-disable-next-line import/no-named-as-default-member
+			store = new Vuex.Store(testStoreConfig)
+
+			message1 = {
+				id: 1,
+				token: TOKEN,
+				message: 'simple text message',
+				messageParameters: {},
+			}
+			conversations = [
+				{
+					token: TOKEN,
+					type: 3,
+					dispalyName: 'conversation 1',
+				},
+				{
+					token: 'token-self',
+					type: 6,
+					dispalyName: 'Note to self',
+				},
+				{
+					token: 'token-2',
+					type: 3,
+					dispalyName: 'conversation 2',
+				},
+			]
+		})
+
+		test('forwards a message to the conversation when a token is given', () => {
+			// Arrange
+			targetToken = 'token-2'
+			messageToBeForwarded = message1
+			messageExpected = cloneDeep(message1)
+			messageExpected.token = targetToken
+
+			// Act
+			store.dispatch('forwardMessage', { targetToken, messageToBeForwarded })
+
+			// Assert
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+		})
+		test('forwards a message to Note to self when no token is given ', () => {
+			// Arrange
+			targetToken = 'token-self'
+			messageToBeForwarded = message1
+			messageExpected = cloneDeep(message1)
+			messageExpected.token = targetToken
+
+			store.dispatch('addConversation', conversations[1])
+
+			// Act
+			store.dispatch('forwardMessage', { messageToBeForwarded })
+
+			// Assert
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+		})
+
+		test('generates Note to self when it does not exist ', async () => {
+			// Arrange
+			messageToBeForwarded = message1
+			messageExpected = cloneDeep(message1)
+			messageExpected.token = 'token-self'
+
+			const response = {
+				data: {
+					ocs: {
+						data: conversations[1],
+					},
+				},
+			}
+			fetchNoteToSelfConversation.mockResolvedValueOnce(response)
+
+			// Act
+			store.dispatch('forwardMessage', { messageToBeForwarded })
+			await flushPromises()
+
+			// Assert
+			expect(store.getters.conversationsList).toContain(conversations[1])
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+		})
+		test('removes parent message ', () => {
+			// Arrange : prepare the expected message to be forwarded
+			messageToBeForwarded = {
+				id: 1,
+				token: TOKEN,
+				parent: message1,
+				message: 'simple text message',
+				messageParameters: {},
+			}
+			messageExpected = cloneDeep(messageToBeForwarded)
+			targetToken = 'token-2'
+			messageExpected.token = targetToken
+			delete messageExpected.parent
+
+			// Act
+			store.dispatch('forwardMessage', { targetToken, messageToBeForwarded })
+
+			// Assert
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+		})
+		test('forwards an object message', () => {
+			// Arrange
+			messageToBeForwarded = {
+				id: 1,
+				token: TOKEN,
+				message: '{object}',
+				messageParameters: {
+					object: {
+						id: '100',
+						type: 'deck-card',
+					},
+				},
+			}
+			const objectToBeForwarded = messageToBeForwarded.messageParameters.object
+			targetToken = 'token-2'
+
+			// Act
+			store.dispatch('forwardMessage', { targetToken, messageToBeForwarded })
+
+			// Assert
+			expect(postRichObjectToConversation).toHaveBeenCalledWith(
+				targetToken,
+				{
+					objectId: objectToBeForwarded.id,
+					objectType: objectToBeForwarded.type,
+					metaData: JSON.stringify(objectToBeForwarded),
+					referenceId: '',
+				},
+			)
+
+		})
+		test('forwards a message with mentions and remove the latter', () => {
+			messageToBeForwarded = {
+				id: 1,
+				token: TOKEN,
+				message: 'Hello {mention-user1}, {mention-user2}',
+				messageParameters: {
+					'mention-user1': {
+						id: 'taylor',
+						name: 'Taylor',
+						type: 'user',
+					},
+					'mention-user2': {
+						id: 'adam',
+						name: 'Adam',
+						type: 'user',
+					},
+				},
+			}
+			targetToken = 'token-2'
+			const mentions = [
+				messageToBeForwarded.messageParameters['mention-user1'],
+				messageToBeForwarded.messageParameters['mention-user2'],
+			]
+			messageExpected = cloneDeep(messageToBeForwarded)
+			messageExpected.message = `Hello @'${mentions[0].name}', @'${mentions[1].name}'`
+			messageExpected.token = targetToken
+
+			// Act
+			store.dispatch('forwardMessage', { targetToken, messageToBeForwarded })
+
+			// Assert
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+		})
+	})
 })

From 7f84892054742f7cb2fbbc26f185edcfbd83a275 Mon Sep 17 00:00:00 2001
From: DorraJaouad <dorra.jaoued7@gmail.com>
Date: Wed, 4 Oct 2023 14:22:16 +0200
Subject: [PATCH 9/9] Post review fixes

Signed-off-by: DorraJaouad <dorra.jaoued7@gmail.com>
---
 src/store/messagesStore.js      |  6 +++---
 src/store/messagesStore.spec.js | 24 ++++++++++--------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js
index 750b9ac8d99..6dac72083d6 100644
--- a/src/store/messagesStore.js
+++ b/src/store/messagesStore.js
@@ -1264,7 +1264,7 @@ const actions = {
 	 * @param {object} context default store context;
 	 * will be forwarded;
 	 * @param {object} data the wrapping object;
-	 * @param {object} data.targetToken the conversation token to where the message will be forwarded;
+	 * @param {string} [data.targetToken] the conversation token to where the message will be forwarded;
 	 * @param {object} data.messageToBeForwarded the message object;
 	 */
 	async forwardMessage(context, { targetToken, messageToBeForwarded }) {
@@ -1306,11 +1306,11 @@ const actions = {
 		for (const key in message.messageParameters) {
 			if (key.startsWith('mention')) {
 				const mention = message.messageParameters[key]
-				message.message = message.message.replace(`{${key}}`, `@'${mention.name}'`)
+				message.message = message.message.replace(`{${key}}`, `@${mention.name}`)
 			}
 		}
 
-		const response = await postNewMessage(message, { silent: true })
+		const response = await postNewMessage(message, { silent: false })
 		return response
 
 	},
diff --git a/src/store/messagesStore.spec.js b/src/store/messagesStore.spec.js
index d4436cd18f2..44e00ba2b99 100644
--- a/src/store/messagesStore.spec.js
+++ b/src/store/messagesStore.spec.js
@@ -1800,7 +1800,6 @@ describe('messagesStore', () => {
 			localVue.use(Vuex)
 
 			testStoreConfig = cloneDeep(storeConfig)
-			// eslint-disable-next-line import/no-named-as-default-member
 			store = new Vuex.Store(testStoreConfig)
 
 			message1 = {
@@ -1813,17 +1812,17 @@ describe('messagesStore', () => {
 				{
 					token: TOKEN,
 					type: 3,
-					dispalyName: 'conversation 1',
+					displayName: 'conversation 1',
 				},
 				{
 					token: 'token-self',
 					type: 6,
-					dispalyName: 'Note to self',
+					displayName: 'Note to self',
 				},
 				{
 					token: 'token-2',
 					type: 3,
-					dispalyName: 'conversation 2',
+					displayName: 'conversation 2',
 				},
 			]
 		})
@@ -1839,7 +1838,7 @@ describe('messagesStore', () => {
 			store.dispatch('forwardMessage', { targetToken, messageToBeForwarded })
 
 			// Assert
-			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: false })
 		})
 		test('forwards a message to Note to self when no token is given ', () => {
 			// Arrange
@@ -1854,7 +1853,7 @@ describe('messagesStore', () => {
 			store.dispatch('forwardMessage', { messageToBeForwarded })
 
 			// Assert
-			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: false })
 		})
 
 		test('generates Note to self when it does not exist ', async () => {
@@ -1878,7 +1877,7 @@ describe('messagesStore', () => {
 
 			// Assert
 			expect(store.getters.conversationsList).toContain(conversations[1])
-			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: false })
 		})
 		test('removes parent message ', () => {
 			// Arrange : prepare the expected message to be forwarded
@@ -1898,7 +1897,7 @@ describe('messagesStore', () => {
 			store.dispatch('forwardMessage', { targetToken, messageToBeForwarded })
 
 			// Assert
-			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: false })
 		})
 		test('forwards an object message', () => {
 			// Arrange
@@ -1932,6 +1931,7 @@ describe('messagesStore', () => {
 
 		})
 		test('forwards a message with mentions and remove the latter', () => {
+			// Arrange
 			messageToBeForwarded = {
 				id: 1,
 				token: TOKEN,
@@ -1950,19 +1950,15 @@ describe('messagesStore', () => {
 				},
 			}
 			targetToken = 'token-2'
-			const mentions = [
-				messageToBeForwarded.messageParameters['mention-user1'],
-				messageToBeForwarded.messageParameters['mention-user2'],
-			]
 			messageExpected = cloneDeep(messageToBeForwarded)
-			messageExpected.message = `Hello @'${mentions[0].name}', @'${mentions[1].name}'`
+			messageExpected.message = 'Hello @Taylor, @Adam'
 			messageExpected.token = targetToken
 
 			// Act
 			store.dispatch('forwardMessage', { targetToken, messageToBeForwarded })
 
 			// Assert
-			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: true })
+			expect(postNewMessage).toHaveBeenCalledWith(messageExpected, { silent: false })
 		})
 	})
 })