Remove empty response method from client

src/Commands/Command.php

@@ -17,6 +17,7 @@ use Longman\TelegramBot\Entities\InlineQuery;
 use Longman\TelegramBot\Entities\Message;
 use Longman\TelegramBot\Entities\Update;
 use Longman\TelegramBot\Http\Client;
+use Longman\TelegramBot\Http\Response;
 use Longman\TelegramBot\Telegram;
 
 /**
@@ -167,7 +168,7 @@ abstract class Command
                 ]);
             }
 
-            return Client::emptyResponse();
+            return new Response(['ok' => true, 'result' => true]);
         }
 
         return $this->execute();
@@ -404,7 +405,7 @@ abstract class Command
             ], $data));
         }
 
-        return Client::emptyResponse();
+        return new Response(['ok' => true, 'result' => true]);
     }
 
     /**
@@ -424,6 +425,6 @@ abstract class Command
             ], $data));
         }
 
-        return Client::emptyResponse();
+        return new Response(['ok' => true, 'result' => true]);
     }
 }

src/Commands/SystemCommand.php

@@ -11,6 +11,7 @@
 namespace Longman\TelegramBot\Commands;
 
 use Longman\TelegramBot\Http\Client;
+use Longman\TelegramBot\Http\Response;
 
 abstract class SystemCommand extends Command
 {
@@ -25,6 +26,6 @@ abstract class SystemCommand extends Command
     public function execute()
     {
         //System command, return empty ServerResponse by default
-        return Client::emptyResponse();
+        return new Response(['ok' => true, 'result' => true]);
     }
 }

src/Commands/SystemCommands/GenericmessageCommand.php

@@ -13,6 +13,7 @@ namespace Longman\TelegramBot\Commands\SystemCommands;
 use Longman\TelegramBot\Commands\SystemCommand;
 use Longman\TelegramBot\Conversation;
 use Longman\TelegramBot\Http\Client;
+use Longman\TelegramBot\Http\Response;
 
 /**
  * Generic message command
@@ -47,7 +48,7 @@ class GenericmessageCommand extends SystemCommand
     public function executeNoDb()
     {
         //Do nothing
-        return Client::emptyResponse();
+        return new Response(['ok' => true, 'result' => true]);
     }
 
     /**
@@ -69,6 +70,6 @@ class GenericmessageCommand extends SystemCommand
             return $this->telegram->executeCommand($command);
         }
 
-        return Client::emptyResponse();
+        return new Response(['ok' => true, 'result' => true]);
     }
 }

src/Console/Kernel.php

@@ -11,7 +11,6 @@
 namespace Longman\TelegramBot\Console;
 
 use Longman\TelegramBot\DB;
-use Longman\TelegramBot\Entities\Update;
 use Longman\TelegramBot\Http\Client;
 use Longman\TelegramBot\Http\Request;
 use Longman\TelegramBot\Http\Response;
@@ -57,18 +56,18 @@ class Kernel
                     'ok'          => false,
                     'description' => 'getUpdates needs MySQL connection! (This can be overridden - see documentation)',
                 ],
-                $this->bot_username
+                $this->app->getBotUsername()
             );
         }
 
         $offset = 0;
 
-        //Take custom input into account.
+        // Take custom input into account.
         if ($custom_input = $this->app->getCustomInput()) {
             $response = new Response(json_decode($custom_input, true), $this->app->getBotUsername());
         } else {
             if (DB::isDbConnected()) {
-                //Get last update id from the database
+                // Get last update id from the database
                 $last_update = DB::selectTelegramUpdate(1);
                 $last_update = reset($last_update);
 
@@ -91,14 +90,14 @@ class Kernel
         if ($response->isOk()) {
             $results = $response->getResult();
 
-            //Process all updates
-            /** @var Update $result */
+            // Process all updates
+            /** @var \Longman\TelegramBot\Entities\Update $result */
             foreach ($results as $result) {
                 $this->app->processUpdate($result);
             }
 
             if (! DB::isDbConnected() && ! $custom_input && $this->app->last_update_id !== null && $offset === 0) {
-                //Mark update(s) as read after handling
+                // Mark update(s) as read after handling
                 Client::getUpdates(
                     [
                         'offset'  => $this->app->last_update_id + 1,

src/Http/Client.php

@@ -625,20 +625,6 @@ class Client
         return call_user_func_array('static::send', $data);
     }
 
-    /**
-     * Return an empty Server Response
-     *
-     * No request to telegram are sent, this function is used in commands that
-     * don't need to fire a message after execution
-     *
-     * @return \Longman\TelegramBot\Http\Response
-     * @throws \Longman\TelegramBot\Exception\TelegramException
-     */
-    public static function emptyResponse()
-    {
-        return new Response(['ok' => true, 'result' => true], null);
-    }
-
     /**
      * Send message to all active chats
      *

src/Http/Response.php

@@ -34,7 +34,7 @@ class Response
      *
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
-    public function __construct(array $data, $bot_username)
+    public function __construct(array $data, $bot_username = '')
     {
         // Make sure we don't double-save the raw_data
         unset($data['raw_data']);
@@ -227,4 +227,18 @@ class Response
 
         return $results;
     }
+
+    /**
+     * Return an empty Server Response
+     *
+     * No request to telegram are sent, this function is used in commands that
+     * don't need to fire a message after execution
+     *
+     * @return \Longman\TelegramBot\Http\Response
+     * @throws \Longman\TelegramBot\Exception\TelegramException
+     */
+    public static function createEmpty()
+    {
+        return new static(['ok' => true, 'result' => true]);
+    }
 }

src/Telegram.php

@@ -22,6 +22,7 @@ use Longman\TelegramBot\Exception\TelegramException;
 use Longman\TelegramBot\Http\Client;
 use Longman\TelegramBot\Http\Kernel;
 use Longman\TelegramBot\Http\Request;
+use Longman\TelegramBot\Http\Response;
 use PDO;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@@ -462,7 +463,7 @@ class Telegram extends Container
         if ($last_id && count($last_id) === 1) {
             TelegramLog::debug('Duplicate update received, processing aborted!');
 
-            return Client::emptyResponse();
+            return new Response(['ok' => true, 'result' => true]);
         }
 
         DB::insertRequest($this->update);

tests/unit/Commands/CustomTestCommands/HiddenCommand.php

@@ -12,6 +12,7 @@ namespace Longman\TelegramBot\Commands\UserCommands;
 
 use Longman\TelegramBot\Commands\UserCommand;
 use Longman\TelegramBot\Http\Client;
+use Longman\TelegramBot\Http\Response;
 
 /**
  * Test "/hidden" command to test $show_in_help
@@ -51,6 +52,6 @@ class HiddenCommand extends UserCommand
      */
     public function execute()
     {
-        return Client::emptyResponse();
+        return new Response(['ok' => true, 'result' => true]);
     }
 }

tests/unit/Commands/CustomTestCommands/VisibleCommand.php

@@ -12,6 +12,7 @@ namespace Longman\TelegramBot\Commands\UserCommands;
 
 use Longman\TelegramBot\Commands\UserCommand;
 use Longman\TelegramBot\Http\Client;
+use Longman\TelegramBot\Http\Response;
 
 /**
  * Test "/visible" command to test $show_in_help
@@ -51,6 +52,6 @@ class VisibleCommand extends UserCommand
      */
     public function execute()
     {
-        return Client::emptyResponse();
+        return new Response(['ok' => true, 'result' => true]);
     }
 }