From 2835e99139b8b26cae599a73dc7ad4fd85913799 Mon Sep 17 00:00:00 2001 From: Alee Date: Sat, 24 Mar 2018 16:10:12 -0400 Subject: 2.1.0 Release --- package.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index d35c79a..88050ed 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,18 @@ "type": "git", "url": "git+https://github.com/AleeCorp/AleeBot.git" }, - "author": "", + "author": "AleeCorp", "license": "MIT", "bugs": { "url": "https://github.com/AleeCorp/AleeBot/issues" }, "homepage": "https://github.com/AleeCorp/AleeBot#readme", "dependencies": { - "discord.js": "^11.2.1", - "node-telegram-bot-api": "^0.29.0" - } + "discord.js": "^11.3.1", + "fs": "0.0.1-security", + "moment": "^2.21.0", + "node-telegram-bot-api": "^0.29.0", + "simple-youtube-api": "^5.0.1" + }, + "devDependencies": {} } -- cgit v1.2.3 From 485deb62a25f424912375868bc254e7668b01192 Mon Sep 17 00:00:00 2001 From: Alee Date: Sat, 24 Mar 2018 19:44:58 -0400 Subject: even more stuff --- package-lock.json | 34 ++++++++++++++++++++++++++++++++++ package.json | 3 ++- 2 files changed, 36 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package-lock.json b/package-lock.json index 4cb9894..f21fdab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -333,6 +333,11 @@ "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==" }, + "html-entities": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=" + }, "http-signature": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", @@ -443,6 +448,14 @@ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, + "m3u8stream": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.2.2.tgz", + "integrity": "sha512-R/xWLXBtVr0m9sPruRL4p9uO01JyHxhcQ4nhqQhVgyT802OZyVW+dn+fWHvTnbfE6YMLc65TksZZut+Mh2OVMQ==", + "requires": { + "miniget": "1.2.0" + } + }, "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", @@ -461,6 +474,11 @@ "mime-db": "1.30.0" } }, + "miniget": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/miniget/-/miniget-1.2.0.tgz", + "integrity": "sha1-ADY3Oia71S2+aUX85sjAOR6eEkE=" + }, "moment": { "version": "2.21.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz", @@ -617,6 +635,11 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, "simple-youtube-api": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/simple-youtube-api/-/simple-youtube-api-5.0.1.tgz", @@ -734,6 +757,17 @@ "async-limiter": "1.0.0", "safe-buffer": "5.1.1" } + }, + "ytdl-core": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-0.20.2.tgz", + "integrity": "sha512-7AAIdhVRJgS3HulFCdT4C4G8FpeKouFinMCa8YA2cvKmEjXoIiNcMJmtnOI1VJil+l57K1Ly4MzEKlvR6H7C0g==", + "requires": { + "html-entities": "1.2.1", + "m3u8stream": "0.2.2", + "miniget": "1.2.0", + "sax": "1.2.4" + } } } } diff --git a/package.json b/package.json index 88050ed..862c83b 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "fs": "0.0.1-security", "moment": "^2.21.0", "node-telegram-bot-api": "^0.29.0", - "simple-youtube-api": "^5.0.1" + "simple-youtube-api": "^5.0.1", + "ytdl-core": "^0.20.2" }, "devDependencies": {} } -- cgit v1.2.3 From b097f009e3176e5e4853d3ffdeee27428fc84166 Mon Sep 17 00:00:00 2001 From: Alee Date: Sat, 24 Mar 2018 21:13:57 -0400 Subject: Moderation features and 2.2 release --- package-lock.json | 56 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + src/bot_discord.js | 2 +- src/commands/ban.js | 23 +++++++++++++++++++ src/commands/changelog.js | 9 ++++---- src/commands/help.js | 2 +- src/commands/kick.js | 18 +++++++++++++++ src/commands/play.js | 2 +- 8 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 src/commands/ban.js create mode 100644 src/commands/kick.js (limited to 'package.json') 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) { -- cgit v1.2.3