oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-29 07:45:33 +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

20
changelog.html
View file

@ -1,3 +1,9 @@
<div class="list-header">3.5.370 <time datetime="2016-11-13">(2016-11-13)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Added: Temporary setting to remove messages with banned words from chat to hold people over until I finish proper chat filtering.</li>
<li>Fixed: Purple links in the sidebar when using FFZ's dark theme.</li>
</ul>
<div class="list-header">3.5.369 <time datetime="2016-11-12">(2016-11-12)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Option to Hide Promoted Games had been removed because I thought that feature was gone. Clearly, it's not.</li>
@ -62,19 +68,5 @@
<li>Fixed: Report menu for Hosts was not positioned well.</li>
</ul>
<div class="list-header">3.5.359 <time datetime="2016-10-28">(2016-10-28)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Presence was not getting set to Invisible properly.</li>
<li>Fixed: Remove obsolete Sidebar settings.</li>
<li>Changed: CSS tweaks.</li>
<li>Changed: Hide <code>Add Friend</code> buttons when friends are disabled.</li>
</ul>
<div class="list-header">3.5.358 <time datetime="2016-10-28">(2016-10-28)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Automatic Theater Mode broke because Twitch removed the player's <code>isLoading</code> function. (Presumably because the player doesn't break if you try using it while it's loading, now.)</li>
<li>Fixed: Update to the latest version of FileSaver.js to, hopefully, fix issues saving settings with Safari.</li>
</ul>
<div class="list-header" id="ffz-old-news-button"><a href="#">View Older</a></div>
<div id="ffz-old-news"></div>

2
dark.css
View file

@ -366,7 +366,7 @@ body.ffz-dark:not([data-page="teams#show"]),
}
.ffz-dark .warp__item a.js-language-select,
.ffz-dark .warp__item > a:not { color: #d5d4d9 !important }
.ffz-dark .warp__item > a { color: #d5d4d9 !important }
.ffz-dark .warp__item--toggled a.js-language-select,
.ffz-dark .warp__item > a:hover,

14
old_changes.html
View file

@ -1,3 +1,17 @@
<div class="list-header">3.5.359 <time datetime="2016-10-28">(2016-10-28)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Presence was not getting set to Invisible properly.</li>
<li>Fixed: Remove obsolete Sidebar settings.</li>
<li>Changed: CSS tweaks.</li>
<li>Changed: Hide <code>Add Friend</code> buttons when friends are disabled.</li>
</ul>
<div class="list-header">3.5.358 <time datetime="2016-10-28">(2016-10-28)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Automatic Theater Mode broke because Twitch removed the player's <code>isLoading</code> function. (Presumably because the player doesn't break if you try using it while it's loading, now.)</li>
<li>Fixed: Update to the latest version of FileSaver.js to, hopefully, fix issues saving settings with Safari.</li>
</ul>
<div class="list-header">3.5.357 <time datetime="2016-10-27">(2016-10-27)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Chat Replay is not darkening properly after a component was removed.</li>

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;