Merge branch 'master' into feature/logger

Author: MBoretto

.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+
 language: php
 
 php:
@@ -6,25 +8,27 @@ php:
     - 7.0
     - hhvm
 
-sudo: false
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
+
+notifications:
+    on_success: never
+    on_failure: always
+
+git:
+  depth: 1
 
 before_install:
   - composer self-update
 
 install:
   - travis_retry composer install --no-interaction
 
+before_script:
+  - mysql -e 'create database telegrambot; use telegrambot; source structure.sql;'
+
 script:
   - vendor/bin/phpunit
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then vendor/bin/phpcs --report=full --extensions=php -np --standard=build/phpcs .; fi"
-
-matrix:
-  allow_failures:
-    - php: hhvm
-    - php: 7.0
-  fast_finish: true
-
-
-notifications:
-    on_success: never
-    on_failure: always
+  - vendor/bin/phpcs --report=full --extensions=php -np --standard=build/phpcs .

README.md

@@ -28,7 +28,8 @@ The Bot can:
 - handle commands in chat with other bots.
 - manage Channel from the bot admin interface.
 - full support for **inline bots**. (**new!**)
-- Messages, InlineQuery and ChosenInlineQuery are stored in the Database. (**new!**)
+- Messages, InlineQuery and ChosenInlineQuery are stored in the Database.
+- Conversation feature (**new!**)
 
 -----
 This code is available on
@@ -348,7 +349,7 @@ You can also store inline query and chosen inline query in the database.
 ### Channels Support
 
 All methods implemented can be used to manage channels.
-With [admin commands](#admin-commands) you can manage your channel directly with your bot private chat.
+With [admin commands](#admin-commands) you can manage your channels directly with your bot private chat.
 
 ### Commands
 
@@ -397,7 +398,7 @@ $telegram->setCommandConfig('date', ['google_api_key' => 'your_google_api_key_he
 Enabling this feature, the admin bot can perform some super user commands like:
 - Send message to all chats */sendtoall*
 - List all the chats started with the bot */chats*
-- Send a message to a channel */sendtochannel* (NEW! see below how to configure it)
+- Post any content to your channels */sendtochannel* (NEW! see below how to configure it)
 You can specify one or more admins with this option:
 
 ```php
@@ -414,7 +415,11 @@ To enable this feature follow these steps:
 - Enable admin interface for your user as explained in the admin section above.
 - Enter your channel name as a parameter for the */sendtochannel* command:
 ```php
-$telegram->setCommandConfig('sendtochannel', ['your_channel' => '@type_here_your_channel']);
+$telegram->setCommandConfig('sendtochannel', ['your_channel' => ['@type_here_your_channel']]);
+```
+- If you want to manage more channels:  
+```php
+$telegram->setCommandConfig('sendtochannel', ['your_channel'=>['@type_here_your_channel', '@type_here_another_channel', '@and_so_on']]);
 ```
 - Enjoy!
 

examples/Commands/ForcereplyCommand.php

@@ -1,53 +1,46 @@
 <?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.
- * Written by <[email protected]>
-*/
-namespace Longman\TelegramBot\Commands;
+ */
 
-use Longman\TelegramBot\Request;
-use Longman\TelegramBot\Command;
-use Longman\TelegramBot\Entities\Update;
+namespace Longman\TelegramBot\Commands\UserCommands;
 
-use Longman\TelegramBot\Entities\ReplyKeyboardMarkup;
-use Longman\TelegramBot\Entities\ReplyKeyboardHide;
+use Longman\TelegramBot\Commands\UserCommand;
+use Longman\TelegramBot\Request;
 use Longman\TelegramBot\Entities\ForceReply;
 
-class ForceReplyCommand extends Command
+/**
+ * User "/forcereply" command
+ */
+class ForceReplyCommand extends UserCommand
 {
+    /**#@+
+     * {@inheritdoc}
+     */
     protected $name = 'forcereply';
     protected $description = 'Force reply with reply markup';
     protected $usage = '/forcereply';
     protected $version = '0.0.5';
-    protected $enabled = true;
+    /**#@-*/
 
+    /**
+     * {@inheritdoc}
+     */
     public function execute()
     {
-        $update = $this->getUpdate();
         $message = $this->getMessage();
-        $message_id = $message->getMessageId();
-
         $chat_id = $message->getChat()->getId();
-        $text = $message->getText(true);
 
-        $data = array();
+        $data = [];
         $data['chat_id'] = $chat_id;
         $data['text'] = 'Write something:';
-        #$data['reply_to_message_id'] = $message_id;
-
-        $force_reply = new ForceReply(['selective' => false]);
-
-        #echo $json;
-        $data['reply_markup'] = $force_reply;
-
+        $data['reply_markup'] = new ForceReply(['selective' => false]);
 
-        $result = Request::sendMessage($data);
-        return $result;
+        return Request::sendMessage($data);
     }
 }

examples/Commands/HidekeyboardCommand.php

@@ -1,51 +1,46 @@
 <?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.
- * Written by Marco Boretto <[email protected]>
-*/
-namespace Longman\TelegramBot\Commands;
+ */
 
-use Longman\TelegramBot\Request;
-use Longman\TelegramBot\Command;
-use Longman\TelegramBot\Entities\Update;
+namespace Longman\TelegramBot\Commands\UserCommands;
 
+use Longman\TelegramBot\Commands\UserCommand;
+use Longman\TelegramBot\Request;
 use Longman\TelegramBot\Entities\ReplyKeyboardMarkup;
-use Longman\TelegramBot\Entities\ReplyKeyboardHide;
-use Longman\TelegramBot\Entities\ForceReply;
 
-class HidekeyboardCommand extends Command
+/**
+ * User "/hidekeyboard" command
+ */
+class HidekeyboardCommand extends UserCommand
 {
+    /**#@+
+     * {@inheritdoc}
+     */
     protected $name = 'hidekeyboard';
     protected $description = 'Hide the custom keyboard';
     protected $usage = '/hidekeyboard';
     protected $version = '0.0.5';
-    protected $enabled = true;
+    /**#@-*/
 
+    /**
+     * {@inheritdoc}
+     */
     public function execute()
     {
-        $update = $this->getUpdate();
         $message = $this->getMessage();
-        $message_id = $message->getMessageId();
-
         $chat_id = $message->getChat()->getId();
-        $text = $message->getText(true);
 
-        $data = array();
+        $data = [];
         $data['chat_id'] = $chat_id;
         $data['text'] = 'Keyboard Hided';
-        #$data['reply_to_message_id'] = $message_id;
-
-        $reply_keyboard_hide = new ReplyKeyboardHide([ 'selective' => false]);
-
-        $data['reply_markup'] = $reply_keyboard_hide;
+        $data['reply_markup'] = new ReplyKeyboardHide([ 'selective' => false]);
 
-        $result = Request::sendMessage($data);
-        return $result;
+        return Request::sendMessage($data);
     }
 }

examples/Commands/ImageCommand.php

@@ -1,45 +1,46 @@
 <?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;
+ */
+
+namespace Longman\TelegramBot\Commands\UserCommands;
 
+use Longman\TelegramBot\Commands\UserCommand;
 use Longman\TelegramBot\Request;
-use Longman\TelegramBot\Command;
-use Longman\TelegramBot\Entities\Update;
+use Longman\TelegramBot\Entities\ReplyKeyboardMarkup;
 
-class ImageCommand extends Command
+/**
+ * User "/image" command
+ */
+class ImageCommand extends UserCommand
 {
+    /**#@+
+     * {@inheritdoc}
+     */
     protected $name = 'image';
     protected $description = 'Send Image';
     protected $usage = '/image';
     protected $version = '1.0.0';
-    protected $enabled = true;
-    protected $public = true;
+    /**#@-*/
 
+    /**
+     * {@inheritdoc}
+     */
     public function execute()
     {
-        $update = $this->getUpdate();
         $message = $this->getMessage();
-
         $chat_id = $message->getChat()->getId();
         $text = $message->getText(true);
 
-        $data = array();
+        $data = [];
         $data['chat_id'] = $chat_id;
         $data['caption'] = $text;
 
-
-        //$result = Request::sendDocument($data,'structure.sql');
-        //$result = Request::sendSticker($data, $this->telegram->getUploadPath().'/'.'image.jpg');
-
-        $result = Request::sendPhoto($data, $this->telegram->getUploadPath().'/'.'image.jpg');
-        return $result;
+        return Request::sendPhoto($data, $this->telegram->getUploadPath().'/'.'image.jpg');
     }
 }