Updated bot and added some more helpful features, such as isPM to messages to discover whether a message is from a PM

This commit is contained in:
hydrabolt 2015-08-14 17:43:51 +01:00
parent 8a41ffe356
commit d5e4e7ba8b
4 changed files with 188 additions and 12 deletions

View file

@ -1,14 +1,184 @@
var Authority = require("./authority.js");
var Authority = require( "./authority.js" );
var Discord = require( "./hydrabot.js" ).Discord;
Commands = [];
Commands["info"] = {
oplevel : 0,
fn : function(bot, params, message){
Commands[ "info" ] = {
oplevel: 0,
fn: function( bot, params, message ) {
bot.reply(message, "Info!");
var verbose = hasFlag( params, "verbose" ) || hasFlag( params, "v" );
var user = getUser( message, params );
}
bot.reply( message, [
"here's some info on " + user.mention() + ":",
"In channel **#" + message.channel.name + "**" + ( verbose ? " - ID *" + message.channel.id + "*" : "" ), ( message.isPM() ?
"You're in a private conversation with me!" + ( verbose ? " The ID is " + message.channel.id : "" ) : "In the server **" + message.channel.server.name + "**" + ( verbose ? " - ID *" + message.channel.server.id + "*" : "" )
),
"User ID is *" + user.id + "*",
"Authority/OP Level to me is **" + Authority.getLevel( user ) + "**"
] );
}
}
Commands[ "echo" ] = {
oplevel: 0,
fn: function( bot, params, message ) {
bot.sendMessage( message, params.join( " " ), function( err, msg ) {
if ( err )
bot.sendMessage( message, "Unable to echo!" );
} );
}
}
Commands[ "auth" ] = {
oplevel: 2,
fn: function( bot, params, message ) {
var level = getKey( params, "level", "0" );
var method = hasFlag( params, "set" ) ? "set" : "get";
var user = getUser( message, params );
if ( method === "set" ) {
if ( authLevel( message.author ) <= level ) {
bot.reply( message, "that authority level is too high for you to set!" );
} else if ( user.equals( message.author ) ) {
bot.reply( message, "you can't alter your own authority level!" );
} else if ( authLevel( user ) > authLevel( message.author ) ) {
bot.reply( message, "that user has a higher OP level than you!" );
} else {
setAuthLevel( user, level );
bot.reply( message, "I set the authority of " + user.mention() + " to **" + level + "**" );
}
} else {
bot.reply( message, user.equals( message.author ) ? "Your authority level is **" + authLevel( user ) + "**" : "The authority level of " + user.mention() + " is **" + authLevel( user ) + "**" );
}
}
}
Commands[ "clear" ] = {
oplevel: 1,
fn: function( bot, params, message ) {
var initMessage = false,
cleared = false;
bot.getChannelLogs( message.channel, 250, function( err, logs ) {
if ( err ) {
bot.sendMessage( "Couldn't grab logs to delete messages." );
} else {
var deletedCount = 0,
failedCount = 0,
todo = logs.length();
for ( message of logs.contents ) {
if ( message.author.equals( bot.user ) ) {
bot.deleteMessage( message, function( err ) {
todo--;
if ( err )
failedCount++;
else
deletedCount++;
if ( todo === 0 ) {
bot.reply(
message,
"Done! " + deletedCount + " message(s) were deleted, with " + failedCount + " error(s).",
false,
true, {
selfDestruct: 5000
}
);
cleared = true;
deleteInitMessage();
}
} );
} else {
todo--;
}
}
}
} );
bot.reply( message, "clearing up my messages...", function( err, msg ) {
if ( !err ) {
initMessage = msg;
if ( cleared )
deleteInitMessage();
}
} );
function deleteInitMessage() {
if ( initMessage ) {
bot.deleteMessage( initMessage );
}
}
}
}
Commands[ "leave" ] = {
oplevel: 3,
fn: function( bot, params, message) {
if(message.isPM()){
bot.reply(message, "Umm... I can't leave PMs... How awkward...");
}else{
bot.reply(message, "Ok ;( I'm leaving!");
bot.leaveServer(message.channel.server, function(err){
if(err){
bot.reply(message, "There was an error leaving... how awkward.");
}
});
}
}
}
exports.Commands = Commands;
function hasFlag( array, flag ) {
return ~array.indexOf( flag );
}
function getKey( array, key, def ) {
for ( element of array ) {
var chunks = element.split( "=" );
if ( chunks.length > 1 ) {
if ( chunks[ 0 ] == key ) {
return chunks[ 1 ];
}
}
}
return def;
}
function authLevel( user ) {
return Authority.getLevel( user );
}
function setAuthLevel( user, level ) {
Authority.setLevel( user, level );
}
function getUser( message, params ) {
var usr = false;
if ( !message.isPM() ) {
var wantedUser = getKey( params, "user", false ) || getKey( params, "u", false );
if ( wantedUser ) {
usr = message.channel.server.members.filter( Discord.isUserID( wantedUser ) ? "id" : "username", wantedUser, true );
}
}
if ( !usr )
usr = message.author;
return usr;
}

View file

@ -2,6 +2,7 @@
// and then run `npm install --save discord.js` in the same directory as this
// file. The bot should then run.
var Discord = require( "../" );
exports.Discord = Discord;
// Load the config file. If you have not already, make one that follows the
// structure : { "email" : "discordEmail", "password" : "discordPassword" }
@ -68,20 +69,16 @@ hydrabot.on( "message", function( message ) {
} );
function handleMessage( command, params, message ) {
var channel = message.channel; // set the channel variable to message.channel
var sender = message.author; // set the sender variable to the author of the message
var isPM = ( message.channel instanceof Discord.PMChannel ); // set isPM to true if the channel is a Private Message Channel.
if ( Commands[ command ] ) {
console.log(Authority.getLevel( message.author ));
console.log( Authority.getLevel( message.author ) );
if ( Authority.getLevel( message.author ) >= Commands[ command ].oplevel ) {
//user has authority to do this
Commands[ command ].fn( hydrabot, params, message );
} else {
//user doesn't have authority
hydrabolt.reply( message, "you don't have authority to do this!" );
hydrabot.reply( message, "you don't have authority to do this!" );
}
} else {

View file

@ -120,6 +120,10 @@ exports.Client.prototype.login = function( email, password ) {
exports.Client.prototype.reply = function(){
if(arguments[1] instanceof Array){
arguments[1] = arguments[1].join("\n");
}
arguments[1] = arguments[0].author.mention() + ", " + arguments[1];
this.sendMessage.apply(this, arguments);

View file

@ -1,5 +1,6 @@
var User = require( "./user.js" ).User;
var List = require( "./list.js" ).List;
var PMChannel = require( "./PMChannel.js" ).PMChannel;
exports.Message = function( time, author, content, channel, id, mentions, everyoneMentioned ) {
@ -27,6 +28,10 @@ exports.Message = function( time, author, content, channel, id, mentions, everyo
}
}
exports.Message.prototype.isPM = function() {
return ( this.channel instanceof PMChannel );
}
exports.Message.prototype.isMentioned = function( user ) {
return ( this.mentions.filter( "id", user.id ).length > 0 );
}