@@ -84,7 +84,7 @@ |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | try { |
87 | - $sth = self::$pdo->prepare('INSERT INTO `' . TB_CONVERSATION . '` |
|
87 | + $sth = self::$pdo->prepare('INSERT INTO `' . TB_CONVERSATION . '` |
|
88 | 88 | ( |
89 | 89 | `status`, `user_id`, `chat_id`, `command`, `notes`, `created_at`, `updated_at` |
90 | 90 | ) |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * Command execute method |
57 | 57 | * |
58 | - * @return \Longman\TelegramBot\Entities\ServerResponse|mixed |
|
58 | + * @return \Longman\TelegramBot\Entities\ServerResponse |
|
59 | 59 | * @throws \Longman\TelegramBot\Exception\TelegramException |
60 | 60 | */ |
61 | 61 | public function execute() |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | * |
330 | 330 | * @todo Why send just to the first found channel? |
331 | 331 | * |
332 | - * @return mixed |
|
332 | + * @return \Longman\TelegramBot\Entities\ServerResponse |
|
333 | 333 | * @throws \Longman\TelegramBot\Exception\TelegramException |
334 | 334 | */ |
335 | 335 | public function executeNoDb() |
@@ -10,12 +10,12 @@ |
||
10 | 10 | |
11 | 11 | namespace Longman\TelegramBot\Commands\AdminCommands; |
12 | 12 | |
13 | -use Longman\TelegramBot\Entities\Keyboard; |
|
14 | -use Longman\TelegramBot\Request; |
|
15 | -use Longman\TelegramBot\Conversation; |
|
16 | 13 | use Longman\TelegramBot\Commands\AdminCommand; |
14 | +use Longman\TelegramBot\Conversation; |
|
15 | +use Longman\TelegramBot\Entities\Keyboard; |
|
17 | 16 | use Longman\TelegramBot\Entities\Message; |
18 | 17 | use Longman\TelegramBot\Exception\TelegramException; |
18 | +use Longman\TelegramBot\Request; |
|
19 | 19 | |
20 | 20 | class SendtochannelCommand extends AdminCommand |
21 | 21 | { |
@@ -262,7 +262,7 @@ |
||
262 | 262 | } |
263 | 263 | |
264 | 264 | //Convert each Entity item into an object based on its JSON reflection |
265 | - $json_entities = array_map(function ($entity) { |
|
265 | + $json_entities = array_map(function($entity) { |
|
266 | 266 | return json_decode($entity, true); |
267 | 267 | }, $entities); |
268 | 268 |
@@ -251,7 +251,7 @@ |
||
251 | 251 | * @todo Find a better way, as json_* functions are very heavy |
252 | 252 | * |
253 | 253 | * @param array|null $entities |
254 | - * @param mixed $default |
|
254 | + * @param string|null $default |
|
255 | 255 | * |
256 | 256 | * @return mixed |
257 | 257 | */ |
@@ -238,7 +238,7 @@ |
||
238 | 238 | * |
239 | 239 | * @param \Longman\TelegramBot\Entities\File $file |
240 | 240 | * |
241 | - * @return boolean |
|
241 | + * @return boolean|string |
|
242 | 242 | * @throws \Longman\TelegramBot\Exception\TelegramException |
243 | 243 | */ |
244 | 244 | public static function downloadFile(File $file) |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | 'first_name' => 'botname', |
189 | 189 | 'username' => 'namebot', |
190 | 190 | ]; |
191 | - $data['chat'] = ['id' => $data['chat_id']]; |
|
191 | + $data['chat'] = ['id' => $data['chat_id']]; |
|
192 | 192 | |
193 | 193 | $fake_response['result'] = $data; |
194 | 194 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $multipart = []; |
213 | 213 | |
214 | 214 | // Convert any nested arrays into JSON strings. |
215 | - array_walk($data, function (&$item) { |
|
215 | + array_walk($data, function(&$item) { |
|
216 | 216 | is_array($item) && $item = json_encode($item); |
217 | 217 | }); |
218 | 218 | |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | */ |
850 | 850 | public static function setWebhook($url = '', array $data = []) |
851 | 851 | { |
852 | - $data = array_intersect_key($data, array_flip([ |
|
852 | + $data = array_intersect_key($data, array_flip([ |
|
853 | 853 | 'certificate', |
854 | 854 | 'max_connections', |
855 | 855 | 'allowed_updates', |
@@ -1077,8 +1077,8 @@ discard block |
||
1077 | 1077 | $requests = DB::getTelegramRequestCount($chat_id, $inline_message_id); |
1078 | 1078 | |
1079 | 1079 | $chat_per_second = ($requests['LIMIT_PER_SEC'] == 0); // No more than one message per second inside a particular chat |
1080 | - $global_per_second = ($requests['LIMIT_PER_SEC_ALL'] < 30); // No more than 30 messages per second to different chats |
|
1081 | - $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 |
|
1080 | + $global_per_second = ($requests['LIMIT_PER_SEC_ALL'] < 30); // No more than 30 messages per second to different chats |
|
1081 | + $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 |
|
1082 | 1082 | |
1083 | 1083 | if ($chat_per_second && $global_per_second && $groups_per_minute) { |
1084 | 1084 | break; |
@@ -42,11 +42,11 @@ |
||
42 | 42 | { |
43 | 43 | return is_array($data) && |
44 | 44 | array_key_exists('text', $data) && ( |
45 | - array_key_exists('url', $data) || |
|
45 | + array_key_exists('url', $data) || |
|
46 | 46 | array_key_exists('callback_data', $data) || |
47 | 47 | array_key_exists('switch_inline_query', $data) || |
48 | 48 | array_key_exists('switch_inline_query_current_chat', $data) |
49 | - ); |
|
49 | + ); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -100,11 +100,11 @@ |
||
100 | 100 | |
101 | 101 | $result_object_types = [ |
102 | 102 | 'total_count' => 'UserProfilePhotos', //Response from getUserProfilePhotos |
103 | - 'file_id' => 'File', //Response from getFile |
|
104 | - 'title' => 'Chat', //Response from getChat |
|
105 | - 'username' => 'User', //Response from getMe |
|
106 | - 'user' => 'ChatMember', //Response from getChatMember |
|
107 | - 'url' => 'WebhookInfo', //Response from getWebhookInfo |
|
103 | + 'file_id' => 'File', //Response from getFile |
|
104 | + 'title' => 'Chat', //Response from getChat |
|
105 | + 'username' => 'User', //Response from getMe |
|
106 | + 'user' => 'ChatMember', //Response from getChatMember |
|
107 | + 'url' => 'WebhookInfo', //Response from getWebhookInfo |
|
108 | 108 | ]; |
109 | 109 | foreach ($result_object_types as $type => $object_class) { |
110 | 110 | if (isset($result[$type])) { |
@@ -199,8 +199,8 @@ |
||
199 | 199 | public function escapeMarkdown($string) |
200 | 200 | { |
201 | 201 | return str_replace( |
202 | - ['[', '`', '*', '_',], |
|
203 | - ['\[', '\`', '\*', '\_',], |
|
202 | + ['[', '`', '*', '_', ], |
|
203 | + ['\[', '\`', '\*', '\_', ], |
|
204 | 204 | $string |
205 | 205 | ); |
206 | 206 | } |
@@ -916,7 +916,7 @@ discard block |
||
916 | 916 | } |
917 | 917 | |
918 | 918 | $this->run_commands = true; |
919 | - $this->botan_enabled = false; // Force disable Botan.io integration, we don't want to track self-executed commands! |
|
919 | + $this->botan_enabled = false; // Force disable Botan.io integration, we don't want to track self-executed commands! |
|
920 | 920 | |
921 | 921 | $result = Request::getMe()->getResult(); |
922 | 922 | |
@@ -928,8 +928,8 @@ discard block |
||
928 | 928 | $bot_name = $result->getFirstName(); |
929 | 929 | $bot_username = $result->getUsername(); |
930 | 930 | |
931 | - $this->enableAdmin($bot_id); // Give bot access to admin commands |
|
932 | - $this->getCommandsList(); // Load full commands list |
|
931 | + $this->enableAdmin($bot_id); // Give bot access to admin commands |
|
932 | + $this->getCommandsList(); // Load full commands list |
|
933 | 933 | |
934 | 934 | foreach ($commands as $command) { |
935 | 935 | $this->update = new Update( |
@@ -801,7 +801,7 @@ |
||
801 | 801 | /** |
802 | 802 | * Delete any assigned webhook |
803 | 803 | * |
804 | - * @return mixed |
|
804 | + * @return ServerResponse |
|
805 | 805 | * @throws \Longman\TelegramBot\Exception\TelegramException |
806 | 806 | */ |
807 | 807 | public function deleteWebhook() |