Merge pull request #103 from noplanman/new_command_structure_alpha

New command structure alpha

Author: MBoretto

src/Commands/AdminCommand.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * This file is part of the TelegramBot package.
+ *
+ * (c) Avtandil Kikabidze aka LONGMAN <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Longman\TelegramBot\Commands;
+
+/**
+ * Abstract Admin Command Class
+ */
+abstract class AdminCommand extends Command
+{
+
+}

src/Admin/ChatsCommand.php renamed to src/Commands/AdminCommands/ChatsCommand.php

@@ -8,17 +8,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Commands;
+namespace Longman\TelegramBot\Commands\AdminCommands;
 
-use Longman\TelegramBot\Command;
+use Longman\TelegramBot\Commands\AdminCommand;
 use Longman\TelegramBot\DB;
 use Longman\TelegramBot\Entities\Chat;
 use Longman\TelegramBot\Request;
 
 /**
  * Admin "/chats" command
  */
-class ChatsCommand extends Command
+class ChatsCommand extends AdminCommand
 {
     /**#@+
      * {@inheritdoc}
@@ -27,33 +27,11 @@ class ChatsCommand extends Command
     protected $description = 'List all chats stored by the bot';
     protected $usage = '/chats';
     protected $version = '1.0.1';
-    protected $public = true;
     protected $need_mysql = false;
     /**#@-*/
 
     /**
-     * Execution if MySQL is required but not available
-     *
-     * @return boolean
-     */
-    public function executeNoDB()
-    {
-        //Preparing message
-        $message = $this->getMessage();
-        $chat_id = $message->getChat()->getId();
-
-        $data = [
-            'chat_id' => $chat_id,
-            'text'    => 'Sorry no database connection, unable to execute "' . $this->name . '" command.',
-        ];
-
-        return Request::sendMessage($data)->isOk();
-    }
-
-    /**
-     * Execute command
-     *
-     * @return boolean
+     * {@inheritdoc}
      */
     public function execute()
     {
@@ -105,6 +83,6 @@ public function execute()
             'text'    => $text,
         ];
 
-        return Request::sendMessage($data)->isOk();
+        return Request::sendMessage($data);
     }
 }

src/Admin/SendtoallCommand.php renamed to src/Commands/AdminCommands/SendtoallCommand.php

@@ -8,46 +8,26 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Commands;
+namespace Longman\TelegramBot\Commands\AdminCommands;
 
-use Longman\TelegramBot\Command;
+use Longman\TelegramBot\Commands\AdminCommand;
 use Longman\TelegramBot\Request;
 
 /**
  * Admin "/sendtoall" command
  */
-class SendtoallCommand extends Command
+class SendtoallCommand extends AdminCommand
 {
     /**#@+
      * {@inheritdoc}
      */
     protected $name = 'sendtoall';
     protected $description = 'Send the message to all the user\'s bot';
-    protected $usage = '/sendall <message to send>';
+    protected $usage = '/sendtoall <message to send>';
     protected $version = '1.2.1';
-    protected $public = true;
     protected $need_mysql = true;
     /**#@-*/
 
-    /**
-     * Execution if MySQL is required but not available
-     *
-     * @return boolean
-     */
-    public function executeNoDB()
-    {
-        //Preparing message
-        $message = $this->getMessage();
-        $chat_id = $message->getChat()->getId();
-
-        $data = [
-            'chat_id' => $chat_id,
-            'text'    => 'Sorry no database connection, unable to execute "' . $this->name . '" command.',
-        ];
-
-        return Request::sendMessage($data)->isOk();
-    }
-
     /**
      * Execute command
      *
@@ -60,9 +40,10 @@ public function execute()
         $message = $this->getMessage();
 
         $chat_id = $message->getChat()->getId();
+        $text = $message->getText(true);
 
         if (empty($text)) {
-            $text = 'Write the message to send: /sendall <message>';
+            $text = 'Write the message to send: /sendtoall <message>';
         } else {
             $results = Request::sendToActiveChats(
                 'sendMessage', //callback function to execute (see Request.php methods)
@@ -103,16 +84,17 @@ public function execute()
                 $text .= $tot . ') ' . $status . ' ' . $type . ' ' . $name . "\n";
             }
             $text .= 'Delivered: ' . ($tot - $fail) . '/' . $tot . "\n";
-        }
-        if ($tot === 0) {
-            $text = 'No users or chats found..';
+
+            if ($tot === 0) {
+                $text = 'No users or chats found..';
+            }
         }
 
         $data = [
             'chat_id' => $chat_id,
             'text'    => $text,
         ];
 
-        return Request::sendMessage($data)->isOk();
+        return Request::sendMessage($data);
     }
 }

src/Admin/SendtochannelCommand.php renamed to src/Commands/AdminCommands/SendtochannelCommand.php

@@ -8,24 +8,23 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Commands;
+namespace Longman\TelegramBot\Commands\AdminCommands;
 
-use Longman\TelegramBot\Command;
+use Longman\TelegramBot\Commands\AdminCommand;
 use Longman\TelegramBot\Request;
 
 /**
  * Admin "/sendtochannel" command
  */
-class SendtochannelCommand extends Command
+class SendtochannelCommand extends AdminCommand
 {
     /**#@+
      * {@inheritdoc}
      */
     protected $name = 'sendtochannel';
     protected $description = 'Send message to a channel';
-    protected $usage = '/sendchannel <message to send>';
+    protected $usage = '/sendtochannel <message to send>';
     protected $version = '0.1.1';
-    protected $public = true;
     protected $need_mysql = false;
     /**#@-*/
 
@@ -53,8 +52,7 @@ public function execute()
                 'text'    => $text,
             ];
 
-            $result = Request::sendMessage($data);
-            if ($result->isOk()) {
+            if (Request::sendMessage($data)->isOk()) {
                 $text_back = 'Message sent succesfully to: ' . $your_channel;
             } else {
                 $text_back = 'Sorry message not sent to: ' . $your_channel;
@@ -66,6 +64,6 @@ public function execute()
             'text'    => $text_back,
         ];
 
-        return Request::sendMessage($data)->isOk();
+        return Request::sendMessage($data);
     }
 }