Skip to content

feat: Convert emoji shortname to unicode on notification emails. #31225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 8 commits into from
Jan 22, 2024
Merged

feat: Convert emoji shortname to unicode on notification emails. #31225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
63d82c4
shortname to unicode
gabriellsh Dec 13, 2023
bb6782d
add cs
gabriellsh Dec 13, 2023
8495548
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into feat…
gabriellsh Dec 13, 2023
94e7cc0
only do it once
gabriellsh Dec 13, 2023
e6bb909
fix crash
gabriellsh Dec 13, 2023
1893494
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into feat…
gabriellsh Jan 19, 2024
de952f1
check if msg exists
gabriellsh Jan 19, 2024
7695d52
Merge branch 'develop' into feat/emailEmoji
kodiakhq[bot] Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/green-timers-cross.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

notification emails should now show emojis properly
14 changes: 13 additions & 1 deletion apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Subscriptions, Users } from '@rocket.chat/models';
import emojione from 'emojione';
import moment from 'moment';

import { callbacks } from '../../../../lib/callbacks';
Expand Down Expand Up @@ -145,12 +146,23 @@ export const sendNotification = async ({
isThread,
})
) {
const messageWithUnicode = message.msg ? emojione.shortnameToUnicode(message.msg) : message.msg;
const firstAttachment = message.attachments?.length > 0 && message.attachments.shift();
firstAttachment.description =
typeof firstAttachment.description === 'string' ? emojione.shortnameToUnicode(firstAttachment.description) : undefined;
firstAttachment.text = typeof firstAttachment.text === 'string' ? emojione.shortnameToUnicode(firstAttachment.text) : undefined;

const attachments = firstAttachment ? [firstAttachment, ...message.attachments].filter(Boolean) : [];
for await (const email of receiver.emails) {
if (email.verified) {
queueItems.push({
type: 'email',
data: await getEmailData({
message,
message: {
...message,
msg: messageWithUnicode,
...(attachments.length > 0 ? { attachments } : {}),
},
receiver,
sender,
subscription,
Expand Down