Merge pull request #2 from TsSaltan/master

Изменение API URL

Author: TsSaltan

README.MD

@@ -108,6 +108,9 @@ $api->sendMessage()
 	->query();
 ```
 
+## Использование прокси сервера
+[PHP proxy for Telegram Bot API](https://github.com/TsSaltan/Telegram-bot-api-php-proxy)
+
 ## Расширение для DevelNext
 [Скачать](https://github.com/jphp-group/jphp-telegram-bot-api/releases/latest)
 

package.php.yml

@@ -1,5 +1,5 @@
 name: telegram-bot-api
-version: 1.1.0
+version: 1.2
 deps:
   jphp-core: '*'
   jphp-json-ext: '*'
@@ -34,7 +34,7 @@ config:
   - /LICENSE
 
 develnext-bundle:
-  version: 1.1.0
+  version: 1.2
   name: Telegram Bot API
   author: broelik
   icon: "develnext/bundle/telegram/icon32.png"

src-bundle/vendor/develnext.bundle.telegram.TelegramBotAPIBundle/telegram/TelegramBotApi.php

@@ -38,7 +38,8 @@
 use telegram\query\TUnbanChatMemberQuery;
 
 class TelegramBotApi{
-    private $baseURL = 'https://api.telegram.org/bot%s/%s';
+    private $apiURL = 'https://api.telegram.org';
+    private $baseURL = '%s/bot%s/%s';
     private $token;
     /**
      * @var Proxy
@@ -55,6 +56,18 @@ function __construct(?string $token = null){
         $this->token = $token;
         $this->json = new JsonProcessor;
     }
+
+    /**
+     * @param string $url
+     * @return TelegramBotApi
+     */
+    function setApiURL(string $url){
+        if(!str::startsWith($url, 'https://')) throw new TelegramException('HTTPS protocol required');
+        if(str::endsWith($url, '/')) $url = str::sub($url, 0, str::length($url)-1);
+        $this->apiURL = $url;
+        return $this;
+    }
+
     /**
      * @return TGetMeQuery
      */
@@ -264,7 +277,7 @@ private function formatMultipart(array $args, string $boundary){
      * @return URLConnection
      */
     private function createConnection(string $method, bool $multipart = false, ?string $boundary = null){
-        $connection = URLConnection::create(str::format($this->baseURL, $this->token, $method), $this->proxy);
+        $connection = URLConnection::create(str::format($this->baseURL, $this->apiURL, $this->token, $method), $this->proxy);
         $connection->doInput = true;
         $connection->doOutput = true;
         $connection->requestMethod = 'POST';

src/telegram/TelegramBotApi.php

@@ -38,7 +38,8 @@
 use telegram\query\TUnbanChatMemberQuery;
 
 class TelegramBotApi{
-    private $baseURL = 'https://api.telegram.org/bot%s/%s';
+    private $apiURL = 'https://api.telegram.org';
+    private $baseURL = '%s/bot%s/%s';
     private $token;
     /**
      * @var Proxy
@@ -55,6 +56,18 @@ function __construct(?string $token = null){
         $this->token = $token;
         $this->json = new JsonProcessor;
     }
+
+    /**
+     * @param string $url
+     * @return TelegramBotApi
+     */
+    function setApiURL(string $url){
+        if(!str::startsWith($url, 'https://')) throw new TelegramException('HTTPS protocol required');
+        if(str::endsWith($url, '/')) $url = str::sub($url, 0, str::length($url)-1);
+        $this->apiURL = $url;
+        return $this;
+    }
+
     /**
      * @return TGetMeQuery
      */
@@ -264,7 +277,7 @@ private function formatMultipart(array $args, string $boundary){
      * @return URLConnection
      */
     private function createConnection(string $method, bool $multipart = false, ?string $boundary = null){
-        $connection = URLConnection::create(str::format($this->baseURL, $this->token, $method), $this->proxy);
+        $connection = URLConnection::create(str::format($this->baseURL, $this->apiURL, $this->token, $method), $this->proxy);
         $connection->doInput = true;
         $connection->doOutput = true;
         $connection->requestMethod = 'POST';

src/telegram/query/TGetFileQuery.php

@@ -20,6 +20,7 @@ public function file_id($value){
     }
 
     /**
+     * @todo change domain for downloading file
      * @return TFile
      */
     function query(){