jimp dies part 2 - the svgs win

push before laptop dies teehee
feinwarusoftware · Nov 13, 2018 · c070368 · c070368
1 parent f8f24a2
commit c070368
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 30 deletions.
diff --git a/bot/assets/profiles/fonts/ARIALN.TTF b/bot/assets/profiles/fonts/ARIALN.TTF
diff --git a/bot/assets/profiles/fonts/ARIALNB.TTF b/bot/assets/profiles/fonts/ARIALNB.TTF
diff --git a/bot/assets/profiles/fonts/ARIALNBI.TTF b/bot/assets/profiles/fonts/ARIALNBI.TTF
diff --git a/bot/assets/profiles/fonts/ARIALNI.TTF b/bot/assets/profiles/fonts/ARIALNI.TTF
diff --git a/bot/assets/profiles/fonts/Uni Sans Heavy.otf b/bot/assets/profiles/fonts/Uni Sans Heavy.otf
diff --git a/bot/assets/profiles/fonts/arial.ttf b/bot/assets/profiles/fonts/arial.ttf
diff --git a/bot/assets/profiles/fonts/arial.woff b/bot/assets/profiles/fonts/arial.woff
diff --git a/bot/assets/profiles/fonts/arialbd.ttf b/bot/assets/profiles/fonts/arialbd.ttf
diff --git a/bot/assets/profiles/fonts/arialbi.ttf b/bot/assets/profiles/fonts/arialbi.ttf
diff --git a/bot/assets/profiles/fonts/ariali.ttf b/bot/assets/profiles/fonts/ariali.ttf
diff --git a/bot/assets/profiles/fonts/ariblk.ttf b/bot/assets/profiles/fonts/ariblk.ttf
diff --git a/bot/assets/profiles/font.svg → bot/assets/profiles/fonts/font.svg b/bot/assets/profiles/font.svg → bot/assets/profiles/fonts/font.svg
diff --git a/bot/index.js b/bot/index.js
@@ -223,6 +223,11 @@ client.on("message", async message => {
         }
     }
 
+    if (matchedTerm == null) {
+
+        return;
+    }
+
     if (!evalPerms(matchedScript, message.member, message.channel)) {
 
         return;

diff --git a/bot/scripts/levels.js b/bot/scripts/levels.js
@@ -129,7 +129,6 @@ const levels = new Command({
                     return message.reply("this user does not have a profile");
                 }
 
-                /*
                 const fetchImages = [];
                 fetchImages.push(rp({ url: users[0].banner, encoding: null }));
                 fetchImages.push(rp({ url: message.author.avatarURL, encoding: null }));
@@ -153,29 +152,47 @@ const levels = new Command({
 
                     throw err;
                 }
-                */
 
-                const svg = new Buffer(
+                const svg = Buffer.from(
                     `<svg version="1.1" baseProfile="full" width="800" height="750" xmlns="http://www.w3.org/2000/svg"> 
                         
-                        <filter id="dropshadow" height="130%">
+                        <filter id="dropshadow-small" height="130%">
+                            <feGaussianBlur in="SourceAlpha" stdDeviation="0"/> <!-- stdDeviation is how much to blur -->
+                            <feOffset dx="1" dy="2" result="offsetblur"/> <!-- how much to offset -->
+                            <feComponentTransfer>
+                                <feFuncA type="linear" slope="0.6"/> <!-- slope is the opacity of the shadow -->
+                            </feComponentTransfer>
+                            <feMerge> 
+                                <feMergeNode/> <!-- this contains the offset blurred image -->
+                                <feMergeNode in="SourceGraphic"/> <!-- this contains the element that the filter is applied to -->
+                            </feMerge>
+                        </filter>
+
+                        <filter id="dropshadow-large" height="130%">
                             <feGaussianBlur in="SourceAlpha" stdDeviation="0"/> <!-- stdDeviation is how much to blur -->
-                            <feOffset dx="4" dy="4" result="offsetblur"/> <!-- how much to offset -->
+                            <feOffset dx="3" dy="5" result="offsetblur"/> <!-- how much to offset -->
                             <feComponentTransfer>
-                                <feFuncA type="linear" slope="0.5"/> <!-- slope is the opacity of the shadow -->
+                                <feFuncA type="linear" slope="0.6"/> <!-- slope is the opacity of the shadow -->
                             </feComponentTransfer>
                             <feMerge> 
                                 <feMergeNode/> <!-- this contains the offset blurred image -->
                                 <feMergeNode in="SourceGraphic"/> <!-- this contains the element that the filter is applied to -->
                             </feMerge>
                         </filter>
+
+                        <rect x="398" y="148" width="325" height="39" fill="#ff594f"></rect>
                     
-                        <text style="filter:url(#dropshadow)" x="200" y="600" font-size="72" font-family="Roboto" font-weight="bold" fill="white">!Dragon1320</text>
-                        <text style="filter:url(#dropshadow)" x="100" y="400" font-size="72" font-family="Roboto" font-weight="bold" fill="white">🍋daddydragon🍋</text>
-                        <text style="filter:url(#dropshadow)" x="400" y="200" font-size="72" font-family="Yu Minicho" font-weight="bold" fill="white">どらごん</text>
+                        <text style="filter:url(#dropshadow-large)" x="12" y="383" font-size="70" font-family="Uni Sans Heavy CAPS" fill="white">ralsei</text>
+                        <text style="filter:url(#dropshadow-large)" text-anchor="middle" x="562" y="125" font-size="92" font-family="Uni Sans Heavy CAPS" fill="white">level 2</text>
+                        <text style="filter:url(#dropshadow-small)" text-anchor="middle" x="560" y="177" font-size="28" font-family="Uni Sans Heavy CAPS" fill="white">90%</text>
+                        <text style="filter:url(#dropshadow-large)" text-anchor="middle" x="560" y="253" font-size="57" font-family="Uni Sans Heavy CAPS" fill="white">#82/608</text>
+                        <text x="24" y="498" font-size="27" font-family="Roboto Medium" fill="black">Im a bad programmer and a libtard. Hi!</text>
+
                     </svg> `
                 );
 
+                //bg.composite(progress, 398, 148);
+
                 let font;
                 try {
                     font = await sharp(svg)
@@ -186,7 +203,6 @@ const levels = new Command({
                     throw err;
                 }
 
-                /*
                 let pf;
                 try {
                     pf = await sharp(images[1])
@@ -197,32 +213,26 @@ const levels = new Command({
 
                     throw err;
                 }
-                */
 
                 let banner;
                 try {
-                    banner = await sharp({
-                            create: {
-                                    width: 300,
-                                    height: 200,
-                                    channels: 4,
-                                    background: {
-                                        r: 255, g: 0, b: 0, alpha: 0.5
-                                    }
-                                }
-                            }/*images[0]*/)
+                    banner = await sharp(images[0])
                         .resize(800, 750)
                         .blur(2)
-                        //.overlayWith(base, {
-                        //    gravity: sharp.gravity.centre
-                        //})
-                        //.overlayWith(pf, {
-                        //    left: 16, top: 19
-                        //})
+                        .overlayWith(pf, {
+                            left: 16, top: 19
+                        })
+                        .toBuffer();
+
+                    banner = await sharp(banner)
+                        .overlayWith(base, {
+                            gravity: sharp.gravity.centre
+                        })
+                        .toBuffer();
+
+                    banner = await sharp(banner)
                         .overlayWith(font)
-                        .png()
-                        .toBuffer()
-                        //.toFile(path.join(__dirname, "temp", "temp.png"));
+                        .toBuffer();
 
                 } catch(err) {