6 files changed, 21 insertions, 13 deletions

diff --git a/ATRI/plugins/bilibili_dynamic/__init__.py b/ATRI/plugins/bilibili_dynamic/__init__.py
index 7459a15..c47feed 100644
--- a/ATRI/plugins/bilibili_dynamic/__init__.py
+++ b/ATRI/plugins/bilibili_dynamic/__init__.py
@@ -16,8 +16,8 @@ from nonebot.adapters.onebot.v11 import Message, MessageSegment, GroupMessageEve
 
 from ATRI.log import log
 from ATRI.service import Service
+from ATRI.utils import TimeDealer
 from ATRI.permission import MASTER, ADMIN
-from ATRI.utils import timestamp2datetime
 from ATRI.utils.apscheduler import scheduler
 from ATRI.database import BilibiliSubscription
 
@@ -192,7 +192,7 @@ async def _():
                     m.uid,
                     m.group_id,
                     {
-                        "last_update": timestamp2datetime(i["timestamp"]),
+                        "last_update": TimeDealer(float(i["timestamp"])).to_datetime(),
                     },
                 )
                 if _pic:
diff --git a/ATRI/plugins/bilibili_dynamic/data_source.py b/ATRI/plugins/bilibili_dynamic/data_source.py
index 26ebf50..2bdfee9 100644
--- a/ATRI/plugins/bilibili_dynamic/data_source.py
+++ b/ATRI/plugins/bilibili_dynamic/data_source.py
@@ -3,7 +3,7 @@ from datetime import datetime
 from operator import itemgetter
 
 from ATRI.message import MessageBuilder
-from ATRI.utils import timestamp2datetime
+from ATRI.utils import TimeDealer
 from ATRI.exceptions import BilibiliDynamicError
 
 from .db import DB
@@ -95,7 +95,7 @@ class BilibiliDynamicSubscriptor:
             pattern["like"] = desc["like"]
             pattern["dynamic_id"] = desc["dynamic_id"]
             pattern["timestamp"] = desc["timestamp"]
-            pattern["time"] = timestamp2datetime(desc["timestamp"])
+            pattern["time"] = TimeDealer(float(desc["timestamp"])).to_datetime()
             pattern["type_zh"] = str()
 
             # alternative 部分
diff --git a/ATRI/plugins/rss/rss_mikanan/__init__.py b/ATRI/plugins/rss/rss_mikanan/__init__.py
index 2c577ee..fb4b23c 100644
--- a/ATRI/plugins/rss/rss_mikanan/__init__.py
+++ b/ATRI/plugins/rss/rss_mikanan/__init__.py
@@ -17,7 +17,7 @@ from ATRI.log import log
 from ATRI.service import Service
 from ATRI.permission import ADMIN
 from ATRI.message import MessageBuilder
-from ATRI.utils import timestamp2datetime
+from ATRI.utils import TimeDealer
 from ATRI.utils.apscheduler import scheduler
 from ATRI.database import RssMikananiSubcription
 
@@ -167,5 +167,5 @@ async def _():
             bot = get_bot()
             await bot.send_group_msg(group_id=data.group_id, message=repo)
             await sub.update_sub(
-                data._id, data.group_id, {"update_time": timestamp2datetime(m_t)}
+                data._id, data.group_id, {"update_time": TimeDealer(m_t).to_datetime()}
             )
diff --git a/ATRI/plugins/rss/rss_rsshub/__init__.py b/ATRI/plugins/rss/rss_rsshub/__init__.py
index 969fe0a..137ec88 100644
--- a/ATRI/plugins/rss/rss_rsshub/__init__.py
+++ b/ATRI/plugins/rss/rss_rsshub/__init__.py
@@ -16,7 +16,7 @@ from nonebot.adapters.onebot.v11 import Message, GroupMessageEvent
 from ATRI.log import log
 from ATRI.service import Service
 from ATRI.permission import ADMIN
-from ATRI.utils import timestamp2datetime
+from ATRI.utils import TimeDealer
 from ATRI.utils.apscheduler import scheduler
 from ATRI.database import RssRsshubSubcription
 
@@ -164,5 +164,5 @@ async def _():
             bot = get_bot()
             await bot.send_group_msg(group_id=m.group_id, message=repo)
             await sub.update_sub(
-                m._id, m.group_id, {"update_time": timestamp2datetime(ts_t)}
+                m._id, m.group_id, {"update_time": TimeDealer(ts_t).to_datetime()}
             )
diff --git a/ATRI/plugins/status.py b/ATRI/plugins/status.py
index e7ed842..d6a5682 100644
--- a/ATRI/plugins/status.py
+++ b/ATRI/plugins/status.py
@@ -11,6 +11,7 @@ from ATRI.log import log
 from ATRI.service import Service
 from ATRI.message import MessageBuilder
 from ATRI.exceptions import GetStatusError
+from ATRI.utils import Limiter
 from ATRI.utils.apscheduler import scheduler
 
 
@@ -35,7 +36,10 @@ async def _():
     await status.finish(msg)
 
 
[email protected]_job("interval", name="状态检查", minutes=15, misfire_grace_time=15)
+limiter = Limiter(5, 21600)
+
+
[email protected]_job("interval", name="状态检查", minutes=30, misfire_grace_time=15)
 async def _():
     log.info("检查资源消耗中...")
     msg, stat = get_status()
@@ -46,8 +50,12 @@ async def _():
             bot = get_bot()
         except Exception:
             bot = None
-        
-        if bot: await plugin.send_to_master(msg)
+        if not limiter.check("114514"):
+            try:
+                if bot: await plugin.send_to_master(msg)
+                limiter.increase("114514")
+            except Exception:
+                return
     else:
         log.info("资源消耗正常")
 
diff --git a/ATRI/plugins/twitter/__init__.py b/ATRI/plugins/twitter/__init__.py
index 2cbdb1b..6e69cc1 100644
--- a/ATRI/plugins/twitter/__init__.py
+++ b/ATRI/plugins/twitter/__init__.py
@@ -17,7 +17,7 @@ from nonebot.adapters.onebot.v11 import Message, MessageSegment, GroupMessageEve
 from ATRI.log import log
 from ATRI.service import Service
 from ATRI.permission import ADMIN
-from ATRI.utils import timestamp2datetime
+from ATRI.utils import TimeDealer
 from ATRI.utils.apscheduler import scheduler
 from ATRI.permission import MASTER
 from ATRI.database import TwitterSubscription
@@ -215,7 +215,7 @@ async def _check_td():
                 log.warning("推信息发送失败")
 
             await sub.update_sub(
-                m.tid, m.group_id, {"last_update": timestamp2datetime(ts_t)}
+                m.tid, m.group_id, {"last_update": TimeDealer(ts_t).to_datetime()}
             )
             if _pic:
                 pic = Message(MessageSegment.image(_pic))