From be5106c8194c39918a6fde2626cad886d2355613 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 20 Oct 2023 12:54:06 +0800
Subject: [PATCH] fix #927

---
 app/command.py   | 7 ++-----
 app/scheduler.py | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/command.py b/app/command.py
index 3313814b..cdfdd01d 100644
--- a/app/command.py
+++ b/app/command.py
@@ -103,10 +103,7 @@ class Command(metaclass=Singleton):
                 "id": "subscribe_search",
                 "type": "scheduler",
                 "description": "搜索订阅",
-                "category": "订阅",
-                "kwargs": {
-                    'state': 'R'
-                }
+                "category": "订阅"
             },
             "/subscribe_delete": {
                 "func": SubscribeChain().remote_delete,
@@ -233,7 +230,7 @@ class Command(metaclass=Singleton):
                 )
 
             # 执行定时任务
-            self.scheduler.start(job_id=command.get("id"), **command.get("kwargs", {}))
+            self.scheduler.start(job_id=command.get("id"))
 
             if userid:
                 self.chain.post_message(
diff --git a/app/scheduler.py b/app/scheduler.py
index 03289bda..9b062517 100644
--- a/app/scheduler.py
+++ b/app/scheduler.py
@@ -60,6 +60,9 @@ class Scheduler(metaclass=Singleton):
             "subscribe_search": {
                 "func": SubscribeChain().search,
                 "running": False,
+                "kwargs": {
+                    "state": "R"
+                }
             },
             "subscribe_refresh": {
                 "func": SubscribeChain().refresh,
@@ -218,6 +221,8 @@ class Scheduler(metaclass=Singleton):
             return
         self._jobs[job_id]["running"] = True
         try:
+            if not kwargs:
+                kwargs = job.get("kwargs") or {}
             job["func"](*args, **kwargs)
         except Exception as e:
             logger.error(f"定时任务 {job_id} 执行失败：{str(e)}")