Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: change private message email subject

Browse Source 
if roomName is set use it in the subject along wit the sender displayname
This commit is contained in:
Barış Soner Uşaklı
2023-10-05 01:02:39 -04:00
parent cddfdae0cc
commit f9fb3c3a06
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/language/en-GB/email.json
View File

@@ -45,8 +45,8 @@
"digest.title.week": "Your Weekly Digest", "digest.title.week": "Your Weekly Digest",
"digest.title.month": "Your Monthly Digest", "digest.title.month": "Your Monthly Digest",
"notif.chat.subject": "New chat message received in \"%1\"", "notif.chat.new-message-from-user": "New message from \"%1\"",
"notif.chat.public-chat-subject": "New message from %1 in room %2", "notif.chat.new-message-from-user-in-room": "New message from %1 in room %2",
"notif.chat.cta": "Click here to continue the conversation", "notif.chat.cta": "Click here to continue the conversation",
"notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.", "notif.chat.unsub.info": "This chat notification was sent to you due to your subscription settings.",

6
src/messaging/notifications.js
View File

@@ -105,7 +105,9 @@ module.exports = function (Messaging) {
const roomName = roomData.roomName || `[[modules:chat.room-id, ${roomId}]]`; const roomName = roomData.roomName || `[[modules:chat.room-id, ${roomId}]]`;
const notifData = { const notifData = {
type: isGroupChat ? 'new-group-chat' : 'new-chat', type: isGroupChat ? 'new-group-chat' : 'new-chat',
subject: `[[email:notif.chat.subject, ${roomName}]]`, subject: roomData.roomName ?
`[[email:notif.chat.new-message-from-user-in-room, ${displayname}, ${roomName}]]` :
`[[email:notif.chat.new-message-from-user, ${displayname}]]`,
bodyShort: isGroupChat || roomData.roomName ? `[[notifications:new_message_in, ${roomName}]]` : `[[notifications:new_message_from, ${displayname}]]`, bodyShort: isGroupChat || roomData.roomName ? `[[notifications:new_message_in, ${roomName}]]` : `[[notifications:new_message_from, ${displayname}]]`,
bodyLong: messageObj.content, bodyLong: messageObj.content,
nid: `chat_${roomId}_${fromUid}_${Date.now()}`, nid: `chat_${roomId}_${fromUid}_${Date.now()}`,
@@ -119,7 +121,7 @@ module.exports = function (Messaging) {
const icon = Messaging.getRoomIcon(roomData); const icon = Messaging.getRoomIcon(roomData);
notifData.type = 'new-public-chat'; notifData.type = 'new-public-chat';
notifData.roomIcon = icon; notifData.roomIcon = icon;
notifData.subject = `[[email:notif.chat.public-chat-subject, ${displayname}, ${roomName}]]`; notifData.subject = `[[email:notif.chat.new-message-from-user-in-room, ${displayname}, ${roomName}]]`;
notifData.bodyShort = `[[notifications:user_posted_in_public_room, ${displayname}, ${icon}, ${roomName}]]`; notifData.bodyShort = `[[notifications:user_posted_in_public_room, ${displayname}, ${icon}, ${roomName}]]`;
notifData.mergeId = `notifications:user_posted_in_public_room|${roomId}`; notifData.mergeId = `notifications:user_posted_in_public_room|${roomId}`;
} }