aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package-lock.json56
-rw-r--r--package.json1
-rw-r--r--src/bot_discord.js2
-rw-r--r--src/commands/ban.js23
-rw-r--r--src/commands/changelog.js9
-rw-r--r--src/commands/help.js2
-rw-r--r--src/commands/kick.js18
-rw-r--r--src/commands/play.js2
8 files changed, 105 insertions, 8 deletions
diff --git a/package-lock.json b/package-lock.json
index f21fdab..97f1c24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,6 +71,11 @@
}
}
},
+ "bindings": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz",
+ "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE="
+ },
"bl": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
@@ -110,6 +115,11 @@
"delayed-stream": "1.0.0"
}
},
+ "commander": {
+ "version": "2.15.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+ "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="
+ },
"core-util-is": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -489,6 +499,11 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
+ "nan": {
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+ "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+ },
"node-fetch": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
@@ -498,6 +513,17 @@
"is-stream": "1.1.0"
}
},
+ "node-opus": {
+ "version": "0.2.7",
+ "resolved": "https://registry.npmjs.org/node-opus/-/node-opus-0.2.7.tgz",
+ "integrity": "sha1-W3JuKXlbCxJ7TIfmYtTegWhAV5w=",
+ "requires": {
+ "bindings": "1.2.1",
+ "commander": "2.15.1",
+ "nan": "2.10.0",
+ "ogg-packet": "1.0.0"
+ }
+ },
"node-telegram-bot-api": {
"version": "0.29.0",
"resolved": "https://registry.npmjs.org/node-telegram-bot-api/-/node-telegram-bot-api-0.29.0.tgz",
@@ -526,6 +552,15 @@
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
},
+ "ogg-packet": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/ogg-packet/-/ogg-packet-1.0.0.tgz",
+ "integrity": "sha1-RbiFchrI991c8iOR1CEGrlM6xng=",
+ "optional": true,
+ "requires": {
+ "ref-struct": "1.1.0"
+ }
+ },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -582,6 +617,27 @@
"util-deprecate": "1.0.2"
}
},
+ "ref": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/ref/-/ref-1.3.5.tgz",
+ "integrity": "sha512-2cBCniTtxcGUjDpvFfVpw323a83/0RLSGJJY5l5lcomZWhYpU2cuLdsvYqMixvsdLJ9+sTdzEkju8J8ZHDM2nA==",
+ "optional": true,
+ "requires": {
+ "bindings": "1.2.1",
+ "debug": "2.6.9",
+ "nan": "2.10.0"
+ }
+ },
+ "ref-struct": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/ref-struct/-/ref-struct-1.1.0.tgz",
+ "integrity": "sha1-XV7mWtQc78Olxf60BYcmHkee3BM=",
+ "optional": true,
+ "requires": {
+ "debug": "2.6.9",
+ "ref": "1.3.5"
+ }
+ },
"request": {
"version": "2.83.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
diff --git a/package.json b/package.json
index 862c83b..6afb120 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
"discord.js": "^11.3.1",
"fs": "0.0.1-security",
"moment": "^2.21.0",
+ "node-opus": "^0.2.7",
"node-telegram-bot-api": "^0.29.0",
"simple-youtube-api": "^5.0.1",
"ytdl-core": "^0.20.2"
diff --git a/src/bot_discord.js b/src/bot_discord.js
index cb828b9..a8d5f8c 100644
--- a/src/bot_discord.js
+++ b/src/bot_discord.js
@@ -7,7 +7,7 @@
**********************************************/
const Discord = require('discord.js');
const client = new Discord.Client();
-const abVersion = '2.2.0 Beta';
+const abVersion = '2.2.0';
const prefix = 'abb:';
const fs = require('fs');
const config = require('./absettings.json');
diff --git a/src/commands/ban.js b/src/commands/ban.js
new file mode 100644
index 0000000..a8d5c6a
--- /dev/null
+++ b/src/commands/ban.js
@@ -0,0 +1,23 @@
+module.exports.run = async (client, message, args) => {
+ let mreason = args.join(" ").slice(22);
+
+ if (!message.member.permissions.has('BAN_MEMBERS')) return message.reply("It looks like that you don't have the permissions to ban people.")
+ const member = message.mentions.members.first();
+ if (!member) return message.reply("Uhh... Please mention a member first.");
+ member.ban({
+ days: args[1] || null,
+ reason: `Banned by ${message.author.tag}`
+ });
+ message.reply("User Banned!");
+};
+
+exports.conf = {
+ aliases: [],
+ guildOnly: false,
+};
+exports.help = {
+ name: 'ban',
+ description: 'Bans a member',
+ usage: 'ban [user] [time]',
+ category: '- Moderation Commands',
+};
diff --git a/src/commands/changelog.js b/src/commands/changelog.js
index 0095517..be41192 100644
--- a/src/commands/changelog.js
+++ b/src/commands/changelog.js
@@ -1,11 +1,10 @@
module.exports.run = async (client, message) => {
const Discord = require('discord.js');
const embed = new Discord.RichEmbed()
- .setAuthor('AleeBot ' + '2.2.0 Beta ' + 'Changelog', 'https://cdn.discordapp.com/avatars/282547024547545109/6c147a444ae328c38145ef1f74169e38.png?size=2048')
- .setDescription('What\'s new in AleeBot 2.2 Beta?')
- .addField('[!] Coming soon music commands!', true)
- .addField('[!] Coming soon moderation commands!', true)
- .addField('And even more!', true)
+ .setAuthor('AleeBot ' + '2.2.0 ' + 'Changelog', 'https://cdn.discordapp.com/avatars/282547024547545109/6c147a444ae328c38145ef1f74169e38.png?size=2048')
+ .setDescription('What\'s new in AleeBot 2.2?')
+ .addField('[>] Music Command!','ab:play [music or url]', true)
+ .addField('[>] Moderation Commands!','Kick and Ban has been added!', true)
.setFooter('AleeCorp Copyright 2017')
.setColor('#1fd619');
message.channel.sendEmbed(embed);
diff --git a/src/commands/help.js b/src/commands/help.js
index 40e4f19..690c91c 100644
--- a/src/commands/help.js
+++ b/src/commands/help.js
@@ -11,7 +11,7 @@ module.exports.run = async (client, message) => {
const embed = new Discord.RichEmbed()
.setTitle('AleeBot Help')
- .setAuthor('AleeBot 2.2.0 Beta' + ` Help and on ${client.guilds.size} servers`, 'https://cdn.discordapp.com/avatars/282547024547545109/6c147a444ae328c38145ef1f74169e38.png?size=2048')
+ .setAuthor('AleeBot 2.2.0' + ` Help and on ${client.guilds.size} servers`, 'https://cdn.discordapp.com/avatars/282547024547545109/6c147a444ae328c38145ef1f74169e38.png?size=2048')
.setDescription('Every command you input into AleeBot is `' + require('../absettings.json').prefix + '`')
.setColor('#1fd619')
.setFooter('AleeCorp Copyright 2018');
diff --git a/src/commands/kick.js b/src/commands/kick.js
new file mode 100644
index 0000000..ffef077
--- /dev/null
+++ b/src/commands/kick.js
@@ -0,0 +1,18 @@
+module.exports.run = async (client, message) => {
+ if (!message.member.permissions.has('KICK_MEMBERS')) return message.reply("It looks like that you don't have the permissions to ban people.")
+ const member = message.mentions.members.first();
+ if (!member) return message.reply("Uhh... Please mention a member first.");
+ member.kick(`Kicked by: ${message.author.tag}`);
+ message.reply("User Kicked!");
+};
+
+exports.conf = {
+ aliases: [],
+ guildOnly: false,
+};
+exports.help = {
+ name: 'kick',
+ description: 'Kicks a member',
+ usage: 'kick [user]',
+ category: '- Moderation Commands',
+};
diff --git a/src/commands/play.js b/src/commands/play.js
index ca4c8cb..d94572e 100644
--- a/src/commands/play.js
+++ b/src/commands/play.js
@@ -50,7 +50,7 @@ module.exports.run = async (client, message, args) => {
.addField('Link', video.url)
.addField('Duration', time)
.setThumbnail(video.thumbnails.high.url)
- .setFooter('Beat Music Player');
+ .setFooter('AleeBot Music Player');
await message.channel.send({embed});
if (!client.voiceConnections.get(message.member.guild.id))
message.member.voiceChannel.join().then(function(connection) {