oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-16 10:06:54 +00:00
Code Wiki Activity

3.5.370. Add temporary setting to remove messages containing banned words. Fix sidebar link color with FFZ's dark theme.

Browse source
This commit is contained in:
SirStendec 2016-11-13 14:37:19 -05:00
parent 35b0665618
commit 791fcab2d2
7 changed files with 54 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/ember/chatview.js
View file

@ -161,6 +161,25 @@ FFZ.settings_info.chat_delay = {
};
FFZ.settings_info.remove_filtered = {
type: "select",
options: {
0: "Disabled",
1: "Mark as Message Deleted",
2: "Remove Message"
},
value: 0,
process_value: utils.process_int(0),
category: "Chat Filtering",
no_bttv: true,
name: "Remove Messages with Banned Words",
help: "Mark messages with banned words as deleted or outright remove them from chat.",
};
FFZ.settings_info.remove_deleted = {
type: "boolean",
value: false,
@ -188,20 +207,8 @@ FFZ.settings_info.remove_deleted = {
while(i--) {
var msg = msgs.get(i);
if ( msg.ffz_deleted || msg.deleted ) {
if ( alternate === undefined )
alternate = msg.ffz_alternate;
if ( msg.ffz_deleted || msg.deleted )
msgs.removeAt(i);
continue;
}
if ( alternate === undefined )
alternate = msg.ffz_alternate;
else {
alternate = ! alternate;
room.set('messages.' + i + '.ffz_alternate', alternate);
}
}
}
}

2
src/ember/room.js
View file

@ -1967,7 +1967,7 @@ FFZ.prototype._modify_room = function(room) {
addMessage: function(msg) {
msg = this.ffzProcessMessage(msg);
if ( ! msg )
if ( ! msg || msg.ffz_removed )
return;
var msg_id = msg.tags && msg.tags.id,

2
src/main.js
View file

@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
// Version
var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 369,
major: 3, minor: 5, revision: 370,
toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
}

12
src/tokenize.js
View file

@ -727,10 +727,20 @@ FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification, del
// Mentions!
if ( ! from_me ) {
tokens = this.tokenize_mentions(tokens);
var st = this.settings.remove_filtered;
for(var i=0; i < tokens.length; i++) {
var token = tokens[i],
is_mention = token.type === "mention";
is_mention = token.type === "mention",
is_removed = token.type === "deleted" || token.censoredLink;
if ( is_removed )
if ( st === 2 )
msgObject.ffz_removed = true;
else if ( st === 1 ) {
msgObject.ffz_deleted = true;
msgObject.deleted = true;
}
if ( ! is_mention || token.isOwnMessage )
continue;