From a087582979c15695a1bc379d874419429a63ff31 Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Wed, 8 Nov 2023 16:35:33 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=88=A0=E9=99=A4=20QQ=20=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/OicqClient.ts           |  9 ---------
 src/controllers/SetupController.ts |  2 --
 src/models/Instance.ts             |  8 --------
 src/services/SetupService.ts       | 10 +---------
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/client/OicqClient.ts b/src/client/OicqClient.ts
index dde4366..b540359 100644
--- a/src/client/OicqClient.ts
+++ b/src/client/OicqClient.ts
@@ -36,8 +36,6 @@ interface CreateOicqParams {
   onVerifyDevice: (phone: string) => Promise<string>;
   // 当滑块时调用此方法，返回 ticker，也可以返回假值改用扫码登录
   onVerifySlider: (url: string) => Promise<string>;
-  // 扫码后返回
-  onQrCode: (image: Buffer) => Promise<void>;
 }
 
 // OicqExtended??
@@ -78,11 +76,6 @@ export default class OicqClient extends Client {
         }
       };
 
-      const loginQrCodeHandler = async ({ image }: { image: Buffer }) => {
-        await params.onQrCode(image);
-        client.qrcodeLogin();
-      };
-
       const loginErrorHandler = ({ message }: { code: number; message: string }) => {
         reject(message);
       };
@@ -90,7 +83,6 @@ export default class OicqClient extends Client {
       const successLoginHandler = () => {
         client.offTrap('system.login.device', loginDeviceHandler);
         client.offTrap('system.login.slider', loginSliderHandler);
-        client.offTrap('system.login.qrcode', loginQrCodeHandler);
         client.offTrap('system.login.error', loginErrorHandler);
         client.offTrap('system.online', successLoginHandler);
 
@@ -136,7 +128,6 @@ export default class OicqClient extends Client {
       });
       client.on('system.login.device', loginDeviceHandler);
       client.on('system.login.slider', loginSliderHandler);
-      client.on('system.login.qrcode', loginQrCodeHandler);
       client.on('system.login.error', loginErrorHandler);
       client.on('system.online', successLoginHandler);
 
diff --git a/src/controllers/SetupController.ts b/src/controllers/SetupController.ts
index 2ca400b..fb8fe7f 100644
--- a/src/controllers/SetupController.ts
+++ b/src/controllers/SetupController.ts
@@ -80,8 +80,6 @@ export default class SetupController {
         platform: this.instance.qq.platform,
         signApi: this.instance.qq.signApi,
         signVer: this.instance.qq.signVer,
-        onQrCode: async (file) => {
-        },
         onVerifyDevice: async (phone) => {
           return await this.setupService.waitForOwnerInput(`请输入手机 ${phone} 收到的验证码`);
         },
diff --git a/src/models/Instance.ts b/src/models/Instance.ts
index fb1befb..91b7fc3 100644
--- a/src/models/Instance.ts
+++ b/src/models/Instance.ts
@@ -123,14 +123,6 @@ export default class Instance {
           platform: this.qq.platform,
           signApi: this.qq.signApi,
           signVer: this.qq.signVer,
-          onQrCode: async (file) => {
-            await this.ownerChat.sendMessage({
-              message: '请使用已登录这个账号的手机 QQ 扫描这个二维码授权',
-              file: new CustomFile('qrcode.png', file.length, '', file),
-              buttons: Button.text('我已扫码', true, true),
-            });
-            await this.waitForOwnerInput();
-          },
           onVerifyDevice: async (phone) => {
             return await this.waitForOwnerInput(`请输入手机 ${phone} 收到的验证码`);
           },
diff --git a/src/services/SetupService.ts b/src/services/SetupService.ts
index 77e6a60..0213180 100644
--- a/src/services/SetupService.ts
+++ b/src/services/SetupService.ts
@@ -87,15 +87,7 @@ export default class SetupService {
     const dbQQBot = await db.qqBot.create({ data: { uin, password, platform, signApi, signVer } });
     return await OicqClient.create({
       id: dbQQBot.id,
-      uin, password, platform, signApi, signVer, 
-      onQrCode: async (file) => {
-        await this.owner.sendMessage({
-          message: '请使用已登录这个账号的手机 QQ 扫描这个二维码授权',
-          file: new CustomFile('qrcode.png', file.length, '', file),
-          buttons: Button.text('我已扫码', true, true),
-        });
-        await this.waitForOwnerInput();
-      },
+      uin, password, platform, signApi, signVer,
       onVerifyDevice: async (phone) => {
         return await this.waitForOwnerInput(`请输入手机 ${phone} 收到的验证码`);
       },