Parse emoji to make them bigger

This commit is contained in:
Mac Carrithers 2017-08-23 17:19:04 +03:00 committed by Pavel Djundik
parent e292ef2bed
commit f8663ed28b
4 changed files with 36 additions and 4 deletions

View File

@ -1619,6 +1619,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
color: #333; color: #333;
margin-top: 6px; margin-top: 6px;
margin-bottom: 6px; margin-bottom: 6px;
line-height: 1.4;
transition: background-color 0.2s; transition: background-color 0.2s;
} }
@ -1643,11 +1644,16 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
opacity: 1; opacity: 1;
} }
.textcomplete-item .emoji { .emoji {
margin-right: 8px;
width: 16px;
text-align: center;
display: inline-block; display: inline-block;
font-size: 1.4em;
vertical-align: bottom;
line-height: 1;
}
.textcomplete-item .emoji {
width: 32px;
text-align: center;
} }
.textcomplete-item .irc-bg { .textcomplete-item .irc-bg {

View File

@ -0,0 +1,20 @@
"use strict";
const emojiRegExp = require("emoji-regex")();
function findEmoji(text) {
const result = [];
let match;
while ((match = emojiRegExp.exec(text))) {
result.push({
start: match.index,
end: match.index + match[0].length,
emoji: match[0]
});
}
return result;
}
module.exports = findEmoji;

View File

@ -4,6 +4,7 @@ const Handlebars = require("handlebars/runtime");
const parseStyle = require("./ircmessageparser/parseStyle"); const parseStyle = require("./ircmessageparser/parseStyle");
const findChannels = require("./ircmessageparser/findChannels"); const findChannels = require("./ircmessageparser/findChannels");
const findLinks = require("./ircmessageparser/findLinks"); const findLinks = require("./ircmessageparser/findLinks");
const findEmoji = require("./ircmessageparser/findEmoji");
const merge = require("./ircmessageparser/merge"); const merge = require("./ircmessageparser/merge");
// Create an HTML `span` with styling information for a given fragment // Create an HTML `span` with styling information for a given fragment
@ -59,10 +60,12 @@ module.exports = function parse(text) {
const userModes = ["!", "@", "%", "+"]; // TODO User modes should be RPL_ISUPPORT.PREFIX const userModes = ["!", "@", "%", "+"]; // TODO User modes should be RPL_ISUPPORT.PREFIX
const channelParts = findChannels(cleanText, channelPrefixes, userModes); const channelParts = findChannels(cleanText, channelPrefixes, userModes);
const linkParts = findLinks(cleanText); const linkParts = findLinks(cleanText);
const emojiParts = findEmoji(cleanText);
// Sort all parts identified based on their position in the original text // Sort all parts identified based on their position in the original text
const parts = channelParts const parts = channelParts
.concat(linkParts) .concat(linkParts)
.concat(emojiParts)
.sort((a, b) => a.start - b.start); .sort((a, b) => a.start - b.start);
// Merge the styling information with the channels / URLs / text objects and // Merge the styling information with the channels / URLs / text objects and
@ -78,6 +81,8 @@ module.exports = function parse(text) {
} else if (textPart.channel) { } else if (textPart.channel) {
const escapedChannel = Handlebars.Utils.escapeExpression(textPart.channel); const escapedChannel = Handlebars.Utils.escapeExpression(textPart.channel);
return `<span class="inline-channel" role="button" tabindex="0" data-chan="${escapedChannel}">${fragments}</span>`; return `<span class="inline-channel" role="button" tabindex="0" data-chan="${escapedChannel}">${fragments}</span>`;
} else if (textPart.emoji) {
return `<span class="emoji">${fragments}</span>`;
} }
return fragments; return fragments;

View File

@ -66,6 +66,7 @@
"babel-loader": "7.1.2", "babel-loader": "7.1.2",
"babel-preset-env": "1.6.0", "babel-preset-env": "1.6.0",
"chai": "4.1.1", "chai": "4.1.1",
"emoji-regex": "6.5.1",
"eslint": "4.5.0", "eslint": "4.5.0",
"font-awesome": "4.7.0", "font-awesome": "4.7.0",
"fuzzy": "0.1.3", "fuzzy": "0.1.3",