From 22b64702186c6b8d2baa80581d95b0bce49a5545 Mon Sep 17 00:00:00 2001
From: WindowsSov8forUs <qwertyuiop2333@hotmail.com>
Date: Mon, 6 May 2024 13:40:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E5=BC=82=E6=AD=A5=E5=93=8D=E5=BA=94=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tsugu_api_async/v1/_bandoristation.py |  10 +-
 tsugu_api_async/v1/_tsugu.py          | 226 +++++++++++++-------------
 tsugu_api_async/v1/_user.py           |  86 +++++-----
 tsugu_api_async/v2/_api.py            |  16 +-
 4 files changed, 172 insertions(+), 166 deletions(-)

diff --git a/tsugu_api_async/v1/_bandoristation.py b/tsugu_api_async/v1/_bandoristation.py
index 04400cb..de79a5f 100644
--- a/tsugu_api_async/v1/_bandoristation.py
+++ b/tsugu_api_async/v1/_bandoristation.py
@@ -1,3 +1,5 @@
+from httpx import Response
+
 from tsugu_api_async import settings
 from tsugu_api_async._network import Api
 from tsugu_api_async.exception import RoomSubmitFailure
@@ -26,12 +28,12 @@ async def submit_room_number(number: int, user_id: str, raw_message: str, source
     }
     
     # 发送请求
-    response = await (
-        await Api(
+    response = await Api(
             BANDORI_STATION_URL,
             proxy=settings.backend_proxy,
             params=params
-        ).get()
-    ).json()
+    ).get()
+    if isinstance(response, Response): response = response.json()
+    else: response = await response.json()
     if response['status'] == 'failure':
         raise RoomSubmitFailure(response['response'])
diff --git a/tsugu_api_async/v1/_tsugu.py b/tsugu_api_async/v1/_tsugu.py
index ffc71e6..929f6d8 100644
--- a/tsugu_api_async/v1/_tsugu.py
+++ b/tsugu_api_async/v1/_tsugu.py
@@ -1,6 +1,8 @@
 from time import time
 from typing import Optional
 
+from httpx import Response
+
 from tsugu_api_async import settings
 from tsugu_api_async._network import Api
 from tsugu_api_async._typing import (
@@ -32,13 +34,13 @@ async def get_card_illustration(card_id: int) -> _Response:
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def gacha_simulate(server_mode: _Server, gacha_id: Optional[int] = None) -> _Response:
     '''模拟抽卡
@@ -63,13 +65,13 @@ async def gacha_simulate(server_mode: _Server, gacha_id: Optional[int] = None) -
         data['gachaId'] = gacha_id
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def search_player(player_id: int, server: _Server) -> _Response:
     '''查询玩家状态
@@ -94,13 +96,13 @@ async def search_player(player_id: int, server: _Server) -> _Response:
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def search_gacha(default_servers: list[_Server], gacha_id: int) -> _Response:
     '''查询卡池
@@ -125,13 +127,13 @@ async def search_gacha(default_servers: list[_Server], gacha_id: int) -> _Respon
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def search_event(default_servers: list[_Server], text: str) -> _Response:
     '''查询活动
@@ -156,13 +158,13 @@ async def search_event(default_servers: list[_Server], text: str) -> _Response:
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def event_stage(server: _Server, meta: bool = False, event_id: Optional[int] = None) -> _Response:
     '''查询团队 LIVE 佳节活动舞台数据
@@ -189,13 +191,13 @@ async def event_stage(server: _Server, meta: bool = False, event_id: Optional[in
         data['eventId'] = event_id
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def search_song(default_servers: list[_Server], text: str) -> _Response:
     '''查询歌曲
@@ -220,13 +222,13 @@ async def search_song(default_servers: list[_Server], text: str) -> _Response:
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def song_meta(default_servers: list[_Server], server: _Server) -> _Response:
     '''查询歌曲分数表
@@ -250,13 +252,13 @@ async def song_meta(default_servers: list[_Server], server: _Server) -> _Respons
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def search_character(default_servers: list[_Server], text: str) -> _Response:
     '''查询角色
@@ -280,13 +282,13 @@ async def search_character(default_servers: list[_Server], text: str) -> _Respon
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def song_chart(default_servers: list[_Server], song_id: int, difficulty_text: _Difficulty) -> _Response:
     '''查询歌曲谱面
@@ -312,13 +314,13 @@ async def song_chart(default_servers: list[_Server], song_id: int, difficulty_te
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def ycx_all(server: _Server, event_id: Optional[int] = None) -> _Response:
     '''查询全挡位预测线
@@ -343,13 +345,13 @@ async def ycx_all(server: _Server, event_id: Optional[int] = None) -> _Response:
         data['eventId'] = event_id
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def ycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _Response:
     '''查询排行榜预测线
@@ -376,13 +378,13 @@ async def ycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _Re
         data['eventId'] = event_id
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def lsycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _Response:
     '''查询历史排行榜预测线
@@ -409,13 +411,13 @@ async def lsycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _
         data['eventId'] = event_id
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def room_list(room_list: list[_CarData]) -> _Response:
     '''绘制车牌绘图
@@ -437,13 +439,13 @@ async def room_list(room_list: list[_CarData]) -> _Response:
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def search_card(default_servers: list[_Server], text: str) -> _Response:
     '''查询卡片
@@ -468,13 +470,13 @@ async def search_card(default_servers: list[_Server], text: str) -> _Response:
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def station_query_all_room() -> _QueryResult:
     '''查询最近车站车牌
@@ -528,10 +530,10 @@ async def station_submit_room_number(
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
diff --git a/tsugu_api_async/v1/_user.py b/tsugu_api_async/v1/_user.py
index d11a8cb..3985083 100644
--- a/tsugu_api_async/v1/_user.py
+++ b/tsugu_api_async/v1/_user.py
@@ -1,4 +1,4 @@
-from httpx import HTTPStatusError
+from httpx import Response, HTTPStatusError
 
 from tsugu_api_async import settings
 from tsugu_api_async._network import Api
@@ -30,13 +30,13 @@ async def get_user_data(platform: str, user_id: str) -> _UserDataResult:
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.userdata_backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.userdata_backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def bind_player_request(
     platform: str,
@@ -69,13 +69,13 @@ async def bind_player_request(
     
     # 发送请求
     try:
-        return await (
-            await Api(
-                url,
-                proxy=settings.userdata_backend_proxy,
-                data=data
-            ).post()
-        ).json()
+        response = await Api(
+            url,
+            proxy=settings.userdata_backend_proxy,
+            data=data
+        ).post()
+        if isinstance(response, Response): return response.json()
+        return await response.json()
     except HTTPStatusError as exception:
         if exception.response.status_code == 400:
             return exception.response.json()
@@ -116,13 +116,13 @@ async def bind_player_verification(
     
     # 发送请求
     try:
-        return await (
-            await Api(
-                url,
-                proxy=settings.userdata_backend_proxy,
-                data=data
-            ).post()
-        ).json()
+        response = await Api(
+            url,
+            proxy=settings.userdata_backend_proxy,
+            data=data
+        ).post()
+        if isinstance(response, Response): return response.json()
+        return await response.json()
     except HTTPStatusError as exception:
         if exception.response.status_code == 400:
             return exception.response.json()
@@ -153,13 +153,13 @@ async def set_car_forwarding(platform: str, user_id: str, status: bool) -> _Resu
     
     # 发送请求
     try:
-        return await (
-            await Api(
-                url,
-                proxy=settings.userdata_backend_proxy,
-                data=data
-            ).post()
-        ).json()
+        response = await Api(
+            url,
+            proxy=settings.userdata_backend_proxy,
+            data=data
+        ).post()
+        if isinstance(response, Response): return response.json()
+        return await response.json()
     except HTTPStatusError as exception:
         if exception.response.status_code == 400:
             return exception.response.json()
@@ -190,13 +190,13 @@ async def set_default_server(platform: str, user_id: str, text: str) -> _Result:
     
     # 发送请求
     try:
-        return await (
-            await Api(
-                url,
-                proxy=settings.userdata_backend_proxy,
-                data=data
-            ).post()
-        ).json()
+        response = await Api(
+            url,
+            proxy=settings.userdata_backend_proxy,
+            data=data
+        ).post()
+        if isinstance(response, Response): return response.json()
+        return await response.json()
     except HTTPStatusError as exception:
         if exception.response.status_code == 400:
             return exception.response.json()
@@ -227,13 +227,13 @@ async def set_server_mode(platform: str, user_id: str, text: str) -> _Result:
     
     # 发送请求
     try:
-        return await (
-            await Api(
-                url,
-                proxy=settings.userdata_backend_proxy,
-                data=data
-            ).post()
-        ).json()
+        response = await Api(
+            url,
+            proxy=settings.userdata_backend_proxy,
+            data=data
+        ).post()
+        if isinstance(response, Response): return response.json()
+        return await response.json()
     except HTTPStatusError as exception:
         if exception.response.status_code == 400:
             return exception.response.json()
diff --git a/tsugu_api_async/v2/_api.py b/tsugu_api_async/v2/_api.py
index 1f5b13a..6a60bb1 100644
--- a/tsugu_api_async/v2/_api.py
+++ b/tsugu_api_async/v2/_api.py
@@ -1,3 +1,5 @@
+from httpx import Response
+
 from tsugu_api_async import settings
 from tsugu_api_async._network import Api
 from tsugu_api_async._typing import _Server, _Response
@@ -33,13 +35,13 @@ async def _v2_post_request(
     }
     
     # 发送请求
-    return await (
-        await Api(
-            url,
-            proxy=settings.backend_proxy,
-            data=data
-        ).post()
-    ).json()
+    response = await Api(
+        url,
+        proxy=settings.backend_proxy,
+        data=data
+    ).post()
+    if isinstance(response, Response): return response.json()
+    return await response.json()
 
 async def card_illustration(
     text: str