From 0460c0299456cdb7d6f1f85d27f851ab6075aba1 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Mon, 30 Oct 2023 14:01:28 -0400 Subject: [PATCH] 4.56.1 * Experiment Changed: This release just changes the parameters of the MQTT pubsub experiment, but otherwise has no changes. --- package.json | 2 +- src/experiments.js | 4 ++-- src/modules/chat/emotes.js | 4 +++- src/modules/chat/room.js | 4 ++-- src/modules/main_menu/index.js | 2 +- src/pubsub/index.js | 9 +++++++-- src/sites/twitch-twilight/modules/channel.jsx | 4 ++-- src/sites/twitch-twilight/modules/mod-view.jsx | 4 ++-- 8 files changed, 20 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 4b9c8e11..d67b0144 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "frankerfacez", "author": "Dan Salvato LLC", - "version": "4.56.0", + "version": "4.56.1", "description": "FrankerFaceZ is a Twitch enhancement suite.", "private": true, "license": "Apache-2.0", diff --git a/src/experiments.js b/src/experiments.js index 987ee771..26686f6a 100644 --- a/src/experiments.js +++ b/src/experiments.js @@ -164,8 +164,8 @@ export default class ExperimentManager extends Module { onEnable() { - this.on('socket:command:reload_experiments', this.loadExperiments, this); - this.on('socket:command:update_experiment', this.updateExperiment, this); + this.on('pubsub:command:reload_experiments', this.loadExperiments, this); + this.on('pubsub:command:update_experiment', this.updateExperiment, this); } diff --git a/src/modules/chat/emotes.js b/src/modules/chat/emotes.js index 0b94e629..1fe38031 100644 --- a/src/modules/chat/emotes.js +++ b/src/modules/chat/emotes.js @@ -638,7 +638,9 @@ export default class Emotes extends Module { } } - this.on('socket:command:follow_sets', this.updateFollowSets, this); + this.on('pubsub:command:follow_sets', this.updateFollowSets, this); + + // TODO: Implement emote updates. this.on('chat:reload-data', flags => { if ( ! flags || flags.emotes ) diff --git a/src/modules/chat/room.js b/src/modules/chat/room.js index f449c0c7..a4ebfede 100644 --- a/src/modules/chat/room.js +++ b/src/modules/chat/room.js @@ -33,7 +33,7 @@ export default class Room { this.manager.room_ids[id] = this; if ( id && this.manager.pubsub ) - this.manager.pubsub.subscribe(this, `twitch/${id}/chat`); + this.manager.pubsub.subscribe(this, `twitch/${id}`); this.manager.emit(':room-add', this); this.load_data(); @@ -85,7 +85,7 @@ export default class Room { } if ( this._id && this.manager.pubsub ) - this.manager.pubsub.unsubscribe(this, `twitch/${this._id}/chat`); + this.manager.pubsub.unsubscribe(this, `twitch/${this._id}`); if ( this.manager.room_ids[this._id] === this ) this.manager.room_ids[this._id] = null; diff --git a/src/modules/main_menu/index.js b/src/modules/main_menu/index.js index 111b1dba..4208c552 100644 --- a/src/modules/main_menu/index.js +++ b/src/modules/main_menu/index.js @@ -232,7 +232,7 @@ export default class MainMenu extends Module { this.scheduleUpdate(); }); - this.on('socket:command:new_version', version => { + this.on('pubsub:command:new_version', version => { if ( version === window.FrankerFaceZ.version_info.commit ) return; diff --git a/src/pubsub/index.js b/src/pubsub/index.js index 8433875f..d0a89438 100644 --- a/src/pubsub/index.js +++ b/src/pubsub/index.js @@ -64,12 +64,16 @@ export default class PubSub extends Module { onEnable() { this.on('experiments:changed:cf_pubsub', this._updateSetting, this); + this.subscribe(null, 'global'); + this.connect(); } onDisable() { this.disconnect(); + this.unsubscribe(null, 'global'); + this.off('experiments:changed:cf_pubsub', this._updateSetting, this); } @@ -159,14 +163,15 @@ export default class PubSub extends Module { data = event.data; if ( ! data?.cmd ) { - this.log.warn(`Received invalid PubSub message on topic "${topic}":`, data); + this.log.debug(`Received message on topic "${topic}":`, data); + this.emit(`pubsub:message`, topic, data); return; } data.topic = topic; this.log.debug(`Received command on topic "${topic}" for command "${data.cmd}":`, data.data); - this.emit(`socket:command:${data.cmd}`, data.data, data); + this.emit(`pubsub:command:${data.cmd}`, data.data, data); }); // Subscribe to topics. diff --git a/src/sites/twitch-twilight/modules/channel.jsx b/src/sites/twitch-twilight/modules/channel.jsx index ec3a524a..548d385c 100644 --- a/src/sites/twitch-twilight/modules/channel.jsx +++ b/src/sites/twitch-twilight/modules/channel.jsx @@ -307,7 +307,7 @@ export default class Channel extends Module { return; if ( this._subbed_id ) { - this.pubsub.unsubscribe(this, `twitch/${this._subbed_id}/channel`); + this.pubsub.unsubscribe(this, `twitch/${this._subbed_id}`); this._subbed_id = null; } @@ -317,7 +317,7 @@ export default class Channel extends Module { } if ( id ) { - this.pubsub.subscribe(this, `twitch/${id}/channel`); + this.pubsub.subscribe(this, `twitch/${id}`); this._subbed_id = id; } diff --git a/src/sites/twitch-twilight/modules/mod-view.jsx b/src/sites/twitch-twilight/modules/mod-view.jsx index 89432b91..2890efa1 100644 --- a/src/sites/twitch-twilight/modules/mod-view.jsx +++ b/src/sites/twitch-twilight/modules/mod-view.jsx @@ -66,7 +66,7 @@ export default class ModView extends Module { return; if ( this._subbed_id ) { - this.pubsub.unsubscribe(this, `twitch/${this._subbed_id}/channel/#`); + this.pubsub.unsubscribe(this, `twitch/${this._subbed_id}`); this._subbed_id = null; } @@ -76,7 +76,7 @@ export default class ModView extends Module { } if ( id ) { - this.pubsub.subscribe(this, `twitch/${id}/channel`); + this.pubsub.subscribe(this, `twitch/${id}`); this._subbed_id = id; }