From dbb2c355049dd707037b8eac0cffe911693f8adf Mon Sep 17 00:00:00 2001 From: Miwory Date: Wed, 17 Dec 2025 19:37:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=20=D0=BE=D1=82=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85=20=D1=8D?= =?UTF-8?q?=D0=BD=D0=B4=D0=BF=D0=BE=D0=B8=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- src/twitchclient/api.py | 48 ++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 178cdd7..9d52ac2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "twitchclient" -version = "1.0.1" +version = "1.0.2" description = "Client for Twitch API" readme = "README.md" authors = [ diff --git a/src/twitchclient/api.py b/src/twitchclient/api.py index f3cbade..e63ad43 100644 --- a/src/twitchclient/api.py +++ b/src/twitchclient/api.py @@ -67,7 +67,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.AdSchedule.model_validate(req.json()).data + return s.AdSchedule.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED: raise s.ClientError(req.status_code, req.json()['message']) @@ -86,7 +86,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.SnoozeNextAd.model_validate(req.json()).data + return s.SnoozeNextAd.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.TOO_MANY_REQUESTS: raise s.ClientError(req.status_code, req.json()['message']) @@ -122,7 +122,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.ExtensionAnalytics.model_validate(req.json()).data + return s.ExtensionAnalytics.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.NOT_FOUND: raise s.ClientError(req.status_code, req.json()['message']) @@ -158,7 +158,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.GameAnalytics.model_validate(req.json()).data + return s.GameAnalytics.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.NOT_FOUND: raise s.ClientError(req.status_code, req.json()['message']) @@ -190,7 +190,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.BitsLeaderboard.model_validate(req.json()).data + return s.BitsLeaderboard.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.FORBIDDEN: raise s.ClientError(req.status_code, req.json()['message']) @@ -209,7 +209,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.Cheermotes.model_validate(req.json()).data + return s.Cheermotes.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED: raise s.ClientError(req.status_code, req.json()['message']) @@ -241,7 +241,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.ExtensionTransactions.model_validate(req.json()).data + return s.ExtensionTransactions.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.NOT_FOUND: raise s.ClientError(req.status_code, req.json()['message']) @@ -262,7 +262,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.ChannelsInformation.model_validate(req.json()).data + return s.ChannelsInformation.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.TOO_MANY_REQUESTS: raise s.ClientError(req.status_code, req.json()['message']) @@ -328,7 +328,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.ChannelEditors.model_validate(req.json()).data + return s.ChannelEditors.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.TOO_MANY_REQUESTS: raise s.ClientError(req.status_code, req.json()['message']) @@ -358,7 +358,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.FollowedChannels.model_validate(req.json()).data + return s.FollowedChannels.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.TOO_MANY_REQUESTS: raise s.ClientError(req.status_code, req.json()['message']) @@ -390,7 +390,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.ChannelFollowers.model_validate(req.json()).data + return s.ChannelFollowers.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.TOO_MANY_REQUESTS: raise s.ClientError(req.status_code, req.json()['message']) @@ -446,7 +446,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.CustomRewards.model_validate(req.json()).data + return s.CustomRewards.model_validate(req.json()) case ( st.BAD_REQUEST @@ -506,7 +506,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.CustomRewards.model_validate(req.json()).data + return s.CustomRewards.model_validate(req.json()) case ( st.BAD_REQUEST @@ -550,9 +550,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.CustomRewardRedemptions.model_validate( - req.json() - ).data + return s.CustomRewardRedemptions.model_validate(req.json()) case ( st.BAD_REQUEST @@ -615,7 +613,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.CustomRewards.model_validate(req.json()).data + return s.CustomRewards.model_validate(req.json()) case ( st.BAD_REQUEST @@ -675,7 +673,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.CharityCampaign.model_validate(req.json()).data + return s.CharityCampaign.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.FORBIDDEN: raise s.ClientError(req.status_code, req.json()['message']) @@ -711,7 +709,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.CharityDonations.model_validate(req.json()).data + return s.CharityDonations.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.FORBIDDEN: raise s.ClientError(req.status_code, req.json()['message']) @@ -749,7 +747,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.Chatters.model_validate(req.json()).data + return s.Chatters.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.FORBIDDEN: raise s.ClientError(req.status_code, req.json()['message']) @@ -913,7 +911,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.ChatSettings.model_validate(req.json()).data + return s.ChatSettings.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED: raise s.ClientError(req.status_code, req.json()['message']) @@ -941,7 +939,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.SharedChatSession.model_validate(req.json()).data + return s.SharedChatSession.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED: raise s.ClientError(req.status_code, req.json()['message']) @@ -1027,7 +1025,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.ChatSettings.model_validate(req.json()).data + return s.ChatSettings.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED: raise s.ClientError(req.status_code, req.json()['message']) @@ -1123,7 +1121,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.Message.model_validate(req.json()).data + return s.Message.model_validate(req.json()) case ( st.BAD_REQUEST @@ -1253,7 +1251,7 @@ class TwitchAPIClient(AioHTTPXClient): match req.status_code: case st.OK: - return s.Clips.model_validate(req.json()).data + return s.Clips.model_validate(req.json()) case st.BAD_REQUEST | st.UNAUTHORIZED | st.NOT_FOUND: raise s.ClientError(req.status_code, req.json()['message']) -- 2.47.2