Merge branch 'master' of https://github.com/TwitchIO/TwitchIO

Author: IAmTomahawkx

docs/changelog.rst

@@ -35,6 +35,7 @@ Master
             - :func:`~twitchio.ext.eventsub.EventSubClient.subscribe_channel_shoutout_create`
             - :func:`~twitchio.ext.eventsub.EventSubClient.subscribe_channel_shoutout_receive`
         - Added :func:`~twitchio.ext.eventsub.EventSubClient.subscribe_channel_follows_v2`
+        - Added support for ``type`` and ``user_id`` queries on :func:`~twitchio.ext.eventsub.EventSubClient.get_subscriptions`
 
     - Deprecations
         - :func:`~twitchio.ext.eventsub.EventSubClient.subscribe_channel_follows`, use :func:`~twitchio.ext.eventsub.EventSubClient.subscribe_channel_follows_v2`

twitchio/ext/eventsub/http.py

@@ -36,10 +36,18 @@ async def delete_subscription(self, subscription: Union[str, Subscription]):
             Route("DELETE", "eventsub/subscriptions", query=[("id", subscription)]), paginate=False
         )
 
-    async def get_subscriptions(self, status: str = None):
+    async def get_subscriptions(
+        self, status: Optional[str] = None, sub_type: Optional[str] = None, user_id: Optional[int] = None
+    ):
         qs = []
         if status:
             qs.append(("status", status))
+        if sub_type:
+            qs.append(("type", sub_type))
+        if user_id:
+            qs.append(("user_id", str(user_id)))
+        if len(qs) > 1:
+            raise ValueError("You cannot specify more than one filter.")
 
         return [
             models.Subscription(d)

twitchio/ext/eventsub/server.py

@@ -53,7 +53,9 @@ async def delete_all_active_subscriptions(self):
         for subscription_id in active_subscriptions:
             await self.delete_subscription(subscription_id)
 
-    async def get_subscriptions(self, status: str = None):
+    async def get_subscriptions(
+        self, status: Optional[str] = None, sub_type: Optional[str] = None, user_id: Optional[int] = None
+    ):
         # All possible statuses are:
         #
         #     enabled: designates that the subscription is in an operable state and is valid.
@@ -62,7 +64,7 @@ async def get_subscriptions(self, status: str = None):
         #     notification_failures_exceeded: notification delivery failure rate was too high.
         #     authorization_revoked: authorization for user(s) in the condition was revoked.
         #     user_removed: a user in the condition of the subscription was removed.
-        return await self._http.get_subscriptions(status)
+        return await self._http.get_subscriptions(status, sub_type, user_id)
 
     async def subscribe_user_updated(self, user: Union[PartialUser, str, int]):
         if isinstance(user, PartialUser):