Merge branch 'dev/3.0' of https://github.com/PythonistaGuild/Twitchio into dev/3.0

Author: Eviee Py

twitchio/http.py

@@ -57,7 +57,7 @@
 from .models.subscriptions import BroadcasterSubscription, BroadcasterSubscriptions
 from .models.videos import Video
 from .user import ActiveExtensions, PartialUser
-from .utils import Colour, _from_json, handle_user_ids, url_encode_datetime  # type: ignore
+from .utils import Colour, _from_json, date_to_datetime_with_z, handle_user_ids, url_encode_datetime  # type: ignore
 
 
 if TYPE_CHECKING:
@@ -538,9 +538,6 @@ def get_extension_analytics(
         if extension_id:
             params["extension_id"] = extension_id
 
-        def date_to_datetime_with_z(date: datetime.date) -> str:
-            return datetime.datetime.combine(date, datetime.time(0, 0)).isoformat() + "Z"
-
         if started_at and ended_at:
             params["started_at"] = date_to_datetime_with_z(started_at)
             params["ended_at"] = date_to_datetime_with_z(ended_at)
@@ -570,9 +567,6 @@ def get_game_analytics(
         if game_id:
             params["game_id"] = game_id
 
-        def date_to_datetime_with_z(date: datetime.date) -> str:
-            return datetime.datetime.combine(date, datetime.time(0, 0)).isoformat() + "Z"
-
         if started_at and ended_at:
             params["started_at"] = date_to_datetime_with_z(started_at)
             params["ended_at"] = date_to_datetime_with_z(ended_at)
@@ -1161,7 +1155,7 @@ async def post_chat_shoutout(
         token_for: str | PartialUser,
     ) -> None:
         params = {
-            "broadcaster_id": broadcaster_id,
+            "from_broadcaster_id": broadcaster_id,
             "moderator_id": moderator_id,
             "to_broadcaster_id": to_broadcaster_id,
         }

twitchio/models/eventsub_.py

@@ -1944,7 +1944,7 @@ class ChannelRaid(BaseEvent):
 
     subscription_type = "channel.raid"
 
-    __slots__ = ("from_broadcaster", "to_boradcaster", "viewer_count")
+    __slots__ = ("from_broadcaster", "to_broadcaster", "viewer_count")
 
     def __init__(self, payload: ChannelRaidEvent, *, http: HTTPClient) -> None:
         self.from_broadcaster: PartialUser = PartialUser(

twitchio/utils.py

@@ -2,14 +2,14 @@
 
 import asyncio
 import colorsys
+import datetime
 import json
 import logging
 import os
 import pathlib
 import struct
 import sys
 from collections.abc import Callable
-from datetime import UTC, datetime
 from functools import wraps
 from typing import TYPE_CHECKING, Any, Generic, Self, TypeVar, cast
 from urllib.parse import quote
@@ -40,6 +40,7 @@
     "MISSING",
     "handle_user_ids",
     "_is_submodule",
+    "date_to_datetime_with_z",
 )
 
 T_co = TypeVar("T_co", covariant=True)
@@ -90,7 +91,7 @@ def stream_supports_rgb(stream: Any) -> bool:
     return False
 
 
-def parse_timestamp(timestamp: str) -> datetime:
+def parse_timestamp(timestamp: str) -> datetime.datetime:
     """
     Parses a timestamp in ISO8601 format to a datetime object.
 
@@ -104,7 +105,7 @@ def parse_timestamp(timestamp: str) -> datetime:
     datetime.datetime
         The parsed datetime object.
     """
-    return datetime.fromisoformat(timestamp)
+    return datetime.datetime.fromisoformat(timestamp)
 
 
 class ColourFormatter(logging.Formatter):
@@ -733,7 +734,7 @@ def chunk_list(sequence: list[Any], n: int) -> Generator[Any, Any, Any]:
         yield sequence[i : i + n]
 
 
-def url_encode_datetime(dt: datetime) -> str:
+def url_encode_datetime(dt: datetime.datetime) -> str:
     """
     Formats a datetime object to an RFC 3339 compliant string and URL-encodes it.
     If the datetime object does not have a timezone, it is converted to UTC first.
@@ -748,7 +749,7 @@ def url_encode_datetime(dt: datetime) -> str:
     str
         The URL encoded parsed datetime object.
     """
-    formatted_dt = dt.replace(tzinfo=UTC).isoformat() if dt.tzinfo is None else dt.isoformat()
+    formatted_dt = dt.replace(tzinfo=datetime.UTC).isoformat() if dt.tzinfo is None else dt.isoformat()
 
     return quote(formatted_dt)
 
@@ -841,4 +842,8 @@ def wrapper(*args: Any, **kwargs: Any) -> Any:
 
 
 def _is_submodule(parent: str, child: str) -> bool:
-    return parent == child or child.startswith(parent + ".")
+    return parent == child or child.startswith(f"{parent}.")
+
+
+def date_to_datetime_with_z(date: datetime.date) -> str:
+    return f"{datetime.datetime.combine(date, datetime.time(0, 0)).isoformat()}Z"