✨🐛 更新

新增：老婆！
新增：涩图

修复：manage中出现的bug

优化：nsfw不再用float，换为int

1 files changed, 87 insertions, 37 deletions

diff --git a/ATRI/plugins/manage/modules/block.py b/ATRI/plugins/manage/modules/block.py
index 0c2fcec..7b982d4 100644
--- a/ATRI/plugins/manage/modules/block.py
+++ b/ATRI/plugins/manage/modules/block.py
@@ -12,24 +12,36 @@ __doc__ = """
   封禁用户 QQ号
 """
 
-block_user = sv.on_command(cmd="封禁用户", docs=__doc__, permission=SUPERUSER)
-
+block_user = sv.on_command(
+    cmd="封禁用户",
+    docs=__doc__,
+    permission=SUPERUSER
+)
 
 @block_user.args_parser  # type: ignore
-async def _block_user_load(bot: Bot, event: MessageEvent, state: T_State) -> None:
+async def _block_user_load(bot: Bot,
+                           event: MessageEvent,
+                           state: T_State) -> None:
     msg = str(event.message).strip()
-    cancel = ["算了", "罢了"]
+    cancel = ['算了', '罢了']
     if msg in cancel:
-        await block_user.finish("好吧...")
+        await block_user.finish('好吧...')
     if not msg:
-        await block_user.reject("是谁呢？！GKD！")
+        await block_user.reject('是谁呢？！GKD！')
     else:
-        state["noob"] = msg
-
+        state['noob'] = msg
 
 @block_user.handle()
 async def _block_user(bot: Bot, event: MessageEvent, state: T_State) -> None:
-    noob = state["noob"]
+    msg = str(event.message).strip()
+    if msg:
+        state['noob'] = msg
+
+@block_user.got('noob', prompt='是谁呢？！GKD！')
+async def _deal_block_user(bot: Bot,
+                           event: MessageEvent,
+                           state: T_State) -> None:
+    noob = state['noob']
     sv.BlockSystem.control_list(True, user=noob)
     msg = f"用户[{noob}]已被封禁(；′⌒`)"
     await block_user.finish(msg)
@@ -42,24 +54,36 @@ __doc__ = """
   解封用户 QQ号
 """
 
-unblock_user = sv.on_command(cmd="解封用户", docs=__doc__, permission=SUPERUSER)
-
+unblock_user = sv.on_command(
+    cmd="解封用户",
+    docs=__doc__,
+    permission=SUPERUSER
+)
 
 @unblock_user.args_parser  # type: ignore
-async def _unblock_user_load(bot: Bot, event: MessageEvent, state: T_State) -> None:
+async def _unblock_user_load(bot: Bot,
+                           event: MessageEvent,
+                           state: T_State) -> None:
     msg = str(event.message).strip()
-    cancel = ["算了", "罢了"]
+    cancel = ['算了', '罢了']
     if msg in cancel:
-        await unblock_user.finish("好吧...")
+        await unblock_user.finish('好吧...')
     if not msg:
-        await unblock_user.reject("要原谅谁呢...")
+        await unblock_user.reject('要原谅谁呢...')
     else:
-        state["forgive"] = msg
-
+        state['forgive'] = msg
 
 @unblock_user.handle()
 async def _unblock_user(bot: Bot, event: MessageEvent, state: T_State) -> None:
-    forgive = state["forgive"]
+    msg = str(event.message).strip()
+    if msg:
+        state['forgive'] = msg
+
+@unblock_user.got('forgive', prompt='要原谅谁呢...')
+async def _deal_unblock_user(bot: Bot,
+                             event: MessageEvent,
+                             state: T_State) -> None:
+    forgive = state['forgive']
     sv.BlockSystem.control_list(False, user=forgive)
     msg = f"用户[{forgive}]已被解封ヾ(´･ω･｀)ﾉ"
     await unblock_user.finish(msg)
@@ -72,24 +96,36 @@ __doc__ = """
   封禁群 群号
 """
 
-block_group = sv.on_command(cmd="封禁群", docs=__doc__, permission=SUPERUSER)
-
+block_group = sv.on_command(
+    cmd="封禁群",
+    docs=__doc__,
+    permission=SUPERUSER
+)
 
 @block_group.args_parser  # type: ignore
-async def _block_group_load(bot: Bot, event: MessageEvent, state: T_State) -> None:
+async def _block_group_load(bot: Bot,
+                           event: MessageEvent,
+                           state: T_State) -> None:
     msg = str(event.message).strip()
-    cancel = ["算了", "罢了"]
+    cancel = ['算了', '罢了']
     if msg in cancel:
-        await block_user.finish("好吧...")
+        await block_user.finish('好吧...')
     if not msg:
-        await block_user.reject("是哪个群？！GKD！")
+        await block_user.reject('是哪个群？！GKD！')
     else:
-        state["noob_g"] = msg
-
+        state['noob_g'] = msg
 
 @block_group.handle()
 async def _block_group(bot: Bot, event: MessageEvent, state: T_State) -> None:
-    noob_g = state["noob_g"]
+    msg = str(event.message).strip()
+    if msg:
+        state['noob_g'] = msg
+
+@block_group.got('noob_g', prompt='是哪个群？！GKD！')
+async def _deal_block_group(bot: Bot,
+                            event: MessageEvent,
+                            state: T_State) -> None:
+    noob_g = state['noob_g']
     sv.BlockSystem.control_list(True, group=noob_g)
     msg = f"群[{noob_g}]已被封禁(；′⌒`)"
     await block_user.finish(msg)
@@ -102,24 +138,38 @@ __doc__ = """
   解封 群号
 """
 
-unblock_group = sv.on_command(cmd="解封群", docs=__doc__, permission=SUPERUSER)
-
+unblock_group = sv.on_command(
+    cmd="解封群",
+    docs=__doc__,
+    permission=SUPERUSER
+)
 
 @unblock_group.args_parser  # type: ignore
-async def _unblock_group_load(bot: Bot, event: MessageEvent, state: T_State) -> None:
+async def _unblock_group_load(bot: Bot,
+                              event: MessageEvent,
+                              state: T_State) -> None:
     msg = str(event.message).strip()
-    cancel = ["算了", "罢了"]
+    cancel = ['算了', '罢了']
     if msg in cancel:
-        await block_user.finish("好吧...")
+        await block_user.finish('好吧...')
     if not msg:
-        await block_user.reject("要原谅哪个群呢...")
+        await block_user.reject('要原谅哪个群呢...')
     else:
-        state["forgive_g"] = msg
-
+        state['forgive_g'] = msg
 
 @unblock_group.handle()
-async def _unblock_group(bot: Bot, event: MessageEvent, state: T_State) -> None:
-    forgive_g = state["forgive_g"]
+async def _unblock_group(bot: Bot,
+                         event: MessageEvent,
+                         state: T_State) -> None:
+    msg = str(event.message).strip()
+    if msg:
+        state['forgive_g'] = msg
+
+@unblock_group.got('forgive_g', prompt='要原谅哪个群呢...')
+async def _deal_unblock_group(bot: Bot,
+                              event: MessageEvent,
+                              state: T_State) -> None:
+    forgive_g = state['forgive_g']
     sv.BlockSystem.control_list(False, group=forgive_g)
     msg = f"群[{forgive_g}]已被解封ヾ(´･ω･｀)ﾉ"
     await unblock_user.finish(msg)