Merge pull request #21 from MBoretto/master

Help Command and new chat participant work
php-telegram-bot · Aug 11, 2015 · fc2a8ca · fc2a8ca
2 parents 5924a7f + 4eef4d4
commit fc2a8ca
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 43 deletions.
diff --git a/src/Commands/HelpCommand.php b/src/Commands/HelpCommand.php
@@ -33,18 +33,21 @@ public function execute()
         $text = $message->getText(true);
 
         $commands = $this->telegram->getCommandsList();
+
         if (empty($text)) {
             $msg = 'GeoBot v. ' . $this->telegram->getVersion() . "\n\n";
             $msg .= 'Commands List:' . "\n";
             foreach ($commands as $command) {
-                if (!$command->isEnabled()) {
-                    continue;
-                }
-                if (!$command->isPublic()) {
-                    continue;
-                }
+                if (is_object($command)) {
+                    if (!$command->isEnabled()) {
+                        continue;
+                    }
+                    if (!$command->isPublic()) {
+                        continue;
+                    }
 
-                $msg .= '/' . $command->getName() . ' - ' . $command->getDescription() . "\n";
+                    $msg .= '/' . $command->getName() . ' - ' . $command->getDescription() . "\n";
+                }
             }
 
             $msg .= "\n" . 'For exact command help type: /help <command>';

diff --git a/src/Commands/KeyboardCommand.php b/src/Commands/KeyboardCommand.php
@@ -47,38 +47,38 @@ public function execute()
         $keyboards = array();
 
         //0
-        $keyboard[0] = array('7','8','9');
-        $keyboard[1] = array('4','5','6');
-        $keyboard[2] = array('1','2','3');
-        $keyboard[3] = array(' ','0',' ');
+        $keyboard[] = ['7','8','9'];
+        $keyboard[] = ['4','5','6'];
+        $keyboard[] = ['1','2','3'];
+        $keyboard[] = [' ','0',' '];
 
         $keyboards[] = $keyboard;
         unset($keyboard);
 
         //1
-        $keyboard[0] = array('7','8','9','+');
-        $keyboard[1] = array('4','5','6','-');
-        $keyboard[2] = array('1','2','3','*');
-        $keyboard[3] = array(' ','0',' ','/');
+        $keyboard[] = ['7','8','9','+'];
+        $keyboard[] = ['4','5','6','-'];
+        $keyboard[] = ['1','2','3','*'];
+        $keyboard[] = [' ','0',' ','/'];
 
         $keyboards[] = $keyboard;
         unset($keyboard);
 
 
         //2
-        $keyboard[0] = array('A');
-        $keyboard[1] = array('B');
-        $keyboard[2] = array('C');
+        $keyboard[] = ['A'];
+        $keyboard[] = ['B'];
+        $keyboard[] = ['C'];
 
         $keyboards[] = $keyboard;
         unset($keyboard);
 
 
 
         //3
-        $keyboard[0] = array('A');
-        $keyboard[1] = array('B');
-        $keyboard[2] = array('C','D');
+        $keyboard[] = ['A'];
+        $keyboard[] = ['B'];
+        $keyboard[] = ['C','D'];
 
         $keyboards[] = $keyboard;
         unset($keyboard);

diff --git a/src/Commands/LeftChatParticipantCommand.php → src/Commands/LeftchatparticipantCommand.php b/src/Commands/LeftChatParticipantCommand.php → src/Commands/LeftchatparticipantCommand.php
@@ -14,7 +14,7 @@
 use Longman\TelegramBot\Command;
 use Longman\TelegramBot\Entities\Update;
 
-class LeftChatParticipantCommand extends Command
+class LeftchatparticipantCommand extends Command
 {
     protected $name = 'left_chat_participant';
     protected $description = 'Left Chat Participant';

diff --git a/src/Commands/NewChatParticipantCommand.php → src/Commands/NewchatparticipantCommand.php b/src/Commands/NewChatParticipantCommand.php → src/Commands/NewchatparticipantCommand.php
@@ -14,7 +14,7 @@
 use Longman\TelegramBot\Command;
 use Longman\TelegramBot\Entities\Update;
 
-class NewChatParticipantCommand extends Command
+class NewchatparticipantCommand extends Command
 {
     protected $name = 'new_chat_participant';
     protected $description = 'New Chat Participant';

diff --git a/src/Telegram.php b/src/Telegram.php
@@ -189,8 +189,11 @@ public function getCommandsList()
                 continue;
             }
             $name = $fileInfo->getFilename();
-            $name = strtolower(str_replace('Command.php', '', $name));
-            $commands[$name] = $this->getCommandClass($name);
+
+            if (substr($name, -11, 11) === 'Command.php') {
+                $name = strtolower(str_replace('Command.php', '', $name));
+                $commands[$name] = $this->getCommandClass($name);
+            }
         }
 
         if (!empty($this->commands_dir)) {
@@ -204,12 +207,13 @@ public function getCommandsList()
                         continue;
                     }
                     $name = $fileInfo->getFilename();
-                    $name = strtolower(str_replace('Command.php', '', $name));
-                    $commands[$name] = $this->getCommandClass($name);
+                    if (substr($name, -11, 11) === 'Command.php') {
+                        $name = strtolower(str_replace('Command.php', '', $name));
+                        $commands[$name] = $this->getCommandClass($name);
+                    }
                 }
             }
         }
-
         return $commands;
     }
 
@@ -295,7 +299,6 @@ public function handle()
             default:
             case 'text':
                 // do nothing
-
                 break;
 
             case 'command':
@@ -306,42 +309,30 @@ public function handle()
 
             case 'new_chat_participant':
                 // trigger new participant
-                $command = 'new_chat_participant';
-                return $this->executeCommand($command, $update);
+                return $this->executeCommand('Newchatparticipant', $update);
                 break;
 
             case 'left_chat_participant':
                 // trigger left chat participant
-                $command = 'left_chat_participant';
-                return $this->executeCommand($command, $update);
+                return $this->executeCommand('Leftchatparticipant', $update);
                 break;
 
 
             case 'new_chat_title':
                 // trigger new_chat_title
-
-
                 break;
 
 
             case 'delete_chat_photo':
                 // trigger delete_chat_photo
-
-
                 break;
 
 
             case 'group_chat_created':
                 // trigger group_chat_created
-
-
                 break;
 
-
-
-
         }
-
     }