Skip to content

[Fix] Links containing ":" will not be rendered as emoji #13604

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

Closed
knrt10 wants to merge 1 commit into from
Closed

[Fix] Links containing ":" will not be rendered as emoji #13604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions app/emoji/client/emojiParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,24 @@ Tracker.autorun(() => {
// '<br>' to ' <br> ' for emojis such at line breaks
message.html = message.html.replace(/<br>/g, ' <br> ');

message.html = Object.entries(emoji.packages).reduce((value, [, emojiPackage]) => emojiPackage.render(value), message.html);
// URL RegEx
const urlRegex = /(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/gm;

Object.keys(emoji.packages).forEach((emojiPackage) => {
// Divide into array
const splitMessage = message.html.split(' ');
for (const urlIndex in splitMessage) {
// Only change emoji for non URLs
if (!splitMessage[urlIndex].match(urlRegex)) {
splitMessage[urlIndex] = emoji.packages[emojiPackage].render(splitMessage[urlIndex]);
}
}
message.html = splitMessage.join(' ');
});

const checkEmojiOnly = $(`<div>${ message.html }</div>`);
let emojiOnly = true;


for (let i = 0, len = checkEmojiOnly[0].childNodes.length; i < len; i++) {
const childNode = checkEmojiOnly[0].childNodes[i];

Expand Down