nodebb-plugin-mentions 4.3.4 → 4.3.6

package/languages/ar/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> ذكرَ اسمك في <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> ذكرَ اسمك في <strong>%2</strong>"
 }

package/languages/bg/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> Ви спомена в <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> Ви спомена в <strong>%2</strong>"
 }

package/languages/bn/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong>, <strong>%2</strong> এ আপনার নাম উল্লেখ করেছেন"
+    "user-mentioned-you-in": "<strong>%1</strong>, <strong>%2</strong> এ আপনার নাম উল্লেখ করেছেন"
 }

package/languages/da/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> nævnte dig i <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> nævnte dig i <strong>%2</strong>"
 }

package/languages/de/notifications.json

@@ -1,6 +1,6 @@
 {
     "mentions": "Erwähnungen",
-    "user_mentioned_you_in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
-    "user_mentioned_group_in": "<strong>%1</strong> erwähnte <strong>%2</strong> in <strong>%3</strong>",
+    "user-mentioned-you-in": "<strong>%1</strong> erwähnte dich in <strong>%2</strong>",
+    "user-mentioned-group-in": "<strong>%1</strong> erwähnte <strong>%2</strong> in <strong>%3</strong>",
     "notificationType_mention": "Wenn dich jemand erwähnt"
 }

package/languages/el/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "Ο/Η <strong>%1</strong> σε ανέφερε στο <strong>%2</strong>"
+    "user-mentioned-you-in": "Ο/Η <strong>%1</strong> σε ανέφερε στο <strong>%2</strong>"
 }

package/languages/en@pirate/notifications.json

@@ -1,4 +1,4 @@
 {
-	"user_mentioned_you_in": "<strong>%1</strong> spoke yer name in <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> called fer <strong>%2</strong> in <strong>%3</strong>"
+	"user-mentioned-you-in": "<strong>%1</strong> spoke yer name in <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> called fer <strong>%2</strong> in <strong>%3</strong>"
 }

package/languages/en_GB/mentions.json

@@ -1,3 +1,3 @@
 {
-	"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>"
+	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>"
 }

package/languages/en_GB/notifications.json

@@ -1,6 +1,7 @@
 {
 	"mentions": "Mentions",
-	"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>",
-	"notificationType_mention": "When someone mentions you"
+	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
+	"user_mentioned_you_in_room": "<strong>%1</strong> mentioned you in <strong class=\"text-nowrap\"><i class=\"fa %2\"></i>%3</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>",
+	"notificationType-mention": "When someone mentions you"
 }

package/languages/en_US/notifications.json

@@ -1,4 +1,4 @@
 {
-	"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>"
+	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>"
 }

package/languages/es/notifications.json

@@ -1,4 +1,4 @@
 {
     "mentions": "Menciones",
-    "user_mentioned_you_in": "<strong>%1</strong> te mencionó en <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> te mencionó en <strong>%2</strong>"
 }

package/languages/et/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> mainis sind postituses <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> mainis sind postituses <strong>%2</strong>"
 }

package/languages/fa_IR/notifications.json

@@ -1,4 +1,4 @@
 {
-	"user_mentioned_you_in": "<strong>%1</strong> شما رو در <strong>%2</strong> منشن کرده",
-	"user_mentioned_group_in": "<strong>%1</strong> گروه <strong>%2</strong> رو در <strong>%3</strong> منشن کرده"
+	"user-mentioned-you-in": "<strong>%1</strong> شما رو در <strong>%2</strong> منشن کرده",
+	"user-mentioned-group-in": "<strong>%1</strong> گروه <strong>%2</strong> رو در <strong>%3</strong> منشن کرده"
 }

package/languages/fi/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> mainitsi sinut viestissä <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> mainitsi sinut viestissä <strong>%2</strong>"
 }

package/languages/fr/notifications.json

@@ -1,6 +1,6 @@
 {
 	"mentions": "Mentions",
-	"user_mentioned_you_in": "<strong>%1</strong> vous a mentionné dans <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> a mentionné <strong>%2</strong> dans <strong>%3</strong>",
+	"user-mentioned-you-in": "<strong>%1</strong> vous a mentionné dans <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> a mentionné <strong>%2</strong> dans <strong>%3</strong>",
 	"notificationType_mention": "Lorsque quelqu'un vous mentionne"
 }

package/languages/gl/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> mencionóute en <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> mencionóute en <strong>%2</strong>"
 }

package/languages/he/notifications.json

@@ -1,6 +1,6 @@
 {
 	"mentions": "אזכורים",
-	"user_mentioned_you_in": "<strong>%1</strong> הזכיר אותך ב <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> הזכיר את <strong>%2</strong> ב <strong>%3</strong>",
+	"user-mentioned-you-in": "<strong>%1</strong> הזכיר אותך ב <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> הזכיר את <strong>%2</strong> ב <strong>%3</strong>",
 	"notificationType_mention": "כאשר מישהו מזכיר אותך"
 }

package/languages/hu/mentions.json

@@ -1,3 +1,3 @@
 {
-	"user_mentioned_you_in": "<strong>%1</strong> megemlített téged itt: <strong>%2</strong>"
+	"user-mentioned-you-in": "<strong>%1</strong> megemlített téged itt: <strong>%2</strong>"
 }

package/languages/hu/notifications.json

@@ -1,6 +1,6 @@
 {
 	"mentions": "Megemlítések",
-	"user_mentioned_you_in": "<strong>%1</strong> megemlített téged itt: <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> megemlítette <strong>%2</strong>-t itt: <strong>%3</strong>",
+	"user-mentioned-you-in": "<strong>%1</strong> megemlített téged itt: <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> megemlítette <strong>%2</strong>-t itt: <strong>%3</strong>",
 	"notificationType_mention": "Amikor valaki megemlít téged"
 }

package/languages/id/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> menyebut mu di <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> menyebut mu di <strong>%2</strong>"
 }

package/languages/it/notifications.json

@@ -1,4 +1,4 @@
 {
     "mentions": "Menzioni",
-    "user_mentioned_you_in": "<strong>%1</strong> ti ha menzionato in <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> ti ha menzionato in <strong>%2</strong>"
 }

package/languages/ja/notifications.json

@@ -1,5 +1,5 @@
 {
 	"mentions": "メンション",
-	"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>"
+	"user-mentioned-you-in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mentioned <strong>%2</strong> in <strong>%3</strong>"
 }

package/languages/jbo/notifications.json

@@ -1,4 +1,4 @@
 {
-	"user_mentioned_you_in": "la .<strong>%1</strong>. klacpe do la .<strong>%2</strong>.",
-	"user_mentioned_group_in": "la .<strong>%1</strong>. klacpe la .<strong>%2</strong>. la .<strong>%3</strong>."
+	"user-mentioned-you-in": "la .<strong>%1</strong>. klacpe do la .<strong>%2</strong>.",
+	"user-mentioned-group-in": "la .<strong>%1</strong>. klacpe la .<strong>%2</strong>. la .<strong>%3</strong>."
 }

package/languages/ko/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong>님이 <strong>%2</strong>에서 나를 언급했습니다."
+    "user-mentioned-you-in": "<strong>%1</strong>님이 <strong>%2</strong>에서 나를 언급했습니다."
 }

package/languages/lt/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> paminėjo Jus <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> paminėjo Jus <strong>%2</strong>"
 }

package/languages/ms/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> sebut anda di <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> sebut anda di <strong>%2</strong>"
 }

package/languages/nb/notifications.json

@@ -1,6 +1,6 @@
 {
     "mentions": "Omtaler",
-    "user_mentioned_you_in": "<strong>%1</strong> nevnte deg i <strong>%2</strong>",
-    "user_mentioned_group_in": "<strong>%1</strong> nevnte <strong>%2</strong> i <strong>%3</strong>",
+    "user-mentioned-you-in": "<strong>%1</strong> nevnte deg i <strong>%2</strong>",
+    "user-mentioned-group-in": "<strong>%1</strong> nevnte <strong>%2</strong> i <strong>%3</strong>",
     "notificationType_mention": "Når noen nevner deg"
 }

package/languages/nl/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "Onze naam is genoemd door <strong>%1</strong> in <strong>%2</strong>."
+    "user-mentioned-you-in": "Onze naam is genoemd door <strong>%1</strong> in <strong>%2</strong>."
 }

package/languages/pl/mentions.json

@@ -1,3 +1,3 @@
 {
-	"user_mentioned_you_in": "<strong>%1</strong> wspomniał o Tobie w <strong>%2</strong>"
+	"user-mentioned-you-in": "<strong>%1</strong> wspomniał o Tobie w <strong>%2</strong>"
 }

package/languages/pl/notifications.json

@@ -1,6 +1,6 @@
 {
 	"mentions": "Wspomnienia",
-	"user_mentioned_you_in": "<strong>%1</strong> wspomniał o Tobie w <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> wspomniał <strong>%2</strong> w <strong>%3</strong>",
+	"user-mentioned-you-in": "<strong>%1</strong> wspomniał o Tobie w <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> wspomniał <strong>%2</strong> w <strong>%3</strong>",
 	"notificationType_mention": "Kiedy ktoś o Tobie wspomni"
 }

package/languages/pt-PT/notifications.json

@@ -1,6 +1,6 @@
 {
 	"mentions": "Menções",
-	"user_mentioned_you_in": "<strong>%1</strong> mencionou-te no tópico <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> mencionou o grupo <strong>%2</strong> no tópico <strong>%3</strong>",
+	"user-mentioned-you-in": "<strong>%1</strong> mencionou-te no tópico <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> mencionou o grupo <strong>%2</strong> no tópico <strong>%3</strong>",
 	"notificationType_mention": "Quando alguém te menciona"
 }

package/languages/pt_BR/notifications.json

@@ -1,4 +1,4 @@
 {
     "mentions": "Menções",
-    "user_mentioned_you_in": "<strong>%1</strong> mencionou você em <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> mencionou você em <strong>%2</strong>"
 }

package/languages/ro/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> te-a menționat în <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> te-a menționat în <strong>%2</strong>"
 }

package/languages/ru/notifications.json

@@ -1,6 +1,6 @@
 {
     "mentions": "Упоминания",
-    "user_mentioned_you_in": "<strong>%1</strong> упомянул Вас в <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> упомянул <strong>%2</strong> в <strong>%3</strong>",
+    "user-mentioned-you-in": "<strong>%1</strong> упомянул Вас в <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> упомянул <strong>%2</strong> в <strong>%3</strong>",
 	"notificationType_mention": "Когда кто-то вас упомянул"
 }

package/languages/rw/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> yakuvuze muri <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> yakuvuze muri <strong>%2</strong>"
 }

package/languages/sl/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> te je omenil v <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> te je omenil v <strong>%2</strong>"
 }

package/languages/sr/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> вас помену у <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> вас помену у <strong>%2</strong>"
 }

package/languages/sv/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> nämnde dig i <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> nämnde dig i <strong>%2</strong>"
 }

package/languages/tr/notifications.json

@@ -1,6 +1,6 @@
 {
 	"mentions": "Bahsedilmeler",
-	"user_mentioned_you_in": "<strong>%1</strong> sizden şu konuda bahsetti: <strong>%2</strong>",
-	"user_mentioned_group_in": "<strong>%1</strong> kullanıcısı <strong>%2</strong> grubundan şu konuda bahsetti: <strong>%3</strong>",
+	"user-mentioned-you-in": "<strong>%1</strong> sizden şu konuda bahsetti: <strong>%2</strong>",
+	"user-mentioned-group-in": "<strong>%1</strong> kullanıcısı <strong>%2</strong> grubundan şu konuda bahsetti: <strong>%3</strong>",
 	"notificationType_mention": "Biri sizden bahsettiğinde"
 }

package/languages/vi/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> nhắc đến bạn trong <strong>%2</strong>"
+    "user-mentioned-you-in": "<strong>%1</strong> nhắc đến bạn trong <strong>%2</strong>"
 }

package/languages/zh-CN/mentions.json

@@ -1,3 +1,3 @@
 {
-	"user_mentioned_you_in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了您"
+	"user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了您"
 }

package/languages/zh-CN/notifications.json

@@ -1,6 +1,6 @@
 {
 	"mentions": "提到",
-	"user_mentioned_you_in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了你",
-	"user_mentioned_group_in": "<strong>%1</strong> 在 <strong>%3</strong> 中提到了 <strong>%2</strong>",
+	"user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong> 中提到了你",
+	"user-mentioned-group-in": "<strong>%1</strong> 在 <strong>%3</strong> 中提到了 <strong>%2</strong>",
 	"notificationType_mention": "当有人提到你时"
 }

package/languages/zh_TW/notifications.json

@@ -1,3 +1,3 @@
 {
-    "user_mentioned_you_in": "<strong>%1</strong> 在 <strong>%2</strong>提到你"
+    "user-mentioned-you-in": "<strong>%1</strong> 在 <strong>%2</strong>提到你"
 }

package/library.js

@@ -136,7 +136,7 @@ Mentions.notify = async function (data) {
 
 	const filteredUids = await filterUidsAlreadyMentioned(uids, postData.pid);
 	if (filteredUids.length) {
-		await sendNotificationToUids(postData, filteredUids, 'user', `[[notifications:user_mentioned_you_in, ${displayname}, ${titleEscaped}]]`);
+		await sendNotificationToUids(postData, filteredUids, 'user', `[[notifications:user-mentioned-you-in, ${displayname}, ${titleEscaped}]]`);
 		await db.setAdd(`mentions:pid:${postData.pid}:uids`, filteredUids);
 	}
 
@@ -146,7 +146,7 @@ Mentions.notify = async function (data) {
 			const groupName = groupsToNotify[i].name;
 			const groupMentionSent = await db.isSetMember(`mentions:pid:${postData.pid}:groups`, groupName);
 			if (!groupMentionSent && memberUids.length) {
-				await sendNotificationToUids(postData, memberUids, groupName, `[[notifications:user_mentioned_group_in, ${displayname} , ${groupName}, ${titleEscaped}]]`);
+				await sendNotificationToUids(postData, memberUids, groupName, `[[notifications:user-mentioned-group-in, ${displayname} , ${groupName}, ${titleEscaped}]]`);
 				await db.setAdd(`mentions:pid:${postData.pid}:groups`, groupName);
 			}
 		}
@@ -171,8 +171,9 @@ Mentions.notifyMessage = async (hookData) => {
 	}
 	const io = require.main.require('./src/socket.io');
 
-	const [onlineUidsInRoom, isUserInRoom, notifSettings, checks] = await Promise.all([
+	const [onlineUidsInRoom, fromUser, isUserInRoom, notifSettings, checks] = await Promise.all([
 		io.getUidsInRoom(`chat_room_${roomId}`),
+		User.getUserFields(message.fromuid, ['username']),
 		Messaging.isUsersInRoom(matchedUids, roomId),
 		Messaging.getUidsNotificationSetting(matchedUids, roomId),
 		Promise.all(matchedUids.map(
@@ -190,9 +191,10 @@ Mentions.notifyMessage = async (hookData) => {
 		return;
 	}
 	const roomName = validator.escape(String(roomData.roomName || `Room ${roomId}`));
+	const icon = Messaging.getRoomIcon(roomData);
 	const notifObj = await Notifications.create({
 		type: 'mention',
-		bodyShort: `[[notifications:user_mentioned_you_in, ${message.fromUser.displayname}, ${roomName}]]`,
+		bodyShort: `[[notifications:user-mentioned-you-in-room, ${fromUser.displayname}, ${icon}, ${roomName}]]`,
 		bodyLong: message.content,
 		nid: `chat_${roomId}_${message.fromuid}_${message.messageId}`,
 		mid: message.messageId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-mentions",
-  "version": "4.3.4",
+  "version": "4.3.6",
   "description": "NodeBB Plugin that allows users to mention other users by prepending an '@' sign to their username",
   "main": "library.js",
   "scripts": {
@@ -32,8 +32,8 @@
   },
   "devDependencies": {
     "mocha": "10.2.0",
-    "eslint": "8.45.0",
+    "eslint": "8.50.0",
     "eslint-config-nodebb": "0.2.1",
-    "eslint-plugin-import": "2.27.5"
+    "eslint-plugin-import": "2.28.1"
   }
 }