fix incompatibility with setWebHook and ServerResponse

Author: MBoretto

src/Entities/ServerResponse.php

@@ -7,6 +7,8 @@
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
+ * ServerResponse.php
 */
 namespace Longman\TelegramBot\Entities;
 
@@ -23,20 +25,49 @@ class ServerResponse extends Entity
     public function __construct(array $data, $bot_name)
     {
 
-        if (isset($data['ok'])) {
-            if ($data['ok']) {
+        if (isset($data['ok']) & isset($data['result'])) {
+            if ($data['ok'] & $data['result'] != 1) {
+                //Response from sendMessage set
                 $this->ok = $data['ok'];
                 $this->result = new Message($data['result'], $bot_name);
                 $this->error_code = null;
                 $this->description = null;
+            } elseif($data['ok'] & $data['result'] == 1) {
+                //Response from setWebhook set
+                $this->ok = $data['ok'];
+                $this->result = $data['result'];
+                $this->error_code = null;
+                $this->description = $data['description'];
+
             } else {
                 $this->ok = false;
                 $this->result = null;
                 $this->error_code = $data['error_code'];
                 $this->description = $data['description'];
             }
         } else {
-            throw new TelegramException('ok is not set!');
+            //webHook not set
+            $this->ok = false;
+
+            if (isset($data['result'])) {
+                $this->result = $data['result'];
+            } else {
+                $this->result = null;
+            }
+
+            if (isset($data['error_code'])) {
+                $this->error_code = $data['error_code'];
+            } else {
+                $this->error_code = null;
+            }
+
+            if (isset($data['description'])) {
+                $this->description = $data['description'];
+            } else {
+                $this->description = null;
+            }
+
+    //throw new TelegramException('ok(variable) is not set!');
         }
     }
 

src/Request.php

@@ -12,7 +12,6 @@
 
 use Longman\TelegramBot\Exception\TelegramException;
 use Longman\TelegramBot\Entities\ServerResponse;
-use Longman\TelegramBot\Entities\User;
 
 class Request
 {
@@ -74,16 +73,16 @@ public static function send($action, array $data = null)
         }
 
         if (defined('PHPUNIT_TESTSUITE')) {
-            $fake_response['ok'] = 1;
-
-            //some fake data just to let iniatilize the class
-            $data['message_id'] = '123';
-            $data['date'] = '123';
-
-            $data['from'] = array( 'id' => 123,'first_name' => 'botname', 'username'=> 'namebot');
-
-            $data['chat'] = array('id'=> $data['chat_id'] );
-            $fake_response['result'] = $data;
+            $fake_response['ok'] = 1; // :)
+
+            //some fake data just to let iniatilize the class method SendMessage
+            if (isset( $data['chat_id'])) {
+                $data['message_id'] = '123';
+                $data['date'] = '123';
+                $data['chat'] = array('id'=> $data['chat_id'] );
+                $data['from'] = array( 'id' => 123,'first_name' => 'botname', 'username'=> 'namebot');
+                $fake_response['result'] = $data;
+            }
 
             return new ServerResponse($fake_response, self::$telegram->getBotName());
         }
@@ -112,6 +111,7 @@ public static function send($action, array $data = null)
             $response['description'] = 'Empty server response';
         }
 
+        //return json_decode($result, true);
         return new ServerResponse(json_decode($result, true), self::$telegram->getBotName());
     }
 
@@ -135,6 +135,7 @@ public static function getMe()
 
     public static function setWebhook($url)
     {
+
         $result = self::send('setWebhook', array('url' => $url));
         return $result;
     }

src/Telegram.php

@@ -299,12 +299,12 @@ public function handle()
         if ($this->admin_enabled) {
             $message = $update->getMessage();
 
-            $from = $message->getFrom();
-            $user_id = $from->getId();
+            //$from = $message->getFrom();
+            //$user_id = $from->getId();
 
             //Admin command avaiable only in single chat with the bot
-            //$chat = $message->getChat();
-            //$user_id = $chat->getId();
+            $chat = $message->getChat();
+            $user_id = $chat->getId();
 
             if (in_array($user_id, $this->admins_list)) {
                 $this->addCommandsPath(BASE_PATH.'/Admin');
@@ -791,11 +791,11 @@ public function setWebHook($url)
         }
         $result = Request::setWebhook($url);
 
-        if (!$result['ok']) {
-            throw new TelegramException('Webhook was not set! Error: '.$result[error_code].' '. $result['description']);
+        if (!$result->isOk()) {
+            throw new TelegramException('Webhook was not set! Error: '.$result->getErrorCode().' '. $result->getDescription());
         }
 
-        return $result['description'];
+        return $result;
     }
 
     /**