From d7b29e73cfc548ad75e0e48492a5eb4329f2946c Mon Sep 17 00:00:00 2001 From: JonnyBro Date: Mon, 24 Jan 2022 01:34:45 +0500 Subject: [PATCH] =?UTF-8?q?v3.3.2=20=D0=9D=D0=BE=D0=B2=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=A3?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B0=20tweet=20=D1=82.=D0=BA.?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/Economy/marry.js | 2 +- commands/Economy/rep.js | 2 +- commands/Economy/slots.js | 4 +-- commands/Images/approved.js | 1 + commands/Images/avatar.js | 1 + commands/Images/batslap.js | 1 + commands/Images/beautiful.js | 1 + commands/Images/bed.js | 1 + commands/Images/brazzers.js | 1 + commands/Images/burn.js | 1 + commands/Images/captcha.js | 1 + commands/Images/challenger.js | 1 + commands/Images/clyde.js | 1 + commands/Images/crush.js | 41 ++++++++++++++++++++++++ commands/Images/dictator.js | 1 + commands/Images/facepalm.js | 1 + commands/Images/fire.js | 1 + commands/Images/jail.js | 3 +- commands/Images/love.js | 1 + commands/Images/magik.js | 41 ++++++++++++++++++++++++ commands/Images/mission.js | 1 + commands/Images/phcomment.js | 1 + commands/Images/ps4.js | 41 ++++++++++++++++++++++++ commands/Images/rip.js | 1 + commands/Images/scary.js | 1 + commands/Images/tobecontinued.js | 1 + commands/Images/trash.js | 1 + commands/Images/tweet.js | 51 ------------------------------ commands/Images/wanted.js | 1 + commands/Images/wasted.js | 1 + commands/Images/youtube-comment.js | 9 +++--- dashboard/public/docs/updates.md | 7 ++++ events/guildMemberUpdate.js | 2 +- events/messageCreate.js | 2 +- languages/ru-RU/images/crush.json | 5 +++ languages/ru-RU/images/magik.json | 5 +++ languages/ru-RU/images/ps4.json | 5 +++ languages/ru-RU/images/tweet.json | 8 ----- package.json | 2 +- 39 files changed, 181 insertions(+), 71 deletions(-) create mode 100644 commands/Images/crush.js create mode 100644 commands/Images/magik.js create mode 100644 commands/Images/ps4.js delete mode 100644 commands/Images/tweet.js create mode 100644 languages/ru-RU/images/crush.json create mode 100644 languages/ru-RU/images/magik.json create mode 100644 languages/ru-RU/images/ps4.json delete mode 100644 languages/ru-RU/images/tweet.json diff --git a/commands/Economy/marry.js b/commands/Economy/marry.js index 596c144c..2ad02c54 100644 --- a/commands/Economy/marry.js +++ b/commands/Economy/marry.js @@ -97,7 +97,7 @@ class Marry extends Command { const messageOptions = { content: `${member.toString()} :heart: ${message.author.toString()}`, files: [{ - name: "unlocked.png", + name: "achievement_unlocked3.png", attachment: "./assets/img/achievements/achievement_unlocked3.png" }] }; diff --git a/commands/Economy/rep.js b/commands/Economy/rep.js index b0c772c7..8689f0ec 100644 --- a/commands/Economy/rep.js +++ b/commands/Economy/rep.js @@ -52,7 +52,7 @@ class Rep extends Command { userData.achievements.rep.achieved = true; message.channel.send({ files: [{ - name: "unlocked.png", + name: "achievement_unlocked6.png", attachment: "./assets/img/achievements/achievement_unlocked6.png" }] }); diff --git a/commands/Economy/slots.js b/commands/Economy/slots.js index 4435f978..e3d116a5 100644 --- a/commands/Economy/slots.js +++ b/commands/Economy/slots.js @@ -103,7 +103,7 @@ class Slots extends Command { data.userData.achievements.slots.achieved = true; message.channel.send({ files: [{ - name: "unlocked.png", + name: "achievement_unlocked4.png", attachment: "./assets/img/achievements/achievement_unlocked4.png" }] }); @@ -144,7 +144,7 @@ class Slots extends Command { data.userData.achievements.slots.achieved = true; message.channel.send({ files: [{ - name: "unlocked.png", + name: "achievement_unlocked4.png", attachment: "./assets/img/achievements/achievement_unlocked4.png" }] }); diff --git a/commands/Images/approved.js b/commands/Images/approved.js index bc1798d2..964b6b27 100644 --- a/commands/Images/approved.js +++ b/commands/Images/approved.js @@ -31,6 +31,7 @@ class Approved extends Command { message.channel.send({ files: [{ + name: "approved.png", attachment: buffer }] }); diff --git a/commands/Images/avatar.js b/commands/Images/avatar.js index 767cb9fd..139cc453 100644 --- a/commands/Images/avatar.js +++ b/commands/Images/avatar.js @@ -29,6 +29,7 @@ class Avatar extends Command { message.channel.send({ files: [{ + name: "avatar.png", attachment: avatarURL }] }); diff --git a/commands/Images/batslap.js b/commands/Images/batslap.js index a51c6b93..b7f88a4c 100644 --- a/commands/Images/batslap.js +++ b/commands/Images/batslap.js @@ -38,6 +38,7 @@ class BatSlap extends Command { message.channel.send({ files: [{ + name: "batslap.png", attachment: buffer }] }); diff --git a/commands/Images/beautiful.js b/commands/Images/beautiful.js index 28182325..439ac670 100644 --- a/commands/Images/beautiful.js +++ b/commands/Images/beautiful.js @@ -31,6 +31,7 @@ class Beautiful extends Command { message.channel.send({ files: [{ + name: "beautiful.png", attachment: buffer }] }); diff --git a/commands/Images/bed.js b/commands/Images/bed.js index a41f7833..3cc41cca 100644 --- a/commands/Images/bed.js +++ b/commands/Images/bed.js @@ -36,6 +36,7 @@ class Bed extends Command { message.channel.send({ files: [{ + name: "bed.png", attachment: buffer }] }); diff --git a/commands/Images/brazzers.js b/commands/Images/brazzers.js index fdb77d06..e5213ac5 100644 --- a/commands/Images/brazzers.js +++ b/commands/Images/brazzers.js @@ -31,6 +31,7 @@ class Brazzers extends Command { message.channel.send({ files: [{ + name: "brazzers.png", attachment: buffer }] }); diff --git a/commands/Images/burn.js b/commands/Images/burn.js index 447dcf40..e4a94f7d 100644 --- a/commands/Images/burn.js +++ b/commands/Images/burn.js @@ -31,6 +31,7 @@ class Burn extends Command { message.channel.send({ files: [{ + name: "burn.png", attachment: buffer }] }); diff --git a/commands/Images/captcha.js b/commands/Images/captcha.js index f0b87990..24671a21 100644 --- a/commands/Images/captcha.js +++ b/commands/Images/captcha.js @@ -29,6 +29,7 @@ class Captcha extends Command { message.channel.send({ files: [{ + name: "captcha.png", attachment: json.message }] }); diff --git a/commands/Images/challenger.js b/commands/Images/challenger.js index 2ce70e1a..edb82b1e 100644 --- a/commands/Images/challenger.js +++ b/commands/Images/challenger.js @@ -31,6 +31,7 @@ class Challenger extends Command { message.channel.send({ files: [{ + name: "challenger.png", attachment: buffer }] }); diff --git a/commands/Images/clyde.js b/commands/Images/clyde.js index f8099ec6..ceb706a4 100644 --- a/commands/Images/clyde.js +++ b/commands/Images/clyde.js @@ -30,6 +30,7 @@ class Clyde extends Command { const json = await res.json(); message.channel.send({ files: [{ + name: "clyde.png", attachment: json.message }] }); diff --git a/commands/Images/crush.js b/commands/Images/crush.js new file mode 100644 index 00000000..de46829d --- /dev/null +++ b/commands/Images/crush.js @@ -0,0 +1,41 @@ +const Command = require("../../base/Command"); + +class Crush extends Command { + constructor(client) { + super(client, { + name: "crush", + dirname: __dirname, + enabled: true, + guildOnly: false, + aliases: [], + memberPermissions: [], + botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"], + nsfw: false, + ownerOnly: false, + cooldown: 3000 + }); + } + + async run(message, args) { + const user = await this.client.resolveUser(args[0]) || message.author; + const m = await message.sendT("misc:PLEASE_WAIT", null, { + prefixEmoji: "loading" + }); + const buffer = await this.client.AmeAPI.generate("crush", { + url: user.displayAvatarURL({ + format: "png", + size: 512 + }) + }); + m.delete(); + + message.channel.send({ + files: [{ + name: "crush.png", + attachment: buffer + }] + }); + } +} + +module.exports = Crush; \ No newline at end of file diff --git a/commands/Images/dictator.js b/commands/Images/dictator.js index f68022c2..fcdd13ce 100644 --- a/commands/Images/dictator.js +++ b/commands/Images/dictator.js @@ -31,6 +31,7 @@ class Dictator extends Command { message.channel.send({ files: [{ + name: "dictator.png", attachment: buffer }] }); diff --git a/commands/Images/facepalm.js b/commands/Images/facepalm.js index 3c904dab..5c27bfd0 100644 --- a/commands/Images/facepalm.js +++ b/commands/Images/facepalm.js @@ -45,6 +45,7 @@ class Facepalm extends Command { message.channel.send({ files: [{ + name: "facepalm.png", attachment: canvas.toBuffer() }] }); diff --git a/commands/Images/fire.js b/commands/Images/fire.js index 685c452d..43b96615 100644 --- a/commands/Images/fire.js +++ b/commands/Images/fire.js @@ -31,6 +31,7 @@ class Fire extends Command { message.channel.send({ files: [{ + name: "fire.png", attachment: buffer }] }); diff --git a/commands/Images/jail.js b/commands/Images/jail.js index 7c0aca86..04f79131 100644 --- a/commands/Images/jail.js +++ b/commands/Images/jail.js @@ -24,13 +24,14 @@ class Jail extends Command { const buffer = await this.client.AmeAPI.generate("jail", { url: user.displayAvatarURL({ format: "png", - size: 1024 + size: 512 }) }); m.delete(); message.channel.send({ files: [{ + name: "jail.png", attachment: buffer }] }); diff --git a/commands/Images/love.js b/commands/Images/love.js index f7fac6fd..9bd20b32 100644 --- a/commands/Images/love.js +++ b/commands/Images/love.js @@ -31,6 +31,7 @@ class Love extends Command { const json = await res.json(); message.channel.send({ files: [{ + name: "love.png", attachment: json.message }] }); diff --git a/commands/Images/magik.js b/commands/Images/magik.js new file mode 100644 index 00000000..cede2f8c --- /dev/null +++ b/commands/Images/magik.js @@ -0,0 +1,41 @@ +const Command = require("../../base/Command"); + +class Magik extends Command { + constructor(client) { + super(client, { + name: "magik", + dirname: __dirname, + enabled: true, + guildOnly: false, + aliases: [], + memberPermissions: [], + botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"], + nsfw: false, + ownerOnly: false, + cooldown: 3000 + }); + } + + async run(message, args) { + const user = await this.client.resolveUser(args[0]) || message.author; + const m = await message.sendT("misc:PLEASE_WAIT", null, { + prefixEmoji: "loading" + }); + const buffer = await this.client.AmeAPI.generate("magik", { + url: user.displayAvatarURL({ + format: "png", + size: 512 + }) + }); + m.delete(); + + message.channel.send({ + files: [{ + name: "magik.png", + attachment: buffer + }] + }); + } +} + +module.exports = Magik; \ No newline at end of file diff --git a/commands/Images/mission.js b/commands/Images/mission.js index 745b8668..8f09251f 100644 --- a/commands/Images/mission.js +++ b/commands/Images/mission.js @@ -31,6 +31,7 @@ class Mission extends Command { message.channel.send({ files: [{ + name: "mission.png", attachment: buffer }] }); diff --git a/commands/Images/phcomment.js b/commands/Images/phcomment.js index 197cd23d..40ae3ea4 100644 --- a/commands/Images/phcomment.js +++ b/commands/Images/phcomment.js @@ -42,6 +42,7 @@ class Phcomment extends Command { message.channel.send({ files: [{ + name: "phcomment.png", attachment: buffer }] }); diff --git a/commands/Images/ps4.js b/commands/Images/ps4.js new file mode 100644 index 00000000..d46098a9 --- /dev/null +++ b/commands/Images/ps4.js @@ -0,0 +1,41 @@ +const Command = require("../../base/Command"); + +class Ps4 extends Command { + constructor(client) { + super(client, { + name: "ps4", + dirname: __dirname, + enabled: true, + guildOnly: false, + aliases: [], + memberPermissions: [], + botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"], + nsfw: false, + ownerOnly: false, + cooldown: 3000 + }); + } + + async run(message, args) { + const user = await this.client.resolveUser(args[0]) || message.author; + const m = await message.sendT("misc:PLEASE_WAIT", null, { + prefixEmoji: "loading" + }); + const buffer = await this.client.AmeAPI.generate("ps4", { + url: user.displayAvatarURL({ + format: "png", + size: 512 + }) + }); + m.delete(); + + message.channel.send({ + files: [{ + name: "ps4.png", + attachment: buffer + }] + }); + } +} + +module.exports = Ps4; \ No newline at end of file diff --git a/commands/Images/rip.js b/commands/Images/rip.js index ef25b0a7..3be814cf 100644 --- a/commands/Images/rip.js +++ b/commands/Images/rip.js @@ -31,6 +31,7 @@ class Rip extends Command { message.channel.send({ files: [{ + name: "rip.png", attachment: buffer }] }); diff --git a/commands/Images/scary.js b/commands/Images/scary.js index b23b2b55..1960f037 100644 --- a/commands/Images/scary.js +++ b/commands/Images/scary.js @@ -31,6 +31,7 @@ class Scary extends Command { message.channel.send({ files: [{ + name: "scary.png", attachment: buffer }] }); diff --git a/commands/Images/tobecontinued.js b/commands/Images/tobecontinued.js index 95a288e3..c7896b16 100644 --- a/commands/Images/tobecontinued.js +++ b/commands/Images/tobecontinued.js @@ -31,6 +31,7 @@ class Tobecontinued extends Command { message.channel.send({ files: [{ + name: "tobecontinued.png", attachment: buffer }] }); diff --git a/commands/Images/trash.js b/commands/Images/trash.js index 6b925c2c..76e9616f 100644 --- a/commands/Images/trash.js +++ b/commands/Images/trash.js @@ -30,6 +30,7 @@ class Trash extends Command { message.channel.send({ files: [{ + name: "trash.png", attachment: buffer }] }); diff --git a/commands/Images/tweet.js b/commands/Images/tweet.js deleted file mode 100644 index e6dc7292..00000000 --- a/commands/Images/tweet.js +++ /dev/null @@ -1,51 +0,0 @@ -const Command = require("../../base/Command"); - -class Tweet extends Command { - constructor(client) { - super(client, { - name: "tweet", - dirname: __dirname, - enabled: false, - guildOnly: false, - aliases: ["twitter"], - memberPermissions: [], - botPermissions: ["SEND_MESSAGES", "EMBED_LINKS"], - nsfw: false, - ownerOnly: false, - cooldown: 3000 - }); - } - - async run(message, args) { - const user = message.mentions.users.first() || message.author; - const text = args.slice(1).join(" "); - - if (!user) return message.error("images/tweet:MISSING_USERNAME"); - - if (!text) return message.error("images/tweet:MISSING_TEXT"); - - const m = await message.sendT("misc:PLEASE_WAIT", null, { - prefixEmoji: "loading" - }); - - await message.guild.members.fetch(); - const randomMembers = message.guild.members.cache.random(3); - - const buffer = await this.client.AmeAPI.generate("twitter", { - url: user.displayAvatarURL(), - avatar1: randomMembers[0].user.displayAvatarURL(), - avatar2: randomMembers[1].user.displayAvatarURL(), - avatar3: randomMembers[2].user.displayAvatarURL(), - text - }); - m.delete(); - - message.channel.send({ - files: [{ - attachment: buffer - }] - }); - } -} - -module.exports = Tweet; \ No newline at end of file diff --git a/commands/Images/wanted.js b/commands/Images/wanted.js index 4865445d..6096e713 100644 --- a/commands/Images/wanted.js +++ b/commands/Images/wanted.js @@ -31,6 +31,7 @@ class Wanted extends Command { message.channel.send({ files: [{ + name: "wanted.png", attachment: buffer }] }); diff --git a/commands/Images/wasted.js b/commands/Images/wasted.js index ca509618..982da7b6 100644 --- a/commands/Images/wasted.js +++ b/commands/Images/wasted.js @@ -31,6 +31,7 @@ class Wasted extends Command { message.channel.send({ files: [{ + name: "wasted.png", attachment: buffer }] }); diff --git a/commands/Images/youtube-comment.js b/commands/Images/youtube-comment.js index d046bee2..117debb0 100644 --- a/commands/Images/youtube-comment.js +++ b/commands/Images/youtube-comment.js @@ -1,14 +1,14 @@ const Command = require("../../base/Command"), canvacord = require("canvacord"); -class YouTubeComment extends Command { +class Ytcomment extends Command { constructor(client) { super(client, { - name: "youtube-comment", + name: "ytcomment", dirname: __dirname, enabled: true, guildOnly: false, - aliases: ["ytcomment"], + aliases: [], memberPermissions: [], botPermissions: ["SEND_MESSAGES", "EMBED_LINKS", "ATTACH_FILES"], nsfw: false, @@ -40,10 +40,11 @@ class YouTubeComment extends Command { message.channel.send({ files: [{ + name: "ytcomment.png", attachment: image }] }); } } -module.exports = YouTubeComment; \ No newline at end of file +module.exports = Ytcomment; \ No newline at end of file diff --git a/dashboard/public/docs/updates.md b/dashboard/public/docs/updates.md index 7278bfcd..ba8ed7d6 100644 --- a/dashboard/public/docs/updates.md +++ b/dashboard/public/docs/updates.md @@ -1,3 +1,10 @@ +### JaBa v3.3.2 +* Добавлено + * Команды *crush*, *magik* и *ps4* в категорию *Images*. + +* Удалено + * Команда *tweet*. + ### JaBa v3.3.1 * Изменено * Команды *findwords*, *horserace*, *number* и *tictactoe* перемещены в категорию *Economy*. diff --git a/events/guildMemberUpdate.js b/events/guildMemberUpdate.js index 71bcef2b..42ecdd4a 100644 --- a/events/guildMemberUpdate.js +++ b/events/guildMemberUpdate.js @@ -17,7 +17,7 @@ module.exports = class { newMember.send({ files: [{ - name: "unlocked.png", + name: "achievement_unlocked5.png", attachment: "./assets/img/achievements/achievement_unlocked5.png" }] }); diff --git a/events/messageCreate.js b/events/messageCreate.js index 5b1dba8b..0b4ee729 100644 --- a/events/messageCreate.js +++ b/events/messageCreate.js @@ -190,7 +190,7 @@ module.exports = class { await data.userData.save(); await message.channel.send({ files: [{ - name: "unlocked.png", + name: "achievement_unlocked2.png", attachment: "./assets/img/achievements/achievement_unlocked2.png" }] }); diff --git a/languages/ru-RU/images/crush.json b/languages/ru-RU/images/crush.json new file mode 100644 index 00000000..8acac070 --- /dev/null +++ b/languages/ru-RU/images/crush.json @@ -0,0 +1,5 @@ +{ + "DESCRIPTION": "Создать изображение \"crush\"", + "USAGE": "{{prefix}}crush (@пользователь)", + "EXAMPLES": "{{prefix}}crush\n{{prefix}}crush @Jonny_Bro#4226" +} \ No newline at end of file diff --git a/languages/ru-RU/images/magik.json b/languages/ru-RU/images/magik.json new file mode 100644 index 00000000..ddb5c01b --- /dev/null +++ b/languages/ru-RU/images/magik.json @@ -0,0 +1,5 @@ +{ + "DESCRIPTION": "Создать изображение \"magik\"", + "USAGE": "{{prefix}}magik (@пользователь)", + "EXAMPLES": "{{prefix}}magik\n{{prefix}}magik @Jonny_Bro#4226" +} \ No newline at end of file diff --git a/languages/ru-RU/images/ps4.json b/languages/ru-RU/images/ps4.json new file mode 100644 index 00000000..075d1fe9 --- /dev/null +++ b/languages/ru-RU/images/ps4.json @@ -0,0 +1,5 @@ +{ + "DESCRIPTION": "Создать изображение \"ps4\"", + "USAGE": "{{prefix}}ps4 (@пользователь)", + "EXAMPLES": "{{prefix}}ps4\n{{prefix}}ps4 @Jonny_Bro#4226" +} \ No newline at end of file diff --git a/languages/ru-RU/images/tweet.json b/languages/ru-RU/images/tweet.json deleted file mode 100644 index a02abc3f..00000000 --- a/languages/ru-RU/images/tweet.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "DESCRIPTION": "Создать изображение \"tweet\"", - "USAGE": "{{prefix}}tweet [@пользователь] [текст]", - "EXAMPLES": "{{prefix}}tweet @Jonny_Bro#4226 Люблю спать", - "MISSING_USERNAME": "Вы должны упомянуть пользователя!", - "MISSING_TEXT": "Укажите текст!", - "SUCCESS": "Новый твит от {{user}}:" -} \ No newline at end of file diff --git a/package.json b/package.json index 967b48e5..b9f63890 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jaba", - "version": "3.3.1", + "version": "3.3.2", "description": "A very complete Discord bot (more than 100 commands) that uses the Discord.js", "main": "index.js", "private": true,