oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-02 17:18:31 +00:00
Code Wiki Activity

Add convenience method for creating CSS variable or setting blocks of CSS directly in css_tweaks. Start using those variables for things like chat width. Add the ability to highlight messages with mentions in them. Fix Sidebar Swap and Theatre Mode. Closes #312

Browse source
This commit is contained in:
SirStendec 2017-11-17 14:59:46 -05:00
parent a45dc472b7
commit 6da5d4c8b5
14 changed files with 213 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/modules/chat/tokenizers.js
View file

@ -201,14 +201,25 @@ export const Mentions = {
render(token, e) {
return e('strong', {
className: 'chat-line__message-mention'
}, `@${token.recipient}`);
className: `chat-line__message-mention${token.me ? ' ffz--mention-me' : ''}`
}, `${token.text}`);
},
process(tokens, msg) {
process(tokens, msg, user) {
if ( ! tokens || ! tokens.length )
return tokens;
let regex, login, display;
if ( user && user.login ) {
login = user.login.toLowerCase();
display = user.display && user.display.toLowerCase();
if ( display === login )
display = null;
regex = new RegExp(`([^\\w@#%\\-+=:~]|\\b)?(@?(${user.login.toLowerCase()}${display ? `|${display}` : ''})|@([^\\u0000-\\u007F]+|\\w+)+)([^\\w.\\/@#%&()\\-+=:?~]|\\s|\\b|$)`, 'gi');
} else
regex = MENTION_REGEX;
const out = [];
for(const token of tokens) {
if ( token.type !== 'text' ) {
@ -216,19 +227,27 @@ export const Mentions = {
continue;
}
MENTION_REGEX.lastIndex = 0;
regex.lastIndex = 0;
const text = token.text;
let idx = 0, match;
while((match = MENTION_REGEX.exec(text))) {
const nix = match.index + (match[1] ? match[1].length : 0);
while((match = regex.exec(text))) {
const nix = match.index + (match[1] ? match[1].length : 0),
m = match[3] || match[4],
ml = m.toLowerCase(),
me = ml === login || ml === display;
if ( idx !== nix )
out.push({type: 'text', text: text.slice(idx, nix)});
if ( me )
msg.mentioned = true;
out.push({
type: 'mention',
recipient: match[3],
length: match[3].length + 1
text: match[2],
me,
recipient: m
});
idx = nix + match[2].length;