(fix) handle multiple usertags

Author: antoine92190

src/components/FormatMessage/FormatMessage.vue

@@ -135,10 +135,24 @@ export default {
 			}
 		},
 		formatTags(content) {
-			this.users.forEach(user => {
-				const index = content.indexOf(user._id)
-				const isTag = content.substring(index - 9, index) === '<usertag>'
-				if (isTag) content = content.replace(user._id, `@${user.username}`)
+			const firstTag = '<usertag>'
+			const secondTag = '</usertag>'
+
+			const usertags = [...content.matchAll(new RegExp(firstTag, 'gi'))].map(
+				a => a.index
+			)
+
+			const initialContent = content
+
+			usertags.forEach(index => {
+				const userId = initialContent.substring(
+					index + firstTag.length,
+					initialContent.indexOf(secondTag, index)
+				)
+
+				const user = this.users.find(user => user._id === userId)
+
+				content = content.replaceAll(userId, `@${user?.username || 'unknown'}`)
 			})
 
 			return content

src/lib/Room/Room.vue

@@ -993,31 +993,30 @@ export default {
 			this.editedMessage = { ...message }
 
 			let messageContent = message.content
+			const initialContent = messageContent
 
-			const res = [
-				...messageContent.matchAll(new RegExp('<usertag>', 'gi'))
-			].map(a => a.index)
+			const firstTag = '<usertag>'
+			const secondTag = '</usertag>'
 
-			if (res.length) {
-				const firstTag = '<usertag>'
-				const secondTag = '</usertag>'
+			const usertags = [
+				...messageContent.matchAll(new RegExp(firstTag, 'gi'))
+			].map(a => a.index)
 
-				res.forEach(r => {
-					const userId = messageContent.substring(
-						messageContent.indexOf(firstTag) + firstTag.length,
-						messageContent.indexOf(secondTag)
-					)
+			usertags.forEach(index => {
+				const userId = initialContent.substring(
+					index + firstTag.length,
+					initialContent.indexOf(secondTag, index)
+				)
 
-					const user = this.room.users.find(user => user._id === userId)
+				const user = this.room.users.find(user => user._id === userId)
 
-					messageContent = messageContent.replace(
-						`${firstTag}${userId}${secondTag}`,
-						`@${user.username || 'unknown'}`
-					)
+				messageContent = messageContent.replace(
+					`${firstTag}${userId}${secondTag}`,
+					`@${user?.username || 'unknown'}`
+				)
 
-					this.selectUserTag(user, true)
-				})
-			}
+				this.selectUserTag(user, true)
+			})
 
 			this.message = messageContent