Old request class renamed to Client

parent 404efd8e
...@@ -13,7 +13,7 @@ namespace Longman\TelegramBot\Commands\AdminCommands; ...@@ -13,7 +13,7 @@ namespace Longman\TelegramBot\Commands\AdminCommands;
use Longman\TelegramBot\Commands\AdminCommand; use Longman\TelegramBot\Commands\AdminCommand;
use Longman\TelegramBot\DB; use Longman\TelegramBot\DB;
use Longman\TelegramBot\Entities\Chat; use Longman\TelegramBot\Entities\Chat;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
class ChatsCommand extends AdminCommand class ChatsCommand extends AdminCommand
{ {
...@@ -135,6 +135,6 @@ class ChatsCommand extends AdminCommand ...@@ -135,6 +135,6 @@ class ChatsCommand extends AdminCommand
'text' => $text_back, 'text' => $text_back,
]; ];
return Request::sendMessage($data); return Client::sendMessage($data);
} }
} }
...@@ -13,7 +13,7 @@ namespace Longman\TelegramBot\Commands\AdminCommands; ...@@ -13,7 +13,7 @@ namespace Longman\TelegramBot\Commands\AdminCommands;
use Longman\TelegramBot\Commands\AdminCommand; use Longman\TelegramBot\Commands\AdminCommand;
use Longman\TelegramBot\DB; use Longman\TelegramBot\DB;
use Longman\TelegramBot\Exception\TelegramException; use Longman\TelegramBot\Exception\TelegramException;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
use Longman\TelegramBot\TelegramLog; use Longman\TelegramBot\TelegramLog;
use PDOException; use PDOException;
...@@ -339,7 +339,7 @@ class CleanupCommand extends AdminCommand ...@@ -339,7 +339,7 @@ class CleanupCommand extends AdminCommand
'text' => '*No database connection!*', 'text' => '*No database connection!*',
]; ];
return Request::sendMessage($data); return Client::sendMessage($data);
} }
/** /**
...@@ -375,7 +375,7 @@ class CleanupCommand extends AdminCommand ...@@ -375,7 +375,7 @@ class CleanupCommand extends AdminCommand
$data['text'] = 'Cleaning up tables:' . PHP_EOL . implode(PHP_EOL, $infos); $data['text'] = 'Cleaning up tables:' . PHP_EOL . implode(PHP_EOL, $infos);
Request::sendMessage($data); Client::sendMessage($data);
$rows = 0; $rows = 0;
$pdo = DB::getPdo(); $pdo = DB::getPdo();
...@@ -395,7 +395,7 @@ class CleanupCommand extends AdminCommand ...@@ -395,7 +395,7 @@ class CleanupCommand extends AdminCommand
$pdo->rollBack(); // rollback changes on exception (useful if you want to track down error - you can't replicate it when some of the data is already deleted...) $pdo->rollBack(); // rollback changes on exception (useful if you want to track down error - you can't replicate it when some of the data is already deleted...)
$data['text'] = '*Database cleanup failed!* _(check your error logs)_'; $data['text'] = '*Database cleanup failed!* _(check your error logs)_';
Request::sendMessage($data); Client::sendMessage($data);
throw new TelegramException($e->getMessage()); throw new TelegramException($e->getMessage());
} }
...@@ -406,6 +406,6 @@ class CleanupCommand extends AdminCommand ...@@ -406,6 +406,6 @@ class CleanupCommand extends AdminCommand
$data['text'] = '*No data to clean!*'; $data['text'] = '*No data to clean!*';
} }
return Request::sendMessage($data); return Client::sendMessage($data);
} }
} }
...@@ -12,7 +12,7 @@ namespace Longman\TelegramBot\Commands\AdminCommands; ...@@ -12,7 +12,7 @@ namespace Longman\TelegramBot\Commands\AdminCommands;
use Longman\TelegramBot\Commands\AdminCommand; use Longman\TelegramBot\Commands\AdminCommand;
use Longman\TelegramBot\DB; use Longman\TelegramBot\DB;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Admin "/debug" command * Admin "/debug" command
...@@ -57,7 +57,7 @@ class DebugCommand extends AdminCommand ...@@ -57,7 +57,7 @@ class DebugCommand extends AdminCommand
if ($text !== 'glasnost' && ! $chat->isPrivateChat()) { if ($text !== 'glasnost' && ! $chat->isPrivateChat()) {
$data['text'] = 'Only available in a private chat.'; $data['text'] = 'Only available in a private chat.';
return Request::sendMessage($data); return Client::sendMessage($data);
} }
$debug_info = []; $debug_info = [];
...@@ -95,10 +95,10 @@ class DebugCommand extends AdminCommand ...@@ -95,10 +95,10 @@ class DebugCommand extends AdminCommand
$webhook_info_title = '*Webhook Info:*'; $webhook_info_title = '*Webhook Info:*';
try { try {
// Check if we're actually using the Webhook method. // Check if we're actually using the Webhook method.
if (Request::getInput() === '') { if (Client::getInput() === '') {
$debug_info[] = $webhook_info_title . ' `Using getUpdates method, not Webhook.`'; $debug_info[] = $webhook_info_title . ' `Using getUpdates method, not Webhook.`';
} else { } else {
$webhook_info_result = json_decode(Request::getWebhookInfo(), true)['result']; $webhook_info_result = json_decode(Client::getWebhookInfo(), true)['result'];
// Add a human-readable error date string if necessary. // Add a human-readable error date string if necessary.
if (isset($webhook_info_result['last_error_date'])) { if (isset($webhook_info_result['last_error_date'])) {
$webhook_info_result['last_error_date_string'] = date('Y-m-d H:i:s', $webhook_info_result['last_error_date']); $webhook_info_result['last_error_date_string'] = date('Y-m-d H:i:s', $webhook_info_result['last_error_date']);
...@@ -118,6 +118,6 @@ class DebugCommand extends AdminCommand ...@@ -118,6 +118,6 @@ class DebugCommand extends AdminCommand
$data['parse_mode'] = 'Markdown'; $data['parse_mode'] = 'Markdown';
$data['text'] = implode(PHP_EOL, $debug_info); $data['text'] = implode(PHP_EOL, $debug_info);
return Request::sendMessage($data); return Client::sendMessage($data);
} }
} }
...@@ -13,7 +13,7 @@ namespace Longman\TelegramBot\Commands\AdminCommands; ...@@ -13,7 +13,7 @@ namespace Longman\TelegramBot\Commands\AdminCommands;
use Longman\TelegramBot\Commands\AdminCommand; use Longman\TelegramBot\Commands\AdminCommand;
use Longman\TelegramBot\Entities\Message; use Longman\TelegramBot\Entities\Message;
use Longman\TelegramBot\Http\ServerResponse; use Longman\TelegramBot\Http\ServerResponse;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Admin "/sendtoall" command * Admin "/sendtoall" command
...@@ -60,7 +60,7 @@ class SendtoallCommand extends AdminCommand ...@@ -60,7 +60,7 @@ class SendtoallCommand extends AdminCommand
} }
/** @var ServerResponse[] $results */ /** @var ServerResponse[] $results */
$results = Request::sendToActiveChats( $results = Client::sendToActiveChats(
'sendMessage', //callback function to execute (see Request.php methods) 'sendMessage', //callback function to execute (see Request.php methods)
['text' => $text], //Param to evaluate the request ['text' => $text], //Param to evaluate the request
[ [
......
...@@ -15,7 +15,7 @@ use Longman\TelegramBot\Conversation; ...@@ -15,7 +15,7 @@ use Longman\TelegramBot\Conversation;
use Longman\TelegramBot\Entities\Chat; use Longman\TelegramBot\Entities\Chat;
use Longman\TelegramBot\Entities\Keyboard; use Longman\TelegramBot\Entities\Keyboard;
use Longman\TelegramBot\Entities\Message; use Longman\TelegramBot\Entities\Message;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
class SendtochannelCommand extends AdminCommand class SendtochannelCommand extends AdminCommand
{ {
...@@ -232,7 +232,7 @@ class SendtochannelCommand extends AdminCommand ...@@ -232,7 +232,7 @@ class SendtochannelCommand extends AdminCommand
if (! $text_yes_or_no && $notes['last_message_id'] !== $message->getMessageId()) { if (! $text_yes_or_no && $notes['last_message_id'] !== $message->getMessageId()) {
$data['text'] .= PHP_EOL . 'Type Yes or No'; $data['text'] .= PHP_EOL . 'Type Yes or No';
} }
$result = Request::sendMessage($data); $result = Client::sendMessage($data);
} }
break; break;
} }
...@@ -255,7 +255,7 @@ class SendtochannelCommand extends AdminCommand ...@@ -255,7 +255,7 @@ class SendtochannelCommand extends AdminCommand
} }
$this->conversation->stop(); $this->conversation->stop();
$result = Request::sendMessage($data); $result = Client::sendMessage($data);
} }
return $result; return $result;
...@@ -305,7 +305,7 @@ class SendtochannelCommand extends AdminCommand ...@@ -305,7 +305,7 @@ class SendtochannelCommand extends AdminCommand
$data['longitude'] = $message->getLocation()->getLongitude(); $data['longitude'] = $message->getLocation()->getLongitude();
} }
return Request::send('send' . ucfirst($type), $data); return Client::send('send' . ucfirst($type), $data);
} }
/** /**
......
...@@ -17,7 +17,7 @@ use Longman\TelegramBot\DB; ...@@ -17,7 +17,7 @@ use Longman\TelegramBot\DB;
use Longman\TelegramBot\Entities\Chat; use Longman\TelegramBot\Entities\Chat;
use Longman\TelegramBot\Entities\PhotoSize; use Longman\TelegramBot\Entities\PhotoSize;
use Longman\TelegramBot\Entities\UserProfilePhotos; use Longman\TelegramBot\Entities\UserProfilePhotos;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Admin "/whois" command * Admin "/whois" command
...@@ -141,7 +141,7 @@ class WhoisCommand extends AdminCommand ...@@ -141,7 +141,7 @@ class WhoisCommand extends AdminCommand
//Code from Whoami command //Code from Whoami command
$limit = 10; $limit = 10;
$offset = null; $offset = null;
$response = Request::getUserProfilePhotos( $response = Client::getUserProfilePhotos(
[ [
'user_id' => $user_id, 'user_id' => $user_id,
'limit' => $limit, 'limit' => $limit,
...@@ -163,7 +163,7 @@ class WhoisCommand extends AdminCommand ...@@ -163,7 +163,7 @@ class WhoisCommand extends AdminCommand
$data['photo'] = $file_id; $data['photo'] = $file_id;
$data['caption'] = $text; $data['caption'] = $text;
return Request::sendPhoto($data); return Client::sendPhoto($data);
} }
} }
} elseif ($chat->isGroupChat()) { } elseif ($chat->isGroupChat()) {
...@@ -182,6 +182,6 @@ class WhoisCommand extends AdminCommand ...@@ -182,6 +182,6 @@ class WhoisCommand extends AdminCommand
$data['text'] = $text; $data['text'] = $text;
return Request::sendMessage($data); return Client::sendMessage($data);
} }
} }
...@@ -16,7 +16,7 @@ use Longman\TelegramBot\Entities\ChosenInlineResult; ...@@ -16,7 +16,7 @@ use Longman\TelegramBot\Entities\ChosenInlineResult;
use Longman\TelegramBot\Entities\InlineQuery; use Longman\TelegramBot\Entities\InlineQuery;
use Longman\TelegramBot\Entities\Message; use Longman\TelegramBot\Entities\Message;
use Longman\TelegramBot\Entities\Update; use Longman\TelegramBot\Entities\Update;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
use Longman\TelegramBot\Telegram; use Longman\TelegramBot\Telegram;
/** /**
...@@ -156,7 +156,7 @@ abstract class Command ...@@ -156,7 +156,7 @@ abstract class Command
$message = $this->getMessage(); $message = $this->getMessage();
if ($user = $message->getFrom()) { if ($user = $message->getFrom()) {
return Request::sendMessage([ return Client::sendMessage([
'chat_id' => $user->getId(), 'chat_id' => $user->getId(),
'parse_mode' => 'Markdown', 'parse_mode' => 'Markdown',
'text' => sprintf( 'text' => sprintf(
...@@ -167,7 +167,7 @@ abstract class Command ...@@ -167,7 +167,7 @@ abstract class Command
]); ]);
} }
return Request::emptyResponse(); return Client::emptyResponse();
} }
return $this->execute(); return $this->execute();
...@@ -198,7 +198,7 @@ abstract class Command ...@@ -198,7 +198,7 @@ abstract class Command
'text' => 'Sorry no database connection, unable to execute "' . $this->name . '" command.', 'text' => 'Sorry no database connection, unable to execute "' . $this->name . '" command.',
]; ];
return Request::sendMessage($data); return Client::sendMessage($data);
} }
/** /**
...@@ -375,7 +375,7 @@ abstract class Command ...@@ -375,7 +375,7 @@ abstract class Command
if (!$chat->isPrivateChat()) { if (!$chat->isPrivateChat()) {
// Delete the falsely called command message. // Delete the falsely called command message.
Request::deleteMessage([ Client::deleteMessage([
'chat_id' => $chat->getId(), 'chat_id' => $chat->getId(),
'message_id' => $message->getMessageId(), 'message_id' => $message->getMessageId(),
]); ]);
...@@ -398,13 +398,13 @@ abstract class Command ...@@ -398,13 +398,13 @@ abstract class Command
public function replyToChat($text, array $data = []) public function replyToChat($text, array $data = [])
{ {
if ($message = $this->getMessage() ?: $this->getEditedMessage() ?: $this->getChannelPost() ?: $this->getEditedChannelPost()) { if ($message = $this->getMessage() ?: $this->getEditedMessage() ?: $this->getChannelPost() ?: $this->getEditedChannelPost()) {
return Request::sendMessage(array_merge([ return Client::sendMessage(array_merge([
'chat_id' => $message->getChat()->getId(), 'chat_id' => $message->getChat()->getId(),
'text' => $text, 'text' => $text,
], $data)); ], $data));
} }
return Request::emptyResponse(); return Client::emptyResponse();
} }
/** /**
...@@ -418,12 +418,12 @@ abstract class Command ...@@ -418,12 +418,12 @@ abstract class Command
public function replyToUser($text, array $data = []) public function replyToUser($text, array $data = [])
{ {
if ($message = $this->getMessage() ?: $this->getEditedMessage()) { if ($message = $this->getMessage() ?: $this->getEditedMessage()) {
return Request::sendMessage(array_merge([ return Client::sendMessage(array_merge([
'chat_id' => $message->getFrom()->getId(), 'chat_id' => $message->getFrom()->getId(),
'text' => $text, 'text' => $text,
], $data)); ], $data));
} }
return Request::emptyResponse(); return Client::emptyResponse();
} }
} }
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
namespace Longman\TelegramBot\Commands; namespace Longman\TelegramBot\Commands;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
abstract class SystemCommand extends Command abstract class SystemCommand extends Command
{ {
...@@ -25,6 +25,6 @@ abstract class SystemCommand extends Command ...@@ -25,6 +25,6 @@ abstract class SystemCommand extends Command
public function execute() public function execute()
{ {
//System command, return empty ServerResponse by default //System command, return empty ServerResponse by default
return Request::emptyResponse(); return Client::emptyResponse();
} }
} }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
namespace Longman\TelegramBot\Commands\SystemCommands; namespace Longman\TelegramBot\Commands\SystemCommands;
use Longman\TelegramBot\Commands\SystemCommand; use Longman\TelegramBot\Commands\SystemCommand;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Callback query command * Callback query command
...@@ -56,7 +56,7 @@ class CallbackqueryCommand extends SystemCommand ...@@ -56,7 +56,7 @@ class CallbackqueryCommand extends SystemCommand
$callback($this->getUpdate()->getCallbackQuery()); $callback($this->getUpdate()->getCallbackQuery());
} }
return Request::answerCallbackQuery(['callback_query_id' => $this->getUpdate()->getCallbackQuery()->getId()]); return Client::answerCallbackQuery(['callback_query_id' => $this->getUpdate()->getCallbackQuery()->getId()]);
} }
/** /**
......
...@@ -12,7 +12,7 @@ namespace Longman\TelegramBot\Commands\SystemCommands; ...@@ -12,7 +12,7 @@ namespace Longman\TelegramBot\Commands\SystemCommands;
use Longman\TelegramBot\Commands\SystemCommand; use Longman\TelegramBot\Commands\SystemCommand;
use Longman\TelegramBot\Conversation; use Longman\TelegramBot\Conversation;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Generic message command * Generic message command
...@@ -47,7 +47,7 @@ class GenericmessageCommand extends SystemCommand ...@@ -47,7 +47,7 @@ class GenericmessageCommand extends SystemCommand
public function executeNoDb() public function executeNoDb()
{ {
//Do nothing //Do nothing
return Request::emptyResponse(); return Client::emptyResponse();
} }
/** /**
...@@ -69,6 +69,6 @@ class GenericmessageCommand extends SystemCommand ...@@ -69,6 +69,6 @@ class GenericmessageCommand extends SystemCommand
return $this->telegram->executeCommand($command); return $this->telegram->executeCommand($command);
} }
return Request::emptyResponse(); return Client::emptyResponse();
} }
} }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
namespace Longman\TelegramBot\Commands\SystemCommands; namespace Longman\TelegramBot\Commands\SystemCommands;
use Longman\TelegramBot\Commands\SystemCommand; use Longman\TelegramBot\Commands\SystemCommand;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Inline query command * Inline query command
...@@ -45,6 +45,6 @@ class InlinequeryCommand extends SystemCommand ...@@ -45,6 +45,6 @@ class InlinequeryCommand extends SystemCommand
//$user_id = $inline_query->getFrom()->getId(); //$user_id = $inline_query->getFrom()->getId();
//$query = $inline_query->getQuery(); //$query = $inline_query->getQuery();
return Request::answerInlineQuery(['inline_query_id' => $this->getUpdate()->getInlineQuery()->getId()]); return Client::answerInlineQuery(['inline_query_id' => $this->getUpdate()->getInlineQuery()->getId()]);
} }
} }
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
namespace Longman\TelegramBot\Entities; namespace Longman\TelegramBot\Entities;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Class CallbackQuery. * Class CallbackQuery.
...@@ -46,7 +46,7 @@ class CallbackQuery extends Entity ...@@ -46,7 +46,7 @@ class CallbackQuery extends Entity
*/ */
public function answer(array $data = []) public function answer(array $data = [])
{ {
return Request::answerCallbackQuery(array_merge([ return Client::answerCallbackQuery(array_merge([
'callback_query_id' => $this->getId(), 'callback_query_id' => $this->getId(),
], $data)); ], $data));
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
namespace Longman\TelegramBot\Entities; namespace Longman\TelegramBot\Entities;
use Longman\TelegramBot\Entities\InlineQuery\InlineQueryResult; use Longman\TelegramBot\Entities\InlineQuery\InlineQueryResult;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Class InlineQuery * Class InlineQuery
...@@ -47,7 +47,7 @@ class InlineQuery extends Entity ...@@ -47,7 +47,7 @@ class InlineQuery extends Entity
*/ */
public function answer(array $results, array $data = []) public function answer(array $results, array $data = [])
{ {
return Request::answerCallbackQuery(array_merge([ return Client::answerCallbackQuery(array_merge([
'callback_query_id' => $this->getId(), 'callback_query_id' => $this->getId(),
'results' => $results, 'results' => $results,
], $data)); ], $data));
......
...@@ -12,7 +12,7 @@ namespace Longman\TelegramBot\Entities\Payments; ...@@ -12,7 +12,7 @@ namespace Longman\TelegramBot\Entities\Payments;
use Longman\TelegramBot\Entities\Entity; use Longman\TelegramBot\Entities\Entity;
use Longman\TelegramBot\Entities\User; use Longman\TelegramBot\Entities\User;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Class PreCheckoutQuery * Class PreCheckoutQuery
...@@ -52,7 +52,7 @@ class PreCheckoutQuery extends Entity ...@@ -52,7 +52,7 @@ class PreCheckoutQuery extends Entity
*/ */
public function answer($ok, array $data = []) public function answer($ok, array $data = [])
{ {
return Request::answerPreCheckoutQuery(array_merge([ return Client::answerPreCheckoutQuery(array_merge([
'pre_checkout_query_id' => $this->getId(), 'pre_checkout_query_id' => $this->getId(),
'ok' => $ok, 'ok' => $ok,
], $data)); ], $data));
......
...@@ -12,7 +12,7 @@ namespace Longman\TelegramBot\Entities\Payments; ...@@ -12,7 +12,7 @@ namespace Longman\TelegramBot\Entities\Payments;
use Longman\TelegramBot\Entities\Entity; use Longman\TelegramBot\Entities\Entity;
use Longman\TelegramBot\Entities\User; use Longman\TelegramBot\Entities\User;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Class ShippingQuery * Class ShippingQuery
...@@ -49,7 +49,7 @@ class ShippingQuery extends Entity ...@@ -49,7 +49,7 @@ class ShippingQuery extends Entity
*/ */
public function answer($ok, array $data = []) public function answer($ok, array $data = [])
{ {
return Request::answerShippingQuery(array_merge([ return Client::answerShippingQuery(array_merge([
'shipping_query_id' => $this->getId(), 'shipping_query_id' => $this->getId(),
'ok' => $ok, 'ok' => $ok,
], $data)); ], $data));
......
<?php
/**
* This file is part of the TelegramBot package.
*
* (c) Avtandil Kikabidze aka LONGMAN <akalongman@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Longman\TelegramBot\Http;
use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\Exception\RequestException;
use Longman\TelegramBot\DB;
use Longman\TelegramBot\Entities\File;
use Longman\TelegramBot\Exception\TelegramException;
use Longman\TelegramBot\Telegram;
use Longman\TelegramBot\TelegramLog;
/**
* Class Request
*
* @method static ServerResponse getUpdates(array $data) Use this method to receive incoming updates using long polling (wiki). An Array of Update
* objects is returned.
* @method static ServerResponse setWebhook(array $data) Use this method to specify a url and receive incoming updates via an outgoing webhook.
* Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized Update. In case of an
* unsuccessful request, we will give up after a reasonable amount of attempts. Returns true.
* @method static ServerResponse deleteWebhook() Use this method to remove webhook integration if you decide to switch back to getUpdates.
* Returns True on success. Requires no parameters.
* @method static ServerResponse getWebhookInfo() Use this method to get current webhook status. Requires no parameters. On success,
* returns a WebhookInfo object. If the bot is using getUpdates, will return an object with the url field empty.
* @method static ServerResponse getMe() A simple method for testing your bot's auth token. Requires no parameters. Returns basic
* information about the bot in form of a User object.
* @method static ServerResponse forwardMessage(array $data) Use this method to forward messages of any kind. On success, the sent Message is
* returned.
* @method static ServerResponse sendPhoto(array $data) Use this method to send photos. On success, the sent Message is returned.
* @method static ServerResponse sendAudio(array $data) Use this method to send audio files, if you want Telegram clients to display them in the
* music player. Your audio must be in the .mp3 format. On success, the sent Message is returned. Bots can currently send audio files of up to 50 MB in
* size, this limit may be changed in the future.
* @method static ServerResponse sendDocument(array $data) Use this method to send general files. On success, the sent Message is returned. Bots can
* currently send files of any type of up to 50 MB in size, this limit may be changed in the future.
* @method static ServerResponse sendSticker(array $data) Use this method to send .webp stickers. On success, the sent Message is returned.
* @method static ServerResponse sendVideo(array $data) Use this method to send video files, Telegram clients support mp4 videos (other formats
* may be sent as Document). On success, the sent Message is returned. Bots can currently send video files of up to 50 MB in size, this limit may be
* changed in the future.
* @method static ServerResponse sendVoice(array $data) Use this method to send audio files, if you want Telegram clients to display the file as
* a playable voice message. For this to work, your audio must be in an .ogg file encoded with OPUS (other formats may be sent as Audio or Document). On
* success, the sent Message is returned. Bots can currently send voice messages of up to 50 MB in size, this limit may be changed in the future.
* @method static ServerResponse sendVideoNote(array $data) Use this method to send video messages. On success, the sent Message is returned.
* @method static ServerResponse sendMediaGroup(array $data) Use this method to send a group of photos or videos as an album. On success, an array of
* the sent Messages is returned.
* @method static ServerResponse sendLocation(array $data) Use this method to send point on the map. On success, the sent Message is returned.
* @method static ServerResponse editMessageLiveLocation(array $data) Use this method to edit live location messages sent by the bot or via the bot (for inline
* bots). A location can be edited until its live_period expires or editing is explicitly disabled by a call to stopMessageLiveLocation. On success, if the
* edited message was sent by the bot, the edited Message is returned, otherwise True is returned.
* @method static ServerResponse stopMessageLiveLocation(array $data) Use this method to stop updating a live location message sent by the bot or via the bot
* (for inline bots) before live_period expires. On success, if the message was sent by the bot, the sent Message is returned, otherwise True is returned.
* @method static ServerResponse sendVenue(array $data) Use this method to send information about a venue. On success, the sent Message is
* returned.
* @method static ServerResponse sendContact(array $data) Use this method to send phone contacts. On success, the sent Message is returned.
* @method static ServerResponse sendChatAction(array $data) Use this method when you need to tell the user that something is happening on the bot's
* side. The status is set for 5 seconds or less (when a message arrives from your bot, Telegram clients clear its typing status). Returns True on success.
* @method static ServerResponse getUserProfilePhotos(array $data) Use this method to get a list of profile pictures for a user. Returns a UserProfilePhotos
* object.
* @method static ServerResponse getFile(array $data) Use this method to get basic info about a file and prepare it for downloading. For the
* moment, bots can download files of up to 20MB in size. On success, a File object is returned. The file can then be downloaded via the link
* https://api.telegram.org/file/bot<token>/<file_path>, where <file_path> is taken from the response. It is guaranteed that the link will be valid for at
* least 1 hour. When the link expires, a new one can be requested by calling getFile again.
* @method static ServerResponse kickChatMember(array $data) Use this method to kick a user from a group, a supergroup or a channel. In the case of
* supergroups and channels, the user will not be able to return to the group on their own using invite links, etc., unless unbanned first. The bot must be
* an administrator in the chat for this to work and must have the appropriate admin rights. Returns True on success.
* @method static ServerResponse unbanChatMember(array $data) Use this method to unban a previously kicked user in a supergroup or channel. The user
* will not return to the group or channel automatically, but will be able to join via link, etc. The bot must be an administrator for this to work.
* Returns True on success.
* @method static ServerResponse restrictChatMember(array $data) Use this method to restrict a user in a supergroup. The bot must be an administrator in
* the supergroup for this to work and must have the appropriate admin rights. Pass True for all boolean parameters to lift restrictions from a user.
* Returns True on success.
* @method static ServerResponse promoteChatMember(array $data) Use this method to promote or demote a user in a supergroup or a channel. The bot must be
* an administrator in the chat for this to work and must have the appropriate admin rights. Pass False for all boolean parameters to demote a user.
* Returns True on success.
* @method static ServerResponse exportChatInviteLink(array $data) Use this method to export an invite link to a supergroup or a channel. The bot must be an
* administrator in the chat for this to work and must have the appropriate admin rights. Returns exported invite link as String on success.
* @method static ServerResponse setChatPhoto(array $data) Use this method to set a new profile photo for the chat. Photos can't be changed for
* private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns True on success.
* @method static ServerResponse deleteChatPhoto(array $data) Use this method to delete a chat photo. Photos can't be changed for private chats. The
* bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns True on success.
* @method static ServerResponse setChatTitle(array $data) Use this method to change the title of a chat. Titles can't be changed for private chats.
* The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns True on success.
* @method static ServerResponse setChatDescription(array $data) Use this method to change the description of a supergroup or a channel. The bot must be
* an administrator in the chat for this to work and must have the appropriate admin rights. Returns True on success.
* @method static ServerResponse pinChatMessage(array $data) Use this method to pin a message in a supergroup or a channel. The bot must be an
* administrator in the chat for this to work and must have the ‘can_pin_messages’ admin right in the supergroup or ‘can_edit_messages’ admin right in the
* channel. Returns True on success.
* @method static ServerResponse unpinChatMessage(array $data) Use this method to unpin a message in a supergroup or a channel. The bot must be an
* administrator in the chat for this to work and must have the ‘can_pin_messages’ admin right in the supergroup or ‘can_edit_messages’ admin right in the
* channel. Returns True on success.
* @method static ServerResponse leaveChat(array $data) Use this method for your bot to leave a group, supergroup or channel. Returns True on
* success.
* @method static ServerResponse getChat(array $data) Use this method to get up to date information about the chat (current name of the user
* for one-on-one conversations, current username of a user, group or channel, etc.). Returns a Chat object on success.
* @method static ServerResponse getChatAdministrators(array $data) Use this method to get a list of administrators in a chat. On success, returns an Array
* of ChatMember objects that contains information about all chat administrators except other bots. If the chat is a group or a supergroup and no
* administrators were appointed, only the creator will be returned.
* @method static ServerResponse getChatMembersCount(array $data) Use this method to get the number of members in a chat. Returns Int on success.
* @method static ServerResponse getChatMember(array $data) Use this method to get information about a member of a chat. Returns a ChatMember object
* on success.
* @method static ServerResponse setChatStickerSet(array $data) Use this method to set a new group sticker set for a supergroup. The bot must be an
* administrator in the chat for this to work and must have the appropriate admin rights. Use the field can_set_sticker_set optionally returned in getChat
* requests to check if the bot can use this method. Returns True on success.
* @method static ServerResponse deleteChatStickerSet(array $data) Use this method to delete a group sticker set from a supergroup. The bot must be an
* administrator in the chat for this to work and must have the appropriate admin rights. Use the field can_set_sticker_set optionally returned in getChat
* requests to check if the bot can use this method. Returns True on success.
* @method static ServerResponse answerCallbackQuery(array $data) Use this method to send answers to callback queries sent from inline keyboards. The
* answer will be displayed to the user as a notification at the top of the chat screen or as an alert. On success, True is returned.
* @method static ServerResponse answerInlineQuery(array $data) Use this method to send answers to an inline query. On success, True is returned.
* @method static ServerResponse editMessageText(array $data) Use this method to edit text and game messages sent by the bot or via the bot (for inline
* bots). On success, if edited message is sent by the bot, the edited Message is returned, otherwise True is returned.
* @method static ServerResponse editMessageCaption(array $data) Use this method to edit captions of messages sent by the bot or via the bot (for inline
* bots). On success, if edited message is sent by the bot, the edited Message is returned, otherwise True is returned.
* @method static ServerResponse editMessageReplyMarkup(array $data) Use this method to edit only the reply markup of messages sent by the bot or via the bot
* (for inline bots). On success, if edited message is sent by the bot, the edited Message is returned, otherwise True is returned.
* @method static ServerResponse deleteMessage(array $data) Use this method to delete a message, including service messages, with certain
* limitations. Returns True on success.
* @method static ServerResponse getStickerSet(array $data) Use this method to get a sticker set. On success, a StickerSet object is returned.
* @method static ServerResponse uploadStickerFile(array $data) Use this method to upload a .png file with a sticker for later use in createNewStickerSet
* and addStickerToSet methods (can be used multiple times). Returns the uploaded File on success.
* @method static ServerResponse createNewStickerSet(array $data) Use this method to create new sticker set owned by a user. The bot will be able to edit
* the created sticker set. Returns True on success.
* @method static ServerResponse addStickerToSet(array $data) Use this method to add a new sticker to a set created by the bot. Returns True on
* success.
* @method static ServerResponse setStickerPositionInSet(array $data) Use this method to move a sticker in a set created by the bot to a specific position.
* Returns True on success.
* @method static ServerResponse deleteStickerFromSet(array $data) Use this method to delete a sticker from a set created by the bot. Returns True on
* success.
* @method static ServerResponse sendInvoice(array $data) Use this method to send invoices. On success, the sent Message is returned.
* @method static ServerResponse answerShippingQuery(array $data) If you sent an invoice requesting a shipping address and the parameter is_flexible was
* specified, the Bot API will send an Update with a shipping_query field to the bot. Use this method to reply to shipping queries. On success, True is
* returned.
* @method static ServerResponse answerPreCheckoutQuery(array $data) Once the user has confirmed their payment and shipping details, the Bot API sends the
* final confirmation in the form of an Update with the field pre_checkout_query. Use this method to respond to such pre-checkout queries. On success, True
* is returned.
*/
class Client
{
/**
* Telegram object
*
* @var \Longman\TelegramBot\Telegram
*/
private static $telegram;
/**
* URI of the Telegram API
*
* @var string
*/
private static $api_base_uri = 'https://api.telegram.org';
/**
* Guzzle Client object
*
* @var \GuzzleHttp\Client
*/
private static $client;
/**
* Input value of the request
*
* @var string
*/
private static $input;
/**
* Request limiter
*
* @var boolean
*/
private static $limiter_enabled;
/**
* Request limiter's interval between checks
*
* @var float
*/
private static $limiter_interval;
/**
* Available actions to send
*
* This is basically the list of all methods listed on the official API documentation.
*
* @link https://core.telegram.org/bots/api
*
* @var array
*/
private static $actions = [
'getUpdates',
'setWebhook',
'deleteWebhook',
'getWebhookInfo',
'getMe',
'sendMessage',
'forwardMessage',
'sendPhoto',
'sendAudio',
'sendDocument',
'sendSticker',
'sendVideo',
'sendVoice',
'sendVideoNote',
'sendMediaGroup',
'sendLocation',
'editMessageLiveLocation',
'stopMessageLiveLocation',
'sendVenue',
'sendContact',
'sendChatAction',
'getUserProfilePhotos',
'getFile',
'kickChatMember',
'unbanChatMember',
'restrictChatMember',
'promoteChatMember',
'exportChatInviteLink',
'setChatPhoto',
'deleteChatPhoto',
'setChatTitle',
'setChatDescription',
'pinChatMessage',
'unpinChatMessage',
'leaveChat',
'getChat',
'getChatAdministrators',
'getChatMembersCount',
'getChatMember',
'setChatStickerSet',
'deleteChatStickerSet',
'answerCallbackQuery',
'answerInlineQuery',
'editMessageText',
'editMessageCaption',
'editMessageReplyMarkup',
'deleteMessage',
'getStickerSet',
'uploadStickerFile',
'createNewStickerSet',
'addStickerToSet',
'setStickerPositionInSet',
'deleteStickerFromSet',
'sendInvoice',
'answerShippingQuery',
'answerPreCheckoutQuery',
];
/**
* Some methods need a dummy param due to certain cURL issues.
*
* @see Client::addDummyParamIfNecessary()
*
* @var array
*/
private static $actions_need_dummy_param = [
'deleteWebhook',
'getWebhookInfo',
'getMe',
];
/**
* Initialize
*
* @param \Longman\TelegramBot\Telegram $telegram
*
* @throws TelegramException
*/
public static function initialize(Telegram $telegram)
{
if (! ($telegram instanceof Telegram)) {
throw new TelegramException('Invalid Telegram pointer!');
}
self::$telegram = $telegram;
self::setClient(new GuzzleClient(['base_uri' => self::$api_base_uri]));
}
/**
* Set a custom Guzzle HTTP Client object
*
* @param Client $client
*
* @throws TelegramException
*/
public static function setClient(GuzzleClient $client)
{
if (! ($client instanceof GuzzleClient)) {
throw new TelegramException('Invalid GuzzleHttp\Client pointer!');
}
self::$client = $client;
}
/**
* Set input from custom input or stdin and return it
*
* @return string
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function getInput()
{
// First check if a custom input has been set, else get the PHP input.
if (! ($input = self::$telegram->getCustomInput())) {
$input = file_get_contents('php://input');
}
// Make sure we have a string to work with.
if (! is_string($input)) {
throw new TelegramException('Input must be a string!');
}
self::$input = $input;
TelegramLog::update(self::$input);
return self::$input;
}
/**
* Generate general fake server response
*
* @param array $data Data to add to fake response
*
* @return array Fake response data
*/
public static function generateGeneralFakeServerResponse(array $data = [])
{
//PARAM BINDED IN PHPUNIT TEST FOR TestServerResponse.php
//Maybe this is not the best possible implementation
//No value set in $data ie testing setWebhook
//Provided $data['chat_id'] ie testing sendMessage
$fake_response = ['ok' => true]; // :)
if ($data === []) {
$fake_response['result'] = true;
}
//some data to let iniatilize the class method SendMessage
if (isset($data['chat_id'])) {
$data['message_id'] = '1234';
$data['date'] = '1441378360';
$data['from'] = [
'id' => 123456789,
'first_name' => 'botname',
'username' => 'namebot',
];
$data['chat'] = ['id' => $data['chat_id']];
$fake_response['result'] = $data;
}
return $fake_response;
}
/**
* Properly set up the request params
*
* If any item of the array is a resource, reformat it to a multipart request.
* Else, just return the passed data as form params.
*
* @param array $data
*
* @return array
*/
private static function setUpRequestParams(array $data)
{
$has_resource = false;
$multipart = [];
// Convert any nested arrays into JSON strings.
array_walk($data, function (&$item) {
is_array($item) && $item = json_encode($item);
});
//Reformat data array in multipart way if it contains a resource
foreach ($data as $key => $item) {
$has_resource |= (is_resource($item) || $item instanceof \GuzzleHttp\Psr7\Stream);
$multipart[] = ['name' => $key, 'contents' => $item];
}
if ($has_resource) {
return ['multipart' => $multipart];
}
return ['form_params' => $data];
}
/**
* Execute HTTP Request
*
* @param string $action Action to execute
* @param array $data Data to attach to the execution
*
* @return string Result of the HTTP Request
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function execute($action, array $data = [])
{
//Fix so that the keyboard markup is a string, not an object
if (isset($data['reply_markup'])) {
$data['reply_markup'] = json_encode($data['reply_markup']);
}
$result = null;
$request_params = self::setUpRequestParams($data);
$request_params['debug'] = TelegramLog::getDebugLogTempStream();
try {
$response = self::$client->post(
'/bot' . self::$telegram->getApiKey() . '/' . $action,
$request_params
);
$result = (string) $response->getBody();
//Logging getUpdates Update
if ($action === 'getUpdates') {
TelegramLog::update($result);
}
} catch (RequestException $e) {
$result = ($e->getResponse()) ? (string) $e->getResponse()->getBody() : '';
} finally {
//Logging verbose debug output
TelegramLog::endDebugLogTempStream('Verbose HTTP Request output:' . PHP_EOL . '%s' . PHP_EOL);
}
return $result;
}
/**
* Download file
*
* @param \Longman\TelegramBot\Entities\File $file
*
* @return boolean
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function downloadFile(File $file)
{
if (empty($download_path = self::$telegram->getDownloadPath())) {
throw new TelegramException('Download path not set!');
}
$tg_file_path = $file->getFilePath();
$file_path = $download_path . '/' . $tg_file_path;
$file_dir = dirname($file_path);
//For safety reasons, first try to create the directory, then check that it exists.
//This is in case some other process has created the folder in the meantime.
if (! @mkdir($file_dir, 0755, true) && ! is_dir($file_dir)) {
throw new TelegramException('Directory ' . $file_dir . ' can\'t be created');
}
$debug_handle = TelegramLog::getDebugLogTempStream();
try {
self::$client->get(
'/file/bot' . self::$telegram->getApiKey() . '/' . $tg_file_path,
['debug' => $debug_handle, 'sink' => $file_path]
);
return filesize($file_path) > 0;
} catch (RequestException $e) {
return ($e->getResponse()) ? (string) $e->getResponse()->getBody() : '';
} finally {
//Logging verbose debug output
TelegramLog::endDebugLogTempStream('Verbose HTTP File Download Request output:' . PHP_EOL . '%s' . PHP_EOL);
}
}
/**
* Encode file
*
* @param string $file
*
* @return resource
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function encodeFile($file)
{
$fp = fopen($file, 'rb');
if ($fp === false) {
throw new TelegramException('Cannot open "' . $file . '" for reading');
}
return $fp;
}
/**
* Send command
*
* @todo Fake response doesn't need json encoding?
* @todo Write debug entry on failure
*
* @param string $action
* @param array $data
*
* @return \Longman\TelegramBot\Http\ServerResponse
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function send($action, array $data = [])
{
self::ensureValidAction($action);
self::addDummyParamIfNecessary($action, $data);
$bot_username = self::$telegram->getBotUsername();
if (defined('PHPUNIT_TESTSUITE')) {
$fake_response = self::generateGeneralFakeServerResponse($data);
return new ServerResponse($fake_response, $bot_username);
}
self::ensureNonEmptyData($data);
self::limitTelegramRequests($action, $data);
$response = json_decode(self::execute($action, $data), true);
if (null === $response) {
throw new TelegramException('Telegram returned an invalid response! Please review your bot name and API key.');
}
return new ServerResponse($response, $bot_username);
}
/**
* Add a dummy parameter if the passed action requires it.
*
* If a method doesn't require parameters, we need to add a dummy one anyway,
* because of some cURL version failed POST request without parameters.
*
* @link https://github.com/php-telegram-bot/core/pull/228
*
* @todo Would be nice to find a better solution for this!
*
* @param string $action
* @param array $data
*/
protected static function addDummyParamIfNecessary($action, array &$data)
{
if (in_array($action, self::$actions_need_dummy_param, true)) {
// Can be anything, using a single letter to minimise request size.
$data = ['d'];
}
}
/**
* Make sure the data isn't empty, else throw an exception
*
* @param array $data
*
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
private static function ensureNonEmptyData(array $data)
{
if (count($data) === 0) {
throw new TelegramException('Data is empty!');
}
}
/**
* Make sure the action is valid, else throw an exception
*
* @param string $action
*
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
private static function ensureValidAction($action)
{
if (! in_array($action, self::$actions, true)) {
throw new TelegramException('The action "' . $action . '" doesn\'t exist!');
}
}
/**
* Use this method to send text messages. On success, the sent Message is returned
*
* @link https://core.telegram.org/bots/api#sendmessage
*
* @param array $data
*
* @return \Longman\TelegramBot\Http\ServerResponse
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function sendMessage(array $data)
{
$text = $data['text'];
do {
//Chop off and send the first message
$data['text'] = mb_substr($text, 0, 4096);
$response = self::send('sendMessage', $data);
//Prepare the next message
$text = mb_substr($text, 4096);
} while (mb_strlen($text, 'UTF-8') > 0);
return $response;
}
/**
* Any statically called method should be relayed to the `send` method.
*
* @param string $action
* @param array $data
*
* @return \Longman\TelegramBot\Http\ServerResponse
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function __callStatic($action, array $data)
{
// Make sure to add the action being called as the first parameter to be passed.
array_unshift($data, $action);
// @todo Use splat operator for unpacking when we move to PHP 5.6+
return call_user_func_array('static::send', $data);
}
/**
* Return an empty Server Response
*
* No request to telegram are sent, this function is used in commands that
* don't need to fire a message after execution
*
* @return \Longman\TelegramBot\Http\ServerResponse
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function emptyResponse()
{
return new ServerResponse(['ok' => true, 'result' => true], null);
}
/**
* Send message to all active chats
*
* @param string $callback_function
* @param array $data
* @param array $select_chats_params
*
* @return array
* @throws TelegramException
*/
public static function sendToActiveChats(
$callback_function,
array $data,
array $select_chats_params
) {
if (! method_exists(Client::class, $callback_function)) {
throw new TelegramException('Method "' . $callback_function . '" not found in class Request.');
}
$chats = DB::selectChats($select_chats_params);
$results = [];
if (is_array($chats)) {
foreach ($chats as $row) {
$data['chat_id'] = $row['chat_id'];
$results[] = call_user_func(Client::class . '::' . $callback_function, $data);
}
}
return $results;
}
/**
* Enable request limiter
*
* @param boolean $enable
* @param array $options
*
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
public static function setLimiter($enable = true, array $options = [])
{
if (DB::isDbConnected()) {
$options_default = [
'interval' => 1,
];
$options = array_merge($options_default, $options);
if (! is_numeric($options['interval']) || $options['interval'] <= 0) {
throw new TelegramException('Interval must be a number and must be greater than zero!');
}
self::$limiter_interval = $options['interval'];
self::$limiter_enabled = $enable;
}
}
/**
* This functions delays API requests to prevent reaching Telegram API limits
* Can be disabled while in execution by 'Request::setLimiter(false)'
*
* @link https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
*
* @param string $action
* @param array $data
*
* @throws \Longman\TelegramBot\Exception\TelegramException
*/
private static function limitTelegramRequests($action, array $data = [])
{
if (self::$limiter_enabled) {
$limited_methods = [
'sendMessage',
'forwardMessage',
'sendPhoto',
'sendAudio',
'sendDocument',
'sendSticker',
'sendVideo',
'sendVoice',
'sendVideoNote',
'sendMediaGroup',
'sendLocation',
'editMessageLiveLocation',
'stopMessageLiveLocation',
'sendVenue',
'sendContact',
'sendInvoice',
'editMessageText',
'editMessageCaption',
'editMessageReplyMarkup',
'setChatTitle',
'setChatDescription',
'setChatStickerSet',
'deleteChatStickerSet',
];
$chat_id = isset($data['chat_id']) ? $data['chat_id'] : null;
$inline_message_id = isset($data['inline_message_id']) ? $data['inline_message_id'] : null;
if (($chat_id || $inline_message_id) && in_array($action, $limited_methods)) {
$timeout = 60;
while (true) {
if ($timeout <= 0) {
throw new TelegramException('Timed out while waiting for a request spot!');
}
$requests = DB::getTelegramRequestCount($chat_id, $inline_message_id);
$chat_per_second = ($requests['LIMIT_PER_SEC'] == 0); // No more than one message per second inside a particular chat
$global_per_second = ($requests['LIMIT_PER_SEC_ALL'] < 30); // No more than 30 messages per second to different chats
$groups_per_minute = (((is_numeric($chat_id) && $chat_id > 0) || ! is_null($inline_message_id)) || ((! is_numeric($chat_id) || $chat_id < 0) && $requests['LIMIT_PER_MINUTE'] < 20)); // No more than 20 messages per minute in groups and channels
if ($chat_per_second && $global_per_second && $groups_per_minute) {
break;
}
$timeout--;
usleep(self::$limiter_interval * 1000000);
}
DB::insertTelegramRequest($action, $data);
}
}
}
}
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
namespace Longman\TelegramBot\Commands\UserCommands; namespace Longman\TelegramBot\Commands\UserCommands;
use Longman\TelegramBot\Commands\UserCommand; use Longman\TelegramBot\Commands\UserCommand;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Test "/hidden" command to test $show_in_help * Test "/hidden" command to test $show_in_help
...@@ -51,6 +51,6 @@ class HiddenCommand extends UserCommand ...@@ -51,6 +51,6 @@ class HiddenCommand extends UserCommand
*/ */
public function execute() public function execute()
{ {
return Request::emptyResponse(); return Client::emptyResponse();
} }
} }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
namespace Longman\TelegramBot\Commands\UserCommands; namespace Longman\TelegramBot\Commands\UserCommands;
use Longman\TelegramBot\Commands\UserCommand; use Longman\TelegramBot\Commands\UserCommand;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* Test "/visible" command to test $show_in_help * Test "/visible" command to test $show_in_help
...@@ -51,6 +51,6 @@ class VisibleCommand extends UserCommand ...@@ -51,6 +51,6 @@ class VisibleCommand extends UserCommand
*/ */
public function execute() public function execute()
{ {
return Request::emptyResponse(); return Client::emptyResponse();
} }
} }
...@@ -14,7 +14,7 @@ namespace Longman\TelegramBot\Tests\Unit; ...@@ -14,7 +14,7 @@ namespace Longman\TelegramBot\Tests\Unit;
use Longman\TelegramBot\Entities\Message; use Longman\TelegramBot\Entities\Message;
use Longman\TelegramBot\Http\ServerResponse; use Longman\TelegramBot\Http\ServerResponse;
use Longman\TelegramBot\Http\Request; use Longman\TelegramBot\Http\Client;
/** /**
* @package TelegramTest * @package TelegramTest
...@@ -259,7 +259,7 @@ class ServerResponseTest extends TestCase ...@@ -259,7 +259,7 @@ class ServerResponseTest extends TestCase
public function testSetGeneralTestFakeResponse() public function testSetGeneralTestFakeResponse()
{ {
//setWebhook ok //setWebhook ok
$fake_response = Request::generateGeneralFakeServerResponse(); $fake_response = Client::generateGeneralFakeServerResponse();
$server = new ServerResponse($fake_response, 'testbot'); $server = new ServerResponse($fake_response, 'testbot');
...@@ -269,7 +269,7 @@ class ServerResponseTest extends TestCase ...@@ -269,7 +269,7 @@ class ServerResponseTest extends TestCase
self::assertEquals('', $server->getDescription()); self::assertEquals('', $server->getDescription());
//sendMessage ok //sendMessage ok
$fake_response = Request::generateGeneralFakeServerResponse(['chat_id' => 123456789, 'text' => 'hello']); $fake_response = Client::generateGeneralFakeServerResponse(['chat_id' => 123456789, 'text' => 'hello']);
$server = new ServerResponse($fake_response, 'testbot'); $server = new ServerResponse($fake_response, 'testbot');
......
...@@ -151,4 +151,13 @@ class TelegramTest extends TestCase ...@@ -151,4 +151,13 @@ class TelegramTest extends TestCase
$this->assertInstanceOf(\Illuminate\Container\Container::class, $telegram); $this->assertInstanceOf(\Illuminate\Container\Container::class, $telegram);
} }
public function testCustom()
{
$telegram = new Telegram(self::$dummy_api_key, 'testbot');
$telegram->handle();
$this->assertTrue(true);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment