diff --git a/example/api-ai-bot.ts b/example/api-ai-bot.ts index 2efcf388c92a7df202d6fbf5ac96bed00b411a01..c08b18e9fff09f14cfb31f72222b9b2f5ea8ad31 100644 --- a/example/api-ai-bot.ts +++ b/example/api-ai-bot.ts @@ -10,6 +10,10 @@ * Wechaty - https://github.com/zixia/wechaty * */ + +/* tslint:disable:variable-name */ +const QrcodeTerminal = require('qrcode-terminal') + import { Brolog as log } from 'brolog' /* tslint:disable:no-var-requires */ const co = require('co') @@ -47,7 +51,11 @@ Loading... please wait for QrCode Image Url and then scan to login. bot .on('scan', (url, code) => { - console.log(`[${code}]Scan QR Code in url to login:\n${url}`) + if (!/201|200/.test(String(code))) { + let loginUrl = url.replace(/\/qrcode\//, '/l/') + QrcodeTerminal.generate(loginUrl) + } + console.log(`${url}\n[${code}] Scan QR Code in above url to login: `) }) .on('login' , user => log.info('Bot', `bot login: ${user}`)) .on('logout' , e => log.info('Bot', 'bot logout.')) diff --git a/example/contact-bot.ts b/example/contact-bot.ts index ded95c17e68a725a136eb31fa92b1c701b225bf4..d9fa08ea04d71d7da3bae871b9365f348c597f8b 100644 --- a/example/contact-bot.ts +++ b/example/contact-bot.ts @@ -6,6 +6,10 @@ * https://github.com/wechaty/wechaty * */ + +/* tslint:disable:variable-name */ +const QrcodeTerminal = require('qrcode-terminal') + import { Config , Contact @@ -51,7 +55,7 @@ bot .on('scan', (url, code) => { if (!/201|200/.test(String(code))) { let loginUrl = url.replace(/\/qrcode\//, '/l/') - require('qrcode-terminal').generate(loginUrl) + QrcodeTerminal.generate(loginUrl) } console.log(`${url}\n[${code}] Scan QR Code in above url to login: `) }) diff --git a/example/ding-dong-bot.ts b/example/ding-dong-bot.ts index ebdf55190c01cc0de6c9553028113392b3c041dd..dbde7cefd03a1d46d439a686ed41334fb33a38f0 100644 --- a/example/ding-dong-bot.ts +++ b/example/ding-dong-bot.ts @@ -6,6 +6,10 @@ * https://github.com/wechaty/wechaty * */ + +/* tslint:disable:variable-name */ +const QrcodeTerminal = require('qrcode-terminal') + import { Wechaty , Config @@ -45,7 +49,7 @@ bot .on('scan', (url, code) => { if (!/201|200/.test(String(code))) { let loginUrl = url.replace(/\/qrcode\//, '/l/') - require('qrcode-terminal').generate(loginUrl) + QrcodeTerminal.generate(loginUrl) } console.log(`${url}\n[${code}] Scan QR Code in above url to login: `) }) diff --git a/example/friend-bot.ts b/example/friend-bot.ts index 9f76a91ec70fc5639a06e4116e96ab1c76620766..9e955aac8ccf77bba72b7137018b4f928b478952 100644 --- a/example/friend-bot.ts +++ b/example/friend-bot.ts @@ -6,6 +6,10 @@ * https://github.com/wechaty/wechaty * */ + +/* tslint:disable:variable-name */ +const QrcodeTerminal = require('qrcode-terminal') + import { Wechaty , Message @@ -47,7 +51,7 @@ bot .on('scan', (url, code) => { if (!/201|200/.test(String(code))) { let loginUrl = url.replace(/\/qrcode\//, '/l/') - require('qrcode-terminal').generate(loginUrl) + QrcodeTerminal.generate(loginUrl) } console.log(`${url}\n[${code}] Scan QR Code in above url to login: `) }) diff --git a/example/image-bot.ts b/example/image-bot.ts index 0b8f13e04d90e53381a8bb053315c69908d2e1ca..783b63094739e4aedab3d4510e4f68eecaf45e70 100644 --- a/example/image-bot.ts +++ b/example/image-bot.ts @@ -6,6 +6,10 @@ * https://github.com/wechaty/wechaty * */ + +/* tslint:disable:variable-name */ +const QrcodeTerminal = require('qrcode-terminal') + import { Message , Wechaty @@ -14,7 +18,11 @@ const bot = Wechaty.instance({ profile: 'example-bot.wechaty.json' }) bot .on('scan', (url, code) => { - console.log(`Use Wechat to Scan QR Code in url to login: ${code}\n${url}`) + if (!/201|200/.test(String(code))) { + let loginUrl = url.replace(/\/qrcode\//, '/l/') + QrcodeTerminal.generate(loginUrl) + } + console.log(`${url}\n[${code}] Scan QR Code in above url to login: `) }) .on('message', m => { console.log(`RECV: ${m}`) diff --git a/example/roger-bot.ts b/example/roger-bot.ts index 73b24319c8417b420647602627f64a560a7f60bf..1b7ed53da4d9b0777a77e952c301c52c742a33ca 100644 --- a/example/roger-bot.ts +++ b/example/roger-bot.ts @@ -6,12 +6,20 @@ * https://github.com/wechaty/wechaty * */ + +/* tslint:disable:variable-name */ +const QrcodeTerminal = require('qrcode-terminal') + import { Wechaty } from '../' const bot = Wechaty.instance(/* no profile here because roger bot is too noisy */) bot .on('scan', (url, code) => { - console.log(`Use Wechat to Scan QR Code in url to login: ${code}\n${url}`) + if (!/201|200/.test(String(code))) { + let loginUrl = url.replace(/\/qrcode\//, '/l/') + QrcodeTerminal.generate(loginUrl) + } + console.log(`${url}\n[${code}] Scan QR Code in above url to login: `) }) .on('message', m => { if (bot.self(m)) { return } diff --git a/example/room-bot.ts b/example/room-bot.ts index c67adef50e123b1f2fedb3fe87ef209f56cb7941..6832e6625dbbaa58bcbedc5bbd784983a7226f55 100644 --- a/example/room-bot.ts +++ b/example/room-bot.ts @@ -34,6 +34,9 @@ const HELPER_CONTACT_NAME = 'Bruce LEE' * */ +/* tslint:disable:variable-name */ +const QrcodeTerminal = require('qrcode-terminal') + import { Config , Contact @@ -71,8 +74,12 @@ console.log(welcome) const bot = Wechaty.instance({ profile: Config.DEFAULT_PROFILE }) bot -.on('scan', function(url, code) { - console.log(`Use Wechat to Scan QR Code in url to login: ${code}\n${url}`) +.on('scan', (url, code) => { + if (!/201|200/.test(String(code))) { + let loginUrl = url.replace(/\/qrcode\//, '/l/') + QrcodeTerminal.generate(loginUrl) + } + console.log(`${url}\n[${code}] Scan QR Code in above url to login: `) }) .on('logout' , user => log.info('Bot', `${user.name()} logouted`)) .on('error' , e => log.info('Bot', 'error: %s', e)) diff --git a/example/tuling123-bot.ts b/example/tuling123-bot.ts index 3990790e23144338b7975b05c5173dd910d7e906..ea0091e61457e47095d60f4fe4c67f7f8c336711 100644 --- a/example/tuling123-bot.ts +++ b/example/tuling123-bot.ts @@ -12,7 +12,8 @@ */ /* tslint:disable:no-var-requires */ /* tslint:disable:variable-name */ -const Tuling123 = require('tuling123-client') +const QrcodeTerminal = require('qrcode-terminal') +const Tuling123 = require('tuling123-client') import { EventEmitter } from 'events' @@ -50,7 +51,11 @@ bot .on('login' , user => log.info('Bot', `bot login: ${user}`)) .on('logout' , e => log.info('Bot', 'bot logout.')) .on('scan', (url, code) => { - console.log(`Scan QR Code in url to login: ${code}\n${url}`) + if (!/201|200/.test(String(code))) { + let loginUrl = url.replace(/\/qrcode\//, '/l/') + QrcodeTerminal.generate(loginUrl) + } + console.log(`${url}\n[${code}] Scan QR Code in above url to login: `) }) .on('message', async m => { if (m.self()) return