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

4.17.2

Browse source 
* Fixed: Normalize white-space when sending messages. This matches the behavior of Twitch's servers when normalizing chat messages and fixes client-side rendering issues with FrankerFaceZ.
This commit is contained in:
SirStendec 2019-12-08 16:09:37 -05:00
parent 2803b211c5
commit 3616027441
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "frankerfacez", "name": "frankerfacez",
"author": "Dan Salvato LLC", "author": "Dan Salvato LLC",
"version": "4.17.1", "version": "4.17.2",
"description": "FrankerFaceZ is a Twitch enhancement suite.", "description": "FrankerFaceZ is a Twitch enhancement suite.",
"license": "Apache-2.0", "license": "Apache-2.0",
"scripts": { "scripts": {

4
src/experiments.json
View file

@ -3,8 +3,8 @@
"name": "New API Stress Testing", "name": "New API Stress Testing",
"description": "Send duplicate requests to the new API server for load testing.", "description": "Send duplicate requests to the new API server for load testing.",
"groups": [ "groups": [
{"value": true, "weight": 100}, {"value": true, "weight": 50},
{"value": false, "weight": 0} {"value": false, "weight": 50}
] ]
} }
} }

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

@ -1468,7 +1468,7 @@ export default class ChatHook extends Module {
cls.prototype._ffz_was_here = true; cls.prototype._ffz_was_here = true;
cls.prototype.ffzGetEmotes = function() { /*cls.prototype.ffzGetEmotes = function() {
const emote_map = this.client && this.client.session && this.client.session.emoteMap; const emote_map = this.client && this.client.session && this.client.session.emoteMap;
if ( this._ffz_cached_map === emote_map ) if ( this._ffz_cached_map === emote_map )
return this._ffz_cached_emotes; return this._ffz_cached_emotes;
@ -1489,7 +1489,7 @@ export default class ChatHook extends Module {
} }
return emotes; return emotes;
} }*/
cls.prototype._ffzInstall = function() { cls.prototype._ffzInstall = function() {
@ -1501,8 +1501,8 @@ export default class ChatHook extends Module {
const inst = this, const inst = this,
old_send = this.sendMessage; old_send = this.sendMessage;
inst.sendMessage = function(raw_msg) { inst.sendMessage = function(msg) {
const msg = raw_msg.replace(/\n/g, ''); msg = msg.replace(/\s+/g, ' ');
if ( msg.startsWith('/ffz') ) { if ( msg.startsWith('/ffz') ) {
inst.addMessage({ inst.addMessage({
@ -1523,7 +1523,7 @@ export default class ChatHook extends Module {
if ( event.defaultPrevented ) if ( event.defaultPrevented )
return; return;
return old_send.call(this, msg); return old_send.call(this, event.message);
} }
} }
@ -1556,7 +1556,7 @@ export default class ChatHook extends Module {
const old_chat = this.onChatMessageEvent; const old_chat = this.onChatMessageEvent;
this.onChatMessageEvent = function(e) { this.onChatMessageEvent = function(e) {
if ( e && e.sentByCurrentUser ) { /*if ( e && e.sentByCurrentUser ) {
try { try {
e.message.user.emotes = findEmotes( e.message.user.emotes = findEmotes(
e.message.body, e.message.body,
@ -1566,7 +1566,7 @@ export default class ChatHook extends Module {
} catch(err) { } catch(err) {
t.log.capture(err, {extra: e}); t.log.capture(err, {extra: e});
} }
} }*/
return old_chat.call(i, e); return old_chat.call(i, e);
} }
@ -1574,7 +1574,7 @@ export default class ChatHook extends Module {
const old_action = this.onChatActionEvent; const old_action = this.onChatActionEvent;
this.onChatActionEvent = function(e) { this.onChatActionEvent = function(e) {
if ( e && e.sentByCurrentUser ) { /*if ( e && e.sentByCurrentUser ) {
try { try {
e.message.user.emotes = findEmotes( e.message.user.emotes = findEmotes(
e.message.body, e.message.body,
@ -1584,7 +1584,7 @@ export default class ChatHook extends Module {
} catch(err) { } catch(err) {
t.log.capture(err, {extra: e}); t.log.capture(err, {extra: e});
} }
} }*/
return old_action.call(i, e); return old_action.call(i, e);
} }
@ -2279,7 +2279,7 @@ export function formatBitsConfig(config) {
} }
export function findEmotes(msg, emotes) { /*export function findEmotes(msg, emotes) {
const out = {}; const out = {};
let idx = 0; let idx = 0;
@ -2300,7 +2300,7 @@ export function findEmotes(msg, emotes) {
} }
return out; return out;
} }*/
function extractCheerPrefix(parts) { function extractCheerPrefix(parts) {