4.0.0-rc6

* Added: Setting to ignore moderators clearing chat.
* Added: Setting to remove deleted messages from chat entirely.
* Added: Setting to control the delay before chat messages appear.

src/main.js

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

src/modules/chat/index.js

@@ -102,13 +102,62 @@ export default class Chat extends Module {
 		this.settings.add('chat.filtering.show-deleted', {
 			default: false,
 			ui: {
-				path: 'Chat > Filtering >> Appearance',
+				path: 'Chat > Behavior >> Deleted Messages',
 				title: 'Always display deleted messages.',
 				description: 'Deleted messages will be faded and displayed with a line through the message text.',
 				component: 'setting-check-box'
 			}
 		});
 
+		this.settings.add('chat.filtering.ignore-clear', {
+			default: false,
+			ui: {
+				path: 'Chat > Behavior >> Deleted Messages',
+				title: 'Do not Clear Chat when commanded to.',
+				component: 'setting-check-box'
+			}
+		});
+
+		this.settings.add('chat.filtering.remove-deleted', {
+			default: 1,
+			ui: {
+				path: 'Chat > Behavior >> Deleted Messages',
+				title: 'Remove deleted messages from chat.',
+				description: 'Deleted messages will be removed from chat entirely. This setting is not recommended for moderators.',
+				component: 'setting-select-box',
+
+				data: [
+					{value: 0, title: 'Do Not Remove'},
+					{value: 1, title: 'Remove Unseen (Default)'},
+					{value: 2, title: 'Remove All'}
+				]
+			}
+		});
+
+		this.settings.add('chat.delay', {
+			default: -1,
+			ui: {
+				path: 'Chat > Behavior >> General',
+				title: 'Artificial Chat Delay',
+				description: 'Delay the appearance of chat messages to allow for moderation before you see them.',
+				component: 'setting-select-box',
+
+				data: [
+					{value: -1, title: 'Default Delay (Room Specific; Non-Mod Only)'},
+					{value: 0, title: 'No Delay'},
+					{value: 300, title: 'Minor (Bot Moderation; 0.3s)'},
+					{value: 1200, title: 'Normal (Human Moderation; 1.2s)'},
+					{value: 5000, title: 'Large (Spoiler Removal / Slow Mods; 5s)'},
+					{value: 10000, title: 'Extra Large (10s)'},
+					{value: 15000, title: 'Extremely Large (15s)'},
+					{value: 20000, title: 'Mods Asleep; Delay Chat (20s)'},
+					{value: 30000, title: 'Half a Minute (30s)'},
+					{value: 60000, title: 'Why??? (1m)'},
+					{value: 788400000000, title: 'The CBenni Option (Literally 25 Years)'}
+				]
+			}
+		});
+
 
 		this.settings.add('chat.filtering.highlight-basic-terms', {
 			default: [],

src/sites/twitch-twilight/modules/chat/index.js

@@ -471,7 +471,9 @@ export default class ChatHook extends Module {
 				if ( ! buffer._ffz_was_here )
 					this.wrapChatBuffer(buffer.constructor);
 
-				buffer.consumeChatEvent = buffer.ffzConsumeChatEvent.bind(buffer);
+				if ( buffer.ffzConsumeChatEvent )
+					buffer.consumeChatEvent = buffer.ffzConsumeChatEvent.bind(buffer);
+
 				buffer.ffzController = inst;
 
 				service.client.events.removeAll();
@@ -538,50 +540,114 @@ export default class ChatHook extends Module {
 
 		cls.prototype._ffz_was_here = true;
 
-		cls.prototype.ffzConsumeChatEvent = cls.prototype.consumeChatEvent = function(msg) {
-			if ( msg ) {
-				try {
-					const types = t.chat_types || {};
+		if ( old_consume )
+			cls.prototype.ffzConsumeChatEvent = cls.prototype.consumeChatEvent = function(msg) {
+				if ( msg ) {
+					try {
+						const types = t.chat_types || {};
 
-					if ( msg.type === types.Message ) {
-						const m = t.chat.standardizeMessage(msg),
-							cont = this.ffzController;
+						if ( msg.type === types.Message ) {
+							const m = t.chat.standardizeMessage(msg),
+								cont = this.ffzController;
 
-						let room = m.roomLogin = m.roomLogin ? m.roomLogin : m.channel ? m.channel.slice(1) : cont && cont.props.channelLogin,
-							room_id = cont && cont.props.channelID;
+							let room = m.roomLogin = m.roomLogin ? m.roomLogin : m.channel ? m.channel.slice(1) : cont && cont.props.channelLogin,
+								room_id = cont && cont.props.channelID;
 
-						if ( ! room && room_id ) {
-							const r = t.chat.getRoom(room_id, null, true);
-							if ( r && r.login )
-								room = m.roomLogin = r.login;
-						}
+							if ( ! room && room_id ) {
+								const r = t.chat.getRoom(room_id, null, true);
+								if ( r && r.login )
+									room = m.roomLogin = r.login;
+							}
 
-						const u = t.site.getUser(),
-							r = {id: room_id, login: room};
+							const u = t.site.getUser(),
+								r = {id: room_id, login: room};
 
-						if ( u && cont ) {
-							u.moderator = cont.props.isCurrentUserModerator;
-							u.staff = cont.props.isStaff;
-						}
+							if ( u && cont ) {
+								u.moderator = cont.props.isCurrentUserModerator;
+								u.staff = cont.props.isStaff;
+							}
 
-						m.ffz_tokens = m.ffz_tokens || t.chat.tokenizeMessage(m, u, r);
+							m.ffz_tokens = m.ffz_tokens || t.chat.tokenizeMessage(m, u, r);
 
-						const event = new FFZEvent({
-							message: m,
-							channel: room
-						});
+							const event = new FFZEvent({
+								message: m,
+								channel: room
+							});
 
-						t.emit('chat:receive-message', event);
-						if ( event.defaultPrevented || m.ffz_removed )
+							t.emit('chat:receive-message', event);
+							if ( event.defaultPrevented || m.ffz_removed )
+								return;
+
+						} else if ( msg.type === types.Moderation ) {
+							const login = msg.userLogin;
+							if ( this.moderatedUsers.has(login) )
+								return;
+
+							const do_remove = t.chat.context.get('chat.filtering.remove-deleted') === 2,
+								do_update = m => {
+									if ( m.type === types.Message && m.user && m.user.userLogin === login )
+										m.deleted = true;
+								};
+
+							if ( do_remove ) {
+								this.buffer = this.buffer.filter(m => m.type !== types.Message || ! m.user || m.user.userLogin !== login);
+								this._isDirty = true;
+								this.onBufferUpdate();
+
+							} else
+								this.buffer.forEach(do_update);
+
+							this.delayedMessageBuffer.forEach(do_update);
+
+							this.moderatedUsers.add(login);
+							setTimeout(this.unmoderateUser(login), 1000);
 							return;
-					}
 
-				} catch(err) {
-					t.log.capture(err, {extra: {msg}})
+						} else if ( msg.type === types.Clear ) {
+							if ( t.chat.context.get('chat.filtering.ignore-clear') )
+								msg = {
+									type: types.Notice,
+									message: 'An attempt to clear chat was ignored.'
+								}
+
+						}
+
+					} catch(err) {
+						t.log.capture(err, {extra: {msg}})
+					}
 				}
+
+				return old_consume.call(this, msg);
 			}
 
-			return old_consume.call(this, msg);
+		cls.prototype.flushRawMessages = function() {
+			const out = [],
+				now = Date.now(),
+				raw_delay = t.chat.context.get('chat.delay'),
+				delay = raw_delay === -1 ? this.delayDuration : raw_delay,
+				first = now - delay,
+				do_remove = t.chat.context.get('chat.filtering.remove-deleted') !== 0;
+
+			let changed = false;
+
+			for(const msg of this.delayedMessageBuffer) {
+				if ( msg.time <= first || ! msg.shouldDelay ) {
+					if ( do_remove && ! this.shouldSeeBlockedAndDeletedMessages && this.isDeletable(msg.event) && msg.event.deleted )
+						continue;
+
+					this.buffer.push(msg.event);
+					changed = true;
+
+				} else
+					out.push(msg);
+			}
+
+			this.delayedMessageBuffer = out;
+
+			if ( changed ) {
+				this._isDirty = true;
+				this.onBufferUpdate();
+			}
 		}
 
 		cls.prototype.toArray = function() {