mirror of
https://github.com/arthur-pbty/xiao.git
synced 2026-06-24 10:25:11 +02:00
Fix?
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
const Command = require('../../framework/Command');
|
const Command = require('../../framework/Command');
|
||||||
const request = require('node-superfetch');
|
const request = require('node-superfetch');
|
||||||
const QrCode = require('qrcode-reader');
|
const { decodeQR } = require('qr/decode.js');
|
||||||
const { createCanvas, loadImage } = require('@napi-rs/canvas');
|
const { createCanvas, loadImage } = require('@napi-rs/canvas');
|
||||||
const { shorten } = require('../../util/Util');
|
const { shorten } = require('../../util/Util');
|
||||||
|
|
||||||
@@ -29,21 +29,14 @@ module.exports = class ReadQRCodeCommand extends Command {
|
|||||||
ctx.drawImage(img, 0, 0);
|
ctx.drawImage(img, 0, 0);
|
||||||
const imgData = ctx.getImageData(0, 0, img.width, img.height);
|
const imgData = ctx.getImageData(0, 0, img.width, img.height);
|
||||||
try {
|
try {
|
||||||
const result = await this.readQrCode(imgData);
|
const result = await this.readQrCode(imgData, img.width, img.height);
|
||||||
return msg.reply(shorten(result, 2000));
|
return msg.reply(shorten(result, 2000));
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return msg.reply(`Could not read QR Code: \`${err.message}\`.`);
|
return msg.reply(`Could not read QR Code: \`${err.message}\`.`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
readQrCode(imgData) {
|
readQrCode(imgData, width, height) {
|
||||||
const qr = new QrCode();
|
return decodeQR({ width, height, data: imgData });
|
||||||
return new Promise((res, rej) => {
|
|
||||||
qr.callback = (err, value) => {
|
|
||||||
if (err) return rej(err);
|
|
||||||
return res(value);
|
|
||||||
}
|
|
||||||
return qr.decode(imgData);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
+1
-1
@@ -70,7 +70,7 @@
|
|||||||
"ntcjs": "^1.1.3",
|
"ntcjs": "^1.1.3",
|
||||||
"parse-domain": "^8.2.2",
|
"parse-domain": "^8.2.2",
|
||||||
"pokersolver": "^2.1.4",
|
"pokersolver": "^2.1.4",
|
||||||
"qrcode-reader": "^1.0.4",
|
"qr": "^0.5.1",
|
||||||
"random-js": "^2.1.0",
|
"random-js": "^2.1.0",
|
||||||
"sagiri": "^4.3.0",
|
"sagiri": "^4.3.0",
|
||||||
"semver": "^7.7.2",
|
"semver": "^7.7.2",
|
||||||
|
|||||||
Reference in New Issue
Block a user