Merge pull request #265 from AmiyaBot/V6-dev

V6 dev
AmiyaBot · Jan 10, 2024 · ebcdfc5 · ebcdfc5
2 parents d76ca75 + 12f6c64
commit ebcdfc5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/publish.txt b/.github/publish.txt
@@ -1 +1 @@
-v6.4.3
+v6.4.4
diff --git a/core/server/bot.py b/core/server/bot.py
@@ -16,7 +16,7 @@ class BotAccountModel(BotAppId):
     private: int = 0
     is_main: int = 0
     is_start: int = 1
-    adapter: str = 'tencent'
+    adapter: str = 'qq_guild'
     console_channel: Optional[str] = None
 
     host: Optional[str] = None
@@ -73,7 +73,8 @@ async def add_bot(self, data: BotAccountModel):
 
     @app.route()
     async def edit_bot(self, data: BotAccountModel):
-        if BotAccounts.get_or_none(appid=data.appid):
+        exists = BotAccounts.get_or_none(appid=data.appid)
+        if exists and exists.id != data.id:
             return app.response(code=500, message='AppId 已存在')
 
         if data.adapter == 'websocket':

diff --git a/pluginsDev b/pluginsDev
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-amiyabot==1.8.6
+amiyabot==1.8.7
 attrdict~=2.0.1
 baidu-aip
 dhash~=1.3
+13 −5		src/arknights/enemy/main.py
+5 −1		src/arknights/intellect/main.py
+7 −1		src/arknights/operatorArchives/main.py
+1 −1		src/arknights/operatorArchives/operatorCore.py
+7 −3		src/arknights/operatorArchives/operatorInfo.py
+2 −2		src/arknights/stage/main.py
+5 −1		src/weibo/main.py