Merge pull request #259 from AmiyaBot/V6-dev

fix 修复插件依赖的一些问题；修复 Tencent 适配器发送消息的问题
AmiyaBot · Nov 6, 2023 · 88aba03 · 88aba03
2 parents 6e7f9a4 + 6aa6bf4
commit 88aba03
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
diff --git 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