Mastodon
/
Pinafore-Web-Client-Frontend
mirror of https://github.com/nolanlawson/pinafore
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(emoji): emoji replacer should ignore pound sign (#666) 

* fix(emoji): emoji replacer should ignore pound sign

* add test

* fix regex
This commit is contained in:
Nolan Lawson 2018-11-20 09:42:49 -08:00 committed by GitHub
parent 5f5cb0d36d
commit d9e79daa6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
routes/_utils/replaceEmoji.js
View File

@ -8,7 +8,8 @@ export function replaceEmoji (string, replacer) {
let emojiRegex = getEmojiRegex() let emojiRegex = getEmojiRegex()
function safeReplacer (substring) { function safeReplacer (substring) {
if (substring.match(/^[0-9]+$/)) { // for some reason, emoji-regex matches digits // emoji regex matches digits and pound sign https://git.io/fpl6J
if (substring.match(/^[0-9#]+$/)) {
return substring return substring
} }
return replacer(substring) return replacer(substring)

6
tests/unit/test-emoji.js
View File

@ -60,11 +60,11 @@ describe('test-emoji.js', function () {
) )
}) })
it('does not replace digits', function () { it('does not replace digits or pound', function () {
let replacer = _ => `<div>${_}</div>` let replacer = _ => `<div>${_}</div>`
assert.strictEqual( assert.strictEqual(
replaceEmoji(`it's over 9000`, replacer), replaceEmoji(`it's over #9000`, replacer),
`it's over 9000` `it's over #9000`
) )
}) })