Merge pull request #138 from linepro6/develop

documents/usage/web-mode.md

@@ -69,7 +69,8 @@ server {
 
   ## 输出文件直接访问（可选，性能）
   #location /yobot/output/ {
-  #  alias /home/yobot/src/client/output/;  # 你的输出文件目录，如果你修改了`public_basepath`，请同时修改这里的`location`
+  #  alias /home/yobot/src/client/yobot_data/output/;  # 你的输出文件目录，如果你修改了`public_basepath`，请同时修改这里的`location`
+  #  charset utf-8;  # 设置 HTTP 响应的字符集避免页面出现乱码
   #  expires 30d;
   #}
 

src/client/ybplugins/gacha.py

@@ -221,8 +221,8 @@ class Gacha:
         db = db_conn.cursor()
         sql_info = list(db.execute(
             "SELECT colle FROM Colle WHERE qqid=?", (qqid,)))
-        db_conn.close()
         if len(sql_info) != 1:
+            db_conn.close()
             return nickname + "的仓库为空"
         colle = pickle.loads(sql_info[0][0])
         more_colle = []
@@ -230,8 +230,10 @@ class Gacha:
             sql_info = list(db.execute(
                 "SELECT colle FROM Colle WHERE qqid=?", (other_qq,)))
             if len(sql_info) != 1:
-                return "[CQ:at,qq={}]的仓库为空".format(other_qq)
+                db_conn.close()
+                return "[CQ:at,qq={}] 的仓库为空".format(other_qq)
             more_colle.append(pickle.loads(sql_info[0][0]))
+        db_conn.close()
         if not os.path.exists(os.path.join(self.setting["dirname"], "temp")):
             os.mkdir(os.path.join(self.setting["dirname"], "temp"))
         showed_colle = set(colle)
@@ -241,7 +243,7 @@ class Gacha:
         showdata["header"] = ["角色", nickname]
         for memb in moreqq_list:
             try:
-                membinfo = await self.bot_api.get_stranger_info(memb)
+                membinfo = await self.bot_api.get_stranger_info(user_id=memb)
                 showdata["header"].append(membinfo["nickname"])
             except:
                 showdata["header"].append(str(memb))