update code

2026-09-29 00:32:06 +08:00 · 2021-09-09 10:47:26 +08:00
parent 754a0c111c
commit 8d0b0e5505
10 changed files with 104 additions and 54 deletions
@@ -1,6 +1,6 @@
-from nonebot import on_command, export
+from nonebot import on_command, on_notice
 from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, GROUP
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, GROUP, GroupIncreaseNoticeEvent
 from .data_source import update_member_info

 __plugin_name__ = "更新群组成员列表"
@@ -12,8 +12,6 @@ __plugin_usage__ = """
        更新群组成员列表
 """

-export = export()
-export.update_member_info = update_member_info

 refresh_member_group = on_command(
    "更新群组成员列表", aliases={"更新群组成员信息"}, permission=GROUP, priority=5, block=True
@@ -26,3 +24,12 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
        await refresh_member_group.finish("更新群员信息成功！", at_sender=True)
    else:
        await refresh_member_group.finish("更新群员信息失败！", at_sender=True)
+
+
+group_increase_handle = on_notice(priority=1, block=False)
+
+
+@group_increase_handle.handle()
+async def _(bot: Bot, event: GroupIncreaseNoticeEvent, state: dict):
+    if event.user_id == int(bot.self_id):
+        await update_member_info(event.group_id)
@@ -19,6 +19,10 @@ __plugin_usage__ = f'''[权限等级]管理帮助：
                        \t\t/设置检测次数/设置禁言时长
    [5]7.群订阅相关 -> 指令：添加订阅 [主播/up/番剧] [id/番名/链接]
                        \t\t/删除订阅 [id]/ 查看订阅
+    [5]8.群员活跃度相关 --> 指令:群员活跃检测设置
+                           设置群员活跃检测时长(天)
+                           添加群员活跃检测白名单[at]...
+                           查看群员活跃检测白名单
    [6]8.上传图片/连续上传图片(6) 
    [7]9.移动图片(7)
    [7]10.删除图片(7)
@@ -279,9 +279,13 @@ async def _get_season_status(id_) -> Optional[str]:
    _idx = (await BilibiliSub.get_sub(id_)).season_current_episode
    new_ep = season_info["media"]["new_ep"]["index"]
    if new_ep != _idx:
-        await BilibiliSub.update_sub_info(id_, season_current_episode=new_ep, season_update_time=datetime.now())
+        await BilibiliSub.update_sub_info(
+            id_, season_current_episode=new_ep, season_update_time=datetime.now()
+        )
        return (
-            f'{image(season_info["media"]["cover"])}\n' f"[{title}]更新啦\n" f"最新集数：{new_ep}"
+            f'{image(season_info["media"]["cover"])}\n'
+            f"[{title}]更新啦\n"
+            f"最新集数：{new_ep}"
        )
    return None

@@ -363,6 +367,8 @@ class SubManager:
        :return:
        """
        sub = None
+        if not self.live_data and not self.up_data and not self.season_data:
+            return sub
        self.current_index += 1
        if self.current_index == 0:
            if self.live_data:
@@ -382,5 +388,3 @@ class SubManager:
            return sub
        await self.reload_sub_data()
        return await self.random_sub_data()
-
-
@@ -19,7 +19,7 @@ coser = on_command(
 )


-url = "http://81.70.100.130/api/cosplay.php"
+url = "http://api520.ltd/api/cosplay.php"


@coser.handle()
@@ -29,20 +29,22 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
            for _ in range(3):
                try:
                    async with session.get(url, timeout=2) as response:
-                        r = re.search(r'±img=(.*)±', await response.text())
-                        if r:
-                            async with session.get(r.group(1), timeout=5, verify_ssl=False) as res:
+                        _url = await response.text()
+                        async with session.get(_url, timeout=5, verify_ssl=False) as res:
+                            if res.status == 200:
                                async with aiofiles.open(f'{IMAGE_PATH}/temp/{event.user_id}_coser.jpg', 'wb') as f:
                                    await f.write(await res.read())
-                            logger.info(
-                                f"(USER {event.user_id}, "
-                                f"GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-                                f" 发送COSER"
-                            )
-                            await coser.send(image(f'{event.user_id}_coser.jpg', 'temp'))
-                            break
+                                logger.info(
+                                    f"(USER {event.user_id}, "
+                                    f"GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
+                                    f" 发送COSER"
+                                )
+                                await coser.send(image(f'{event.user_id}_coser.jpg', 'temp'))
+                                break
                except TimeoutError:
                    pass
+            else:
+                await coser.send('你cos给我看！')
        except Exception as e:
            await coser.send('发生了预料之外的错误..请稍后再试或联系管理员修复...')
            logger.error(f'coser 发送了未知错误 {type(e)}：{e}')
@@ -116,15 +116,10 @@ async def _(matcher: Matcher, bot: Bot, event: GroupMessageEvent, state: T_State
        return
    if matcher.type == "message" and matcher.priority not in [1, 9]:
        if state["_prefix"]["raw_command"]:
-            # print(state["_prefix"]["raw_command"])
            if _blmt.check(f'{event.user_id}{state["_prefix"]["raw_command"]}'):
                if await BanUser.ban(event.user_id, 9, MALICIOUS_BAN_TIME * 60):
                    logger.info(f"USER {event.user_id} 触发了恶意触发检测")
-                # await update_img.finish('检测到恶意触发命令，您将被封禁 30 分钟', at_sender=True)
-                if event.message_type == "group":
-                    if not static_flmt.check(event.user_id):
-                        return
-                    static_flmt.start_cd(event.user_id)
+                if isinstance(event, GroupMessageEvent):
                    try:
                        await bot.send_group_msg(
                            group_id=event.group_id,
@@ -133,9 +128,6 @@ async def _(matcher: Matcher, bot: Bot, event: GroupMessageEvent, state: T_State
                    except ActionFailed:
                        pass
                else:
-                    if not static_flmt.check(event.user_id):
-                        return
-                    static_flmt.start_cd(event.user_id)
                    try:
                        await bot.send_private_msg(
                            user_id=event.user_id,
@@ -31,7 +31,10 @@ driver: Driver = nonebot.get_driver()
@driver.on_startup
 async def init_image():
    SIGN_RESOURCE_PATH.mkdir(parents=True, exist_ok=True)
-    await GroupInfoUser.add_member_info(114514, 114514, "", datetime.min)
+    await GroupInfoUser.add_member_info(114514, 114514, "", datetime.min, 0)
+    _u = await GroupInfoUser.get_member_info(114514, 114514)
+    if _u.uid is None:
+        await _u.update(uid=0).apply()
    generate_progress_bar_pic()
    clear_sign_data_pic()

@@ -15,16 +15,17 @@ yiqing = on_command("疫情", aliases={"查询疫情", "疫情查询"}, priority
@yiqing.handle()
 async def _(bot: Bot, event: MessageEvent, state: T_State):
    msg = get_message_text(event.json())
-    result = await get_yiqing_data(msg)
-    if result:
-        await yiqing.send(result)
-        logger.info(
-            f"(USER {event.user_id}, GROUP "
-            f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) 查询疫情: {msg}"
-        )
-    else:
-        await yiqing.send("查询失败!!!!", at_sender=True)
-        logger.info(
-            f"(USER {event.user_id}, GROUP "
-            f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) 查询疫情失败"
-        )
+    if msg:
+        result = await get_yiqing_data(msg)
+        if result:
+            await yiqing.send(result)
+            logger.info(
+                f"(USER {event.user_id}, GROUP "
+                f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) 查询疫情: {msg}"
+            )
+        else:
+            await yiqing.send("查询失败!!!!", at_sender=True)
+            logger.info(
+                f"(USER {event.user_id}, GROUP "
+                f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'}) 查询疫情失败"
+            )