Merge branch 'master' of https://gitlab.com/LoicBersier/DiscordBot

commands/fun/despacito.js

@@ -1,5 +1,8 @@
 const { Command } = require('discord.js-commando');
 const responseObject = require("../../json/despacito.json");
+const { createCanvas, loadImage, getContext } = require('canvas')
+const superagent = require('superagent')
+const Discord = require('discord.js');
 module.exports = class DespacitoCommand extends Command {
     constructor(client) {
         super(client, {
@@ -11,7 +14,7 @@ module.exports = class DespacitoCommand extends Command {
                 {
                     key: 'user',
                     prompt: 'What do you want me to say',
-                    type: 'member',
+                    type: 'user',
                     default: ''
                 }
             ]
@@ -22,14 +25,25 @@ module.exports = class DespacitoCommand extends Command {
         if (!user) {
         const number = Object.keys(responseObject).length;
         const despacitoNumber = Math.floor (Math.random() * (number - 1 + 1)) + 1;
-        if (!user)
+        return message.channel.send({files: [responseObject[despacitoNumber]]});
-            return message.channel.send({files: [responseObject[despacitoNumber]]});
+        } else if (user.id === message.author.id) {
-          } else if (user.id === message.author.id) {
            return message.say(`Did you just try to despacitoad yourself?`);
         } else if (user.id === this.client.user.id) {
             return message.say('Nice try but you wont get me :^)');
-        } else
+        } else {
+            const canvas = createCanvas(660, 660);
+            const ctx = canvas.getContext('2d');
+            const background = await loadImage(user.avatarURL);
+            ctx.drawImage(background, 5, 12, canvas.width, canvas.height);
+            const { body: buffer } = await superagent.get('https://image.noelshack.com/fichiers/2018/41/6/1539381851-untitled.png');
+            const bg = await loadImage(buffer);
+            ctx.drawImage(bg, 0, 0, canvas.width, canvas.height);
+            const attachment = new Discord.Attachment(canvas.toBuffer(), 'despacito.png');
+            
         message.delete();
-        message.say(`${user}, you have been despacitoad`);
+        message.say(`${user}, you have been despacitoad`, attachment);
-        } 
+    }
+
+        
+} 
 };

commands/fun/idubbbz.js

@@ -0,0 +1,69 @@
+const { Command } = require('discord.js-commando');
+const Discord = require('discord.js');
+const { createCanvas, loadImage, getContext } = require('canvas')
+const superagent = require('superagent')
+
+
+module.exports = class idubbbzCommand extends Command {
+    constructor(client) {
+        super(client, {
+            name: 'idubbbz',
+            aliases: ['idubbz', 'edups'],
+            group: 'fun',
+            memberName: 'idubbbz',
+            description: `Put the text you send in idubbbz piece of paper`,
+            args: [
+                {
+                    key: 'text',
+                    prompt: 'What do you the paper to say?',
+                    type: 'string',
+                    default: 'Nigger Faggot'
+                }
+            ]
+        });
+    }
+
+    async run(message, { text }) {
+        let Attachment = (message.attachments).array();
+        let image = null
+        if (!Attachment[0])
+            image = message.author.displayAvatarURL
+        else 
+            image = Attachment[0].url
+
+            const applyText = (canvas, text) => {
+                const ctx = canvas.getContext('2d');
+            
+                // Declare a base size of the font
+                let fontSize = 50;
+            
+                do {
+                    // Assign the font to the context and decrement it so it can be measured again
+                    ctx.font = `${fontSize -= 10}px sans-serif`;
+                    // Compare pixel width of the text to the canvas minus the approximate avatar size
+                } while (ctx.measureText(text).width > canvas.width - 300);
+            
+                // Return the result to use in the actual canvas
+                return ctx.font;
+            };
+
+        const canvas = createCanvas(1281, 627)
+        const ctx = canvas.getContext('2d')
+        const background = await loadImage(image);
+        ctx.drawImage(background, 620, 100, 200, 200);
+        const { body: buffer } = await superagent.get('https://image.noelshack.com/fichiers/2018/41/7/1539510207-untitled.png');
+        const bg = await loadImage(buffer);
+        ctx.drawImage(bg, 0, 0, canvas.width, canvas.height);
+        ctx.font = applyText(canvas, text)
+        //ctx.font = '40px sans-serif';
+    // Select the style that will be used to fill the text in
+        ctx.fillStyle = '#000000';
+    // Actually fill the text with a solid color
+        ctx.fillText(text, canvas.width / 2.1, canvas.height / 1.5);
+
+        const attachment = new Discord.Attachment(canvas.toBuffer(), 'test.png');
+
+        message.say(attachment);
+
+          }
+};

commands/utility/avatar.js

@@ -6,16 +6,23 @@ module.exports = class AvatarCommand extends Command {
             group: 'utility',
             memberName: 'avatar',
             description: 'Send the avatar of the mentionned user.',
+            memberName: 'say',
+            description: `Repeat the text you send`,
+            args: [
+                {
+                    key: 'user',
+                    prompt: 'What do you want me to say',
+                    type: 'user',
+                    default: ''
+                }
+            ]
         });
     }
 
-    async run(message) {
+    async run(message, { user }) {
-        if (!message.mentions.users.size)
+        if (!user)
-            return message.channel.send(`Your avatar: ${message.author.displayAvatarURL}`);
+            return message.say(`Your avatar:\n${message.author.displayAvatarURL}`);
-
+        else
-        const avatarList = message.mentions.users.map(user => {
+            return message.say(`${user.username}'s avatar:\n${user.displayAvatarURL}`);
-            return `${user.username}'s avatar: ${user.displayAvatarURL}`;
-        });
-        message.channel.send(avatarList);
     }
 };

package.json

@@ -18,6 +18,7 @@
   },
   "homepage": "https://gitlab.com/loicbersier/discordbot#readme",
   "dependencies": {
+    "canvas": "^2.0.0-alpha.18",
     "discord.js": "^11.4.2",
     "discord.js-commando": "^0.10.0",
     "faceapp": "^0.4.4",