Merge branch 'main' into main

2 files changed, 4 insertions, 4 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 部分