make all image responses use the same embed type

commands/message/fun/otter.js

@@ -17,23 +17,13 @@ module.exports = {
       let res = await superagent.get(`https://otter.bruhmomentlol.repl.co/random`)
         .set("User-Agent","labscore/2.0")
     
-      await editOrReply(context, {
+      return await editOrReply(context, {
-        embeds: [
+        embeds: [ createEmbed("image", context, {
-          createEmbed("default", context, {
+          url: `otter.${res.headers["x-file-ext"]}`
-            image: {
+        })],
-              url: `attachment://otter.${res.headers["x-file-ext"]}`
+        files: [{ filename: `otter.${res.headers["x-file-ext"]}`, value: res.body }]
-            }
-          })
-        ],
-        files: [
-          {
-            filename: `otter.${res.headers["x-file-ext"]}`,
-            value: res.body
-          }
-        ]
       })
     }catch(e){
-      console.log(e)
       return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to fetch otter.`)]})
     }
   }

commands/message/image/deepai/deepdream.js

@@ -22,15 +22,11 @@ module.exports = {
       let res = await deepdream(context, image)
 
       if(res.response.body.status == 1) return editOrReply(context, {embeds:[createEmbed("warning", context, res.response.body.errors[0])]})
-      return editOrReply(context, {embeds:[createEmbed("default", context, {
+
-        image: {
+      return editOrReply(context, createEmbed("image", context, {
-          url: res.response.body.image
+        url: res.response.body.image,
-        },
+        time: res.timings
-        footer: {
+      }))
-          iconUrl: `https://cdn.discordapp.com/avatars/${context.application.id}/${context.application.icon}.png?size=256`,
-          text: `${context.application.name} • Took ${res.timings}s`
-        }
-      })]})
     }catch(e){
       console.log(e)
       return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to modify image.`)]})

commands/message/image/deepai/superresolution.js

@@ -22,15 +22,11 @@ module.exports = {
       let res = await superresolution(context, image)
 
       if(res.response.body.status == 1) return editOrReply(context, {embeds:[createEmbed("warning", context, res.response.body.errors[0])]})
-      return editOrReply(context, {embeds:[createEmbed("default", context, {
+      
-        image: {
+      return editOrReply(context, createEmbed("image", context, {
-          url: res.response.body.image
+        url: res.response.body.image,
-        },
+        time: res.timings
-        footer: {
+      }))
-          iconUrl: `https://cdn.discordapp.com/avatars/${context.application.id}/${context.application.icon}.png?size=256`,
-          text: `${context.application.name} • Took ${res.timings}s`
-        }
-      })]})
     }catch(e){
       console.log(e)
       return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to modify image.`)]})

commands/message/image/deepai/text2image.js

@@ -22,15 +22,11 @@ module.exports = {
       let res = await text2image(context, args.text)
 
       if(res.response.body.status == 1) return editOrReply(context, {embeds:[createEmbed("warning", context, res.response.body.errors[0])]})    
-      return editOrReply(context, {embeds:[createEmbed("default", context, {
+      
-        image: {
+      return editOrReply(context, createEmbed("image", context, {
-          url: res.response.body.image
+        url: res.response.body.image,
-        },
+        time: res.timings
-        footer: {
+      }))
-          iconUrl: `https://cdn.discordapp.com/avatars/${context.application.id}/${context.application.icon}.png?size=256`,
-          text: `${context.application.name} • Took ${res.timings}s`
-        }
-      })]})
     }catch(e){
       console.log(e)
       return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to generate image.`)]})

commands/message/image/deepai/waifu2x.js

@@ -22,15 +22,11 @@ module.exports = {
       let res = await waifu2x(context, image)
 
       if(res.response.body.status == 1) return editOrReply(context, {embeds:[createEmbed("warning", context, res.response.body.errors[0])]})    
-      return editOrReply(context, {embeds:[createEmbed("default", context, {
+      
-        image: {
+      return editOrReply(context, createEmbed("image", context, {
-          url: res.response.body.image
+        url: res.response.body.image,
-        },
+        time: res.timings
-        footer: {
+      }))
-          iconUrl: `https://cdn.discordapp.com/avatars/${context.application.id}/${context.application.icon}.png?size=256`,
-          text: `${context.application.name} • Took ${res.timings}s`
-        }
-      })]})
     }catch(e){
       console.log(e)
       return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to modify image.`)]})

commands/message/image/makesweet/billboard.js

@@ -27,20 +27,20 @@ module.exports = {
       const timings = Date.now();
       let mkswt = await billboardCityscape(image)
       
-      await response.edit({ embeds: [createEmbed("default", context, {
+      return await response.edit({
-        image: {
+        embeds: [createEmbed("image", context, {
-          url: "attachment://makesweet.gif"
+          url: "makesweet.gif",
-        },
+          time: ((Date.now() - timings) / 1000).toFixed(2),
-        footer: {
+          provider: {
-          iconUrl: STATICS.makesweet,
+            icon: STATICS.makesweet,
-          text: `MakeSweet • Took ${((Date.now() - timings) / 1000).toFixed(2)}s`
+            text: "MakeSweet"
           }
-      })], files: [{
+        })],
-        filename: "makesweet.gif",
+        files: [{ filename: "makesweet.gif", value: mkswt.body }]
-        value: mkswt.body
+      })
-      }] })
     } catch (e) {
-      await response.edit({ embeds: [createEmbed("error", context, e)] })
+      console.log(e)
+      await response.edit({ embeds: [createEmbed("error", context, "Something went wrong.")] })
     }
   },
 }

commands/message/image/makesweet/circuitboard.js

@@ -27,18 +27,17 @@ module.exports = {
       const timings = Date.now();
       let mkswt = await circuitBoard(image)
       
-      await response.edit({ embeds: [createEmbed("default", context, {
+      return await response.edit({
-        image: {
+        embeds: [createEmbed("image", context, {
-          url: "attachment://makesweet.gif"
+          url: "makesweet.gif",
-        },
+          time: ((Date.now() - timings) / 1000).toFixed(2),
-        footer: {
+          provider: {
-          iconUrl: STATICS.makesweet,
+            icon: STATICS.makesweet,
-          text: `MakeSweet • Took ${((Date.now() - timings) / 1000).toFixed(2)}s`
+            text: "MakeSweet"
           }
-      })], files: [{
+        })],
-        filename: "makesweet.gif",
+        files: [{ filename: "makesweet.gif", value: mkswt.body }]
-        value: mkswt.body
+      })
-      }] })
     } catch (e) {
       await response.edit({ embeds: [createEmbed("error", context, e)] })
     }

commands/message/image/makesweet/flag.js

@@ -27,18 +27,17 @@ module.exports = {
       const timings = Date.now();
       let mkswt = await flag(image)
       
-      await response.edit({ embeds: [createEmbed("default", context, {
+      return await response.edit({
-        image: {
+        embeds: [createEmbed("image", context, {
-          url: "attachment://makesweet.gif"
+          url: "makesweet.gif",
-        },
+          time: ((Date.now() - timings) / 1000).toFixed(2),
-        footer: {
+          provider: {
-          iconUrl: STATICS.makesweet,
+            icon: STATICS.makesweet,
-          text: `MakeSweet • Took ${((Date.now() - timings) / 1000).toFixed(2)}s`
+            text: "MakeSweet"
           }
-      })], files: [{
+        })],
-        filename: "makesweet.gif",
+        files: [{ filename: "makesweet.gif", value: mkswt.body }]
-        value: mkswt.body
+      })
-      }] })
     } catch (e) {
       await response.edit({ embeds: [createEmbed("error", context, e)] })
     }

commands/message/image/makesweet/heartlocket.js

@@ -27,18 +27,17 @@ module.exports = {
       const timings = Date.now();
       let mkswt = await heartLocket(args.text, image)
       
-      await response.edit({ embeds: [createEmbed("default", context, {
+      return await response.edit({
-        image: {
+        embeds: [createEmbed("image", context, {
-          url: "attachment://makesweet.gif"
+          url: "makesweet.gif",
-        },
+          time: ((Date.now() - timings) / 1000).toFixed(2),
-        footer: {
+          provider: {
-          iconUrl: STATICS.makesweet,
+            icon: STATICS.makesweet,
-          text: `MakeSweet • Took ${((Date.now() - timings) / 1000).toFixed(2)}s`
+            text: "MakeSweet"
           }
-      })], files: [{
+        })],
-        filename: "makesweet.gif",
+        files: [{ filename: "makesweet.gif", value: mkswt.body }]
-        value: mkswt.body
+      })
-      }] })
     } catch (e) {
       await response.edit({ embeds: [createEmbed("error", context, e)] })
     }

commands/message/image/photofunia/retro-wave.js

@@ -29,15 +29,15 @@ module.exports = {
       if(res.response.body.status == 1) return editOrReply(context, {embeds:[createEmbed("warning", context, res.response.body.errors[0])]})
 
       image = res.response.body.data.images[res.response.body.data.best_quality]
-      return editOrReply(context, {embeds:[createEmbed("default", context, {
+      
-        image: {
+      return editOrReply(context, createEmbed("image", context, {
-          url: image
+        url: image,
-        },
+        time: res.timings,
-        footer: {
+        provider: {
-          iconUrl: STATICS.photofunia,
+          icon: STATICS.photofunia,
-          text: `PhotoFunia • ${context.application.name} • Took ${res.timings}s`
+          text: "PhotoFunia"
         }
-      })]})
+      }))
     }catch(e){
       console.log(e)
       if(e.response?.body?.message) return editOrReply(context, {embeds:[createEmbed("error", context, e.response.body.message)]})

commands/message/image/photofunia/yacht.js

@@ -20,16 +20,15 @@ module.exports = {
     try{
       let res = await yacht(context, args.text)
       image = res.response.body.data.images[res.response.body.data.best_quality]
-      return editOrReply(context, {embeds:[createEmbed("default", context, {
+      
-        description: `⛵`,
+      return editOrReply(context, createEmbed("image", context, {
-        image: {
+        url: image,
-          url: image
+        time: res.timings,
-        },
+        provider: {
-        footer: {
+          icon: STATICS.photofunia,
-          iconUrl: STATICS.photofunia,
+          text: "PhotoFunia"
-          text: `PhotoFunia • ${context.application.name} • Took ${res.timings}s`
         }
-      })]})
+      }))
     }catch(e){
       console.log(e)
       return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to generate image.`)]})

commands/message/utils/qr.js

@@ -24,26 +24,15 @@ module.exports = {
           "data": args.text
         })
       
-      await response.edit({
+      return await response.edit({
-        embeds: [
+        embeds: [createEmbed("image", context, {
-          createEmbed("default", context, {
+          url: "qrcode.png",
-            image: {
+          time: ((Date.now() - t) / 1000).toFixed(2)
-              url: `attachment://qrcode.png`
+        })],
-            },
+        files: [{ filename: "qrcode.png", value: res.body }]
-            footer: {
-              iconUrl: `https://cdn.discordapp.com/avatars/${context.application.id}/${context.application.icon}.png?size=256`,
-              text: `labsCore • Took ${((Date.now() - t) / 1000).toFixed(2)}s`
-            }
-          })
-        ],
-        files: [{
-          filename: "qrcode.png",
-          value: res.body
-        }]
       })
     }catch(e){
-      console.log(e)
+      return await response.edit({ embeds: [createEmbed("error", context, `Unable to generate qr code.`) ] })
-      return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to generate qr code.`)]})
     }
   }
 };

commands/message/utils/screenshot.js

@@ -14,7 +14,10 @@ module.exports = {
   },
   run: async (context, args) => {
     context.triggerTyping();
-    if(!args.url) return editOrReply(context, { embeds: [createEmbed("warning", context, "No images found.")] })
+    if(!args.url) return editOrReply(context, { embeds: [createEmbed("warning", context, "No url supplied.")] })
+    
+    let response = await editOrReply(context, createEmbed("loading", context, `Creating website screenshot...`))
+
     try{
       let ss = await screenshot(context, args.url)
       if(ss.response.body.status){
@@ -32,20 +35,16 @@ module.exports = {
           return editOrReply(context, { embeds: [createEmbed("error", context, "Unable to create screenshot.")] })
         }
       }
-      return editOrReply(context, { embeds: [createEmbed("default", context, {
+      
-        image: {
+      return await response.edit({
-          url: `attachment://screenshot.png`
+        embeds: [createEmbed("image", context, {
-        },
+          url: "screenshot.png",
-        footer: {
+          time: ss.timings
-          iconUrl: `https://cdn.discordapp.com/avatars/${context.application.id}/${context.application.icon}.png?size=256`,
+        })],
-          text: `${context.application.name} • Took ${ss.timings}s`
+        files: [{ filename: "screenshot.png", value: ss.response.body }]
-        }
+      })
-      })], files: [{
-          filename: "screenshot.png",
-          value: ss.response.body
-        }]})
     } catch(e){
-      console.log(e)
+      return await response.edit({ embeds: [createEmbed("error", context, `Unable to create screenshot.`) ] })
     }
   }
 };

labscore/utils/embed.js

@@ -11,6 +11,15 @@ const embedTypes = Object.freeze({
       }
     }
   },
+  "image": (context) => {
+    return {
+      color: COLORS.embed,
+      footer: {
+        iconUrl: `https://cdn.discordapp.com/avatars/${context.application.id}/${context.application.icon}.png?size=256`,
+        text: context.application.name
+      }
+    }
+  },
   "defaultNoFooter": (context) => {
     return {
       color: COLORS.embed
@@ -68,10 +77,29 @@ module.exports.createEmbed = function(type, context, content){
   if(!embedTypes[type]) throw "Invalid Embed Type"
   if(!content) embedTypes[type](context)
   let emb = embedTypes[type](context)
+
+  // Special handling
   if(["success","warning","error","loading"].includes(type)){
     emb.author.name = content
     return emb
   }
+
+  if(["image"].includes(type)){
+    if(content.url.includes('://')){
+      emb.image = { url: content.url }
+    } else {
+      emb.image = { url: `attachment://${content.url}` }
+    }
+
+    if(content.provider){
+      if(content.provider.text) emb.footer.text = `${content.provider.text} • ${context.application.name}`
+      if(content.provider.icon) emb.footer.iconUrl = content.provider.icon
+    }
+
+    if(content.time) emb.footer.text = `${emb.footer.text} • Took ${content.time}s`
+
+    return emb
+  }
   return Object.assign(emb, content)
 }