Merge pull request #8 from hootener/v5-updates

Error Handling and v5 Updates
PetterKraabol · Jun 29, 2017 · 530f937 · 530f937
2 parents d8b7b24 + f159f61
commit 530f937
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 19 deletions.
diff --git a/config/twitch-api.php b/config/twitch-api.php
@@ -5,17 +5,24 @@
     'client_secret' => env('TWITCH_SECRET', ''),
     'redirect_url' => env('TWITCH_REDIRECT_URI', ''),
     'scopes' => [
-        'user_read',
-        'user_blocks_edit',
-        'user_blocks_read',
-        'user_follows_edit',
-        'channel_read',
-        'channel_editor',
+        'channel_check_subscription',
         'channel_commercial',
+        'channel_editor',
+        'channel_feed_edit',
+        'channel_feed_read',
+        'channel_read',
         'channel_stream',
         'channel_subscriptions',
-        'user_subscriptions',
-        'channel_check_subscription',
         'chat_login',
+        'collections_edit',
+        'communities_edit',
+        'communities_moderate',
+        'openid',
+        'user_blocks_edit',
+        'user_blocks_read',
+        'user_follows_edit',
+        'user_read',
+        'user_subscriptions',
+        'viewing_activity_read'
     ],
-];
+];
diff --git a/src/API/Api.php b/src/API/Api.php
@@ -4,6 +4,8 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Exception\RequestException;
+
 use Zarlach\TwitchApi\Exceptions\RequestRequiresAuthenticationException;
 use Zarlach\TwitchApi\Exceptions\RequestRequiresClientIdException;
 
@@ -21,6 +23,7 @@ class Api
      *
      * @var clientId
      */
+
     protected $clientId;
 
     /**
@@ -49,7 +52,7 @@ public function __construct($token = null, $clientId = null)
             $this->setClientId($clientId);
         } elseif (config('twitch-api.client_id')) {
             $this->setClientId(config('twitch-api.client_id'));
-        }
+        } 
 
         // GuzzleHttp Client with default parameters.
         $this->client = new Client([
@@ -146,15 +149,15 @@ public function sendRequest($type = 'GET', $path = '', $token = false, $options
  * This variable can either be removed completed or used for something
  * more useful, like telling developers what options they have.
  */
-
         // URL parameters
+        //$path = $this->generateUrl($path, $token, $options, $availableOptions);
         $path = $this->generateUrl($path, $token, $options, $availableOptions);
 
         // Headers
         $data = [
           'headers' => [
             'Client-ID' => $this->getClientId(),
-            'Accept' => 'application/vnd.twitchtv.v3+json',
+            'Accept' => 'application/vnd.twitchtv.v5+json',
           ],
         ];
 
@@ -163,14 +166,30 @@ public function sendRequest($type = 'GET', $path = '', $token = false, $options
             $data['headers']['Authorization'] = 'OAuth '.$this->getToken($token);
         }
 
-        // Request object
-        $request = new Request($type, $path, $data);
+        try{
+            // Request object
+            $request = new Request($type, $path, $data);
+            // Send request
+            $response = $this->client->send($request);
 
-        // Send request
-        $response = $this->client->send($request);
-
-        // Return body in JSON data
-        return json_decode($response->getBody(), true);
+            // Return body in JSON data
+            return json_decode($response->getBody(), true);
+        }
+        catch(RequestException $e){
+            if ($e->hasResponse()) {
+                $exception = (string) $e->getResponse()->getBody();
+                $exception = json_decode($exception);
+                return $exception;
+            } else {
+                //503
+                return array(
+                    'error' => 'Service Unavailable',
+                    'status' => 503,
+                    'message' => $e->getMessage()
+                );
+            }
+        }
+
     }
 
     /**