Add custom exceptions for Telegram errors

Author: MBoretto

src/DB.php

@@ -837,7 +837,7 @@ public static function insertEditedMessageRequest(Message &$edited_message)
         $from_id = $from->getId();
 
         // Don't save the messages edited by myself
-        if ($from_id == self::telegram->getBotUserId()) {
+        if ($from_id == self::$telegram->getBotUserId()) {
             return;
         }
 

src/Entities/Chat.php

@@ -20,6 +20,7 @@ class Chat extends Entity
     protected $username;
     protected $first_name;
     protected $last_name;
+    protected $slow_mode_delay;
 
     /**
      * Chat constructor.
@@ -49,6 +50,7 @@ public function __construct(array $data)
         $this->first_name = isset($data['first_name']) ? $data['first_name'] : null;
         $this->last_name = isset($data['last_name']) ? $data['last_name'] : null;
         $this->username = isset($data['username']) ? $data['username'] : null;
+        $this->slow_mode_delay = isset($data['slow_mode_delay']) ? $data['slow_mode_delay'] : null;
     }
 
     public function isGroupChat()
@@ -113,6 +115,11 @@ public function getUsername()
         return $this->username;
     }
 
+    public function getSlowModeDelay()
+    {
+        return $this->slow_mode_delay;
+    }
+
     public function tryMention()
     {
         if ($this->isPrivateChat()) {

src/Exception/Request/RequestException.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Longman\TelegramBot\Exception\Request;
+
+/**
+ * Main exception class used for request exception handling
+ */
+class RequestException extends \Exception
+{
+    /**
+     * parameters
+     *
+     * @var array
+     */
+    protected $parameters = [];
+
+    // Redefine the exception so message isn't optional
+    public function __construct($message, $code = 0, Exception $previous = null)
+    {
+        $data = json_decode($message, true);
+        $this->parameters = $data['parameters'];
+        //$data['description']
+        // make sure everything is assigned properly
+        parent::__construct($data['description'], $code, $previous);
+    }
+
+    /**
+     * Get the parameters
+     *
+     * @param string $key
+     *
+     * @return mixed
+     */
+    public function getParameters($key)
+    {
+        return $this->parameters[$key];
+    }
+}

src/Exception/Request/TooManyRequests.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Longman\TelegramBot\Exception\Request;
+
+/**
+ * Main exception class used for request exception handling
+ */
+class TooManyRequests extends RequestException
+{
+}

src/Exception/TelegramSlowModeException.php

@@ -11,11 +11,11 @@
 namespace Longman\TelegramBot;
 
 use GuzzleHttp\Client;
-use GuzzleHttp\Exception\RequestException;
 use Longman\TelegramBot\Entities\File;
 use Longman\TelegramBot\Entities\ServerResponse;
 use Longman\TelegramBot\Exception\TelegramException;
-use Longman\TelegramBot\Exception\TelegramSlowModeException;
+use Longman\TelegramBot\Exception\Request\RequestException;
+use Longman\TelegramBot\Exception\Request\TooManyRequests;
 
 class Request
 {
@@ -208,16 +208,15 @@ public static function execute($action, array $data = null)
                 '/bot' . self::$telegram->getApiKey() . '/' . $action,
                 $request_params
             );
-        } catch (RequestException $e) {
-            //throw new TelegramException($e->getMessage());
+        } catch (\GuzzleHttp\Exception\RequestException $e) {
             $error_code = $e->getResponse()->getStatusCode();
             if ($error_code == 429) {
                 //echo Psr7\Message::toString($e->getRequest());
                 //echo Psr7\Message::toString($e->getResponse());
                 //print($e);
-                throw new TelegramSlowModeException($e->getResponse()->getBody()->getContents(), $error_code);
+                throw new TooManyRequests($e->getResponse()->getBody()->getContents(), $error_code);
             }
-            throw new TelegramException($e->getResponse()->getBody()->getContents(), $error_code);
+            throw new RequestException($e->getResponse()->getBody()->getContents(), $error_code);
         } finally {
             //Logging verbose debug output
             TelegramLog::endDebugLogTempStream("Verbose HTTP Request output:\n%s\n");
@@ -259,14 +258,13 @@ public static function downloadFile(File $file)
                 '/file/bot' . self::$telegram->getApiKey() . '/' . $path,
                 ['debug' => $debug_handle, 'sink' => $loc_path]
             );
-        } catch (RequestException $e) {
-            //throw new TelegramException($e->getMessage());
-            throw new TelegramException($e->getResponse()->getBody()->getContents());
+        } catch (\GuzzleHttp\Exception\RequestException $e) {
+            $error_code = $e->getResponse()->getStatusCode();
+            throw new RequestException($e->getResponse()->getBody()->getContents(), $error_code);
         } finally {
             //Logging verbose debug output
             TelegramLog::endDebugLogTempStream("Verbose HTTP File Download Request output:\n%s\n");
         }
-
         return (filesize($loc_path) > 0);
     }