chore: 增加变量 TG_LOG_LEVEL

ccmuyuu · Feb 29, 2024 · b922788 · b922788
1 parent c7368c5
commit b922788
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/main/package.json b/main/package.json
@@ -39,7 +39,7 @@
     "fastify": "^4.26.0",
     "file-type": "^19.0.0",
     "fluent-ffmpeg": "^2.1.2",
-    "icqq": "^0.6.8",
+    "icqq": "^0.6.10",
     "image-size": "^1.1.1",
     "lodash": "^4.17.21",
     "log4js": "^6.6.1",

diff --git a/main/src/client/Telegram.ts b/main/src/client/Telegram.ts
@@ -12,7 +12,7 @@ import TelegramChat from './TelegramChat';
 import TelegramSession from '../models/TelegramSession';
 import { LogLevel } from 'telegram/extensions/Logger';
 import { BigInteger } from 'big-integer';
-import { EditMessageParams, IterMessagesParams } from 'telegram/client/messages';
+import { IterMessagesParams } from 'telegram/client/messages';
 import { PromisedNetSockets, PromisedWebSockets } from 'telegram/extensions';
 import { ConnectionTCPFull, ConnectionTCPObfuscated } from 'telegram/network';
 import env from '../models/env';
@@ -62,7 +62,7 @@ export default class Telegram {
         connection: env.TG_CONNECTION === 'websocket' ? ConnectionTCPObfuscated : ConnectionTCPFull,
       },
     );
-    // this.client.logger.setLevel(LogLevel.WARN);
+    this.client.logger.setLevel(env.TG_LOG_LEVEL as LogLevel);
   }
 
   public static async create(startArgs: UserAuthParams | BotAuthParams, appName = 'Q2TG') {

diff --git a/main/src/controllers/ForwardController.ts b/main/src/controllers/ForwardController.ts
@@ -178,6 +178,7 @@ export default class ForwardController {
   private onQqPoke = async (event: FriendPokeEvent | GroupPokeEvent) => {
     const target = event.notice_type === 'friend' ? event.friend : event.group;
     const pair = this.instance.forwardPairs.find(target);
+    if (!pair) return;
     if ((pair?.flags | this.instance.flags) & flags.DISABLE_POKE) return;
     let operatorName: string, targetName: string;
     if (target instanceof Friend) {

diff --git a/main/src/models/env.ts b/main/src/models/env.ts
@@ -4,6 +4,7 @@ import path from 'path';
 const configParsed = z.object({
   DATA_DIR: z.string().default(path.resolve('./data')),
   OICQ_LOG_LEVEL: z.enum(['trace', 'debug', 'info', 'warn', 'error', 'fatal', 'mark', 'off']).default('warn'),
+  TG_LOG_LEVEL: z.enum(['none', 'error', 'warn', 'info', 'debug']).default('warn'),
   FFMPEG_PATH: z.string().optional(),
   FFPROBE_PATH: z.string().optional(),
   SIGN_API: z.string().url().optional(),

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml