forked from GitHub/dbot
Merge branch 'master' of https://github.com/reality/dbot
This commit is contained in:
reality
commit
a4697e8d36
@ -1,10 +1,10 @@
|
||||
var _ = require('underscore')._,
|
||||
uuid = require('node-uuid');
|
||||
uuid = require('node-uuid');
|
||||
|
||||
var commands = function(dbot) {
|
||||
var commands = function (dbot) {
|
||||
var commands = {
|
||||
/*** Kick Management ***/
|
||||
'~quiet': function(event) {
|
||||
'~quiet': function (event) {
|
||||
var server = event.server,
|
||||
quieter = event.rUser,
|
||||
duration = event.input[1],
|
||||
@ -12,12 +12,12 @@ var commands = function(dbot) {
|
||||
quietee = event.input[3].trim(),
|
||||
reason = event.input[4] || "N/A";
|
||||
|
||||
this.api.quietUser(server, quieter, duration, channel, quietee, reason, function(response) {
|
||||
this.api.quietUser(server, quieter, duration, channel, quietee, reason, function (response) {
|
||||
event.reply(response);
|
||||
});
|
||||
},
|
||||
|
||||
'~timeout': function(event) {
|
||||
'~timeout': function (event) {
|
||||
var server = event.server,
|
||||
quieter = event.rUser,
|
||||
duration = this.config.timeoutTime,
|
||||
@ -27,46 +27,50 @@ var commands = function(dbot) {
|
||||
|
||||
reason += ' #timeout';
|
||||
|
||||
dbot.api.users.resolveUser(server, quietee, function(err, user) {
|
||||
if(!err && user) {
|
||||
if(!_.has(this.recentTimeouts, user.id)) {
|
||||
dbot.api.users.resolveUser(server, quietee, function (err, user) {
|
||||
if (!err && user) {
|
||||
if (!_.has(this.recentTimeouts, user.id)) {
|
||||
this.recentTimeouts[user.id] = 0;
|
||||
}
|
||||
|
||||
this.recentTimeouts[user.id] += 1;
|
||||
setTimeout(function() {
|
||||
setTimeout(function () {
|
||||
this.recentTimeouts[user.id] -= 1;
|
||||
if(this.recentTimeouts[user.id] == 0) {
|
||||
if (this.recentTimeouts[user.id] == 0) {
|
||||
delete this.recentTimeouts[user.id];
|
||||
}
|
||||
}.bind(this), 3600000);
|
||||
}
|
||||
.bind(this), 3600000);
|
||||
|
||||
if(this.recentTimeouts[user.id] == 3) {
|
||||
if (this.recentTimeouts[user.id] == 3) {
|
||||
duration = null;
|
||||
reason += ' #permatimeout';
|
||||
dbot.say(event.server, dbot.config.servers[event.server].admin_channel, quietee + ' has been given three timeouts in the last hour, and so has been quieted indefinitely in '+channel+'. Please review.');
|
||||
dbot.say(event.server, dbot.config.servers[event.server].admin_channel, quietee + ' has been given three timeouts in the last hour, and so has been quieted indefinitely in ' + channel + '. Please review.');
|
||||
}
|
||||
|
||||
this.api.quietUser(server, quieter, duration, channel, quietee, reason, function(response) {
|
||||
this.api.quietUser(server, quieter, duration, channel, quietee, reason, function (response) {
|
||||
event.reply(response);
|
||||
});
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
},
|
||||
|
||||
'~unquiet': function(event) {
|
||||
'~unquiet': function (event) {
|
||||
var server = event.server,
|
||||
quieter = event.user,
|
||||
channel = (event.input[1] || event.channel.name).trim(),
|
||||
quietee = event.input[2].trim();
|
||||
|
||||
if(_.has(this.hosts[server], quietee)) {
|
||||
if(_.include(this.config.quietBans, channel)) {
|
||||
if (_.has(this.hosts[server], quietee)) {
|
||||
if (_.include(this.config.quietBans, channel)) {
|
||||
this.api.unban(server, this.hosts[server][quietee], channel);
|
||||
} else {
|
||||
this.api.unquiet(server, this.hosts[server][quietee], channel);
|
||||
}
|
||||
event.reply(dbot.t('unquieted', { 'quietee': quietee }));
|
||||
event.reply(dbot.t('unquieted', {
|
||||
'quietee': quietee
|
||||
}));
|
||||
dbot.api.report.notify('unquiet', server, event.rUser, channel,
|
||||
dbot.t('unquiet_notify', {
|
||||
'unquieter': quieter,
|
||||
@ -75,14 +79,14 @@ var commands = function(dbot) {
|
||||
}
|
||||
},
|
||||
|
||||
'~ckick': function(event) {
|
||||
'~ckick': function (event) {
|
||||
var server = event.server,
|
||||
kicker = event.user,
|
||||
kickee = event.input[2],
|
||||
channel = event.input[1],
|
||||
reason = event.input[3];
|
||||
|
||||
if(_.isUndefined(channel)) {
|
||||
if (_.isUndefined(channel)) {
|
||||
channel = event.channel.name;
|
||||
}
|
||||
channel = channel.trim();
|
||||
@ -97,8 +101,9 @@ var commands = function(dbot) {
|
||||
},
|
||||
|
||||
// Kick and ban from all channels on the network.
|
||||
'~nban': function(event) {
|
||||
if(!event.input) return;
|
||||
'~nban': function (event) {
|
||||
if (!event.input)
|
||||
return;
|
||||
|
||||
var server = event.server,
|
||||
banner = event.user,
|
||||
@ -109,27 +114,32 @@ var commands = function(dbot) {
|
||||
channels = _.keys(dbot.instance.connections[server].channels),
|
||||
network = event.server;
|
||||
|
||||
if(this.config.network_name[event.server]) {
|
||||
if (this.config.network_name[event.server]) {
|
||||
network = this.config.network_name[event.server];
|
||||
}
|
||||
|
||||
dbot.api.nickserv.getUserHost(event.server, banee, function(host) {
|
||||
dbot.api.nickserv.getUserHost(event.server, banee, function (host) {
|
||||
// Add host record entry
|
||||
if(host) {
|
||||
if((reason.match('#line') || reason.match('#specialk') || reason.match('#kline')) && _.include(dbot.access.moderator(), event.rUser.primaryNick)) {
|
||||
if (host) {
|
||||
var didKill = false;
|
||||
|
||||
if ((reason.match('#line') || reason.match('#specialk') || reason.match('#kline')) && _.include(dbot.access.moderator(), event.rUser.primaryNick)) {
|
||||
didKill = true;
|
||||
var t = ' !P ';
|
||||
if(timeout) {
|
||||
if (timeout) {
|
||||
t = ' !T ' + (timeout * 60);
|
||||
}
|
||||
dbot.say(event.server, 'operserv', 'akill add '+banee + t + banee + ' banned by ' + banner + ': ' + reason);
|
||||
dbot.say(event.server, 'operserv', 'akill add ' + banee + t + banee + ' banned by ' + banner + ': ' + reason);
|
||||
}
|
||||
|
||||
// Do not ban if user was killed - redundant
|
||||
if(!didKill) {
|
||||
// Ban from current channel first
|
||||
this.api.ban(server, host, event.channel);
|
||||
this.api.kick(server, banee, event.channel, reason +
|
||||
' (network-wide ban)');
|
||||
channels = _.without(channels, event.channel);
|
||||
if(!_.isUndefined(adminChannel)) {
|
||||
if (!_.isUndefined(adminChannel)) {
|
||||
channels = _.without(channels, adminChannel);
|
||||
} else {
|
||||
adminChannel = event.channel.name;
|
||||
@ -137,26 +147,30 @@ var commands = function(dbot) {
|
||||
|
||||
// Ban the user from all channels
|
||||
var i = 0;
|
||||
var banChannel = function(channels) {
|
||||
if(i >= channels.length) return;
|
||||
var banChannel = function (channels) {
|
||||
if (i >= channels.length)
|
||||
return;
|
||||
var channel = channels[i];
|
||||
this.api.ban(server, host, channel);
|
||||
this.api.kick(server, banee, channel, reason +
|
||||
' (network-wide ban)');
|
||||
i++; banChannel(channels);
|
||||
}.bind(this);
|
||||
i++;
|
||||
banChannel(channels);
|
||||
}
|
||||
.bind(this);
|
||||
banChannel(channels);
|
||||
}
|
||||
|
||||
this.hosts[event.server][banee] = host;
|
||||
|
||||
// Create notify string
|
||||
if(!_.isUndefined(timeout)) {
|
||||
if (!_.isUndefined(timeout)) {
|
||||
timeout = timeout.trim();
|
||||
|
||||
var msTimeout = new Date(new Date().getTime() + (parseFloat(timeout) * 3600000));
|
||||
if(_.has(dbot.modules, 'remind')) {
|
||||
if (_.has(dbot.modules, 'remind')) {
|
||||
msTimeout = dbot.api.remind.parseTime(timeout);
|
||||
if(!msTimeout) {
|
||||
if (!msTimeout) {
|
||||
return event.reply('Invalid time. Remember you must give e.g. 5m now.');
|
||||
}
|
||||
timeout = timeout.replace(/([\d]+)d/, '$1 days').replace(/([\d]+)h/, '$1 hours ').replace(/([\d]+)m/, '$1 minutes ').replace(/([\d]+)s/, '$1 seconds').trim();
|
||||
@ -164,9 +178,13 @@ var commands = function(dbot) {
|
||||
timeout += ' hours';
|
||||
}
|
||||
|
||||
if(!_.has(this.tempBans, event.server)) this.tempBans[event.server] = {};
|
||||
// Do not schedule unbans if the user was killed as no ban was put in place
|
||||
if(!didKill) {
|
||||
if (!_.has(this.tempBans, event.server))
|
||||
this.tempBans[event.server] = {};
|
||||
this.tempBans[event.server][banee] = msTimeout;
|
||||
this.internalAPI.addTempBan(event.server, banee, msTimeout);
|
||||
}
|
||||
|
||||
var notifyString = dbot.t('tbanned', {
|
||||
'network': network,
|
||||
@ -187,7 +205,7 @@ var commands = function(dbot) {
|
||||
}
|
||||
|
||||
// Add db entry documenting ban
|
||||
if(this.config.document_bans) {
|
||||
if (this.config.document_bans) {
|
||||
var id = uuid.v4();
|
||||
var banRecord = {
|
||||
'id': id,
|
||||
@ -198,11 +216,11 @@ var commands = function(dbot) {
|
||||
'host': host,
|
||||
'reason': reason
|
||||
};
|
||||
this.db.save('nbans', id, banRecord, function() {});
|
||||
this.db.save('nbans', id, banRecord, function () {});
|
||||
}
|
||||
|
||||
// Notify moderators, banee
|
||||
if(!_.isUndefined(adminChannel)) {
|
||||
if (!_.isUndefined(adminChannel)) {
|
||||
channels = _.without(channels, adminChannel);
|
||||
} else {
|
||||
adminChannel = event.channel.name;
|
||||
@ -211,7 +229,7 @@ var commands = function(dbot) {
|
||||
dbot.api.report.notify('ban', server, event.rUser, adminChannel, notifyString, false, banee);
|
||||
dbot.say(event.server, adminChannel, notifyString);
|
||||
|
||||
if(!_.isUndefined(timeout)) {
|
||||
if (!_.isUndefined(timeout)) {
|
||||
dbot.say(event.server, banee, dbot.t('tbanned_notify', {
|
||||
'network': network,
|
||||
'banner': banner,
|
||||
@ -232,19 +250,24 @@ var commands = function(dbot) {
|
||||
// err
|
||||
dbot.say(event.server, 'NickServ', 'FREEZE ' + banee + ' ON ' + reason);
|
||||
} else {
|
||||
event.reply(dbot.t('no_user', { 'user': banee }));
|
||||
event.reply(dbot.t('no_user', {
|
||||
'user': banee
|
||||
}));
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
},
|
||||
|
||||
'~nunban': function(event) {
|
||||
'~nunban': function (event) {
|
||||
var unbanee = event.params[1],
|
||||
host = event.params[2] || undefined,
|
||||
unbanner = event.rUser;
|
||||
|
||||
this.api.networkUnban(event.server, unbanee, unbanner, host, function(err) {
|
||||
if(err) {
|
||||
event.reply(dbot.t('nunban_error', { 'unbanee': unbanee }));
|
||||
this.api.networkUnban(event.server, unbanee, unbanner, host, function (err) {
|
||||
if (err) {
|
||||
event.reply(dbot.t('nunban_error', {
|
||||
'unbanee': unbanee
|
||||
}));
|
||||
}
|
||||
});
|
||||
},
|
||||
@ -253,16 +276,16 @@ var commands = function(dbot) {
|
||||
|
||||
// Give the number of times a given user has been kicked and has kicked
|
||||
// other people.
|
||||
'~kickcount': function(event) {
|
||||
'~kickcount': function (event) {
|
||||
var username = event.params[1];
|
||||
|
||||
if(!_.has(dbot.db.kicks, username)) {
|
||||
if (!_.has(dbot.db.kicks, username)) {
|
||||
var kicks = '0';
|
||||
} else {
|
||||
var kicks = dbot.db.kicks[username];
|
||||
}
|
||||
|
||||
if(!_.has(dbot.db.kickers, username)) {
|
||||
if (!_.has(dbot.db.kickers, username)) {
|
||||
var kicked = '0';
|
||||
} else {
|
||||
var kicked = dbot.db.kickers[username];
|
||||
@ -277,17 +300,19 @@ var commands = function(dbot) {
|
||||
|
||||
// Output a list of the people who have been kicked the most and those
|
||||
// who have kicked other people the most.
|
||||
'~kickstats': function(event) {
|
||||
var orderedKickLeague = function(list, topWhat) {
|
||||
'~kickstats': function (event) {
|
||||
var orderedKickLeague = function (list, topWhat) {
|
||||
var kickArr = _.chain(list)
|
||||
.pairs()
|
||||
.sortBy(function(kick) { return kick[1] })
|
||||
.sortBy(function (kick) {
|
||||
return kick[1]
|
||||
})
|
||||
.reverse()
|
||||
.first(10)
|
||||
.value();
|
||||
|
||||
var kickString = "Top " + topWhat + ": ";
|
||||
for(var i=0;i<kickArr.length;i++) {
|
||||
for (var i = 0; i < kickArr.length; i++) {
|
||||
kickString += kickArr[i][0] + " (" + kickArr[i][1] + "), ";
|
||||
}
|
||||
|
||||
@ -298,28 +323,34 @@ var commands = function(dbot) {
|
||||
event.reply(orderedKickLeague(dbot.db.kickers, 'Kickers'));
|
||||
},
|
||||
|
||||
'~votequiet': function(event) {
|
||||
'~votequiet': function (event) {
|
||||
var target = event.input[1],
|
||||
reason = event.input[2];
|
||||
|
||||
if(_.has(event.channel.nicks, target)) {
|
||||
dbot.api.users.resolveUser(event.server, target, function(err, user) {
|
||||
if(!err && user) {
|
||||
if(_.include(dbot.access.power_user(), user.primaryNick) || target == dbot.config.name) {
|
||||
if (_.has(event.channel.nicks, target)) {
|
||||
dbot.api.users.resolveUser(event.server, target, function (err, user) {
|
||||
if (!err && user) {
|
||||
if (_.include(dbot.access.power_user(), user.primaryNick) || target == dbot.config.name) {
|
||||
return event.reply('User is immune to votequiet.');
|
||||
}
|
||||
|
||||
if(!_.has(this.voteQuiets, user.id)) {
|
||||
this.voteQuiets[user.id] = { 'user': user.id, 'reason': reason, 'channel': event.channel, 'yes': [event.rUser.primaryNick], 'no': [] };
|
||||
if (!_.has(this.voteQuiets, user.id)) {
|
||||
this.voteQuiets[user.id] = {
|
||||
'user': user.id,
|
||||
'reason': reason,
|
||||
'channel': event.channel,
|
||||
'yes': [event.rUser.primaryNick],
|
||||
'no': []
|
||||
};
|
||||
event.reply(event.user + ' has started a vote to quiet ' + target + ' for "' + reason + '." Type either "~voteyes ' + target + '" or "~voteno ' + target + '" in the next 90 seconds.');
|
||||
|
||||
this.voteQuiets[user.id].timer = setTimeout(function() {
|
||||
this.voteQuiets[user.id].timer = setTimeout(function () {
|
||||
var vq = this.voteQuiets[user.id];
|
||||
vq.spent = true;
|
||||
if(vq.yes.length >= 3 && vq.no.length < 2) {
|
||||
if (vq.yes.length >= 3 && vq.no.length < 2) {
|
||||
event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
|
||||
|
||||
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, reason + '[votequiet]', function(response) {
|
||||
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, reason + '[votequiet]', function (response) {
|
||||
clearTimeout(vq.timer);
|
||||
event.reply(response);
|
||||
});
|
||||
@ -329,35 +360,38 @@ var commands = function(dbot) {
|
||||
|
||||
var nString = 'A votequiet was attempted on ' + target + ' in ' + event.channel + '. It was initiated by ' + event.rUser.primaryNick + '. ' +
|
||||
vq.yes.join(', ') + ' voted yes (' + vq.yes.length + '). ';
|
||||
if(vq.no.length > 0) {
|
||||
if (vq.no.length > 0) {
|
||||
nString += vq.no.join(', ') + ' voted no (' + vq.no.length + ').'
|
||||
}
|
||||
|
||||
dbot.api.report.notify('votequiet', event.server, event.rUser, event.channel, nString, false, target);
|
||||
|
||||
setTimeout(function() {
|
||||
setTimeout(function () {
|
||||
delete this.voteQuiets[user.id];
|
||||
}.bind(this), 600000);
|
||||
}.bind(this), 90000);
|
||||
}
|
||||
.bind(this), 600000);
|
||||
}
|
||||
.bind(this), 90000);
|
||||
} else {
|
||||
if(this.voteQuiets[user.id].spent) {
|
||||
if (this.voteQuiets[user.id].spent) {
|
||||
event.reply('A votequiet attempt has already been made on this user in the last 10 minutes.');
|
||||
} else {
|
||||
var vq = this.voteQuiets[user.id]
|
||||
if(!_.include(vq.yes, event.rUser.primaryNick)) {
|
||||
if (!_.include(vq.yes, event.rUser.primaryNick)) {
|
||||
vq.yes.push(event.rUser.primaryNick);
|
||||
|
||||
event.reply('There is already a votequiet attempt active for this user, adding yes vote to existing poll.');
|
||||
event.reply('Voted yes on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
|
||||
|
||||
if(vq.yes.length == 4) {
|
||||
if (vq.yes.length == 4) {
|
||||
event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
|
||||
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, reason + '[votequiet]', function(response) {
|
||||
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, reason + '[votequiet]', function (response) {
|
||||
clearTimeout(vq.timer);
|
||||
vq.spent = true;
|
||||
setTimeout(function() {
|
||||
setTimeout(function () {
|
||||
delete this.voteQuiets[user.id];
|
||||
}.bind(this), 600000);
|
||||
}
|
||||
.bind(this), 600000);
|
||||
event.reply(response);
|
||||
});
|
||||
}
|
||||
@ -369,37 +403,39 @@ var commands = function(dbot) {
|
||||
} else {
|
||||
event.reply('Target does not seem to be in the channel.');
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
} else {
|
||||
event.reply('Target does not seem to be in the channel.');
|
||||
}
|
||||
},
|
||||
|
||||
'~voteyes': function(event) {
|
||||
'~voteyes': function (event) {
|
||||
var target = event.params[1];
|
||||
|
||||
dbot.api.users.resolveUser(event.server, target, function(err, user) {
|
||||
if(!err && user) {
|
||||
if(user.id == event.rUser.id) {
|
||||
dbot.api.users.resolveUser(event.server, target, function (err, user) {
|
||||
if (!err && user) {
|
||||
if (user.id == event.rUser.id) {
|
||||
return event.reply('You cannot vote on your own silencing. Be good.');
|
||||
}
|
||||
if(_.has(this.voteQuiets, user.id) && !this.voteQuiets[user.id].spent) {
|
||||
if (_.has(this.voteQuiets, user.id) && !this.voteQuiets[user.id].spent) {
|
||||
var vq = this.voteQuiets[user.id];
|
||||
if(event.channel != vq.channel) {
|
||||
if (event.channel != vq.channel) {
|
||||
return event.reply('Vote must be in ' + vq.channel);
|
||||
}
|
||||
if(!_.include(vq.yes, event.rUser.primaryNick) && !_.include(vq.no, event.rUser.primaryNick)) {
|
||||
if (!_.include(vq.yes, event.rUser.primaryNick) && !_.include(vq.no, event.rUser.primaryNick)) {
|
||||
vq.yes.push(event.rUser.primaryNick);
|
||||
event.reply('Voted yes on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
|
||||
|
||||
if(vq.yes.length == 4) {
|
||||
if (vq.yes.length == 4) {
|
||||
event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
|
||||
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, vq.reason + '[votequiet]', function(response) {
|
||||
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, vq.reason + '[votequiet]', function (response) {
|
||||
clearTimeout(vq.timer);
|
||||
vq.spent = true;
|
||||
setTimeout(function() {
|
||||
setTimeout(function () {
|
||||
delete this.voteQuiets[user.id];
|
||||
}.bind(this), 600000);
|
||||
}
|
||||
.bind(this), 600000);
|
||||
event.reply(response);
|
||||
});
|
||||
}
|
||||
@ -412,23 +448,24 @@ var commands = function(dbot) {
|
||||
} else {
|
||||
event.reply('No idea who that is m8');
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
},
|
||||
|
||||
'~voteno': function(event) {
|
||||
'~voteno': function (event) {
|
||||
var target = event.params[1];
|
||||
|
||||
dbot.api.users.resolveUser(event.server, target, function(err, user) {
|
||||
if(!err && user) {
|
||||
if(user.id == event.rUser.id) {
|
||||
dbot.api.users.resolveUser(event.server, target, function (err, user) {
|
||||
if (!err && user) {
|
||||
if (user.id == event.rUser.id) {
|
||||
return event.reply('You cannot vote on your own silencing. Be good.');
|
||||
}
|
||||
if(_.has(this.voteQuiets, user.id) && !this.voteQuiets[user.id].spent) {
|
||||
if (_.has(this.voteQuiets, user.id) && !this.voteQuiets[user.id].spent) {
|
||||
var vq = this.voteQuiets[user.id];
|
||||
if(event.channel != vq.channel) {
|
||||
if (event.channel != vq.channel) {
|
||||
return event.reply('Vote must be in ' + vq.channel);
|
||||
}
|
||||
if(!_.include(vq.yes, event.rUser.primaryNick) && !_.include(vq.no, event.rUser.primaryNick)) {
|
||||
if (!_.include(vq.yes, event.rUser.primaryNick) && !_.include(vq.no, event.rUser.primaryNick)) {
|
||||
vq.no.push(event.rUser.primaryNick);
|
||||
event.reply('Voted no on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
|
||||
} else {
|
||||
@ -440,11 +477,12 @@ var commands = function(dbot) {
|
||||
} else {
|
||||
event.reply('No idea who that is m8');
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
}
|
||||
};
|
||||
|
||||
_.each(commands, function(command) {
|
||||
_.each(commands, function (command) {
|
||||
command.access = 'moderator';
|
||||
});
|
||||
|
||||
@ -469,6 +507,6 @@ var commands = function(dbot) {
|
||||
return commands;
|
||||
};
|
||||
|
||||
exports.fetch = function(dbot) {
|
||||
exports.fetch = function (dbot) {
|
||||
return commands(dbot);
|
||||
};
|
||||
|
||||
@ -1,58 +1,58 @@
|
||||
var _ = require('underscore')._;
|
||||
|
||||
var kick = function(dbot) {
|
||||
if(!_.has(dbot.db, 'recentTimeouts')) {
|
||||
var kick = function (dbot) {
|
||||
if (!_.has(dbot.db, 'recentTimeouts')) {
|
||||
dbot.db.recentTimeouts = {};
|
||||
}
|
||||
this.recentTimeouts = dbot.db.recentTimeouts;
|
||||
|
||||
this.api = {
|
||||
'ban': function(server, host, channel) {
|
||||
'ban': function (server, host, channel) {
|
||||
dbot.instance.connections[server].send('MODE ' + channel + ' +b *!*@' + host);
|
||||
},
|
||||
|
||||
'quiet': function(server, host, channel) {
|
||||
'quiet': function (server, host, channel) {
|
||||
dbot.instance.connections[server].send('MODE ' + channel + ' +q *!*@' + host);
|
||||
},
|
||||
|
||||
'unquiet': function(server, host, channel) {
|
||||
'unquiet': function (server, host, channel) {
|
||||
dbot.instance.connections[server].send('MODE ' + channel + ' -q *!*@' + host);
|
||||
},
|
||||
|
||||
'devoice': function(server, nick, channel) {
|
||||
dbot.instance.connections[server].send('MODE ' + channel + ' -v ' +nick);
|
||||
'devoice': function (server, nick, channel) {
|
||||
dbot.instance.connections[server].send('MODE ' + channel + ' -v ' + nick);
|
||||
},
|
||||
|
||||
'voice': function(server, nick, channel) {
|
||||
dbot.instance.connections[server].send('MODE ' + channel + ' +v ' +nick);
|
||||
'voice': function (server, nick, channel) {
|
||||
dbot.instance.connections[server].send('MODE ' + channel + ' +v ' + nick);
|
||||
},
|
||||
|
||||
'kick': function(server, user, channel, msg) {
|
||||
'kick': function (server, user, channel, msg) {
|
||||
dbot.instance.connections[server].send('KICK ' + channel + ' ' + user + ' :' + msg);
|
||||
},
|
||||
|
||||
'kill': function(server, user, reason) {
|
||||
'kill': function (server, user, reason) {
|
||||
dbot.instance.connections[server].send('kill ' + user + ' ' + reason);
|
||||
},
|
||||
|
||||
'unban': function(server, host, channel) {
|
||||
'unban': function (server, host, channel) {
|
||||
// TODO: Wrest control from chanserv
|
||||
//dbot.say(server, this.config.chanserv, 'unban ' + channel + ' *!*@' + host);
|
||||
dbot.instance.connections[server].send('MODE ' + channel + ' -b *!*@' + host);
|
||||
},
|
||||
|
||||
'quietUser': function(server, quieter, duration, channel, quietee, reason, callback) {
|
||||
dbot.api.nickserv.getUserHost(server, quietee, function(host) {
|
||||
'quietUser': function (server, quieter, duration, channel, quietee, reason, callback) {
|
||||
dbot.api.nickserv.getUserHost(server, quietee, function (host) {
|
||||
// Add host record entry
|
||||
if(host) {
|
||||
if (host) {
|
||||
this.hosts[server][quietee] = host;
|
||||
|
||||
if(!_.isUndefined(duration) && !_.isNull(duration)) {
|
||||
if (!_.isUndefined(duration) && !_.isNull(duration)) {
|
||||
duration = duration.trim();
|
||||
var msTimeout = new Date(new Date().getTime() + (parseFloat(duration) * 60000));
|
||||
if(_.has(dbot.modules, 'remind')) {
|
||||
if (_.has(dbot.modules, 'remind')) {
|
||||
msTimeout = dbot.api.remind.parseTime(duration);
|
||||
if(!msTimeout) {
|
||||
if (!msTimeout) {
|
||||
return callback('Invalid time. Remember you must give e.g. 5m now.');
|
||||
}
|
||||
duration = duration.replace(/([\d]+)d/, '$1 years').replace(/([\d]+)d/, '$1 days').replace(/([\d]+)h/, '$1 hours ').replace(/([\d]+)m/, '$1 minutes ').replace(/([\d]+)s/, '$1 seconds').trim();
|
||||
@ -61,16 +61,16 @@ var kick = function(dbot) {
|
||||
}
|
||||
|
||||
var vStatus = dbot.instance.connections[server].channels[channel].nicks[quietee].voice;
|
||||
dbot.api.timers.addTimeout(msTimeout, function() {
|
||||
if(_.has(this.hosts[server], quietee)) {
|
||||
if(_.include(this.config.quietBans, channel)) {
|
||||
dbot.api.timers.addTimeout(msTimeout, function () {
|
||||
if (_.has(this.hosts[server], quietee)) {
|
||||
if (_.include(this.config.quietBans, channel)) {
|
||||
this.api.unban(server, this.hosts[server][quietee], channel);
|
||||
this.api.voice(server, quietee, channel);
|
||||
} else {
|
||||
this.api.unquiet(server, this.hosts[server][quietee], channel);
|
||||
}
|
||||
|
||||
dbot.api.users.resolveUser(server, dbot.config.name, function(err, user) {
|
||||
dbot.api.users.resolveUser(server, dbot.config.name, function (err, user) {
|
||||
dbot.api.report.notify('unquiet', server, user, channel,
|
||||
dbot.t('unquiet_notify', {
|
||||
'unquieter': dbot.config.name,
|
||||
@ -78,7 +78,8 @@ var kick = function(dbot) {
|
||||
}), false, quietee);
|
||||
});
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
callback(dbot.t('tquieted', {
|
||||
'quietee': quietee,
|
||||
'minutes': duration
|
||||
@ -89,10 +90,11 @@ var kick = function(dbot) {
|
||||
'quieter': quieter.primaryNick,
|
||||
'quietee': quietee,
|
||||
'reason': reason
|
||||
}), false, quietee
|
||||
);
|
||||
}), false, quietee);
|
||||
} else {
|
||||
callback(dbot.t('quieted', { 'quietee': quietee }));
|
||||
callback(dbot.t('quieted', {
|
||||
'quietee': quietee
|
||||
}));
|
||||
dbot.api.report.notify('quiet', server, quieter.primaryNick, channel,
|
||||
dbot.t('quiet_notify', {
|
||||
'quieter': quieter.primaryNick,
|
||||
@ -103,37 +105,40 @@ var kick = function(dbot) {
|
||||
|
||||
this.api.devoice(server, quietee, channel);
|
||||
|
||||
if(_.include(this.config.quietBans, channel)) {
|
||||
if (_.include(this.config.quietBans, channel)) {
|
||||
this.api.ban(server, this.hosts[server][quietee], channel);
|
||||
} else {
|
||||
this.api.quiet(server, host, channel);
|
||||
}
|
||||
|
||||
if(reason.indexOf('#warn') !== -1) {
|
||||
if (reason.indexOf('#warn') !== -1) {
|
||||
dbot.api.warning.warn(server, quieter, quietee,
|
||||
'Quieted in ' + channel + ' for ' + reason, channel,
|
||||
function() {});
|
||||
function () {});
|
||||
}
|
||||
} else {
|
||||
event.reply(dbot.t('no_user', { 'user': quietee }));
|
||||
event.reply(dbot.t('no_user', {
|
||||
'user': quietee
|
||||
}));
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
},
|
||||
|
||||
'networkUnban': function(server, unbanee, unbanner, manualHost, callback) {
|
||||
'networkUnban': function (server, unbanee, unbanner, manualHost, callback) {
|
||||
var channels = dbot.config.servers[server].channels,
|
||||
network = this.config.network_name[server] || server,
|
||||
adminChannel = dbot.config.servers[server].admin_channel;
|
||||
|
||||
if(!_.isUndefined(manualHost)) {
|
||||
if (!_.isUndefined(manualHost)) {
|
||||
this.hosts[server][unbanee] = manualHost;
|
||||
}
|
||||
|
||||
if(_.has(this.hosts, server) && _.has(this.hosts[server], unbanee) && _.isString(this.hosts[server][unbanee])) {
|
||||
if (_.has(this.hosts, server) && _.has(this.hosts[server], unbanee) && _.isString(this.hosts[server][unbanee])) {
|
||||
var host = this.hosts[server][unbanee];
|
||||
|
||||
// Notify Staff
|
||||
if(_.isUndefined(adminChannel)) {
|
||||
if (_.isUndefined(adminChannel)) {
|
||||
adminChannel = event.channel.name;
|
||||
}
|
||||
|
||||
@ -155,63 +160,73 @@ var kick = function(dbot) {
|
||||
|
||||
// Unban
|
||||
var i = 0;
|
||||
var unbanChannel = function(channels) {
|
||||
if(i >= channels.length) return;
|
||||
var unbanChannel = function (channels) {
|
||||
if (i >= channels.length)
|
||||
return;
|
||||
var channel = channels[i];
|
||||
this.api.unban(server, host, channel);
|
||||
setTimeout(function() {
|
||||
i++; unbanChannel(channels);
|
||||
setTimeout(function () {
|
||||
i++;
|
||||
unbanChannel(channels);
|
||||
}, 1000);
|
||||
}.bind(this);
|
||||
}
|
||||
.bind(this);
|
||||
unbanChannel(channels);
|
||||
|
||||
dbot.say(server, 'NickServ', 'FREEZE ' + unbanee + ' OFF');
|
||||
callback(null); // Success
|
||||
} else {
|
||||
// Attempt to look up the host on-the-fly
|
||||
dbot.api.nickserv.getUserHost(server, unbanee, unbanner, function(host) {
|
||||
if(host) {
|
||||
if(!_.has(this.hosts, server)) this.hosts[server] = {};
|
||||
dbot.api.nickserv.getUserHost(server, unbanee, unbanner, function (host) {
|
||||
if (host) {
|
||||
if (!_.has(this.hosts, server))
|
||||
this.hosts[server] = {};
|
||||
this.hosts[server][unbanee] = host;
|
||||
this.api.networkUnban(server, unbanee, unbanner);
|
||||
} else {
|
||||
callback(true); // No host could be found
|
||||
}
|
||||
}.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
this.internalAPI = {
|
||||
'addTempBan': function(server, banee, timeout) {
|
||||
dbot.api.users.resolveUser(server, dbot.config.name, function(err, bot) {
|
||||
dbot.api.timers.addTimeout(timeout, function() {
|
||||
this.api.networkUnban(server, banee, bot, undefined, function(err) {});
|
||||
'addTempBan': function (server, banee, timeout) {
|
||||
dbot.api.users.resolveUser(server, dbot.config.name, function (err, bot) {
|
||||
dbot.api.timers.addTimeout(timeout, function () {
|
||||
this.api.networkUnban(server, banee, bot, undefined, function (err) {});
|
||||
delete this.tempBans[server][banee];
|
||||
}.bind(this));
|
||||
}.bind(this));
|
||||
}.bind(this)
|
||||
}
|
||||
.bind(this));
|
||||
}
|
||||
.bind(this));
|
||||
}
|
||||
.bind(this)
|
||||
};
|
||||
|
||||
this.listener = function(event) {
|
||||
if(event.kickee == dbot.config.name) {
|
||||
this.listener = function (event) {
|
||||
if (event.kickee == dbot.config.name) {
|
||||
dbot.instance.join(event, event.channel.name);
|
||||
event.reply(dbot.t('kicked_dbot', { 'botname': dbot.config.name }));
|
||||
event.reply(dbot.t('kicked_dbot', {
|
||||
'botname': dbot.config.name
|
||||
}));
|
||||
dbot.db.kicks[dbot.config.name] += 1;
|
||||
} else {
|
||||
if(!_.has(dbot.db.kicks, event.kickee)) {
|
||||
if (!_.has(dbot.db.kicks, event.kickee)) {
|
||||
dbot.db.kicks[event.kickee] = 1;
|
||||
} else {
|
||||
dbot.db.kicks[event.kickee] += 1;
|
||||
}
|
||||
|
||||
if(!_.has(dbot.db.kickers, event.user)) {
|
||||
if (!_.has(dbot.db.kickers, event.user)) {
|
||||
dbot.db.kickers[event.user] = 1;
|
||||
} else {
|
||||
dbot.db.kickers[event.user] += 1;
|
||||
}
|
||||
|
||||
if(!this.config.countSilently) {
|
||||
if (!this.config.countSilently) {
|
||||
event.reply(event.kickee + '-- (' + dbot.t('user_kicks', {
|
||||
'user': event.kickee,
|
||||
'kicks': dbot.db.kicks[event.kickee],
|
||||
@ -219,34 +234,37 @@ var kick = function(dbot) {
|
||||
}) + ')');
|
||||
}
|
||||
}
|
||||
}.bind(this);
|
||||
}
|
||||
.bind(this);
|
||||
this.on = 'KICK';
|
||||
|
||||
this.onLoad = function() {
|
||||
if(!_.has(dbot.db, 'hosts')) {
|
||||
this.onLoad = function () {
|
||||
if (!_.has(dbot.db, 'hosts')) {
|
||||
dbot.db.hosts = {};
|
||||
_.each(dbot.config.servers, function(v, k) {
|
||||
_.each(dbot.config.servers, function (v, k) {
|
||||
dbot.db.hosts[k] = {};
|
||||
}, this);
|
||||
}
|
||||
if(!_.has(dbot.db, 'tempBans')) dbot.db.tempBans = {};
|
||||
if (!_.has(dbot.db, 'tempBans'))
|
||||
dbot.db.tempBans = {};
|
||||
this.hosts = dbot.db.hosts;
|
||||
this.tempBans = dbot.db.tempBans;
|
||||
this.voteQuiets = {};
|
||||
|
||||
_.each(this.tempBans, function(bans, server) {
|
||||
_.each(bans, function(timeout, nick) {
|
||||
_.each(this.tempBans, function (bans, server) {
|
||||
_.each(bans, function (timeout, nick) {
|
||||
timeout = new Date(timeout);
|
||||
this.internalAPI.addTempBan(server, nick, timeout);
|
||||
}, this);
|
||||
}, this);
|
||||
|
||||
if(_.has(dbot.modules, 'web')) {
|
||||
if (_.has(dbot.modules, 'web')) {
|
||||
dbot.api.web.addIndexLink('/bans', 'Ban List');
|
||||
}
|
||||
}.bind(this);
|
||||
}
|
||||
.bind(this);
|
||||
};
|
||||
|
||||
exports.fetch = function(dbot) {
|
||||
exports.fetch = function (dbot) {
|
||||
return new kick(dbot);
|
||||
};
|
||||
|
||||
@ -1,19 +1,21 @@
|
||||
var _ = require('underscore')._;
|
||||
|
||||
var pages = function(dbot) {
|
||||
var pages = function (dbot) {
|
||||
return {
|
||||
'/bans': function(req, res) {
|
||||
'/bans': function (req, res) {
|
||||
res.render('servers', {
|
||||
'servers': _.keys(dbot.config.servers)
|
||||
});
|
||||
},
|
||||
|
||||
'/underbans': function(req, res) {
|
||||
this.db.search('nbans', { 'server': server }, function(ban) {
|
||||
if(ban.reason.match('#underban')) {
|
||||
'/underbans': function (req, res) {
|
||||
this.db.search('nbans', {
|
||||
'server': server
|
||||
}, function (ban) {
|
||||
if (ban.reason.match('#underban')) {
|
||||
bans.push(ban);
|
||||
}
|
||||
}, function() {
|
||||
}, function () {
|
||||
res.render('bans', {
|
||||
'server': server,
|
||||
'bans': bans
|
||||
@ -21,13 +23,15 @@ var pages = function(dbot) {
|
||||
});
|
||||
},
|
||||
|
||||
'/bans/:server': function(req, res) {
|
||||
'/bans/:server': function (req, res) {
|
||||
var server = req.params.server,
|
||||
bans = [];
|
||||
|
||||
this.db.search('nbans', { 'server': server }, function(ban) {
|
||||
this.db.search('nbans', {
|
||||
'server': server
|
||||
}, function (ban) {
|
||||
bans.push(ban);
|
||||
}, function() {
|
||||
}, function () {
|
||||
res.render('bans', {
|
||||
'server': server,
|
||||
'bans': bans
|
||||
@ -37,6 +41,6 @@ var pages = function(dbot) {
|
||||
}
|
||||
};
|
||||
|
||||
exports.fetch = function(dbot) {
|
||||
exports.fetch = function (dbot) {
|
||||
return pages(dbot);
|
||||
};
|
||||
|
||||
@ -6,5 +6,6 @@
|
||||
"________ ______"
|
||||
],
|
||||
"cliconn_channel": "#dnsbl",
|
||||
"cliconn_patterns": []
|
||||
"cliconn_patterns": [],
|
||||
"exempt_channels": []
|
||||
}
|
||||
|
||||
@ -12,25 +12,36 @@ var kill_namespam = function(dbot) {
|
||||
dbot.modules.admin.internalAPI.saveConfig();
|
||||
}.bind(this);
|
||||
|
||||
this.matchedKill = {};
|
||||
|
||||
this.listener = function(event) {
|
||||
if(event.action == 'PRIVMSG') {
|
||||
// Here we listen for atropos
|
||||
if(event.channel == this.config.cliconn_channel) {
|
||||
if(event.message.match('▶')) {
|
||||
var matchedPattern = _.find(this.config.cliconn_patterns,
|
||||
function(p) { try { return event.message.match(p); } catch(e) {}; }); // ok.jpg
|
||||
if(matchedPattern) {
|
||||
var ip = event.message.split(' ')[1]
|
||||
|
||||
// Alternatively you can just do dbot.api.kick.kill(event.server, event.user, message);
|
||||
dbot.say(event.server, 'operserv', 'akill add *@'+ ip +' !P Naughty Nelly Auto-kill v6.2. Matched pattern: /'+ matchedPattern +'/');
|
||||
|
||||
var msg = dbot.t('clikill_act', {
|
||||
'ip': ip,
|
||||
var nick = event.message.split(' ')[2];
|
||||
dbot.api.nickserv.getUserHost(event.server, nick, function(host) {
|
||||
var userIsAuthenticated = host && host.startsWith('tripsit/');
|
||||
if (userIsAuthenticated) {
|
||||
event.reply(dbot.t('clikill_spared', {
|
||||
'user': nick,
|
||||
'pattern': matchedPattern
|
||||
});
|
||||
event.reply(msg);
|
||||
dbot.api.report.notify('autokill', event.server, event.rUser,
|
||||
dbot.config.servers[event.server].admin_channel, msg, ip, ip);
|
||||
}));
|
||||
} else {
|
||||
if(!this.matchedKill[host]) {
|
||||
// Defer killing this connection until after they join a non-exempted channel
|
||||
this.matchedKill[host] = {
|
||||
ip: event.message.split(' ')[1],
|
||||
server: event.server,
|
||||
matchedPattern: matchedPattern,
|
||||
rUser: event.rUser
|
||||
};
|
||||
}
|
||||
}
|
||||
}, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -76,8 +87,31 @@ var kill_namespam = function(dbot) {
|
||||
|
||||
dbot.api.report.notify('spam', event.server, event.user, event.channel, message, event.host, event.user);
|
||||
}
|
||||
} else if (event.action == 'JOIN') {
|
||||
|
||||
if(this.matchedKill[event.host]) {
|
||||
if(this.config.exempt_channels.indexOf(event.channel) == -1) {
|
||||
var kill = this.matchedKill[event.host];
|
||||
delete this.matchedKill[event.host];
|
||||
|
||||
// Alternatively you can just do dbot.api.kick.kill(event.server, event.user, message);
|
||||
dbot.say(event.server, 'operserv', 'akill add *@'+ kill.ip +' !P Naughty Nelly Auto-kill v6.2. Matched pattern: /'+ kill.matchedPattern +'/');
|
||||
|
||||
var msg = dbot.t('clikill_act', {
|
||||
'ip': kill.ip,
|
||||
'pattern': kill.matchedPattern
|
||||
});
|
||||
dbot.api.report.notify('autokill', kill.server, kill.rUser,
|
||||
dbot.config.servers[kill.server].admin_channel, msg, kill.ip, kill.ip);
|
||||
}
|
||||
}
|
||||
} else if (event.action == 'QUIT') {
|
||||
if(this.matchedKill[event.host]) {
|
||||
delete this.matchedKill[event.host];
|
||||
}
|
||||
}
|
||||
}.bind(this);
|
||||
this.on = 'PRIVMSG';
|
||||
this.on = ['PRIVMSG', 'JOIN', 'QUIT'];
|
||||
|
||||
this.commands = {
|
||||
'~add_spamkill': function(event) {
|
||||
|
||||
@ -7,5 +7,8 @@
|
||||
},
|
||||
"clikill_act": {
|
||||
"en": "Added K-Line for {ip}, due to matching pattern: /{pattern}/"
|
||||
},
|
||||
"clikill_spared": {
|
||||
"en": "{user} spared from clikill matched pattern: /{pattern}/"
|
||||
}
|
||||
}
|
||||
|
||||
@ -97,7 +97,8 @@ var link = function(dbot) {
|
||||
},
|
||||
|
||||
'~xkcd': function(event) {
|
||||
var comicId = event.params[1] || "";
|
||||
//var comicId = event.params[1] || "";
|
||||
var comicId = event.params.slice(1).join(' ');
|
||||
|
||||
if(comicId == "*") {
|
||||
request("http://xkcd.com/info.0.json", function(error, response, body){
|
||||
@ -109,6 +110,65 @@ var link = function(dbot) {
|
||||
}
|
||||
} catch(err) { };
|
||||
});
|
||||
} else {
|
||||
if (isNaN(parseInt(comicId))) {
|
||||
request({
|
||||
url: 'http://www.explainxkcd.com/wiki/api.php',
|
||||
qs: {
|
||||
action: 'query',
|
||||
format: 'json',
|
||||
generator: 'search',
|
||||
gsrwhat: 'text',
|
||||
gsrsearch: comicId,
|
||||
prop: 'info|categories',
|
||||
gsrlimit: 50
|
||||
},
|
||||
json: true
|
||||
}, function(err, res, body) {
|
||||
if(!body) {
|
||||
event.reply(dbot.t("no-hits"));
|
||||
return;
|
||||
}
|
||||
|
||||
var pages = _.values(body.query.pages);
|
||||
|
||||
// page titles must be of the format "####: $$$$$$"
|
||||
pages = _.filter(pages, p => p.title.indexOf(':') > 0);
|
||||
|
||||
if (pages.length > 0) {
|
||||
// See if any of these matches are exact title matches
|
||||
var match = false;
|
||||
_.each(pages, function(p) {
|
||||
var title = p.title.slice(p.title.indexOf(':')+2).trim();
|
||||
if(title.toLowerCase() == comicId.toLowerCase()) {
|
||||
match = p;
|
||||
}
|
||||
});
|
||||
|
||||
if (match) {
|
||||
// We got a match! Get the ID and let's get tf out of here.
|
||||
comicId = match.title.slice(0, match.title.indexOf(':'));
|
||||
} else {
|
||||
comicId = pages[0].title.slice(0, pages[0].title.indexOf(':'));
|
||||
}
|
||||
|
||||
var link = "http://xkcd.com/"+comicId+"/info.0.json";
|
||||
request(link, function(error, response, body) {
|
||||
try {
|
||||
if (response.statusCode == "200") {
|
||||
data = JSON.parse(body);
|
||||
event.reply(dbot.t("xkcd", data));
|
||||
} else {
|
||||
event.reply(dbot.t("no-hits"));
|
||||
}
|
||||
} catch(err) { };
|
||||
});
|
||||
|
||||
|
||||
} else {
|
||||
event.reply(dbot.t("no-hits"));
|
||||
}
|
||||
});
|
||||
} else {
|
||||
if(comicId !== "") {
|
||||
comicId = comicId + "/";
|
||||
@ -126,7 +186,7 @@ var link = function(dbot) {
|
||||
} catch(err) { };
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
'~ud': function(event) {
|
||||
|
||||
@ -26,12 +26,15 @@ var nickserv = function(dbot) {
|
||||
}.bind(this), 6000);
|
||||
},
|
||||
|
||||
'getUserHost': function(server, nick, callback) {
|
||||
'getUserHost': function(server, nick, callback, skipFallback) {
|
||||
if(!_.has(this.userStack, server)) this.userStack[server] = {};
|
||||
this.userStack[server][nick] = callback;
|
||||
dbot.instance.connections[server].send('USERHOST ' + nick);
|
||||
setTimeout(function() {
|
||||
if(_.has(this.userStack[server], nick)) {
|
||||
if (skipFallback) {
|
||||
callback(false);
|
||||
} else {
|
||||
dbot.instance.connections[server].send('WHOWAS ' + nick + ' 1');
|
||||
setTimeout(function() {
|
||||
if(_.has(this.userStack[server], nick)) {
|
||||
@ -39,6 +42,7 @@ var nickserv = function(dbot) {
|
||||
}
|
||||
}.bind(this), 2000);
|
||||
}
|
||||
}
|
||||
}.bind(this), 4000);
|
||||
}
|
||||
};
|
||||
|
||||
6
modules/omdb/config.json
Normal file
6
modules/omdb/config.json
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
"dependencies": [ ],
|
||||
"ignorable": true,
|
||||
"outputPrefix": "omdb",
|
||||
"api_key": "insert api key here - get from http://www.omdbapi.com/apikey.aspx"
|
||||
}
|
||||
83
modules/omdb/omdb.js
Normal file
83
modules/omdb/omdb.js
Normal file
@ -0,0 +1,83 @@
|
||||
/**
|
||||
* Module Name: omdb
|
||||
* Description: Interacts with the Open Movie Database to provide movie summary
|
||||
* and review information.
|
||||
*/
|
||||
|
||||
var rp = require('request-promise-native'),
|
||||
_ = require('underscore')._;
|
||||
|
||||
var OMDB = function(dbot) {
|
||||
this.apiRoot = 'http://www.omdbapi.com';
|
||||
this.imdbLinkPrefix = 'https://www.imdb.com/title/';
|
||||
|
||||
this.internalAPI = {
|
||||
formatLink: r => {
|
||||
var aRating = parseFloat(r.imdbRating) * 10;
|
||||
var cRating = parseFloat(r.Metascore);
|
||||
|
||||
if (isNaN(aRating)) {
|
||||
aRating = " N/A";
|
||||
} else {
|
||||
var aColour = (aRating <= 5) ? '\u00033 ' : '\u00034 ';
|
||||
aRating = aColour + String(aRating) + '%\u000f';
|
||||
}
|
||||
|
||||
if (isNaN(cRating)) {
|
||||
cRating = " N/A";
|
||||
} else {
|
||||
var cColour = (cRating <= 5) ? '\u00033 ' : '\u00034 ';
|
||||
cRating = cColour + String(cRating) + '%\u000f';
|
||||
}
|
||||
|
||||
var mString = dbot.t('omdb_film', {
|
||||
'title': r.Title,
|
||||
'year': r.Year,
|
||||
'aRating': aRating,
|
||||
'cRating': cRating
|
||||
});
|
||||
|
||||
if (_.has(r, 'Director') && r.Director != "N/A") mString += ' [Director: ' + r.Director + ']';
|
||||
if (_.has(r, 'Genre') && r.Genre != "N/A") mString += ' [Genre: ' + r.Genre + ']';
|
||||
if (_.has(r, 'Plot') && r.Plot != "N/A") {
|
||||
if (r.Plot.length > 140) r.Plot = r.Plot.substring(0, 140) + '...';
|
||||
mString += ' [Plot: ' + r.Plot + ']';
|
||||
}
|
||||
|
||||
mString += ' - ' + this.imdbLinkPrefix + r.imdbID;
|
||||
|
||||
return mString;
|
||||
}
|
||||
};
|
||||
|
||||
this.commands = {
|
||||
'~movie': async event => {
|
||||
try {
|
||||
var r = await rp({
|
||||
url: this.apiRoot,
|
||||
qs: {
|
||||
apikey: this.config.api_key,
|
||||
t: event.input[1],
|
||||
plot: 'short',
|
||||
r: 'json'
|
||||
},
|
||||
json: true
|
||||
});
|
||||
|
||||
if (r.Response === 'True') {
|
||||
event.reply(this.internalAPI.formatLink(r));
|
||||
} else {
|
||||
event.reply(dbot.t('omdb_noresults'));
|
||||
}
|
||||
}
|
||||
catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
this.commands['~movie'].regex = [/^movie (.+)$/, 2];
|
||||
}
|
||||
|
||||
|
||||
exports.fetch = dbot => new OMDB(dbot);
|
||||
10
modules/omdb/strings.json
Normal file
10
modules/omdb/strings.json
Normal file
@ -0,0 +1,10 @@
|
||||
{
|
||||
"omdb_film": {
|
||||
"en": "[{title} - Audience:{aRating} - Critic:{cRating} - {year}]",
|
||||
"de": "[{title} - {aRating} - {year}]"
|
||||
},
|
||||
"omdb_noresults": {
|
||||
"en": "No films found.",
|
||||
"de": "Kein Film gefunden."
|
||||
}
|
||||
}
|
||||
@ -113,6 +113,8 @@ var spotify = function(dbot) {
|
||||
}
|
||||
}
|
||||
};
|
||||
commands['~sp'] = commands['~spotify'].bind(this);
|
||||
commands['~sp'].regex = [/^sp (.*)/, 2];
|
||||
commands['~spotify'].regex = [/^spotify (.*)/, 2];
|
||||
this.commands = commands;
|
||||
|
||||
|
||||
@ -30,13 +30,14 @@ var youtube = function(dbot) {
|
||||
|
||||
this.internalAPI = {
|
||||
'formatLink': function(v) {
|
||||
var time = v.contentDetails.duration.match(/^PT(\d+)?M?(\d+)S$/);
|
||||
var time = v.contentDetails.duration.match(/^PT(?:(\d+)M)?(\d+)S$/);
|
||||
|
||||
if(time) {
|
||||
if(time[1]) {
|
||||
var seconds =((time[2]%60 < 10) ? "0"+time[2]%60 : time[2]%60),
|
||||
minutes = time[1];
|
||||
} else {
|
||||
var seconds =((time[1]%60 < 10) ? "0"+time[1]%60 : time[1]%60),
|
||||
var seconds =((time[2]%60 < 10) ? "0"+time[2]%60 : time[2]%60),
|
||||
minutes = 0;
|
||||
}
|
||||
} else {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user