Merge pull request Agnes4m#24 from smoadrareun/main

删除合并时导致的重复代码
smoadrareun · May 5, 2024 · b8d2a80 · b8d2a80
2 parents ebccdc7 + 8fda520
commit b8d2a80
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/nonebot_plugin_bilifan/main.py b/nonebot_plugin_bilifan/main.py
@@ -18,7 +18,6 @@
 )
 # os.chdir(os.path.dirname(os.path.abspath(__file__)).split(__file__)[0])
 
-base_path = Path().joinpath("data/bilifan")
 base_path = Path().joinpath("data/bilifan")
 base_path.mkdir(parents=True, exist_ok=True)
 logger.info(base_path)
@@ -44,31 +43,20 @@ async def read_yaml(msg_path: Path):
             # ) as f:
             #     users = yaml.load(f, Loader=yaml.FullLoader)
 
-        assert users["ASYNC"] in [0, 1], "ASYNC参数错误"
-        assert users["LIKE_CD"] >= 0, "LIKE_CD参数错误"
         assert users["ASYNC"] in [0, 1], "ASYNC参数错误"
         assert users["LIKE_CD"] >= 0, "LIKE_CD参数错误"
         # assert users['SHARE_CD'] >= 0, "SHARE_CD参数错误"
         assert users["DANMAKU_CD"] >= 0, "DANMAKU_CD参数错误"
         assert users["WATCHINGLIVE"] >= 0, "WATCHINGLIVE参数错误"
         assert users["WEARMEDAL"] in [0, 1], "WEARMEDAL参数错误"
-        assert users["DANMAKU_CD"] >= 0, "DANMAKU_CD参数错误"
-        assert users["WATCHINGLIVE"] >= 0, "WATCHINGLIVE参数错误"
-        assert users["WEARMEDAL"] in [0, 1], "WEARMEDAL参数错误"
         config = {
-            "ASYNC": users["ASYNC"],
-            "LIKE_CD": users["LIKE_CD"],
             "ASYNC": users["ASYNC"],
             "LIKE_CD": users["LIKE_CD"],
             # "SHARE_CD": users['SHARE_CD'],
             "DANMAKU_CD": users["DANMAKU_CD"],
             "WATCHINGLIVE": users["WATCHINGLIVE"],
             "WEARMEDAL": users["WEARMEDAL"],
             "SIGNINGROUP": users.get("SIGNINGROUP", 2),
-            "DANMAKU_CD": users["DANMAKU_CD"],
-            "WATCHINGLIVE": users["WATCHINGLIVE"],
-            "WEARMEDAL": users["WEARMEDAL"],
-            "SIGNINGROUP": users.get("SIGNINGROUP", 2),
         }
     except Exception as e:
         logger.error(f"读取配置文件失败,请检查配置文件格式是否正确: {e}")
@@ -83,14 +71,6 @@ async def mains(msg_path):
     start_tasks = []
     catch_msg = []
 
-    for user in users["USERS"]:
-        if user["access_key"]:
-            bili_user = BiliUser(
-                user["access_key"],
-                user.get("white_uid", ""),
-                user.get("banned_uid", ""),
-                config,
-            )
     for user in users["USERS"]:
         if user["access_key"]:
             bili_user = BiliUser(