Add newer subscriptions to websocket client for release

Author: IAmTomahawkx

docs/changelog.rst

@@ -24,6 +24,9 @@ Master
         - Fix reconnect loop when Twitch sends a RECONNECT via IRC websocket
         - Fix :func:`~twitchio.CustomReward.edit` so it now can enable the reward
 
+- ext.eventsub
+    - Added websocket support via eventsub.EventSubWSClient
+
 - Other
     - [speed] extra
         - Added wheels on external pypi index for cchardet and ciso8601

docs/exts/eventsub.rst

@@ -217,6 +217,12 @@ API Reference
     :members:
     :undoc-members:
 
+.. attributetable:: EventSubWSClient
+
+.. autoclass:: EventSubWSClient
+    :members:
+    :undoc-members:
+
 .. attributetable:: Subscription
 
 .. autoclass:: Subscription

twitchio/ext/eventsub/server.py

@@ -51,7 +51,7 @@ async def delete_all_active_subscriptions(self):
         # A convenience method
         active_subscriptions = await self.get_subscriptions("enabled")
         for subscription_id in active_subscriptions:
-            await self.delete_subscription(subscription_id)
+            await self.delete_subscription(subscription_id.id)
 
     async def get_subscriptions(
         self, status: Optional[str] = None, sub_type: Optional[str] = None, user_id: Optional[int] = None
@@ -127,7 +127,7 @@ async def _subscribe_with_broadcaster_moderator(
 
         broadcaster = str(broadcaster)
         moderator = str(moderator)
-        return await self._http.create_subscription(
+        return await self._http.create_webhook_subscription(
             event, {"broadcaster_user_id": broadcaster, "moderator_user_id": moderator}
         )
 

twitchio/ext/eventsub/websocket.py

@@ -261,6 +261,24 @@ def _subscribe_with_broadcaster(
         broadcaster = str(broadcaster)
         sub = _Subscription(event, {"broadcaster_user_id": broadcaster}, token)
         self._assign_subscription(sub)
+    
+    def _subscribe_with_broadcaster_moderator(
+        self,
+        event: Tuple[str, int, Type[models._DataType]],
+        broadcaster: Union[PartialUser, str, int],
+        moderator: Union[PartialUser, str, int],
+        token: str
+    ):
+        if isinstance(broadcaster, PartialUser):
+            broadcaster = broadcaster.id
+        if isinstance(moderator, PartialUser):
+            moderator = moderator.id
+
+        broadcaster = str(broadcaster)
+        moderator = str(moderator)
+        sub = _Subscription(event, {"broadcaster_user_id": broadcaster, "moderator_user_id": moderator}, token)
+        self._assign_subscription(sub)
+
 
     def subscribe_channel_bans(self, broadcaster: Union[PartialUser, str, int], token: str):
         return self._subscribe_with_broadcaster(models.SubscriptionTypes.ban, broadcaster, token)
@@ -287,7 +305,12 @@ def subscribe_channel_update(self, broadcaster: Union[PartialUser, str, int], to
         return self._subscribe_with_broadcaster(models.SubscriptionTypes.channel_update, broadcaster, token)
 
     def subscribe_channel_follows(self, broadcaster: Union[PartialUser, str, int], token: str):
-        return self._subscribe_with_broadcaster(models.SubscriptionTypes.follow, broadcaster, token)
+        raise RuntimeError("This subscription has been removed by twitch, please use subscribe_channel_follows_v2")
+
+    def subscribe_channel_follows_v2(
+        self, broadcaster: Union[PartialUser, str, int], moderator: Union[PartialUser, str, int], token: str
+    ):
+        return self._subscribe_with_broadcaster_moderator(models.SubscriptionTypes.followV2, broadcaster, moderator, token)
 
     def subscribe_channel_moderators_add(self, broadcaster: Union[PartialUser, str, int], token: str):
         return self._subscribe_with_broadcaster(models.SubscriptionTypes.channel_moderator_add, broadcaster, token)
@@ -365,10 +388,31 @@ def subscribe_channel_prediction_lock(self, broadcaster: Union[PartialUser, str,
     def subscribe_channel_prediction_end(self, broadcaster: Union[PartialUser, str, int], token: str):
         return self._subscribe_with_broadcaster(models.SubscriptionTypes.prediction_end, broadcaster, token)
 
-    def subscribe_user_authorization_granted(self, token: str):
-        sub = _Subscription(models.SubscriptionTypes.user_authorization_grant, {"client_id": self.client._http.client_id}, token)
-        self._assign_subscription(sub)
+    
+    def subscribe_channel_shield_mode_begin(
+        self, broadcaster: Union[PartialUser, str, int], moderator: Union[PartialUser, str, int], token: str
+    ):
+        return self._subscribe_with_broadcaster_moderator(
+            models.SubscriptionTypes.channel_shield_mode_begin, broadcaster, moderator, token
+        )
 
-    async def subscribe_user_authorization_revoked(self, token: str):
-        sub = _Subscription(models.SubscriptionTypes.user_authorization_revoke, {"client_id": self.client._http.client_id}, token)
-        self._assign_subscription(sub)
+    def subscribe_channel_shield_mode_end(
+        self, broadcaster: Union[PartialUser, str, int], moderator: Union[PartialUser, str, int], token: str
+    ):
+        return self._subscribe_with_broadcaster_moderator(
+            models.SubscriptionTypes.channel_shield_mode_end, broadcaster, moderator, token
+        )
+
+    def subscribe_channel_shoutout_create(
+        self, broadcaster: Union[PartialUser, str, int], moderator: Union[PartialUser, str, int], token: str
+    ):
+        return self._subscribe_with_broadcaster_moderator(
+            models.SubscriptionTypes.channel_shoutout_create, broadcaster, moderator, token
+        )
+
+    def subscribe_channel_shoutout_receive(
+        self, broadcaster: Union[PartialUser, str, int], moderator: Union[PartialUser, str, int], token: str
+    ):
+        return self._subscribe_with_broadcaster_moderator(
+            models.SubscriptionTypes.channel_shoutout_receive, broadcaster, moderator, token
+        )