From b2cb1a9de72ec7074c4c7b56d5367169b61f21ad Mon Sep 17 00:00:00 2001 From: liuwei Date: Tue, 24 Feb 2026 17:08:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=97=E9=B1=BC=E5=8A=A0=E5=85=A5=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=BC=B9=E5=B9=95=E8=AE=B0=E5=BD=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=82=E4=BC=9A=E8=87=AA=E5=8A=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=BC=80=E6=92=AD=E7=9A=84=E5=BC=B9=E5=B9=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/douyu/main.py | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/plugins/douyu/main.py b/plugins/douyu/main.py index 1a73bd4..91abc9a 100644 --- a/plugins/douyu/main.py +++ b/plugins/douyu/main.py @@ -474,7 +474,8 @@ class DouyuPlugin(MessagePluginInterface): if first_token == "订阅鱼吧": parts = content.split() if len(parts) < 2: - await self.bot.send_text_message(roomid or sender, "请提供鱼吧 hash_id，例如：订阅鱼吧 PDAP2zEk3nwx", sender) + await self.bot.send_text_message(roomid or sender, "请提供鱼吧 hash_id，例如：订阅鱼吧 PDAP2zEk3nwx", + sender) return True, "命令格式错误" hash_id = parts[1].strip() ok = self.redis_manager.add_group_yuba(roomid or sender, hash_id) @@ -484,7 +485,8 @@ class DouyuPlugin(MessagePluginInterface): if first_token == "取消订阅鱼吧": parts = content.split() if len(parts) < 2: - await self.bot.send_text_message(roomid or sender, "请提供鱼吧 hash_id，例如：取消订阅鱼吧 PDAP2zEk3nwx", sender) + await self.bot.send_text_message(roomid or sender, "请提供鱼吧 hash_id，例如：取消订阅鱼吧 PDAP2zEk3nwx", + sender) return True, "命令格式错误" hash_id = parts[1].strip() ok = self.redis_manager.remove_group_yuba(roomid or sender, hash_id) @@ -548,10 +550,6 @@ class DouyuPlugin(MessagePluginInterface): logger.error(f"斗鱼定时任务异常: {e}") async def _notify_groups_live(self, room_id: str, nickname: str, room_name: str, thumb_url: str): - try: - self._start_danmu_record(room_id) - except Exception as e: - logger.error(f"启动斗鱼弹幕记录失败({room_id}): {e}") groups = self.redis_manager.groups_for_room(room_id) text = f"🚀 斗鱼开播通知 \n🎤 {nickname} 正在直播中！\n 📌 房间标题：{room_name} \n 👉 点击观看：https://www.douyu.com/{room_id}" xml_content = DOUYU_MESSAGE_XML.format(title=room_name, liver=nickname, roomid=room_id, thumburl=thumb_url) @@ -567,12 +565,13 @@ class DouyuPlugin(MessagePluginInterface): except Exception as e: logger.error(f"发送斗鱼开播提醒失败: {e}") continue + try: + logger.info(f"启动斗鱼弹幕记录({room_id})") + self._start_danmu_record(room_id) + except Exception as e: + logger.error(f"启动斗鱼弹幕记录失败({room_id}): {e}") async def _notify_groups_offline(self, room_id: str, nickname: str, room_name: str, is_loop: bool = False): - try: - self._stop_danmu_record(room_id) - except Exception as e: - logger.error(f"停止斗鱼弹幕记录失败({room_id}): {e}") groups = self.redis_manager.groups_for_room(room_id) text = f"🔔 斗鱼提醒：{nickname} 下播啦～\n 🏷️ {room_name}" if is_loop: @@ -584,6 +583,11 @@ class DouyuPlugin(MessagePluginInterface): except Exception as e: logger.error(f"发送斗鱼下播提醒失败: {e}") continue + try: + logger.info(f"停止斗鱼弹幕记录({room_id})") + self._stop_danmu_record(room_id) + except Exception as e: + logger.error(f"停止斗鱼弹幕记录失败({room_id}): {e}") async def _scheduled_yuba_check_job(self): try: @@ -603,7 +607,8 @@ class DouyuPlugin(MessagePluginInterface): "User-Agent": self._user_agent, "Referer": f"https://yuba.douyu.com/member/{hash_id}/main/news", } - async with session.get(self._yuba_api, headers=headers, params=params, timeout=aiohttp.ClientTimeout(total=10)) as resp: + async with session.get(self._yuba_api, headers=headers, params=params, + timeout=aiohttp.ClientTimeout(total=10)) as resp: data = await resp.json(content_type=None) if data.get("error") != 0: @@ -633,19 +638,20 @@ class DouyuPlugin(MessagePluginInterface): content = target_feed.get("text", "") ctime = target_feed.get("ctime") from datetime import datetime - publish_time = datetime.fromtimestamp(int(ctime)).strftime('%Y-%m-%d %H:%M:%S') if ctime else "未知时间" + publish_time = datetime.fromtimestamp(int(ctime)).strftime( + '%Y-%m-%d %H:%M:%S') if ctime else "未知时间" # 限制内容长度 if len(content) > 200: content = content[:200] + "..." - + full_url = f"https://yuba.douyu.com/feed/{feed_id}" - + await self._notify_groups_yuba(hash_id, nickname, content, full_url, publish_time) - + # 保存标记 self.redis_manager.set_yuba_last_id(hash_id, feed_id) - + await asyncio.sleep(0.5) except Exception as e: logger.error(f"检查斗鱼鱼吧 ({hash_id}) 失败: {e}") @@ -653,7 +659,8 @@ class DouyuPlugin(MessagePluginInterface): except Exception as e: logger.error(f"斗鱼鱼吧定时任务异常: {e}") - async def _notify_groups_yuba(self, hash_id: str, nickname: str, content: str, url: str, publish_time: str = "未知时间"): + async def _notify_groups_yuba(self, hash_id: str, nickname: str, content: str, url: str, + publish_time: str = "未知时间"): groups = self.redis_manager.groups_for_yuba(hash_id) text = f"🌟 斗鱼鱼吧动态提醒 \n👤 主播：{nickname}\n⏰ 时间：{publish_time}\n📝 内容：{content}\n🔗 链接：{url}" for gid in groups: