diff --git a/commands/analyze/read-qr-code.js b/commands/analyze/read-qr-code.js index af16db8d..e3bd3aef 100644 --- a/commands/analyze/read-qr-code.js +++ b/commands/analyze/read-qr-code.js @@ -1,6 +1,6 @@ const Command = require('../../framework/Command'); const request = require('node-superfetch'); -const QrCode = require('qrcode-reader'); +const { decodeQR } = require('qr/decode.js'); const { createCanvas, loadImage } = require('@napi-rs/canvas'); const { shorten } = require('../../util/Util'); @@ -29,21 +29,14 @@ module.exports = class ReadQRCodeCommand extends Command { ctx.drawImage(img, 0, 0); const imgData = ctx.getImageData(0, 0, img.width, img.height); try { - const result = await this.readQrCode(imgData); + const result = await this.readQrCode(imgData, img.width, img.height); return msg.reply(shorten(result, 2000)); } catch (err) { return msg.reply(`Could not read QR Code: \`${err.message}\`.`); } } - readQrCode(imgData) { - const qr = new QrCode(); - return new Promise((res, rej) => { - qr.callback = (err, value) => { - if (err) return rej(err); - return res(value); - } - return qr.decode(imgData); - }); + readQrCode(imgData, width, height) { + return decodeQR({ width, height, data: imgData }); } }; diff --git a/package.json b/package.json index c577d4a7..730bc561 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "ntcjs": "^1.1.3", "parse-domain": "^8.2.2", "pokersolver": "^2.1.4", - "qrcode-reader": "^1.0.4", + "qr": "^0.5.1", "random-js": "^2.1.0", "sagiri": "^4.3.0", "semver": "^7.7.2",