oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-05 10:38:30 +00:00
Code Wiki Activity

3.5.337. Chatter count on dashboard. Channel-specific badge fixes. Stuff.

Browse source
This commit is contained in:
SirStendec 2016-10-18 00:35:31 -04:00
parent a89b71f0a2
commit f04edf7f54
10 changed files with 98 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tokenize.js
View file

@ -180,7 +180,7 @@ FFZ.settings_info.show_deleted_links = {
name: "Show Deleted Links",
help: "Do not delete links based on room settings or link length."
};
};
// ---------------------
@ -550,7 +550,7 @@ FFZ.prototype.tokenize_conversation_line = function(message, prevent_notificatio
emotes = emote_helpers(emotes);
// Standard Tokenization
if ( helpers && helpers.linkifyMessage )
if ( helpers && helpers.linkifyMessage && this.settings.parse_links )
tokens = helpers.linkifyMessage(tokens);
if ( user && user.login && helpers && helpers.mentionizeMessage ) {
@ -602,7 +602,7 @@ FFZ.prototype.tokenize_vod_line = function(msgObject, delete_links) {
tokens = [msg];
if ( helpers && helpers.linkifyMessage )
if ( helpers && helpers.linkifyMessage && this.settings.parse_links )
tokens = helpers.linkifyMessage(tokens, delete_links);
if ( user && user.login && helpers && helpers.mentionizeMessage ) {
@ -666,7 +666,7 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification, del
//if ( helpers && helpers.tokenizeRichContent )
// tokens = helpers.tokenizeRichContent(tokens, tags.content, delete_links);
if ( helpers && helpers.linkifyMessage )
if ( helpers && helpers.linkifyMessage && this.settings.parse_links )
tokens = helpers.linkifyMessage(tokens, delete_links && ! tags.mod);