fix bug and update

.gitignore

@@ -140,6 +140,7 @@ cython_debug/
 
 test.py
 server_ip.py
+game_utils.py
 member_activity_handle.py
 Yu-Gi-Oh/
 csgo/

README.md

@@ -243,11 +243,13 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
 
 ## 更新
 
-### 2022/6/8
+### 2022/6/9
 
-* chore(deps): update `nonebot-adapter-onebot`
+* 修复b站订阅同群二人以上相同订阅时发送多次信息
+* 修复超级用户帮助中缺少了 ‘插件商店’ 相关帮助
+* 昵称系统提供了详细帮助
 
-### 2022/6/5 \[v0.1.5.9] (__需要更新WebUI!__)
+### 2022/6/5 \[v0.1.5.9]
 
 * webui修复plugin2setting中cmd从list转变为str
 * 当命令`我的金币`被风控时将以图片形式发送

basic_plugins/nickname.py

@@ -22,6 +22,12 @@ __plugin_des__ = "区区昵称，才不想叫呢！"
 __plugin_cmd__ = ["以后叫我 [昵称]", f"{NICKNAME}我是谁"]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
+__plugin_settings__ = {
+    "level": 5,
+    "default_status": True,
+    "limit_superuser": False,
+    "cmd": ["昵称", "昵称系统"],
+}
 __plugin_configs__ = {
     "BLACK_WORD": {
         "value": ["爸", "爹", "爷", "父亲"],

basic_plugins/plugin_shop/__init__.py

@@ -20,7 +20,7 @@ usage：
         卸载插件 [name/id]
 """.strip()
 __plugin_des__ = "从真寻适配仓库中下载插件"
-__plugin_cmd__ = [""]
+__plugin_cmd__ = ["查看插件仓库", "更新插件仓库", "安装插件 [name/id]", "卸载插件 [name/id]"]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 

basic_plugins/plugin_shop/data_source.py

@@ -81,7 +81,7 @@ async def install_plugin(name: str) -> str:
                 json.dump(data[name], f, ensure_ascii=False, indent=4)
             logger.debug("移动插件文件夹完成...")
             logger.info(f"成功安装插件 {name} 成功！\n{tmp}")
-        return f"成功安装插件 {name}，请重启bot！"
+        return f"成功安装插件 {name}，请重启真寻！"
     except Exception as e:
         logger.error(f"安装插件 {name} 失败 {type(e)}：{e}")
         return f"安装插件 {name} 失败 {type(e)}：{e}"
@@ -130,12 +130,17 @@ async def show_plugin_repo() -> Union[int, str]:
             "download_url": plugin_info[key]["download_url"],
             "github_url": plugin_info[key]["github_url"],
         }
+        status = ""
+        version = ""
+        if key in load_plugin_list:
+            status = "<f font_color=#1a7e30>[已安装]</f>"
+            version = f"<f font_color=#1a7e30>[{plugins_manager.get_data()[key]['version']}]</f>"
         s = (
             f'id：{i+1}\n名称：{plugin_info[key]["plugin_name"]}'
-            f' \t\t{"<f font_color=#1a7e30>[已安装]</f>" if key in load_plugin_list else ""}\n'
+            f' \t\t{status}\n'
             f"模块：{key}\n"
             f'作者：{plugin_info[key]["author"]}\n'
-            f'版本：{plugin_info[key]["version"]}\n'
+            f'版本：{plugin_info[key]["version"]} \t\t{version}\n'
             f'简介：{plugin_info[key]["introduction"]}\n'
             f"-------------------"
         )

plugins/bilibili_sub/__init__.py

@@ -228,12 +228,14 @@ async def send_sub_msg(rst: str, sub: BilibiliSub, bot: Bot):
     :param sub: BilibiliSub
     :param bot: Bot
     """
+    temp_group = []
     if rst:
         for x in sub.sub_users.split(",")[:-1]:
             try:
-                if ":" in x:
+                if ":" in x and x.split(":")[1] not in temp_group:
+                    temp_group.append(x.split(":")[1])
                     await bot.send_group_msg(
-                        group_id=int(x.split(":")[1]), message=Message(rst)
+                            group_id=int(x.split(":")[1]), message=Message(rst)
                     )
                 else:
                     await bot.send_private_msg(user_id=int(x), message=Message(rst))

utils/image_utils.py

@@ -681,7 +681,10 @@ class BuildImage:
             right, bottom = [(value - offset) * antialias for value in ellipse_box[2:]]
             draw.ellipse([left, top, right, bottom], fill=fill)
         mask = mask.resize(self.markImg.size, Image.LANCZOS)
-        self.markImg.putalpha(mask)
+        try:
+            self.markImg.putalpha(mask)
+        except ValueError:
+            pass
 
     async def acircle_corner(self, radii: int = 30):
         """