Merge remote-tracking branch 'origin/feat/subscriptions' into feat/subscriptions

Author: plun1331

discord/http.py

@@ -3057,8 +3057,10 @@ async def get_subscription(
     ) -> Response[monetization.Subscription]:
         return self.request(
             Route(
-                "GET", "/skus/{sku_id}/subscriptions/{subscription_id}",
-                sku_id=sku_id, subscription_id=subscription_id
+                "GET",
+                "/skus/{sku_id}/subscriptions/{subscription_id}",
+                sku_id=sku_id,
+                subscription_id=subscription_id,
             )
         )
 

discord/iterators.py

@@ -65,10 +65,10 @@
     from .types.audit_log import AuditLog as AuditLogPayload
     from .types.guild import Guild as GuildPayload
     from .types.message import Message as MessagePayload
+    from .types.monetization import Subscription as SubscriptionPayload
     from .types.threads import Thread as ThreadPayload
     from .types.user import PartialUser as PartialUserPayload
     from .user import User
-    from .types.monetization import Subscription as SubscriptionPayload
 
 T = TypeVar("T")
 OT = TypeVar("OT")
@@ -1053,7 +1053,7 @@ def __init__(
         limit: int = None,
         before: datetime.datetime | None = None,
         after: datetime.datetime | None = None,
-        user_id: int | None = None
+        user_id: int | None = None,
     ):
         if isinstance(before, datetime.datetime):
             before = Object(id=time_snowflake(before, high=False))

discord/monetization.py

@@ -32,7 +32,13 @@
 from .flags import SKUFlags
 from .iterators import SubscriptionIterator
 from .mixins import Hashable
-from .utils import cached_property, cached_slot_property, MISSING, _get_as_snowflake, parse_time
+from .utils import (
+    MISSING,
+    _get_as_snowflake,
+    cached_property,
+    cached_slot_property,
+    parse_time,
+)
 
 if TYPE_CHECKING:
     from datetime import datetime
@@ -133,7 +139,14 @@ def list_subscriptions(
         limit: :class:`int` | None
             The number of subscriptions to retrieve. If ``None``, retrieves all subscriptions.
         """
-        return SubscriptionIterator(self._state, self.id, user_id=user.id, before=before, after=after, limit=limit)
+        return SubscriptionIterator(
+            self._state,
+            self.id,
+            user_id=user.id,
+            before=before,
+            after=after,
+            limit=limit,
+        )
 
 
 class Entitlement(Hashable):
@@ -199,7 +212,9 @@ def __init__(self, *, data: EntitlementPayload, state: ConnectionState) -> None:
         self.starts_at: datetime | MISSING = (
             parse_time(data.get("starts_at")) or MISSING
         )
-        self.ends_at: datetime | MISSING | None = parse_time(ea) if (ea := data.get("ends_at")) is not None else MISSING
+        self.ends_at: datetime | MISSING | None = (
+            parse_time(ea) if (ea := data.get("ends_at")) is not None else MISSING
+        )
         self.guild_id: int | MISSING = _get_as_snowflake(data, "guild_id") or MISSING
         self.consumed: bool = data.get("consumed", False)
 
@@ -269,6 +284,7 @@ class Subscription(Hashable):
     canceled_at: :class:`datetime.datetime` | ``None``
         When the subscription was canceled.
     """
+
     __slots__ = (
         "_state",
         "id",
@@ -292,7 +308,9 @@ def __init__(self, *, state: ConnectionState, data: SubscriptionPayload) -> None
         self.current_period_end: datetime = parse_time(data["current_period_end"])
         self.status: SubscriptionStatus = try_enum(SubscriptionStatus, data["status"])
         self.canceled_at: datetime | None = parse_time(data.get("canceled_at"))
-        self.country: str | None = data.get("country")  # Not documented, it is only available with oauth2, not bots
+        self.country: str | None = data.get(
+            "country"
+        )  # Not documented, it is only available with oauth2, not bots
 
     def __repr__(self) -> str:
         return (
@@ -306,4 +324,3 @@ def __eq__(self, other: object) -> bool:
     def user(self):
         """Optional[:class:`User`]: The user that owns this subscription."""
         return self._state.get_user(self.user_id)
-

discord/types/monetization.py

@@ -67,8 +67,8 @@ class CreateTestEntitlementPayload(TypedDict):
 class Subscription(TypedDict):
     id: Snowflake
     user_id: Snowflake
-    sku_ids: List[Snowflake]
-    entitlement_ids: List[Snowflake]
+    sku_ids: list[Snowflake]
+    entitlement_ids: list[Snowflake]
     current_period_start: str
     current_period_end: str
     status: SubscriptionStatus