Merge remote-tracking branch 'origin/v2' into v2

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:

app/modules/filemanager/__init__.py

@@ -1262,7 +1262,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: