Merge branch 'main' of https://github.com/PythonistaGuild/TwitchIO

Author: EvieePy

twitchio/models/channels.py

@@ -218,15 +218,15 @@ def __init__(self, data: ChannelInformationResponseData, *, http: HTTPClient) ->
     def __repr__(self) -> str:
         return f"<ChannelInfo user={self.user} game_id={self.game_id} game_name={self.game_name} title={self.title} language={self.language} delay={self.delay}>"
 
-    async def fetch_game(self) -> Game:
+    async def fetch_game(self) -> Game | None:
         """|coro|
 
         Fetches the :class:~twitchio.Game` associated with this ChannelInfo.
 
         Returns
         -------
-        Game
+        Game | None
             The game associated with this ChannelInfo.
         """
         payload: GamesResponse = await self._http.get_games(ids=[self.game_id])
-        return Game(payload["data"][0], http=self._http)
+        return Game(payload["data"][0], http=self._http) if payload["data"] else None

twitchio/models/clips.py

@@ -125,18 +125,18 @@ def __repr__(self) -> str:
     def __str__(self) -> str:
         return self.id
 
-    async def fetch_game(self) -> Game:
+    async def fetch_game(self) -> Game | None:
         """|coro|
 
         Fetches the :class:`~twitchio.Game` associated with this Clip.
 
         Returns
         -------
-        Game
+        Game | None
             The game associated with this Clip.
         """
         payload: GamesResponse = await self._http.get_games(ids=[self.game_id])
-        return Game(payload["data"][0], http=self._http)
+        return Game(payload["data"][0], http=self._http) if payload["data"] else None
 
     async def fetch_video(self) -> Video | None:
         """|coro|

twitchio/models/entitlements.py

@@ -93,18 +93,18 @@ def __repr__(self) -> str:
     def __str__(self) -> str:
         return self.id
 
-    async def fetch_game(self) -> Game:
+    async def fetch_game(self) -> Game | None:
         """|coro|
 
         Fetches the :class:`~twitchio.Game` associated with this drop entitlement.
 
         Returns
         -------
-        Game
+        Game | None
             The game associated with this drop entitlement.
         """
         payload: GamesResponse = await self._http.get_games(ids=[self.game_id])
-        return Game(payload["data"][0], http=self._http)
+        return Game(payload["data"][0], http=self._http) if payload["data"] else None
 
 
 class EntitlementStatus:

twitchio/models/search.py

@@ -96,7 +96,7 @@ def __init__(self, data: SearchChannelsResponseData, *, http: HTTPClient) -> Non
     def __repr__(self) -> str:
         return f"<SearchChannel broadcaster={self.broadcaster} title={self.title} live={self.live} game_id={self.game_id}>"
 
-    async def fetch_game(self) -> Game:
+    async def fetch_game(self) -> Game | None:
         """|coro|
 
         Fetches the :class:`~twitchio.Game` associated with this channel.
@@ -110,4 +110,4 @@ async def fetch_game(self) -> Game:
             The game associated with this :class:`~twitchio.SearchChannel` instance.
         """
         payload: GamesResponse = await self._http.get_games(ids=[self.game_id])
-        return Game(payload["data"][0], http=self._http)
+        return Game(payload["data"][0], http=self._http) if payload["data"] else None