diff --git a/.github/publish.txt b/.github/publish.txt index 397ed6df..19318c67 100644 --- a/.github/publish.txt +++ b/.github/publish.txt @@ -1 +1 @@ -v6.4.1 +v6.4.1-fix diff --git a/core/plugins/__init__.py b/core/plugins/__init__.py index f3d5c0d6..75bba175 100644 --- a/core/plugins/__init__.py +++ b/core/plugins/__init__.py @@ -44,6 +44,9 @@ async def load_plugin_file(self, file: str) -> PLUGIN: async def install_loaded_plugins(self): count = 0 for item in sorted(self.plugins.values(), key=lambda n: n.priority, reverse=True): + if item.plugin_id in self.bot.plugins: + continue + try: res = self.bot.install_plugin(item) if res: @@ -72,8 +75,10 @@ async def check_requirements(self, plugins: PLUGINS_MAP, exists_plugins: Optiona if req.plugin_id == item.plugin_id: continue + exists = {**self.bot.plugins, **(exists_plugins or plugins), **final_res} + # 本地已存在此依赖插件 - if req.plugin_id in {**(exists_plugins or plugins), **final_res}: + if req.plugin_id in exists: # 本地的依赖版本不匹配,则不安装此插件 if req.version and req.version != plugins[req.plugin_id].version: allow_install = False diff --git a/pluginsDev b/pluginsDev index fc86a084..caa7b929 160000 --- a/pluginsDev +++ b/pluginsDev @@ -1 +1 @@ -Subproject commit fc86a084cc71cda3ab9a5a6c78066d593f304d2e +Subproject commit caa7b929b1624f3139d5492611ebb329471d8c59 diff --git a/requirements.txt b/requirements.txt index 23a86e49..990bb3d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -amiyabot==1.8.0 +amiyabot==1.8.1 attrdict~=2.0.1 baidu-aip dhash~=1.3