Merge pull request #8 from Kyomotoi/main

sync master

4 files changed, 11 insertions, 10 deletions

diff --git a/ATRI/plugins/console/driver/api.py b/ATRI/plugins/console/driver/api.py
index ba5405a..d83f98b 100644
--- a/ATRI/plugins/console/driver/api.py
+++ b/ATRI/plugins/console/driver/api.py
@@ -149,7 +149,7 @@ def get_block_list() -> dict:
     return {"user": u_data, "group": g_data}
 
 
-def edit_block_list(is_enab: int, user_id: str, group_id: str) -> tuple:
+def edit_block_list(is_enab: bool, user_id: str, group_id: str) -> tuple:
     d = get_block_list()
     u_d = d["user"]
     g_d = d["group"]
@@ -191,3 +191,7 @@ def edit_block_list(is_enab: int, user_id: str, group_id: str) -> tuple:
         return False, dict()
 
     return True, {"user": u_d, "group": g_d}
+
+
+def get_group_list():
+    ...
diff --git a/ATRI/plugins/funny/data_source.py b/ATRI/plugins/funny/data_source.py
index 75fa4ee..7e9ba30 100644
--- a/ATRI/plugins/funny/data_source.py
+++ b/ATRI/plugins/funny/data_source.py
@@ -1,5 +1,4 @@
 import re
-import os
 
 from pathlib import Path
 from random import choice, randint
@@ -13,8 +12,8 @@ from ATRI.utils import request, Translate
 from ATRI.rule import is_in_service
 
 
-FUNNY_DIR = Path(".") / "data"
-os.makedirs(FUNNY_DIR, exist_ok=True)
+FUNNY_DIR = Path(".") / "data" / "database" / "funny"
+FUNNY_DIR.mkdir(parents=True, exist_ok=True)
 
 
 class Funny(Service):
diff --git a/ATRI/plugins/setu/__init__.py b/ATRI/plugins/setu/__init__.py
index 00eba07..6656f29 100644
--- a/ATRI/plugins/setu/__init__.py
+++ b/ATRI/plugins/setu/__init__.py
@@ -16,6 +16,9 @@ random_setu = Setu().on_command("来张涩图", "来张随机涩图，冷却2分
 
 
 @random_setu.handle([Cooldown(120)])
+async def _(): ...
+
+@random_setu.handle()
 async def _random_setu(bot: Bot, event: MessageEvent):
     loop = asyncio.get_running_loop()
 
diff --git a/ATRI/plugins/wife/data_source.py b/ATRI/plugins/wife/data_source.py
index 29d58e7..9ba1e93 100644
--- a/ATRI/plugins/wife/data_source.py
+++ b/ATRI/plugins/wife/data_source.py
@@ -12,14 +12,9 @@ WIFE_DIR = Path(".") / "data" / "database" / "wife"
 os.makedirs(WIFE_DIR, exist_ok=True)
 
 
-__doc__ = """
-老婆...嘿嘿嘿...
-"""
-
-
 class Wife(Service):
     def __init__(self):
-        Service.__init__(self, "老婆", __doc__, rule=is_in_service("老婆"))
+        Service.__init__(self, "老婆", "老婆...嘿嘿嘿...", rule=is_in_service("老婆"))
 
     def to_superuser(self, user_id: str):
         """