Move deco to http

Author: chillymosh

twitchio/http.py

@@ -58,7 +58,7 @@
 from .models.subscriptions import BroadcasterSubscription, BroadcasterSubscriptions
 from .models.videos import Video
 from .user import ActiveExtensions, PartialUser
-from .utils import Colour, _from_json, url_encode_datetime  # type: ignore
+from .utils import Colour, _from_json, url_encode_datetime, handle_user_ids  # type: ignore
 
 
 if TYPE_CHECKING:
@@ -586,16 +586,16 @@ async def converter(data: GameAnalyticsResponseData, *, raw: Any) -> GameAnalyti
         return iterator
 
     ### Bits ###
-
+    @handle_user_ids()
     async def get_bits_leaderboard(
         self,
         *,
         broadcaster_id: str | int,
-        token_for: str,
+        token_for: str | PartialUser,
         count: int = 10,
         period: Literal["day", "week", "month", "year", "all"] = "all",
         started_at: datetime.datetime | None = None,
-        user_id: str | int | None = None,
+        user_id: str | int | PartialUser | None = None,
     ) -> BitsLeaderboardResponse:
         params: dict[str, str | int | datetime.datetime] = {
             "broadcaster_id": broadcaster_id,
@@ -605,10 +605,10 @@ async def get_bits_leaderboard(
 
         if started_at is not None:
             params["started_at"] = url_encode_datetime(started_at)
-        if user_id:
-            params["user_id"] = user_id
+        if user_id is not None:
+            params["user_id"] = str(user_id)
 
-        route: Route = Route("GET", "bits/leaderboard", params=params, token_for=token_for)
+        route: Route = Route("GET", "bits/leaderboard", params=params, token_for=str(token_for))
         return await self.request_json(route)
 
     async def get_cheermotes(

twitchio/user.py

@@ -30,7 +30,7 @@
 from .exceptions import HTTPException
 from .models.ads import AdSchedule, CommercialStart, SnoozeAd
 from .models.raids import Raid
-from .utils import handle_user_ids, parse_timestamp
+from .utils import parse_timestamp
 
 
 if TYPE_CHECKING:
@@ -309,7 +309,6 @@ def fetch_game_analytics(
             max_results=max_results,
         )
 
-    @handle_user_ids(is_self=True)
     async def fetch_bits_leaderboard(
         self,
         token_for: str | PartialUser,

twitchio/utils.py

@@ -741,7 +741,7 @@ def wrapper(*args: Any, **kwargs: Any) -> Any:
             from .user import PartialUser
 
             new_args = [
-                (str(arg.id) if isinstance(arg, PartialUser) else arg)
+                str(arg.id) if isinstance(arg, PartialUser) else arg
                 for i, arg in enumerate(args)
                 if not (is_self and i == 0)
             ]