Merge pull request #138 from DJTommek/pr/file-upload-fix

Fixed uploading documents and thumbnails

Author: unreal4u

examples/binary-test-data/logo-php7-telegram-bot-api-thumbnail.jpg

@@ -17,6 +17,7 @@
 $sendAudio->chat_id = A_USER_CHAT_ID;
 $sendAudio->audio = new InputFile('binary-test-data/ICQ-uh-oh.mp3');
 $sendAudio->title = 'The famous ICQ new message alert';
+$sendAudio->thumb = new InputFile(__DIR__ . '/binary-test-data/logo-php7-telegram-bot-api-thumbnail.jpg');
 
 $promise = $tgLog->performApiRequest($sendAudio);
 

examples/send-audio.php

@@ -6,24 +6,40 @@
 
 use React\EventLoop\Factory;
 use unreal4u\TelegramAPI\HttpClientRequestHandler;
+use unreal4u\TelegramAPI\Telegram\Methods\GetFile;
 use unreal4u\TelegramAPI\Telegram\Methods\SendDocument;
 use unreal4u\TelegramAPI\Telegram\Types\Custom\InputFile;
 use unreal4u\TelegramAPI\TgLog;
+use function Clue\React\Block\await;
 
 $loop = Factory::create();
 $tgLog = new TgLog(BOT_TOKEN, new HttpClientRequestHandler($loop));
 
 $sendDocument = new SendDocument();
 $sendDocument->chat_id = A_USER_CHAT_ID;
 $sendDocument->document = new InputFile(__FILE__);
+$sendDocument->thumb = new InputFile(__DIR__ . '/binary-test-data/logo-php7-telegram-bot-api-thumbnail.jpg');
 
 $promise = $tgLog->performApiRequest($sendDocument);
 
 $promise->then(
-    function ($response) {
+    function ($response) use ($tgLog, $loop) {
         echo '<pre>';
         var_dump($response);
         echo '</pre>';
+        /** @var $response \unreal4u\TelegramAPI\Telegram\Types\Message */
+
+        // Load uploaded video and generate URL to download using bot token
+        $getFileVideo = new GetFile();
+        $getFileVideo->file_id = $response->document->file_id;
+        $fileVideo = await($tgLog->performApiRequest($getFileVideo), $loop);
+        var_dump('Document url: ' . $tgLog->fileUrl($fileVideo));
+
+        // Load uploaded thumbnail and generate URL to download using bot token
+        $getFileThumb = new GetFile();
+        $getFileThumb->file_id = $response->document->thumb->file_id;
+        $fileThumb = await($tgLog->performApiRequest($getFileThumb), $loop);
+        var_dump('Thumbnail url: ' . $tgLog->fileUrl($fileThumb));
     },
     function (\Exception $exception) {
         // Onoes, an exception occurred...

examples/send-document.php

@@ -92,12 +92,12 @@ private function checkIsMultipart(TelegramMethods $method): array
 
         $return = [];
 
-        foreach ($method as $key => $value) {
-            if ($method->hasLocalFiles() === true) {
-                $this->logger->debug('About to send a file, so changing request to use multi-part instead');
-                // If we are about to send a file, we must use the multipart/form-data way
-                $this->formType = 'multipart/form-data';
-                foreach ($method->getLocalFiles() as $identifier => $localFile) {
+        if ($method->hasLocalFiles() === true) {
+            $this->logger->debug('About to send a file, so changing request to use multi-part instead');
+            // If we are about to send a file, we must use the multipart/form-data way
+            $this->formType = 'multipart/form-data';
+            foreach ($method->getLocalFiles() as $identifier => $localFile) {
+                if ($localFile instanceof InputFile) {
                     $return[$identifier . '~' . $this->numberOfLocalFiles] = [
                         'id' => $this->numberOfLocalFiles,
                         'filename' => basename($localFile->path),

src/InternalFunctionality/PostOptionsConstructor.php

@@ -41,6 +41,16 @@ class SendAudio extends TelegramMethods
      */
     public $audio = '';
 
+    /**
+     * Optional. Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported
+     * server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height
+     * should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused
+     * and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was
+     * uploaded using multipart/form-data under <file_attach_name>.
+     * @var string|InputFile
+     */
+    public $thumb;
+
     /**
      * Optional. Audio caption, 0-200 characters
      * @var string
@@ -108,6 +118,9 @@ public function hasLocalFiles(): bool
 
     public function getLocalFiles(): Generator
     {
-        yield 'audio' => $this->audio;
+        yield from [
+            'audio' => $this->audio,
+            'thumb' => $this->thumb,
+        ];
     }
 }

src/Telegram/Methods/SendAudio.php

@@ -102,10 +102,10 @@ public function performApiRequest(TelegramMethods $method): PromiseInterface
      */
     public function downloadFile(File $file): PromiseInterface
     {
-        $url = 'https://api.telegram.org/file/bot' . $this->botToken . '/' . $file->file_path;
+        $fileUrl = $this->fileUrl($file);
         $this->logger->debug('About to perform request to begin downloading file');
 
-        return $this->requestHandler->get($url)->then(
+        return $this->requestHandler->get($fileUrl)->then(
             function (TelegramResponse $rawData) {
                 return new TelegramDocument($rawData);
             }
@@ -156,4 +156,15 @@ protected function composeApiMethodUrl(TelegramMethods $call): string
 
         return $this->apiUrl . $this->methodName;
     }
+
+    /**
+     * Generate URL for file download using bot token
+     *
+     * @param File $file
+     * @return string
+     */
+    public function fileUrl(File $file): string
+    {
+        return 'https://api.telegram.org/file/bot' . $this->botToken . '/' . $file->file_path;
+    }
 }