Skip to content

[FIX] Emoji are rendered in URL #15516

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
ggazzo merged 2 commits into from
Oct 9, 2019
Merged

[FIX] Emoji are rendered in URL #15516

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f3a3a3
[FIX] Emoji are rendered in URL
ogustavo-pereira Oct 4, 2019
ac3b3fc
[FIX] Remove Emoji Url and create autolink token
ogustavo-pereira Oct 9, 2019
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
54 changes: 23 additions & 31 deletions app/autolinker/client/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,17 @@
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
import { Tracker } from 'meteor/tracker';
import s from 'underscore.string';
import Autolinker from 'autolinker';


import { settings } from '../../settings';
import { callbacks } from '../../callbacks';

const createAutolinker = () => {
const regUrls = new RegExp(settings.get('AutoLinker_UrlsRegExp'));

const replaceAutolinkerMatch = (match) => {
if (match.getType() !== 'url') {
return null;
}

if (!regUrls.test(match.matchedText)) {
return null;
}

if (match.matchedText.indexOf(Meteor.absoluteUrl()) === 0) {
const tag = match.buildTag();
tag.setAttr('target', '');
return tag;
}
let config;

return true;
};

return new Autolinker({
Tracker.autorun(function() {
config = {
stripPrefix: settings.get('AutoLinker_StripPrefix'),
urls: {
schemeMatches: settings.get('AutoLinker_Urls_Scheme'),
Expand All @@ -38,14 +22,7 @@ const createAutolinker = () => {
phone: settings.get('AutoLinker_Phone'),
twitter: false,
stripTrailingSlash: false,
replaceFn: replaceAutolinkerMatch,
});
};

let autolinker;

Tracker.autorun(() => {
autolinker = createAutolinker();
};
});

const renderMessage = (message) => {
Expand All @@ -67,8 +44,22 @@ const renderMessage = (message) => {
if (regexTokens && regexTokens.test(msgPart)) {
return msgPart;
}
return Autolinker.link(msgPart, {
...config,
replaceFn: (match) => {
const token = `=!=${ Random.id() }=!=`;
const tag = match.buildTag();

if (~match.matchedText.indexOf(Meteor.absoluteUrl())) {
tag.setAttr('target', '');
}

return autolinker.link(msgPart);
message.tokens.push({
token,
text: tag.toAnchorString(),
});
return token;
} });
})
.join('');

Expand All @@ -79,5 +70,6 @@ Tracker.autorun(function() {
if (settings.get('AutoLinker') !== true) {
return callbacks.remove('renderMessage', 'autolinker');
}
callbacks.add('renderMessage', renderMessage, callbacks.priority.LOW, 'autolinker');

callbacks.add('renderMessage', renderMessage, callbacks.priority.MEDIUM, 'autolinker');
});