Now getCommand() method in Message object return null if text p…

…roperty isn't a command.
Lukasss93 · Sep 17, 2017 · 63b03c4 · 63b03c4
1 parent 5b421de
commit 63b03c4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.6.1]
+### Changed
+- Now `getCommand()` method in Message object return `null` if `text` property isn't a command.
+
 ## [1.6.0]
 ### Changed
 - Updated to Telegram Bot API 3.3

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "Framework for Telegram Bot API",
   "license": "MIT",
   "type": "project",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "authors": [
     {
       "name": "Luca Patera",

diff --git a/readme.md b/readme.md
@@ -251,6 +251,6 @@ Changelog
 All notable changes to this project will be documented [here](https://github.com/Lukasss93/telegrambot-php/blob/master/CHANGELOG.md).
 
 ### Recent changes
-## [1.6.0]
+## [1.6.1]
 ### Changed
-- Updated to Telegram Bot API 3.3
+- Now `getCommand()` method in Message object return `null` if `text` property isn't a command.
diff --git a/src/Types/Message.php b/src/Types/Message.php
@@ -139,10 +139,16 @@ public function getCommand()
     {
         if($this->text!==null)
         {
-            $commandArray=explode(' ', $this->text);
-            $command=array_shift($commandArray);
-            $command=preg_replace('/@.*/','',$command);
-            return $command;
+	        $result=preg_match('/^(\/\w+)@\w+$/',$this->text,$matches);
+
+	        if(!$result)
+	        {
+	        	return null;
+	        }
+	        else
+	        {
+	        	return $matches[1];
+	        }
         }
         return null;
     }