Merge pull request #810 from noplanman/improve_admin_send_commands

Improve admin send commands

CHANGELOG.md

@@ -13,6 +13,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 - Updated Travis to use Trusty containers (for HHVM) and add PHP 7.2 to the tests.
 - Add debug log entry instead of throwing an exception for duplicate updates.
 - `Telegram::handleGetUpdates()` can now work without a database connection (not enabled by default).
+- Improved `/sendtochannel` and `/sendtoall` commands, using new message helpers.
 ### Deprecated
 ### Removed
 ### Fixed

src/Commands/AdminCommands/SendtoallCommand.php

@@ -38,7 +38,7 @@ class SendtoallCommand extends AdminCommand
     /**
      * @var string
      */
-    protected $version = '1.4.0';
+    protected $version = '1.5.0';
 
     /**
      * @var bool
@@ -53,14 +53,13 @@ class SendtoallCommand extends AdminCommand
      */
     public function execute()
     {
-        $message = $this->getMessage();
-
-        $chat_id = $message->getChat()->getId();
-        $text    = $message->getText(true);
+        $text = $this->getMessage()->getText(true);
 
         if ($text === '') {
-            $text = 'Write the message to send: /sendtoall <message>';
-        } else {
+            return $this->replyToChat('Usage: ' . $this->getUsage());
+        }
+
+        /** @var ServerResponse[] $results */
         $results = Request::sendToActiveChats(
             'sendMessage',     //callback function to execute (see Request.php methods)
             ['text' => $text], //Param to evaluate the request
@@ -72,12 +71,15 @@ class SendtoallCommand extends AdminCommand
             ]
         );
 
+        if (empty($results)) {
+            return $this->replyToChat('No users or chats found.');
+        }
+
         $total  = 0;
         $failed = 0;
 
         $text = 'Message sent to:' . PHP_EOL;
 
-            /** @var ServerResponse $result */
         foreach ($results as $result) {
             $name = '';
             $type = '';
@@ -104,16 +106,6 @@ class SendtoallCommand extends AdminCommand
         }
         $text .= 'Delivered: ' . ($total - $failed) . '/' . $total . PHP_EOL;
 
-            if ($total === 0) {
-                $text = 'No users or chats found..';
-            }
-        }
-
-        $data = [
-            'chat_id' => $chat_id,
-            'text'    => $text,
-        ];
-
-        return Request::sendMessage($data);
+        return $this->replyToChat($text);
     }
 }