Merge pull request #124 from nicklaw5/v5-0-1

Author: Brandin

spec/NewTwitchApi/Resources/ChatApiSpec.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace spec\NewTwitchApi\Resources;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
+use NewTwitchApi\RequestGenerator;
+use PhpSpec\ObjectBehavior;
+
+class ChatApiSpec extends ObjectBehavior
+{
+    function let(Client $guzzleClient, RequestGenerator $requestGenerator, Request $request, Response $response)
+    {
+        $this->beConstructedWith($guzzleClient, $requestGenerator);
+        $guzzleClient->send($request)->willReturn($response);
+    }
+
+    function it_should_get_channel_chat_badges(RequestGenerator $requestGenerator, Request $request, Response $response)
+    {
+        $requestGenerator->generate('GET', 'chat/badges', 'TEST_TOKEN', [['key' => 'broadcaster_id', 'value' => '123']], [])->willReturn($request);
+        $this->getChannelChatBadges('TEST_TOKEN', '123')->shouldBe($response);
+    }
+
+    function it_should_get_global_chat_badges(RequestGenerator $requestGenerator, Request $request, Response $response)
+    {
+        $requestGenerator->generate('GET', 'chat/badges/global', 'TEST_TOKEN', [], [])->willReturn($request);
+        $this->getGlobalChatBadges('TEST_TOKEN')->shouldBe($response);
+    }
+}

spec/NewTwitchApi/Resources/EventSubApiSpec.php

@@ -79,10 +79,16 @@ function it_should_subscribe_to_channel_subscribe(RequestGenerator $requestGener
         $this->subscribeToChannelSubscribe($this->bearer, $this->secret, $this->callback, '12345')->shouldBe($response);
     }
 
-    function it_should_subscribe_to_channel_unsubscribe(RequestGenerator $requestGenerator, Request $request, Response $response)
+    function it_should_subscribe_to_channel_subscription_end(RequestGenerator $requestGenerator, Request $request, Response $response)
     {
-        $this->createEventSubSubscription('channel.unsubscribe', 'beta', ['broadcaster_user_id' => '12345'], $requestGenerator)->willReturn($request);
-        $this->subscribeToChannelUnsubscribe($this->bearer, $this->secret, $this->callback, '12345')->shouldBe($response);
+        $this->createEventSubSubscription('channel.subscription.end', '1', ['broadcaster_user_id' => '12345'], $requestGenerator)->willReturn($request);
+        $this->subscribeToChannelSubscriptionEnd($this->bearer, $this->secret, $this->callback, '12345')->shouldBe($response);
+    }
+
+    function it_should_subscribe_to_channel_subscription_gift(RequestGenerator $requestGenerator, Request $request, Response $response)
+    {
+        $this->createEventSubSubscription('channel.subscription.gift', '1', ['broadcaster_user_id' => '12345'], $requestGenerator)->willReturn($request);
+        $this->subscribeToChannelSubscriptionGift($this->bearer, $this->secret, $this->callback, '12345')->shouldBe($response);
     }
 
     function it_should_subscribe_to_channel_cheer(RequestGenerator $requestGenerator, Request $request, Response $response)

src/NewTwitchApi/NewTwitchApi.php

@@ -11,6 +11,7 @@
 use NewTwitchApi\Resources\BitsApi;
 use NewTwitchApi\Resources\ChannelPointsApi;
 use NewTwitchApi\Resources\ChannelsApi;
+use NewTwitchApi\Resources\ChatApi;
 use NewTwitchApi\Resources\ClipsApi;
 use NewTwitchApi\Resources\EntitlementsApi;
 use NewTwitchApi\Resources\EventSubApi;
@@ -37,6 +38,7 @@ class NewTwitchApi
     private $bitsApi;
     private $channelPointsApi;
     private $channelsApi;
+    private $chatApi;
     private $clipsApi;
     private $entitlementsApi;
     private $eventSubApi;
@@ -64,6 +66,7 @@ public function __construct(Client $helixGuzzleClient, string $clientId, string
         $this->bitsApi = new BitsApi($helixGuzzleClient, $requestGenerator);
         $this->channelPointsApi = new ChannelPointsApi($helixGuzzleClient, $requestGenerator);
         $this->channelsApi = new ChannelsApi($helixGuzzleClient, $requestGenerator);
+        $this->chatApi = new ChatApi($helixGuzzleClient, $requestGenerator);
         $this->clipsApi = new ClipsApi($helixGuzzleClient, $requestGenerator);
         $this->entitlementsApi = new EntitlementsApi($helixGuzzleClient, $requestGenerator);
         $this->eventSubApi = new EventSubApi($helixGuzzleClient, $requestGenerator);
@@ -113,6 +116,11 @@ public function getChannelsApi(): ChannelsApi
         return $this->channelsApi;
     }
 
+    public function getChatApi(): ChatApi
+    {
+        return $this->chatApi;
+    }
+
     public function getClipsApi(): ClipsApi
     {
         return $this->clipsApi;

src/NewTwitchApi/Resources/ChatApi.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace NewTwitchApi\Resources;
+
+use GuzzleHttp\Exception\GuzzleException;
+use Psr\Http\Message\ResponseInterface;
+
+class ChatApi extends AbstractResource
+{
+    /**
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#get-channel-chat-badges
+     */
+    public function getChannelChatBadges(string $bearer, string $broadcasterId): ResponseInterface
+    {
+        $queryParamsMap = [];
+        $queryParamsMap[] = ['key' => 'broadcaster_id', 'value' => $broadcasterId];
+
+        return $this->getApi('chat/badges', $bearer, $queryParamsMap);
+    }
+
+    /**
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#get-global-chat-badges
+     */
+    public function getGlobalChatBadges(string $bearer): ResponseInterface
+    {
+        return $this->getApi('chat/badges/global', $bearer);
+    }
+}

src/NewTwitchApi/Resources/EventSubApi.php

@@ -109,16 +109,31 @@ public function subscribeToChannelSubscribe(string $bearer, string $secret, stri
     }
 
     /**
-     * @link https://dev.twitch.tv/docs/eventsub/eventsub-subscription-types#channelunsubscribe-beta
+     * @link https://dev.twitch.tv/docs/eventsub/eventsub-subscription-types/#channelsubscriptionend
      */
-    public function subscribeToChannelUnsubscribe(string $bearer, string $secret, string $callback, string $twitchId): ResponseInterface
+    public function subscribeToChannelSubscriptionEnd(string $bearer, string $secret, string $callback, string $twitchId): ResponseInterface
     {
         return $this->createEventSubSubscription(
             $bearer,
             $secret,
             $callback,
-            'channel.unsubscribe',
-            'beta',
+            'channel.subscription.end',
+            '1',
+            ['broadcaster_user_id' => $twitchId],
+        );
+    }
+
+    /**
+     * @link https://dev.twitch.tv/docs/eventsub/eventsub-subscription-types/#channelsubscriptiongift-beta
+     */
+    public function subscribeToChannelSubscriptionGift(string $bearer, string $secret, string $callback, string $twitchId): ResponseInterface
+    {
+        return $this->createEventSubSubscription(
+            $bearer,
+            $secret,
+            $callback,
+            'channel.subscription.gift',
+            '1',
             ['broadcaster_user_id' => $twitchId],
         );
     }