Merge branch 'plugins' into dev

plugins/banwords/banwords.py

@@ -38,7 +38,7 @@ class Banwords(Plugin):
             self.handlers[Event.ON_HANDLE_CONTEXT] = self.on_handle_context
             logger.info("[Banwords] inited")
         except Exception as e:
-            logger.error("Banwords init failed: %s" % e)
+            logger.warn("Banwords init failed: %s" % e)
         
 
 

plugins/plugin_manager.py

@@ -6,8 +6,8 @@ import os
 from common.singleton import singleton
 from common.sorted_dict import SortedDict
 from .event import *
-from .plugin import *
 from common.log import logger
+from config import conf
 
 
 @singleton
@@ -62,7 +62,11 @@ class PluginManager:
                 if os.path.isfile(main_module_path):
                     # 导入插件
                     import_path = "{}.{}.{}".format(plugins_dir, plugin_name, plugin_name)
-                    main_module = importlib.import_module(import_path)
+                    try:
+                        main_module = importlib.import_module(import_path)
+                    except Exception as e:
+                        logger.warn("Failed to import plugin %s: %s" % (plugin_name, e))
+                        continue
         pconf = self.pconf
         new_plugins = []
         modified = False

plugins/role/role.py

@@ -119,7 +119,7 @@ class Role(Plugin):
             e_context.action = EventAction.CONTINUE
 
     def get_help_text(self):
-        help_text = "输入\"$角色 (角色名)\"或\"$role (角色名)\"为我设定角色吧，$停止扮演 可以清除设定的角色。\n目前可用角色列表：\n"
+        help_text = "输入\"$角色 (角色名)\"或\"$role (角色名)\"为我设定角色吧，#reset 可以清除设定的角色。\n\n目前可用角色列表：\n"
         for role in self.roles:
             help_text += f"[{role}]: {self.roles[role]['remark']}\n"
         return help_text