Merge pull request #862 from SwitchbladeBot/new-qrcode

QR Code command and imageParameter improvements
SwitchbladeBot · Jun 5, 2019 · d054078 · d054078
2 parents b77fabd + 8b15d1c
commit d054078
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 11 deletions.
diff --git a/src/commands/misc/qrcode.js b/src/commands/misc/qrcode.js
@@ -1,20 +1,26 @@
 const { Command, SwitchbladeEmbed } = require('../../')
 
+const types = ['generate', 'create', 'g', 'read', 'r']
+
 module.exports = class QRCode extends Command {
   constructor (client) {
     super(client, {
       name: 'qrcode',
       aliases: ['qr'],
       parameters: [{
-        type: 'string', full: true, missingError: 'commands:qrcode.noText'
+        type: 'string',
+        full: false,
+        whitelist: types,
+        missingError: ({ t, prefix }) => {
+          return new SwitchbladeEmbed().setTitle(t('commons:search.noType'))
+            .setDescription([
+              this.usage(t, prefix),
+              '',
+              `__**${t('commons:search.types')}:**__`,
+              `\`${['generate', 'read'].join('`, `')}\``
+            ].join('\n'))
+        }
       }]
     })
   }
-
-  async run ({ t, author, channel }, text) {
-    channel.send(
-      new SwitchbladeEmbed(author)
-        .setImage(`https://api.qrserver.com/v1/create-qr-code/?data=${encodeURIComponent(text)}`)
-    )
-  }
 }
diff --git a/src/commands/misc/qrcode/generate.js b/src/commands/misc/qrcode/generate.js
@@ -0,0 +1,21 @@
+const { Command, SwitchbladeEmbed } = require('../../../')
+
+module.exports = class QRCodeGenerate extends Command {
+  constructor (client) {
+    super(client, {
+      name: 'generate',
+      aliases: ['create', 'g'],
+      parentCommand: 'qrcode',
+      parameters: [{
+        type: 'string', full: true, missingError: 'commands:qrcode.subcommands.generate.noText'
+      }]
+    })
+  }
+
+  async run ({ t, author, channel, language }, text) {
+    channel.send(
+      new SwitchbladeEmbed(author)
+        .setImage(`https://api.qrserver.com/v1/create-qr-code/?data=${encodeURIComponent(text)}`)
+    )
+  }
+}
diff --git a/src/commands/misc/qrcode/read.js b/src/commands/misc/qrcode/read.js
@@ -0,0 +1,30 @@
+const { Command, CommandError, SwitchbladeEmbed } = require('../../../')
+const fetch = require('node-fetch')
+
+module.exports = class QRCodeRead extends Command {
+  constructor (client) {
+    super(client, {
+      name: 'read',
+      aliases: ['r'],
+      parentCommand: 'qrcode',
+      parameters: [{
+        type: 'image',
+        authorAvatar: false,
+        url: true,
+        missingError: 'commands:qrcode.subcommands.read.noImage'
+      }]
+    })
+  }
+
+  async run ({ t, channel, author, message }, image) {
+    const body = await fetch(`http://api.qrserver.com/v1/read-qr-code/?fileurl=${encodeURIComponent(image)}`).then(res => res.json())
+    if (body[0].symbol[0].data !== null) {
+      channel.send(
+        new SwitchbladeEmbed(author)
+          .setDescription(body[0].symbol[0].data)
+      )
+    } else {
+      throw new CommandError(t('commands:qrcode.subcommands.read.unknownImage'))
+    }
+  }
+}
diff --git a/src/locales/en-US/commands.json b/src/locales/en-US/commands.json
@@ -457,9 +457,20 @@
     "time": "Time"
   },
   "qrcode": {
-    "commandDescription": "Generates a QR Code.",
-    "commandUsage": "<text>",
-    "noText": " You have to give me some text!"
+    "commandDescription": "Generates or reads a QR code.",
+    "subcommands": {
+      "generate": {
+        "commandDescription": "Generates a QR code.",
+        "commandUsage": "<text>",
+        "noText": " You have to give me some text!"
+      },
+      "read": {
+        "commandDescription": "Reads a QR code.",
+        "commandUsage": "<image/link>",
+        "noImage": "You have to give me an image to read.",
+        "unknownImage": "You have to give me a valid QR code to read."
+      }
+    }
   },
   "strawpoll": {
     "commandDescription": "Creates a Straw Poll.",

diff --git a/src/structures/command/parameters/types/ImageParameter.js b/src/structures/command/parameters/types/ImageParameter.js
@@ -38,6 +38,7 @@ module.exports = class ImageParameter extends Parameter {
     return {
       ...super.parseOptions(options),
       user,
+      url: defVal(options, 'url', false),
       attachment: defVal(options, 'attachment', true),
       link: defVal(options, 'link', true),
       userOptions: user ? UserParameter.parseOptions(options.userOptions) : null,
@@ -70,6 +71,7 @@ module.exports = class ImageParameter extends Parameter {
       parseState.argIndex--
       const attachment = message.attachments.first()
       try {
+        if (this.url) return attachment.url
         const buffer = await imageRequest(attachment.url, client)
         return buffer
       } catch (e) {
@@ -82,6 +84,7 @@ module.exports = class ImageParameter extends Parameter {
       // Link
       if (this.link && isValidURL(arg)) {
         try {
+          if (this.url) return arg
           const buffer = await imageRequest(arg, client)
           return buffer
         } catch (e) {
@@ -96,6 +99,7 @@ module.exports = class ImageParameter extends Parameter {
           const user = UserParameter._parse(arg, this.userOptions, context)
           if (user) {
             try {
+              if (this.url) return user.displayAvatarURL
               const buffer = await imageRequest(user.displayAvatarURL, client)
               return buffer
             } catch (e) {
@@ -117,6 +121,7 @@ module.exports = class ImageParameter extends Parameter {
             parseState.argIndex--
             const attachment = msg.attachments.first()
             try {
+              if (this.url) return attachment.url
               const buffer = await imageRequest(attachment.url, client)
               return buffer
             } catch (e) {
@@ -136,6 +141,7 @@ module.exports = class ImageParameter extends Parameter {
             if (url) {
               parseState.argIndex--
               try {
+                if (this.url) return url
                 const buffer = await imageRequest(url, client)
                 return buffer
               } catch (e) {
@@ -152,6 +158,7 @@ module.exports = class ImageParameter extends Parameter {
     if (this.authorAvatar) {
       try {
         parseState.argIndex--
+        if (this.url) return author.displayAvatarURL
         const buffer = await imageRequest(author.displayAvatarURL, client)
         return buffer
       } catch (e) {