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

4.0.0-rc6.1

Browse source 
* Fixed: Error causing messages in the delayed buffer to not be removed when a user is timed out.
* Changed: Add localization support for message when a clear chat is ignored.
This commit is contained in:
SirStendec 2018-07-16 15:28:53 -04:00
parent 9d36b78ec7
commit 8022cbc8be
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
FrankerFaceZ.Logger = Logger; FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = { const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc6', major: 4, minor: 0, revision: 0, extra: '-rc6.1',
commit: __git_commit__, commit: __git_commit__,
build: __webpack_hash__, build: __webpack_hash__,
toString: () => toString: () =>

3
src/modules/chat/index.js
View file

@ -129,7 +129,8 @@ export default class Chat extends Module {
data: [ data: [
{value: 0, title: 'Do Not Remove'}, {value: 0, title: 'Do Not Remove'},
{value: 1, title: 'Remove Unseen (Default)'}, {value: 1, title: 'Remove Unseen (Default)'},
{value: 2, title: 'Remove All'} {value: 2, title: 'Remove Unseen as Moderator'},
{value: 3, title: 'Remove All'}
] ]
} }
}); });

11
src/sites/twitch-twilight/modules/chat/index.js
View file

@ -583,8 +583,11 @@ export default class ChatHook extends Module {
if ( this.moderatedUsers.has(login) ) if ( this.moderatedUsers.has(login) )
return; return;
const do_remove = t.chat.context.get('chat.filtering.remove-deleted') === 2, const do_remove = t.chat.context.get('chat.filtering.remove-deleted') === 3,
do_update = m => { do_update = m => {
if ( m.event )
m = m.event;
if ( m.type === types.Message && m.user && m.user.userLogin === login ) if ( m.type === types.Message && m.user && m.user.userLogin === login )
m.deleted = true; m.deleted = true;
}; };
@ -607,7 +610,7 @@ export default class ChatHook extends Module {
if ( t.chat.context.get('chat.filtering.ignore-clear') ) if ( t.chat.context.get('chat.filtering.ignore-clear') )
msg = { msg = {
type: types.Notice, type: types.Notice,
message: 'An attempt to clear chat was ignored.' message: t.i18n.t('chat.ignore-clear', 'An attempt to clear chat was ignored.')
} }
} }
@ -626,13 +629,13 @@ export default class ChatHook extends Module {
raw_delay = t.chat.context.get('chat.delay'), raw_delay = t.chat.context.get('chat.delay'),
delay = raw_delay === -1 ? this.delayDuration : raw_delay, delay = raw_delay === -1 ? this.delayDuration : raw_delay,
first = now - delay, first = now - delay,
do_remove = t.chat.context.get('chat.filtering.remove-deleted') !== 0; do_remove = t.chat.context.get('chat.filtering.remove-deleted');
let changed = false; let changed = false;
for(const msg of this.delayedMessageBuffer) { for(const msg of this.delayedMessageBuffer) {
if ( msg.time <= first || ! msg.shouldDelay ) { if ( msg.time <= first || ! msg.shouldDelay ) {
if ( do_remove && ! this.shouldSeeBlockedAndDeletedMessages && this.isDeletable(msg.event) && msg.event.deleted ) if ( do_remove !== 0 && (do_remove > 1 || ! this.shouldSeeBlockedAndDeletedMessages) && this.isDeletable(msg.event) && msg.event.deleted )
continue; continue;
this.buffer.push(msg.event); this.buffer.push(msg.event);