new log system

Author: MBoretto

src/Command.php

@@ -11,6 +11,7 @@
 namespace Longman\TelegramBot;
 
 use Longman\TelegramBot\Entities\Update;
+use Longman\TelegramBot\Entities\User;
 
 abstract class Command
 {
@@ -125,10 +126,10 @@ public function isPublic()
 
     public function tryMention(User $user)
     {
-        if (!is_null($participant->getUsername())) {
-            return '@'.$participant->getUsername();
+        if (!is_null($user->getUsername())) {
+            return '@'.$user->getUsername();
         } else {
-            return $participant->getFirstName();
+            return $user->getFirstName();
         }
     }
 }

src/Request.php

@@ -60,12 +60,12 @@ public static function getInput()
         } else {
             self::setInputRaw(file_get_contents('php://input'));
         }
-        self::log();
+        self::log(self::$input);
         return self::$input;
     }
 
 
-    private static function log()
+    private static function log($string)
     {
         if (!self::$telegram->getLogRequests()) {
             return false;
@@ -75,8 +75,8 @@ private static function log()
             return false;
         }
 
-        $status = file_put_contents($path, self::$input . "\n", FILE_APPEND);
-
+        //$status = file_put_contents($path, self::$input . "\n", FILE_APPEND);
+        $status = file_put_contents($path, $string . "\n", FILE_APPEND);
         return $status;
     }
 
@@ -128,13 +128,36 @@ public static function executeCurl($action, array $data)
             $curlConfig[CURLOPT_POSTFIELDS] = $data;
         }
 
+        if ( self::$telegram->getLogVerbosity() >= 3) {
+            $curlConfig[CURLOPT_VERBOSE] = true;
+            $verbose = fopen('php://temp', 'w+');
+            curl_setopt($ch, CURLOPT_STDERR, $verbose);
+            //Not so useful
+            //$info = curl_getinfo($ch);
+            //echo "Info\n";
+            //print_r($info);
+        }
+
         curl_setopt_array($ch, $curlConfig);
         $result = curl_exec($ch);
 
+        //Logging curl requests 
+        if ( self::$telegram->getLogVerbosity() >= 3) {
+            rewind($verbose);
+            $verboseLog = stream_get_contents($verbose);
+            self::log("Verbose curl output:\n". htmlspecialchars($verboseLog). "\n");
+        }
+
+        //Logging getUpdates Updates
+        //Logging curl updates 
+        if ($action == 'getUpdates' & self::$telegram->getLogVerbosity() >= 1 | self::$telegram->getLogVerbosity() >= 3) {
+            self::setInputRaw($result);
+            self::log($result);
+        }        
+
         if ($result === false) {
             throw new TelegramException(curl_error($ch), curl_errno($ch));
         }
-
         if (empty($result)) {
             throw new TelegramException('Empty server response');
         }
@@ -162,7 +185,6 @@ public static function send($action, array $data = null)
 
     public static function getMe()
     {
-
         $result = self::send('getMe');
         return $result;
     }
@@ -197,7 +219,6 @@ public static function sendLocation(array $data)
 
     public static function sendChatAction(array $data)
     {
-
         if (empty($data)) {
             throw new TelegramException('Data is empty!');
         }
@@ -210,21 +231,8 @@ public static function sendChatAction(array $data)
 
     public static function getUpdates($data)
     {
-
-        if ($update = self::$telegram->getCustomUpdate()) {
-            self::setInputRaw($update);
-        } else {
-            $result = self::executeCurl('getUpdates', $data);
-
-            self::setInputRaw($result);
-
-        }
-
-        self::log();
-
-        $bot_name = self::$telegram->getBotName();
-        return new ServerResponse(json_decode($result, true), $bot_name);
-
+        $result = self::send('getUpdates', $data);
+        return $result;
     }
 
     public static function setWebhook($url)

src/Telegram.php

@@ -30,7 +30,7 @@ class Telegram
      *
      * @var string
      */
-    protected $version = '0.18.0';
+    protected $version = '0.18.1';
 
     /**
      * Telegram API key
@@ -81,6 +81,13 @@ class Telegram
      */
     protected $log_path;
 
+    /**
+     * Log verbosity
+     *
+     * @var string
+     */
+    protected $log_verbosity;
+
     /**
      * MySQL Integration
      *
@@ -216,6 +223,8 @@ public function getCommandsList()
     public function setLogRequests($log_requests)
     {
         $this->log_requests = $log_requests;
+        //set default log verbosity
+        $this->log_verbosity = 1;
         return $this;
     }
 
@@ -255,6 +264,33 @@ public function getLogPath()
     }
 
 
+    /**
+     * Set log Verbosity
+     *
+     * @param int $log_verbosity
+     *
+     * 1 only incoming updates from webhook and getUpdates
+     * 3 incoming updates from webhook and getUpdates and curl request info and response
+     *
+     * @return \Longman\TelegramBot\Telegram
+     */
+    public function setLogVerbosity($log_verbosity)
+    {
+        $this->log_verbosity = $log_verbosity;;
+        return $this;
+    }
+
+    /**
+     * Get log verbosity
+     *
+     *
+     * @return int
+     */
+    public function getLogVerbosity()
+    {
+        return $this->log_verbosity;
+    }
+
     /**
      * Set custom update string for debug purposes
      *