feat: executor supporting block90

aiotieba_reviewer/__version__.py

@@ -1 +1 @@
-__version__ = "0.4.1"
+__version__ = "0.4.2a0"

aiotieba_reviewer/database.py

@@ -6,7 +6,7 @@
 from typing import Any, Callable, Final, List, Optional, Tuple, Union
 
 import aiomysql
-from aiotieba.logging import get_logger as LOG
+from aiotieba import get_logger as LOG
 from aiotieba.typing import UserInfo
 
 from .config import DB_CONFIG

aiotieba_reviewer/executor.py

@@ -1,6 +1,7 @@
 from typing import Awaitable, Callable, Optional
 
-from aiotieba.logging import get_logger as LOG
+import aiotieba as tb
+from aiotieba import get_logger as LOG
 
 from .client import get_client, get_fname
 from .enums import Ops
@@ -12,7 +13,13 @@
 async def default_punish_executor(punish: Punish) -> Optional[Punish]:
     if day := punish.day:
         client = await get_client()
-        await client.block(get_fname(), punish.obj.user.portrait, day=day, reason=punish.note)
+        ret = await client.block(get_fname(), punish.obj.user.portrait, day=day, reason=punish.note)
+        if isinstance(ret.err, tb.exception.TiebaServerError):
+            if ret.err.code == 1211068:
+                await client.unblock(get_fname(), punish.obj.user.user_id)
+                await client.block(get_fname(), punish.obj.user.portrait, day=day, reason=punish.note)
+            elif ret.err.code == 3150003:
+                await client.block(get_fname(), punish.obj.user.portrait, day=10, reason=punish.note)
 
     op = punish.op
     if op == Ops.NORMAL:

aiotieba_reviewer/imgproc.py

@@ -2,7 +2,7 @@
 
 import cv2 as cv
 import numpy as np
-from aiotieba.logging import get_logger as LOG
+from aiotieba import get_logger as LOG
 
 from .client import get_db
 

aiotieba_reviewer/reviewer/entry.py

@@ -3,7 +3,7 @@
 from typing import Generator, List, NoReturn, Optional
 
 from aiotieba.enums import PostSortType
-from aiotieba.logging import get_logger as LOG
+from aiotieba import get_logger as LOG
 
 from .. import client, executor
 from ..client import get_client

aiotieba_reviewer/reviewer/thread/runner.py

@@ -1,6 +1,6 @@
 from typing import Awaitable, Callable
 
-from aiotieba.logging import get_logger as LOG
+from aiotieba import get_logger as LOG
 
 from ... import executor
 from ...perf_stat import aperf_stat

aiotieba_reviewer/reviewer/threads/runner.py

@@ -1,7 +1,7 @@
 import asyncio
 from typing import Awaitable, Callable
 
-from aiotieba.logging import get_logger as LOG
+from aiotieba import get_logger as LOG
 
 from ... import executor
 from ...perf_stat import aperf_stat

aiotieba_reviewer/reviewer/user_checker.py

@@ -17,7 +17,7 @@ async def _(obj: TypeObj) -> Optional[Punish]:
         db = await get_db()
         permission = await db.get_user_id(obj.user.user_id)
         if permission <= -5:
-            return Punish(obj, Ops.DELETE, 10, "黑名单")
+            return Punish(obj, Ops.DELETE, 90, "黑名单")
         if permission >= 1:
             return Punish(obj, Ops.NORMAL)
         return await func(obj)

examples/cmd_handler.py

@@ -413,8 +413,12 @@ async def cmd_block(self, ctx: Context) -> None:
         note = ctx.args[1] if len(ctx.args) > 1 else ctx.note
 
         success = await ctx.admin.block(ctx.fname, user.portrait, day=day, reason=note)
-        if isinstance(success.err, tb.exception.TiebaServerError) and success.err.code == 3150003:
-            success = await ctx.admin.block(ctx.fname, user.portrait, day=10, reason=note)
+        if isinstance(success.err, tb.exception.TiebaServerError):
+            if success.err.code == 3150003:
+                success = await ctx.admin.block(ctx.fname, user.portrait, day=10, reason=note)
+            elif success.err.code == 1211068:
+                await ctx.admin.unblock(ctx.fname, user.user_id)
+                success = await ctx.admin.block(ctx.fname, user.portrait, day=10, reason=note)
         if success:
             await ctx.admin.del_post(ctx.fname, ctx.tid, ctx.pid)