client: _updateEmoteset no longer uses .api

AlcaDesign · AlcaDesign · commit c74c2bb36598 · 2021-04-13T07:43:45.000-05:00
Also adds skipUpdatingEmotesets and updateEmotesetsTimer to either stop
the API call or disable/change the automatic refresh behavior.
diff --git a/lib/client.js b/lib/client.js
@@ -6,6 +6,7 @@ var parse = require('./parser');
 var Queue = require('./timer');
 var _global = typeof global !== 'undefined' ? global : typeof window !== 'undefined' ? window : {};
 var _WebSocket = _global.WebSocket || require('ws');
+var _fetch = _global.fetch || require('node-fetch');
 var _ = require('./utils');
 
 // Client instance..
@@ -21,6 +22,9 @@ var client = function client(opts) {
 	this.clientId = _.get(this.opts.options.clientId, null);
 	this._globalDefaultChannel = _.channel(_.get(this.opts.options.globalDefaultChannel, '#tmijs'));
 	this._skipMembership = _.get(this.opts.options.skipMembership, false);
+	this._skipUpdatingEmotesets = _.get(this.opts.options.skipUpdatingEmotesets, false);
+	this._updateEmotesetsTimer = null;
+	this._updateEmotesetsTimerDelay = _.get(this.opts.options.updateEmotesetsTimer, 60000);
 
 	this.maxReconnectAttempts = _.get(this.opts.connection.maxReconnectAttempts, Infinity);
 	this.maxReconnectInterval = _.get(this.opts.connection.maxReconnectInterval, 30000);
@@ -1153,7 +1157,7 @@ client.prototype._onOpen = function _onOpen() {
 		this.emit('logon');
 
 		let caps = 'twitch.tv/tags twitch.tv/commands';
-		if(this._skipMembership !== true) {
+		if(!this._skipMembership) {
 			caps += ' twitch.tv/membership';
 		}
 		this.ws.send('CAP REQ :' + caps);
@@ -1384,27 +1388,43 @@ client.prototype._sendMessage = function _sendMessage(delay, channel, message, f
 };
 
 // Grab the emote-sets object from the API..
-client.prototype._updateEmoteset = function _updateEmoteset(sets) {
-	this.emotes = sets;
-
-	this._getToken()
-	.then(token =>
-		this.api({
-			url: `/chat/emoticon_images?emotesets=${sets}`,
+client.prototype._updateEmoteset = async function _updateEmoteset(sets) {
+	let setsChanges = sets !== undefined;
+	if(setsChanges) {
+		if(sets === this.emotes) {
+			setsChanges = false;
+		}
+		else {
+			this.emotes = sets;
+		}
+	}
+	if(this._skipUpdatingEmotesets) {
+		if(setsChanges) {
+			this.emit('emotesets', sets, {});
+		}
+		return;
+	}
+	try {
+		const token = await this._getToken();
+		const url = `https://api.twitch.tv/kraken/chat/emoticon_images?emotesets=${sets}`;
+		/** @type {import('node-fetch').Response} */
+		const res = await _fetch(url, {
 			headers: {
 				'Accept': 'application/vnd.twitchtv.v5+json',
 				'Authorization': `OAuth ${_.token(token)}`,
 				'Client-ID': this.clientId
 			}
-		}, (err, res, body) => {
-			if(!err) {
-				this.emotesets = body['emoticon_sets'] || {};
-				return this.emit('emotesets', sets, this.emotesets);
-			}
-			setTimeout(() => this._updateEmoteset(sets), 60000);
-		})
-	)
-	.catch(() => setTimeout(() => this._updateEmoteset(sets), 60000));
+		});
+		const data = await res.json();
+		this.emotesets = data.emoticon_sets || {};
+		this.emit('emotesets', sets, this.emotesets);
+	} catch(err) {
+		// TODO: Potentially send error to logger
+	}
+	if(this._updateEmotesetsTimerDelay > 0) {
+		clearTimeout(this._updateEmotesetsTimer);
+		this._updateEmotesetsTimer = setTimeout(() => this._updateEmoteset(), this._updateEmotesetsTimerDelay);
+	}
 };
 
 // Get current username..
