monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix shortname problem in emojify() (regression from #5016) (#5032) 

When colon appears end of line, skiped all character containing unicode emojis. Fixed.
https://github.com/tootsuite/mastodon/pull/5016#issuecomment-331012008
This commit is contained in:
MIYAGI Hikaru 2017-09-21 01:47:16 +00:00 committed by Eugen Rochko
parent 798b0fc5af
commit a9abe89093
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/javascript/mastodon/emoji.js
View File

@ -7,29 +7,34 @@ const emojify = (str, customEmojis = {}) => {
let rtn = ''; let rtn = '';
for (;;) { for (;;) {
let match, i = 0, tag; let match, i = 0, tag;
while (i < str.length && (tag = '<&:'.indexOf(str[i])) === -1 && !(match = trie.search(str.slice(i)))) { while (i < str.length && (tag = '<&'.indexOf(str[i])) === -1 && str[i] !== ':' && !(match = trie.search(str.slice(i)))) {
i += str.codePointAt(i) < 65536 ? 1 : 2; i += str.codePointAt(i) < 65536 ? 1 : 2;
} }
if (i === str.length) if (i === str.length)
break; break;
else if (tag >= 0) { else if (tag >= 0) {
let tagend = str.indexOf('>;:'[tag], i + 1) + 1; const tagend = str.indexOf('>;'[tag], i + 1) + 1;
if (!tagend) if (!tagend)
break; break;
if (str[i] === ':') { rtn += str.slice(0, tagend);
const shortname = str.slice(i, tagend); str = str.slice(tagend);
} else if (str[i] === ':') {
try {
// if replacing :shortname: succeed, exit this block with "continue"
const closeColon = str.indexOf(':', i + 1) + 1;
if (!closeColon) throw null; // no pair of ':'
const lt = str.indexOf('<', i + 1); const lt = str.indexOf('<', i + 1);
if ((lt === -1 || lt >= tagend) && shortname in customEmojis) { if (!(lt === -1 || lt >= closeColon)) throw null; // tag appeared before closing ':'
const shortname = str.slice(i, closeColon);
if (shortname in customEmojis) {
rtn += str.slice(0, i) + `<img draggable="false" class="emojione" alt="${shortname}" title="${shortname}" src="${customEmojis[shortname]}" />`; rtn += str.slice(0, i) + `<img draggable="false" class="emojione" alt="${shortname}" title="${shortname}" src="${customEmojis[shortname]}" />`;
str = str.slice(tagend); str = str.slice(closeColon);
} else { continue;
rtn += str.slice(0, i + 1);
str = str.slice(i + 1);
} }
} else { } catch (e) {}
rtn += str.slice(0, tagend); // replacing :shortname: failed
str = str.slice(tagend); rtn += str.slice(0, i + 1);
} str = str.slice(i + 1);
} else { } else {
const [filename, shortCode] = unicodeMapping[match]; const [filename, shortCode] = unicodeMapping[match];
rtn += str.slice(0, i) + `<img draggable="false" class="emojione" alt="${match}" title=":${shortCode}:" src="/emoji/${filename}.svg" />`; rtn += str.slice(0, i) + `<img draggable="false" class="emojione" alt="${match}" title=":${shortCode}:" src="/emoji/${filename}.svg" />`;