Nofated095
/
Q2TG
mirror of https://github.com/Nofated095/Q2TG.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Instance.ts

This commit is contained in:
Nofated 2023-01-19 00:03:32 +08:00 committed by GitHub
parent 7cc5e331de
commit 5060ba5189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/models/Instance.ts
View File

@ -36,7 +36,6 @@ export default class Instance {
private readonly log: Logger; private readonly log: Logger;
private tgBot: Telegram; private tgBot: Telegram;
private tgUser: Telegram;
private oicq: OicqClient; private oicq: OicqClient;
private _ownerChat: TelegramChat; private _ownerChat: TelegramChat;
@ -107,13 +106,13 @@ export default class Instance {
this.log.info('当前服务器未配置，请向 Bot 发送 /setup 来设置'); this.log.info('当前服务器未配置，请向 Bot 发送 /setup 来设置');
this.setupController = new SetupController(this, this.tgBot); this.setupController = new SetupController(this, this.tgBot);
// 这会一直卡在这里，所以要新开一个异步来做，提前返回掉上面的 // 这会一直卡在这里，所以要新开一个异步来做，提前返回掉上面的
({ tgUser: this.tgUser, oicq: this.oicq } = await this.setupController.waitForFinish()); ({ oicq: this.oicq } = await this.setupController.waitForFinish());
this._ownerChat = await this.tgBot.getChat(this.owner); this._ownerChat = await this.tgBot.getChat(this.owner);
} }
else { else {
this.log.debug('正在登录 TG UserBot'); this.log.debug('正在登录 TG UserBot');
this.tgUser = await Telegram.connect(this._userSessionId); // this.tgUser = await Telegram.connect(this._userSessionId);
this.log.info('TG UserBot 登录完成'); this.log.info('TG UserBot 登录完成 //skip');
this._ownerChat = await this.tgBot.getChat(this.owner); this._ownerChat = await this.tgBot.getChat(this.owner);
this.log.debug('正在登录 OICQ'); this.log.debug('正在登录 OICQ');
this.oicq = await OicqClient.create({ this.oicq = await OicqClient.create({
@ -140,7 +139,7 @@ export default class Instance {
}); });
this.log.info('OICQ 登录完成'); this.log.info('OICQ 登录完成');
} }
this.statusReportController = new StatusReportController(this, this.tgBot, this.tgUser, this.oicq); this.statusReportController = new StatusReportController(this, this.tgBot, this.oicq);
this.forwardPairs = await ForwardPairs.load(this.id, this.oicq, this.tgBot); this.forwardPairs = await ForwardPairs.load(this.id, this.oicq, this.tgBot);
this.setupCommands() this.setupCommands()
.then(() => this.log.info('命令设置成功')) .then(() => this.log.info('命令设置成功'))
@ -150,13 +149,13 @@ export default class Instance {
} }
this.oicqErrorNotifyController = new OicqErrorNotifyController(this, this.oicq); this.oicqErrorNotifyController = new OicqErrorNotifyController(this, this.oicq);
this.requestController = new RequestController(this, this.tgBot, this.oicq); this.requestController = new RequestController(this, this.tgBot, this.oicq);
this.configController = new ConfigController(this, this.tgBot, this.tgUser, this.oicq); this.configController = new ConfigController(this, this.tgBot, this.oicq);
this.deleteMessageController = new DeleteMessageController(this, this.tgBot, this.tgUser, this.oicq); this.deleteMessageController = new DeleteMessageController(this, this.tgBot, this.oicq);
this.inChatCommandsController = new InChatCommandsController(this, this.tgBot, this.tgUser, this.oicq); this.inChatCommandsController = new InChatCommandsController(this, this.tgBot, this.oicq);
if (this.workMode === 'group') { if (this.workMode === 'group') {
this.hugController = new HugController(this, this.tgBot, this.oicq); this.hugController = new HugController(this, this.tgBot, this.oicq);
} }
this.forwardController = new ForwardController(this, this.tgBot, this.tgUser, this.oicq); this.forwardController = new ForwardController(this, this.tgBot, this.oicq);
if (this.workMode === 'group') { if (this.workMode === 'group') {
// 希望那个 /q 也被转发 // 希望那个 /q 也被转发
this.quotLyController = new QuotLyController(this, this.tgBot, this.oicq); this.quotLyController = new QuotLyController(this, this.tgBot, this.oicq);
@ -243,10 +242,6 @@ export default class Instance {
return this.tgBot.me; return this.tgBot.me;
} }
get userMe() {
return this.tgUser.me;
}
get ownerChat() { get ownerChat() {
return this._ownerChat; return this._ownerChat;
} }