From 175a69a9b5782d980843845228b6889079ae91bf Mon Sep 17 00:00:00 2001
From: jarvis2f <137974272+jarvis2f@users.noreply.github.com>
Date: Wed, 19 Feb 2025 13:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=8A=20fix:=20Improve=20history=20messa?=
 =?UTF-8?q?ge=20logging=20for=20timeout=20and=20limit=20exceed=20scenarios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/telegram/files/AutoDownloadVerticle.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/telegram/files/AutoDownloadVerticle.java b/api/src/main/java/telegram/files/AutoDownloadVerticle.java
index 3c7d539..6f7573e 100644
--- a/api/src/main/java/telegram/files/AutoDownloadVerticle.java
+++ b/api/src/main/java/telegram/files/AutoDownloadVerticle.java
@@ -124,8 +124,12 @@ public class AutoDownloadVerticle extends AbstractVerticle {
 
     private void addHistoryMessage(SettingAutoRecords.Item auto, long currentTimeMillis) {
         log.debug("Start scan history! TelegramId: %d ChatId: %d FileType: %s".formatted(auto.telegramId, auto.chatId, auto.nextFileType));
-        if (System.currentTimeMillis() - currentTimeMillis > MAX_HISTORY_SCAN_TIME || isExceedLimit(auto.telegramId)) {
-            log.debug("Scan history end! TelegramId: %d ChatId: %d".formatted(auto.telegramId, auto.chatId));
+        if (System.currentTimeMillis() - currentTimeMillis > MAX_HISTORY_SCAN_TIME) {
+            log.debug("Scan history timeout! TelegramId: %d ChatId: %d".formatted(auto.telegramId, auto.chatId));
+            return;
+        }
+        if (isExceedLimit(auto.telegramId)) {
+            log.debug("Scan history exceed per telegram account limit! TelegramId: %d ChatId: %d".formatted(auto.telegramId, auto.chatId));
             return;
         }
         Tuple2<String, List<String>> rule = handleRule(auto);