From 4ec9af1bb8c68a503ce1ceb93f67339b1294a61b Mon Sep 17 00:00:00 2001
From: CMHopeSunshine <277073121@qq.com>
Date: Tue, 6 Sep 2022 11:17:39 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E7=A9=BA=E7=99=BDqq?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/plugin_manager/__init__.py        |  2 +-
 LittlePaimon/plugins/Paimon_Gacha_Log/draw.py | 13 +++--
 .../plugins/Paimon_Info/draw_player_card.py   | 13 +++--
 LittlePaimon/utils/files.py                   |  2 +-
 example/plugin_data.py                        | 51 -------------------
 5 files changed, 18 insertions(+), 63 deletions(-)
 delete mode 100644 example/plugin_data.py

diff --git a/LittlePaimon/manager/plugin_manager/__init__.py b/LittlePaimon/manager/plugin_manager/__init__.py
index e4ab490..e778042 100644
--- a/LittlePaimon/manager/plugin_manager/__init__.py
+++ b/LittlePaimon/manager/plugin_manager/__init__.py
@@ -71,7 +71,7 @@ async def _(event: PrivateMessageEvent, state: T_State, match: dict = RegexDict(
 @manage_cmd.got('bool')
 async def _(state: T_State):
     if not state['group'] and state['user']:
-        await manage_cmd.finish('使用ban|unban -g 群号 -u 用户', at_sender=True)
+        await manage_cmd.finish('用法：ban|unban 插件名 -g 群号列表 -u 用户列表', at_sender=True)
     if state['session_id'] in cache_help:
         del cache_help[state['session_id']]
     if not state['plugin'] and state['plugin_no_exist']:
diff --git a/LittlePaimon/plugins/Paimon_Gacha_Log/draw.py b/LittlePaimon/plugins/Paimon_Gacha_Log/draw.py
index f1ea4c1..0e3e31e 100644
--- a/LittlePaimon/plugins/Paimon_Gacha_Log/draw.py
+++ b/LittlePaimon/plugins/Paimon_Gacha_Log/draw.py
@@ -17,11 +17,14 @@ small_avatar_cache = {}
 
 
 async def get_avatar(qid: str, size: Tuple[int, int] = (146, 146)) -> PMImage:
-    avatar = await get_qq_avatar(qid)
-    await avatar.resize(size)
-    await avatar.to_circle('circle')
-    await avatar.add_border(6, '#ddcdba', 'circle')
-    return avatar
+    try:
+        avatar = await get_qq_avatar(qid)
+        await avatar.resize(size)
+        await avatar.to_circle('circle')
+        await avatar.add_border(6, '#ddcdba', 'circle')
+        return avatar
+    except Exception:
+        return PMImage(size=size, color=(255, 255, 255, 255))
 
 
 async def small_avatar(info: FiveStarItem):
diff --git a/LittlePaimon/plugins/Paimon_Info/draw_player_card.py b/LittlePaimon/plugins/Paimon_Info/draw_player_card.py
index 06bfc35..09988f6 100644
--- a/LittlePaimon/plugins/Paimon_Info/draw_player_card.py
+++ b/LittlePaimon/plugins/Paimon_Info/draw_player_card.py
@@ -25,11 +25,14 @@ def get_percent_text(percent: int) -> str:
 
 
 async def get_avatar(qid: str, size: Tuple[int, int] = (146, 146)) -> PMImage:
-    avatar = await get_qq_avatar(qid)
-    await avatar.resize(size)
-    await avatar.to_circle('circle')
-    await avatar.add_border(6, '#ddcdba', 'circle')
-    return avatar
+    try:
+        avatar = await get_qq_avatar(qid)
+        await avatar.resize(size)
+        await avatar.to_circle('circle')
+        await avatar.add_border(6, '#ddcdba', 'circle')
+        return avatar
+    except Exception:
+        return PMImage(size=size, color=(255, 255, 255, 255))
 
 
 async def draw_weapon_icon(weapon: Weapon, size: Tuple[int, int] = (65, 65)) -> PMImage:
diff --git a/LittlePaimon/utils/files.py b/LittlePaimon/utils/files.py
index 53949de..409094d 100644
--- a/LittlePaimon/utils/files.py
+++ b/LittlePaimon/utils/files.py
@@ -117,7 +117,7 @@ def load_yaml(path: Union[Path, str], encoding: str = 'utf-8'):
     if isinstance(path, str):
         path = Path(path)
     return yaml.load(path.open('r', encoding=encoding),
-                     Loader=yaml.RoundTripLoader) if path.exists() else yaml.round_trip_load('{}')
+                     Loader=yaml.Loader) if path.exists() else yaml.round_trip_load('{}')
 
 
 def save_yaml(data: dict, path: Union[Path, str] = None, encoding: str = 'utf-8'):
diff --git a/example/plugin_data.py b/example/plugin_data.py
deleted file mode 100644
index 36f1b58..0000000
--- a/example/plugin_data.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from nonebot import on_command
-from nonebot.plugin import PluginMetadata
-
-"""
-一个插件配置例子，不是最终版本，可能会有更多的变动
-"""
-
-__plugin_meta__ = PluginMetadata(
-    name='test plugin',
-    description='a test plugin',
-    usage='only test',
-    extra={
-        'author': '惜月',
-        'type': '其他',
-        'default_status': True,
-        'priority': 1,
-        'permit_range': ['private', 'group', 'guild'],
-        'permit_member': ['superuser', 'admin', 'member'],
-        'configs': {
-            'config1': {
-                'description': 'config1 description',
-                'value': 1
-            },
-            'config2': {
-                'description': 'config2 description',
-                'value': 123
-            }
-        },
-    }
-)
-
-command = on_command('example', priority=1, block=True)
-command.__paimon_meta__ = {
-    'name': 'test command',
-    'description': 'a test command',
-    'usage': 'only test',
-    'default_status': True,
-    'priority': 1,
-    'cooldown': {
-        'per_user': 1,
-        'per_private_user': 1,
-        'per_group': 1,
-        'per_group_member': 2,
-        'per_guild': 5,
-        'per_guild_channel': 6,
-        'per_guild_member': 7
-    },
-    'permit_range':  ['private', 'group', 'guild'],
-    'permit_member': ['superuser', 'admin', 'member']
-}
-