diff --git a/gsuid_core/utils/api/mys/request.py b/gsuid_core/utils/api/mys/request.py index ec4e247..8347de2 100644 --- a/gsuid_core/utils/api/mys/request.py +++ b/gsuid_core/utils/api/mys/request.py @@ -274,11 +274,20 @@ class BaseMysApi: [f'{k}={v}' for k, v in params.items()] ) ) + header['x-rpc-challenge_game'] = '6' if self.is_sr else '2' header['x-rpc-page'] = ( '3.1.3_#/rpg' if self.is_sr else '3.1.3_#/ys' ) + if ( + 'x-rpc-challenge' in header + and not header['x-rpc-challenge'] + ): + del header['x-rpc-challenge'] + del header['x-rpc-page'] + del header['x-rpc-challenge_game'] + print(header) async with client.request( method, diff --git a/gsuid_core/utils/image/convert.py b/gsuid_core/utils/image/convert.py index 78a421a..a075433 100644 --- a/gsuid_core/utils/image/convert.py +++ b/gsuid_core/utils/image/convert.py @@ -113,12 +113,15 @@ def get_height(content: str, size: int) -> int: async def text2pic(text: str, max_size: int = 600, font_size: int = 24): + if text.endswith('\n'): + text = text[:-1] + img = Image.new( 'RGB', (max_size, len(text) * font_size // 5), (228, 222, 210) ) img_draw = ImageDraw.ImageDraw(img) y = draw_center_text_by_line( - img_draw, (0, 0), text, core_font(font_size), 'black', 600, True + img_draw, (50, 0), text, core_font(font_size), 'black', 500, True ) img = img.crop((0, 0, 600, int(y + 30))) return await convert_img(img)