oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-04 11:44:00 +00:00
Code Wiki Activity

3.5.379. Fix chat breaking due to unloaded badge data. Fix host mode not starting correctly. Add name_key parameter to API constructor. Use name_key for badge classes rather than id to give badges added by the API stable, predictable classnames.

Browse source
This commit is contained in:
SirStendec 2016-11-23 16:41:49 -05:00
parent caa68c507c
commit 32f3e9b20b
8 changed files with 60 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ext/api.js
View file

@ -69,14 +69,18 @@ var API = FFZ.API = function(instance, name, icon, version, name_key) {
this.name = name || ("Extension#" + this.id);
this.name_key = name_key || this.name.replace(/[^A-Z0-9_\-]/g, '').toLowerCase();
// We can't start name key with a number.
if ( /^[0-9]/.test(this.name_key) )
this.name_key = '_' + this.name_key;
this.icon = icon || null;
this.version = version || null;
this.ffz.log('Registered New Extension #' + this.id + ': ' + this.name);
this.ffz.log('Registered New Extension #' + this.id + ' (' + this.name_key + '): ' + this.name);
};
FFZ.prototype.api = function(name, icon, version) {
FFZ.prototype.api = function(name, icon, version, name_key) {
// Load the known APIs list.
if ( ! this._known_apis ) {
this._known_apis = {};
@ -88,17 +92,17 @@ FFZ.prototype.api = function(name, icon, version) {
}
}
return new API(this, name, icon, version);
return new API(this, name, icon, version, name_key);
}
API.prototype.log = function(msg, data, to_json, log_json) {
this.ffz.log('Ext "' + this.name + '": ' + msg, data, to_json, log_json);
this.ffz.log('Ext #' + this.id + ' (' + this.name_key + '): ' + msg, data, to_json, log_json);
}
API.prototype.error = function(msg, error, to_json, log_json) {
this.ffz.error('Ext "' + this.name + '": ' + msg, data, to_json, log_json);
this.ffz.error('Ext #' + this.id + ' (' + this.name_key + '): ' + msg, data, to_json, log_json);
}
@ -431,7 +435,7 @@ API.prototype.unregister_room_set = function(room_id, set_id) {
// -----------------------
API.prototype.add_badge = function(badge_id, badge) {
var exact_id = this.id + '-' + badge_id,
var exact_id = this.name_key + '-' + badge_id, // this.id + '-' + badge_id,
real_badge = _.extend({}, badge, {
id: exact_id,
@ -453,7 +457,7 @@ API.prototype.add_badge = function(badge_id, badge) {
API.prototype.remove_badge = function(badge_id) {
var exact_id = this.id + '-' + badge_id;
var exact_id = this.name_key + '-' + badge_id;
this.badges[badge_id] = undefined;
if ( this.ffz.badges )
@ -475,7 +479,7 @@ API.prototype.user_add_badge = function(username, slot, badge_id) {
badges = user.badges = user.badges || {},
ffz_badges = ffz_user.badges = ffz_user.badges || {},
exact_id = this.id + '-' + badge_id,
exact_id = this.name_key + '-' + badge_id,
badge = {id: exact_id};
badges[slot] = ffz_badges[slot] = badge;