mirror of
https://github.com/FrankerFaceZ/FrankerFaceZ.git
synced 2025-08-06 06:10:54 +00:00
I really need to remember to commit more frequently.
This commit is contained in:
SirStendec
parent
800553c602
commit
d55af32b4e
45 changed files with 4777 additions and 2913 deletions
|
|
@ -158,7 +158,9 @@ FFZ.settings_info.mod_buttons = {
|
|||
help: "Change out the different in-line moderation icons to use any command quickly.",
|
||||
|
||||
method: function() {
|
||||
var old_val = "";
|
||||
var f = this,
|
||||
old_val = "";
|
||||
|
||||
for(var i=0; i < this.settings.mod_buttons.length; i++) {
|
||||
var pair = this.settings.mod_buttons[i],
|
||||
prefix = pair[0], cmd = pair[1], had_prefix = pair[2];
|
||||
|
|
@ -182,91 +184,102 @@ FFZ.settings_info.mod_buttons = {
|
|||
old_val += ' ' + prefix + cmd;
|
||||
}
|
||||
|
||||
var new_val = prompt("Custom In-Line Moderation Icons\n\nPlease enter a list of commands to be made available as mod icons within chat lines. Commands are separated by spaces. To include spaces in a command, surround the command with double quotes (\"). Use \"{user}\" to insert the user's username into the command, otherwise it will be appended to the end.\n\nExample: !permit \"!reg add {user}\"\n\nTo send multiple commands, separate them with \"<LINE>\".\n\nNumeric values will become timeout buttons for that number of seconds. The text \"<BAN>\" is a special value that will act like the normal Ban button in chat.\n\nTo assign a specific letter for use as the icon, specify it at the start of the command followed by an equals sign.\n\nExample: A=\"!reg add\"\n\nDefault: <BAN> 600", old_val);
|
||||
|
||||
if ( new_val === null || new_val === undefined )
|
||||
return;
|
||||
utils.prompt(
|
||||
"Custom In-Line Moderation Icons",
|
||||
"Please enter a list of commands to be made available as mod icons within chat lines. Commands are separated by spaces. " +
|
||||
"To include spaces in a command, surround the command with double quotes (\"). Use <code>{user}</code> to insert the user's name " +
|
||||
"into the command, otherwise it will be appended to the end.</p><p><b>Example:</b> <code>!permit \"!reg add {user}\"</code></p><p>To " +
|
||||
"send multiple commands, separate them with <code><LINE></code>.</p><p>Numeric values will become timeout buttons for " +
|
||||
"that number of seconds. The text <code><BAN></code> is a special value that will act like the normal Ban button in chat.</p><p>" +
|
||||
"To assign a specific letter for use as the icon, specify it at the start of the command followed by an equals sign.</p><p>" +
|
||||
"<b>Example:</b> <code>A=\"!reg add\"</code></p><p><b>Default:</b> <code><BAN> 600</code>",
|
||||
old_val.substr(1),
|
||||
function(new_val) {
|
||||
if ( new_val === null || new_val === undefined )
|
||||
return;
|
||||
|
||||
var vals = [], prefix = '';
|
||||
new_val = new_val.trim();
|
||||
var vals = [], prefix = '';
|
||||
new_val = new_val.trim();
|
||||
|
||||
while(new_val) {
|
||||
if ( new_val.charAt(1) === '=' ) {
|
||||
prefix = new_val.charAt(0);
|
||||
new_val = new_val.substr(2);
|
||||
continue;
|
||||
}
|
||||
while(new_val) {
|
||||
if ( new_val.charAt(1) === '=' ) {
|
||||
prefix = new_val.charAt(0);
|
||||
new_val = new_val.substr(2);
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( new_val.charAt(0) === '"' ) {
|
||||
var end = new_val.indexOf('"', 1);
|
||||
if ( end === -1 )
|
||||
end = new_val.length;
|
||||
if ( new_val.charAt(0) === '"' ) {
|
||||
var end = new_val.indexOf('"', 1);
|
||||
if ( end === -1 )
|
||||
end = new_val.length;
|
||||
|
||||
var segment = new_val.substr(1, end - 1);
|
||||
if ( segment ) {
|
||||
vals.push([prefix, segment]);
|
||||
prefix = '';
|
||||
}
|
||||
var segment = new_val.substr(1, end - 1);
|
||||
if ( segment ) {
|
||||
vals.push([prefix, segment]);
|
||||
prefix = '';
|
||||
}
|
||||
|
||||
new_val = new_val.substr(end + 1);
|
||||
new_val = new_val.substr(end + 1);
|
||||
|
||||
} else {
|
||||
var ind = new_val.indexOf(' ');
|
||||
if ( ind === -1 ) {
|
||||
if ( new_val ) {
|
||||
vals.push([prefix, new_val]);
|
||||
prefix = '';
|
||||
}
|
||||
} else {
|
||||
var ind = new_val.indexOf(' ');
|
||||
if ( ind === -1 ) {
|
||||
if ( new_val ) {
|
||||
vals.push([prefix, new_val]);
|
||||
prefix = '';
|
||||
}
|
||||
|
||||
new_val = '';
|
||||
new_val = '';
|
||||
|
||||
} else {
|
||||
var segment = new_val.substr(0, ind);
|
||||
if ( segment ) {
|
||||
vals.push([prefix, segment]);
|
||||
prefix = '';
|
||||
}
|
||||
} else {
|
||||
var segment = new_val.substr(0, ind);
|
||||
if ( segment ) {
|
||||
vals.push([prefix, segment]);
|
||||
prefix = '';
|
||||
}
|
||||
|
||||
new_val = new_val.substr(ind + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
new_val = new_val.substr(ind + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var final = [];
|
||||
for(var i=0; i < vals.length; i++) {
|
||||
var had_prefix = false, prefix = vals[i][0], val = vals[i][1];
|
||||
if ( val === "<BAN>" )
|
||||
val = false;
|
||||
var final = [];
|
||||
for(var i=0; i < vals.length; i++) {
|
||||
var had_prefix = false, prefix = vals[i][0], val = vals[i][1];
|
||||
if ( val === "<BAN>" )
|
||||
val = false;
|
||||
|
||||
var num = parseInt(val);
|
||||
if ( num > 0 && num !== NaN )
|
||||
val = num;
|
||||
var num = parseInt(val);
|
||||
if ( num > 0 && ! Number.isNaN(num) )
|
||||
val = num;
|
||||
|
||||
if ( ! prefix ) {
|
||||
var tmp;
|
||||
if ( typeof val === "string" )
|
||||
tmp = /\w/.exec(val);
|
||||
else
|
||||
tmp = utils.duration_string(val);
|
||||
if ( ! prefix ) {
|
||||
var tmp;
|
||||
if ( typeof val === "string" )
|
||||
tmp = /\w/.exec(val);
|
||||
else
|
||||
tmp = utils.duration_string(val);
|
||||
|
||||
prefix = tmp && tmp.length ? tmp[0].toUpperCase() : "C";
|
||||
} else
|
||||
had_prefix = true;
|
||||
prefix = tmp && tmp.length ? tmp[0].toUpperCase() : "C";
|
||||
} else
|
||||
had_prefix = true;
|
||||
|
||||
if ( typeof val === "string" ) {
|
||||
// Split it up for this step.
|
||||
var lines = val.split(/ *<LINE> */);
|
||||
for(var x=0; x < lines.length; x++) {
|
||||
if ( lines[x].indexOf('{user}') === -1 )
|
||||
lines[x] += ' {user}';
|
||||
}
|
||||
val = lines.join("<LINE>");
|
||||
}
|
||||
if ( typeof val === "string" ) {
|
||||
// Split it up for this step.
|
||||
var lines = val.split(/ *<LINE> */);
|
||||
for(var x=0; x < lines.length; x++) {
|
||||
if ( lines[x].indexOf('{user}') === -1 )
|
||||
lines[x] += ' {user}';
|
||||
}
|
||||
val = lines.join("<LINE>");
|
||||
}
|
||||
|
||||
final.push([prefix, val, had_prefix]);
|
||||
}
|
||||
final.push([prefix, val, had_prefix]);
|
||||
}
|
||||
|
||||
this.settings.set('mod_buttons', final);
|
||||
f.settings.set('mod_buttons', final);
|
||||
}, 600);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -282,7 +295,8 @@ FFZ.settings_info.mod_card_buttons = {
|
|||
help: "Add additional buttons to moderation cards for running chat commands on those users.",
|
||||
|
||||
method: function() {
|
||||
var old_val = "";
|
||||
var f = this,
|
||||
old_val = "";
|
||||
for(var i=0; i < this.settings.mod_card_buttons.length; i++) {
|
||||
var cmd = this.settings.mod_card_buttons[i];
|
||||
if ( cmd.indexOf(' ') !== -1 )
|
||||
|
|
@ -291,45 +305,51 @@ FFZ.settings_info.mod_card_buttons = {
|
|||
old_val += ' ' + cmd;
|
||||
}
|
||||
|
||||
var new_val = prompt("Moderation Card Additional Buttons\n\nPlease enter a list of additional commands to display buttons for on moderation cards. Commands are separated by spaces. To include spaces in a command, surround the command with double quotes (\"). Use \"{user}\" to insert the user's username into the command, otherwise it will be appended to the end.\n\nExample: !permit \"!reg add {user}\"", old_val);
|
||||
utils.prompt(
|
||||
"Moderation Card Additional Buttons",
|
||||
"Please enter a list of additional commands to display buttons for on moderation cards. Commands are separated by spaces. " +
|
||||
"To include spaces in a command, surround the command with double quotes (\"). Use <code>{user}</code> to insert the " +
|
||||
"user's name into the command, otherwise it will be appended to the end.</p><p><b>Example:</b> !permit \"!reg add {user}\"",
|
||||
old_val.substr(1),
|
||||
function(new_val) {
|
||||
if ( new_val === null || new_val === undefined )
|
||||
return;
|
||||
|
||||
if ( new_val === null || new_val === undefined )
|
||||
return;
|
||||
var vals = [];
|
||||
new_val = new_val.trim();
|
||||
|
||||
var vals = [];
|
||||
new_val = new_val.trim();
|
||||
while(new_val) {
|
||||
if ( new_val.charAt(0) === '"' ) {
|
||||
var end = new_val.indexOf('"', 1);
|
||||
if ( end === -1 )
|
||||
end = new_val.length;
|
||||
|
||||
while(new_val) {
|
||||
if ( new_val.charAt(0) === '"' ) {
|
||||
var end = new_val.indexOf('"', 1);
|
||||
if ( end === -1 )
|
||||
end = new_val.length;
|
||||
var segment = new_val.substr(1, end - 1);
|
||||
if ( segment )
|
||||
vals.push(segment);
|
||||
|
||||
var segment = new_val.substr(1, end - 1);
|
||||
if ( segment )
|
||||
vals.push(segment);
|
||||
new_val = new_val.substr(end + 1);
|
||||
|
||||
new_val = new_val.substr(end + 1);
|
||||
} else {
|
||||
var ind = new_val.indexOf(' ');
|
||||
if ( ind === -1 ) {
|
||||
if ( new_val )
|
||||
vals.push(new_val);
|
||||
|
||||
} else {
|
||||
var ind = new_val.indexOf(' ');
|
||||
if ( ind === -1 ) {
|
||||
if ( new_val )
|
||||
vals.push(new_val);
|
||||
new_val = '';
|
||||
|
||||
new_val = '';
|
||||
} else {
|
||||
var segment = new_val.substr(0, ind);
|
||||
if ( segment )
|
||||
vals.push(segment);
|
||||
|
||||
} else {
|
||||
var segment = new_val.substr(0, ind);
|
||||
if ( segment )
|
||||
vals.push(segment);
|
||||
new_val = new_val.substr(ind + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
new_val = new_val.substr(ind + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.settings.set("mod_card_buttons", vals);
|
||||
f.settings.set("mod_card_buttons", vals);
|
||||
}, 600);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -345,29 +365,36 @@ FFZ.settings_info.mod_card_durations = {
|
|||
help: "Add additional timeout buttons to moderation cards with specific durations.",
|
||||
|
||||
method: function() {
|
||||
var old_val = this.settings.mod_card_durations.join(", "),
|
||||
new_val = prompt("Moderation Card Timeout Buttons\n\nPlease enter a comma-separated list of durations that you would like to have timeout buttons for. Durations must be expressed in seconds.\n\nEnter \"reset\" without quotes to return to the default value.", old_val);
|
||||
var f = this,
|
||||
old_val = this.settings.mod_card_durations.join(", ");
|
||||
|
||||
if ( new_val === null || new_val === undefined )
|
||||
return;
|
||||
utils.prompt(
|
||||
"Moderation Card Timeout Buttons",
|
||||
"Please enter a comma-separated list of durations that you would like to have timeout buttons for. " +
|
||||
"Durations must be expressed in seconds.</p><p><b>Default:</b> 300, 600, 3600, 43200, 86400, 604800",
|
||||
old_val,
|
||||
function(new_val) {
|
||||
if ( new_val === null || new_val === undefined )
|
||||
return;
|
||||
|
||||
if ( new_val === "reset" )
|
||||
new_val = FFZ.settings_info.mod_card_durations.value.join(", ");
|
||||
if ( new_val === "reset" )
|
||||
new_val = FFZ.settings_info.mod_card_durations.value.join(", ");
|
||||
|
||||
// Split them up.
|
||||
new_val = new_val.trim().split(/[ ,]+/);
|
||||
var vals = [];
|
||||
// Split them up.
|
||||
new_val = new_val.trim().split(/[ ,]+/);
|
||||
var vals = [];
|
||||
|
||||
for(var i=0; i < new_val.length; i++) {
|
||||
var val = parseInt(new_val[i]);
|
||||
if ( val === 0 )
|
||||
val = 1;
|
||||
for(var i=0; i < new_val.length; i++) {
|
||||
var val = parseInt(new_val[i]);
|
||||
if ( val === 0 )
|
||||
val = 1;
|
||||
|
||||
if ( val !== NaN && val > 0 )
|
||||
vals.push(val);
|
||||
}
|
||||
if ( ! Number.isNaN(val) && val > 0 )
|
||||
vals.push(val);
|
||||
}
|
||||
|
||||
this.settings.set("mod_card_durations", vals);
|
||||
f.settings.set("mod_card_durations", vals);
|
||||
}, 600);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -420,7 +447,7 @@ FFZ.prototype.setup_mod_card = function() {
|
|||
} else if ( followers === undefined ) {
|
||||
var t = this;
|
||||
this.set('cardInfo.user.ffz_followers', false);
|
||||
Twitch.api.get("channels/" + this.get('cardInfo.user.id') + '/follows', {limit:1}).done(function(data) {
|
||||
utils.api.get("channels/" + this.get('cardInfo.user.id') + '/follows', {limit:1}).done(function(data) {
|
||||
t.set('cardInfo.user.ffz_followers', data._total);
|
||||
t.ffzRebuildInfo();
|
||||
}).fail(function(data) {
|
||||
|
|
@ -682,7 +709,7 @@ FFZ.prototype.setup_mod_card = function() {
|
|||
real_msg.title = "Message User";
|
||||
|
||||
real_msg.addEventListener('click', function() {
|
||||
window.open('http://www.twitch.tv/message/compose?to=' + controller.get('cardInfo.user.id'));
|
||||
window.open('//www.twitch.tv/message/compose?to=' + controller.get('cardInfo.user.id'));
|
||||
})
|
||||
|
||||
msg_btn.parentElement.insertBefore(real_msg, msg_btn.nextSibling);
|
||||
|
|
@ -699,28 +726,29 @@ FFZ.prototype.setup_mod_card = function() {
|
|||
var user = controller.get('cardInfo.user.id'),
|
||||
alias = f.aliases[user];
|
||||
|
||||
var new_val = prompt("Alias for User: " + user + "\n\nPlease enter an alias for the user. Leave it blank to remove the alias.", alias);
|
||||
if ( new_val === null || new_val === undefined )
|
||||
return;
|
||||
utils.prompt(
|
||||
"Alias for <b>" + utils.sanitize(controller.get('cardInfo.user.display_name') || user) + "</b>",
|
||||
"Please enter an alias for the user. Leave it blank to remove the alias.",
|
||||
alias,
|
||||
function(new_val) {
|
||||
if ( new_val === null || new_val === undefined )
|
||||
return;
|
||||
|
||||
new_val = new_val.trim();
|
||||
if ( ! new_val )
|
||||
new_val = undefined;
|
||||
new_val = new_val.trim();
|
||||
if ( ! new_val )
|
||||
new_val = undefined;
|
||||
|
||||
f.aliases[user] = new_val;
|
||||
f.save_aliases();
|
||||
f.aliases[user] = new_val;
|
||||
f.save_aliases();
|
||||
|
||||
// Update UI
|
||||
f._update_alias(user);
|
||||
// Update UI
|
||||
f._update_alias(user);
|
||||
|
||||
Ember.propertyDidChange(controller, 'userName');
|
||||
var name = el.querySelector('h3.name'),
|
||||
link = name && name.querySelector('a');
|
||||
|
||||
if ( link )
|
||||
name = link;
|
||||
if ( name )
|
||||
name.classList.toggle('ffz-alias', new_val);
|
||||
Ember.propertyDidChange(controller, 'cardInfo.user.display_name');
|
||||
var name = el.querySelector('h3.name');
|
||||
if ( name )
|
||||
name.classList.toggle('ffz-alias', new_val);
|
||||
});
|
||||
});
|
||||
|
||||
if ( msg_btn )
|
||||
|
|
@ -1040,9 +1068,11 @@ FFZ.prototype._build_mod_card_history = function(msg, modcard, show_from) {
|
|||
|
||||
// Interactivity
|
||||
jQuery('a.undelete', l_el).click(function(e) { this.parentElement.outerHTML = this.getAttribute('data-message'); });
|
||||
jQuery('.deleted-word', l_el).click(function(e) { jQuery(this).trigger('mouseout'); this.outerHTML = this.getAttribute('data-text'); });
|
||||
jQuery('a.deleted-link', l_el).click(f._deleted_link_click);
|
||||
jQuery('img.emoticon', l_el).click(function(e) { f._click_emote(this, e) });
|
||||
jQuery('.html-tooltip', l_el).tipsy({html:true, gravity: utils.tooltip_placement(2*constants.TOOLTIP_DISTANCE, 's')});
|
||||
jQuery('.ffz-tooltip', l_el).tipsy({live: true, html: true, title: f.render_tooltip(), gravity: utils.tooltip_placement(2*constants.TOOLTIP_DISTANCE, 's')});
|
||||
|
||||
if ( modcard ) {
|
||||
modcard.get('cardInfo.user.id') !== msg.from && jQuery('span.from', l_el).click(function(e) {
|
||||
|
|
@ -1082,6 +1112,9 @@ FFZ.prototype._update_alias = function(user) {
|
|||
var line = lines[i],
|
||||
el_from = line.querySelector('.from');
|
||||
|
||||
if ( ! el_from )
|
||||
continue;
|
||||
|
||||
el_from.classList.toggle('ffz-alias', alias);
|
||||
el_from.textContent = display_name;
|
||||
el_from.title = alias ? cap_name : '';
|
||||
|
|
@ -1110,7 +1143,7 @@ FFZ.chat_commands.purge = function(room, args) {
|
|||
}
|
||||
|
||||
FFZ.chat_commands.p = function(room, args) {
|
||||
return FFZ.chat_commands.purge.bind(this)(room, args);
|
||||
return FFZ.chat_commands.purge.call(this, room, args);
|
||||
}
|
||||
|
||||
FFZ.chat_commands.p.enabled = function() { return this.settings.short_commands; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue