nonebot-plugin-jmdownloader 1.0.2__tar.gz → 1.0.4__tar.gz

{nonebot_plugin_jmdownloader-1.0.2 → nonebot_plugin_jmdownloader-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-jmdownloader
-Version: 1.0.2
+Version: 1.0.4
 Summary: 基于 Nonebot2 的 JMComic 插件
 Author-email: Misty02600 <xiao02600@gmail.com>
 Project-URL: Repository, https://github.com/Misty02600/nonebot-plugin-jmdownloader

{nonebot_plugin_jmdownloader-1.0.2 → nonebot_plugin_jmdownloader-1.0.4}/nonebot_plugin_jmdownloader/__init__.py

@@ -13,7 +13,7 @@ from nonebot import logger, on_command, require, get_bot
 from nonebot.adapters.onebot.v11 import (GROUP_ADMIN, GROUP_OWNER,
                                          ActionFailed, Bot, GroupMessageEvent,
                                          Message, MessageEvent, MessageSegment,
-                                         PrivateMessageEvent)
+                                         PrivateMessageEvent, NetworkError)
 from nonebot.params import ArgPlainText, CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
@@ -61,11 +61,12 @@ jm_download = on_command("jm下载", aliases={"JM下载"}, block=True, rule=chec
 async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
     photo_id = arg.extract_plain_text().strip()
     user_id = event.user_id
+    is_superuser = str(user_id) in bot.config.superusers
 
     if not photo_id.isdigit():
         await jm_download.finish("请输入要下载的jm号")
 
-    if str(user_id) not in bot.config.superusers:
+    if not is_superuser:
         user_limit = data_manager.get_user_limit(user_id)
         if user_limit <= 0:
             await jm_download.finish(MessageSegment.at(user_id) + f"你的下载次数已经用完了！")
@@ -79,18 +80,24 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
         await jm_download.finish("查询时发生错误")
 
     if data_manager.is_jm_id_restricted(photo.id) or data_manager.has_restricted_tag(photo.tags):
+
         if isinstance(event, GroupMessageEvent):
-            try:
-                await bot.set_group_ban(group_id=event.group_id, user_id=user_id, duration=86400)
-            except ActionFailed:
-                pass
-            data_manager.add_blacklist(event.group_id, user_id)
-            await jm_download.finish(MessageSegment.at(user_id) + "该本子（或其tag）被禁止下载!你已被加入本群jm黑名单")
+            if not is_superuser:
+                try:
+                    await bot.set_group_ban(group_id=event.group_id, user_id=user_id, duration=86400)
+                except ActionFailed:
+                    pass
+                data_manager.add_blacklist(event.group_id, user_id)
+                await jm_download.finish(MessageSegment.at(user_id) + "该本子（或其tag）被禁止下载!你已被加入本群jm黑名单")
+
+            else:
+                await jm_download.finish("该本子（或其tag）被禁止下载！")
+
         else:
             await jm_download.finish("该本子（或其tag）被禁止下载！")
 
     try:
-        if str(user_id) not in bot.config.superusers:
+        if not is_superuser:
             data_manager.decrease_user_limit(user_id, 1)
             user_limit_new = data_manager.get_user_limit(user_id)
             message = Message()
@@ -108,15 +115,17 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
             await jm_download.send(message)
     except ActionFailed:
         await jm_download.send("本子信息可能被屏蔽，已开始下载")
+    except NetworkError as e:
+        logger.warning(f"{e},可能是协议端发送文件时间太长导致的报错")
 
-    try:
-        pdf_path = f"{cache_dir}/{photo.id}.pdf"
+    pdf_path = f"{cache_dir}/{photo.id}.pdf"
 
-        # 如果不存在，则下载
-        if not os.path.exists(pdf_path):
-            if not await download_photo_async(downloader, photo):
-                await jm_download.finish("下载失败")
+    # 如果不存在，则下载
+    if not os.path.exists(pdf_path):
+        if not await download_photo_async(downloader, photo):
+            await jm_download.finish("下载失败")
 
+    try:
         # 根据配置决定是否需要修改MD5
         if plugin_config.jmcomic_modify_real_md5:
             random_suffix = hashlib.md5(str(time.time() + random.random()).encode()).hexdigest()[:8]
@@ -125,41 +134,41 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
             modified = await asyncio.to_thread(modify_pdf_md5, pdf_path, renamed_pdf_path)
             if modified:
                 pdf_path = renamed_pdf_path
+    except Exception as e:
+        logger.error(f"处理PDF文件时出错: {e}")
+        await jm_download.finish("处理文件失败")
 
-        try:
-            if isinstance(event, GroupMessageEvent):
-                folder_id = data_manager.get_group_folder_id(event.group_id)
-
-                if folder_id:
-                    await bot.call_api(
-                        "upload_group_file",
-                        group_id=event.group_id,
-                        file=pdf_path,
-                        name=f"{photo.id}.pdf",
-                        folder_id=folder_id
-                    )
-                else:
-                    await bot.call_api(
-                        "upload_group_file",
-                        group_id=event.group_id,
-                        file=pdf_path,
-                        name=f"{photo.id}.pdf"
-                    )
-
-            elif isinstance(event, PrivateMessageEvent):
+    try:
+        if isinstance(event, GroupMessageEvent):
+            folder_id = data_manager.get_group_folder_id(event.group_id)
+
+            if folder_id:
                 await bot.call_api(
-                    "upload_private_file",
-                    user_id=event.user_id,
+                    "upload_group_file",
+                    group_id=event.group_id,
+                    file=pdf_path,
+                    name=f"{photo.id}.pdf",
+                    folder_id=folder_id
+                )
+            else:
+                await bot.call_api(
+                    "upload_group_file",
+                    group_id=event.group_id,
                     file=pdf_path,
                     name=f"{photo.id}.pdf"
                 )
 
-        except ActionFailed:
-            await jm_download.send("发送文件失败")
+        elif isinstance(event, PrivateMessageEvent):
+            await bot.call_api(
+                "upload_private_file",
+                user_id=event.user_id,
+                file=pdf_path,
+                name=f"{photo.id}.pdf"
+            )
+
+    except ActionFailed:
+        await jm_download.send("发送文件失败")
 
-    except Exception as e:
-        logger.error(f"处理PDF文件时出错: {e}")
-        await jm_download.send("处理文件失败")
 
 
 jm_query = on_command("jm查询", aliases={"JM查询"}, block=True, rule=check_group_and_user)
@@ -413,9 +422,6 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
     group_id = event.group_id
     operator_id = event.user_id
 
-    if user_id == operator_id:
-        await jm_ban_user.finish("你拉黑你自己？")
-
     has_permission = await check_permission(bot, group_id, operator_id, user_id)
     if not has_permission:
         await jm_unban_user.finish("权限不足")
@@ -438,9 +444,6 @@ async def handle_jm_unban_user(bot: Bot, event: GroupMessageEvent, arg: Message
     group_id = event.group_id
     operator_id = event.user_id
 
-    if user_id == operator_id:
-        await jm_ban_user.finish("想都别想！")
-
     has_permission = await check_permission(bot, group_id, operator_id, user_id)
     if not has_permission:
         await jm_unban_user.finish("权限不足")
@@ -607,6 +610,7 @@ async def clear_cache_dir():
     except Exception as e:
         logger.error(f"清理缓存目录失败：{e}")
 
+
 @scheduler.scheduled_job("interval", minutes=10)
 async def clean_expired_search_states():
     """ 定期清理过期的搜索状态 """

{nonebot_plugin_jmdownloader-1.0.2 → nonebot_plugin_jmdownloader-1.0.4}/nonebot_plugin_jmdownloader/utils.py

@@ -128,7 +128,7 @@ async def send_forward_message(bot: Bot, event: MessageEvent, messages: list):
 
 #region 权限相关
 async def check_permission(bot: Bot, group_id: int, operator_id: int, target_id: int) -> bool:
-    """增减群黑名单权限检查"""
+    """增减群黑名单权限检查，群主和超管拥有所有权限，管理员只能操作普通成员"""
     if str(operator_id) in bot.config.superusers:
         return True
 
@@ -142,10 +142,12 @@ async def check_permission(bot: Bot, group_id: int, operator_id: int, target_id:
         if operator_role == "owner":
             return True
 
-        if operator_role == "admin" and target_role in ["admin", "owner"]:
-            return False
+        if operator_role == "admin":
+            if target_role not in ["admin", "owner"]:
+                return True
+
+        return False
 
-        return True
     except ActionFailed as e:
         logger.error(f"无法获取群成员信息：{e}")
         return False

{nonebot_plugin_jmdownloader-1.0.2 → nonebot_plugin_jmdownloader-1.0.4}/nonebot_plugin_jmdownloader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-jmdownloader
-Version: 1.0.2
+Version: 1.0.4
 Summary: 基于 Nonebot2 的 JMComic 插件
 Author-email: Misty02600 <xiao02600@gmail.com>
 Project-URL: Repository, https://github.com/Misty02600/nonebot-plugin-jmdownloader

{nonebot_plugin_jmdownloader-1.0.2 → nonebot_plugin_jmdownloader-1.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-jmdownloader"
-version = "1.0.2"
+version = "1.0.4"
 description = "基于 Nonebot2 的 JMComic 插件"
 readme = "README.md"
 authors = [{ name = "Misty02600", email = "xiao02600@gmail.com" }]