From 71ef6f6a61c8c5bb9b5721ae6dc80f58d07f3c57 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 17 Jan 2025 12:32:55 +0800 Subject: [PATCH 1/2] fix media_files Exception --- app/modules/filemanager/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/modules/filemanager/__init__.py b/app/modules/filemanager/__init__.py index df0010f7..5b0abbe6 100644 --- a/app/modules/filemanager/__init__.py +++ b/app/modules/filemanager/__init__.py @@ -1273,7 +1273,11 @@ class FileManagerModule(_ModuleBase): fileitem = storage_oper.get_item(media_path) if not fileitem: continue - media_files = self.list_files(fileitem, True) + try: + media_files = self.list_files(fileitem, True) + except Exception as e: + logger.debug(f"获取媒体文件列表失败：{str(e)}") + continue if media_files: for media_file in media_files: if f".{media_file.extension.lower()}" in settings.RMT_MEDIAEXT: From bae7bff70d9e709e2931f60e6d106822c145ad1b Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 17 Jan 2025 16:41:01 +0800 Subject: [PATCH 2/2] fix #3744 --- app/chain/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/chain/__init__.py b/app/chain/__init__.py index b041b755..c0c1c43a 100644 --- a/app/chain/__init__.py +++ b/app/chain/__init__.py @@ -531,6 +531,9 @@ class ChainBase(metaclass=ABCMeta): # 管理员发过了，此消息不发了 logger.info(f"用户 {send_message.username} 不存在，消息无法发送到对应用户") continue + elif send_message.username == settings.SUPERUSER: + # 管理员同名已发送 + admin_sended = True else: # 按原消息发送全体 if not admin_sended: