From 296dbc555c2a64a1d912c6d60eed48e5d0cd609c Mon Sep 17 00:00:00 2001
From: Kyomotoi <0w0@imki.moe>
Date: Wed, 18 Jan 2023 00:40:50 +0800
Subject: =?UTF-8?q?=F0=9F=8E=A8=20=E7=A7=BB=E9=99=A4=E5=AF=B9=20pytz=20?=
 =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ATRI/plugins/bilibili_dynamic/__init__.py    | 7 +++----
 ATRI/plugins/bilibili_dynamic/data_source.py | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'ATRI/plugins/bilibili_dynamic')

diff --git a/ATRI/plugins/bilibili_dynamic/__init__.py b/ATRI/plugins/bilibili_dynamic/__init__.py
index c47feed..7c30193 100644
--- a/ATRI/plugins/bilibili_dynamic/__init__.py
+++ b/ATRI/plugins/bilibili_dynamic/__init__.py
@@ -1,8 +1,7 @@
 import re
-import pytz
 import asyncio
 from tabulate import tabulate
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone as tz
 
 from apscheduler.triggers.base import BaseTrigger
 from apscheduler.triggers.combining import AndTrigger
@@ -106,7 +105,7 @@ async def _bd_get_sub_list(event: GroupMessageEvent):
     subs = list()
     for i in query_result:
         raw_tm = (
-            i.last_update.replace(tzinfo=pytz.timezone("Asia/Shanghai"))
+            i.last_update.replace(tzinfo=tz(timedelta(hours=8)))
             + timedelta(hours=8)
         ).timestamp()
         tm = datetime.fromtimestamp(raw_tm).strftime("%m-%d %H:%M:%S")
@@ -192,7 +191,7 @@ async def _():
                     m.uid,
                     m.group_id,
                     {
-                        "last_update": TimeDealer(float(i["timestamp"])).to_datetime(),
+                        "last_update": TimeDealer(float(i["timestamp"]), tz(timedelta(hours=8))).to_datetime(),
                     },
                 )
                 if _pic:
diff --git a/ATRI/plugins/bilibili_dynamic/data_source.py b/ATRI/plugins/bilibili_dynamic/data_source.py
index 2bdfee9..1308d0f 100644
--- a/ATRI/plugins/bilibili_dynamic/data_source.py
+++ b/ATRI/plugins/bilibili_dynamic/data_source.py
@@ -1,5 +1,5 @@
 import json
-from datetime import datetime
+from datetime import datetime, timedelta, timezone as tz
 from operator import itemgetter
 
 from ATRI.message import MessageBuilder
@@ -95,7 +95,7 @@ class BilibiliDynamicSubscriptor:
             pattern["like"] = desc["like"]
             pattern["dynamic_id"] = desc["dynamic_id"]
             pattern["timestamp"] = desc["timestamp"]
-            pattern["time"] = TimeDealer(float(desc["timestamp"])).to_datetime()
+            pattern["time"] = TimeDealer(float(desc["timestamp"]), tz(timedelta(hours=8))).to_datetime()
             pattern["type_zh"] = str()
 
             # alternative 部分
-- 
cgit v1.2.3