Reduce logs 2

dobrys · Apr 19, 2021 · 959ebf0 · 959ebf0
1 parent 9ffb1e6
commit 959ebf0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/src/Controllers/AbstractApiController.php b/src/Controllers/AbstractApiController.php
@@ -11,7 +11,7 @@
 use Amp\Http\Server\Router;
 use Amp\Promise;
 use danog\MadelineProto\API;
-use TelegramApiServer\Exceptions\NoMediaException;
+use TelegramApiServer\Exceptions\NoticeException;
 use TelegramApiServer\Logger;
 use TelegramApiServer\MadelineProtoExtensions\ApiExtensions;
 use TelegramApiServer\MadelineProtoExtensions\SystemApiExtensions;
@@ -142,7 +142,7 @@ private function generateResponse(): \Generator
             }
 
         } catch (\Throwable $e) {
-            if (!$e instanceof NoMediaException) {
+            if (!$e instanceof NoticeException) {
                 error($e->getMessage(), Logger::getExceptionAsArray($e));
             } else {
                 notice($e->getMessage());

diff --git a/src/Exceptions/MediaTooBig.php b/src/Exceptions/MediaTooBig.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace TelegramApiServer\Exceptions;
+
+class MediaTooBig extends NoticeException
+{
+
+}
diff --git a/src/Exceptions/NoMediaException.php b/src/Exceptions/NoMediaException.php
@@ -2,7 +2,7 @@
 
 namespace TelegramApiServer\Exceptions;
 
-class NoMediaException extends \Exception
+class NoMediaException extends NoticeException
 {
 
 }
diff --git a/src/Exceptions/NoticeException.php b/src/Exceptions/NoticeException.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace TelegramApiServer\Exceptions;
+
+class NoticeException extends \Exception
+{
+
+}
diff --git a/src/MadelineProtoExtensions/ApiExtensions.php b/src/MadelineProtoExtensions/ApiExtensions.php
@@ -11,8 +11,8 @@
 use Amp\Promise;
 use danog\MadelineProto;
 use danog\MadelineProto\TL\Conversion\BotAPI;
-use OutOfRangeException;
 use TelegramApiServer\EventObservers\EventHandler;
+use TelegramApiServer\Exceptions\MediaTooBig;
 use TelegramApiServer\Exceptions\NoMediaException;
 use function Amp\call;
 
@@ -375,7 +375,7 @@ function() use ($data) {
                 }
 
                 if ($data['size_limit'] && $info['size'] > $data['size_limit']) {
-                    throw new OutOfRangeException(
+                    throw new MediaTooBig(
                         "Media exceeds size limit. Size: {$info['size']} bytes; limit: {$data['size_limit']} bytes"
                     );
                 }
@@ -524,13 +524,13 @@ public function downloadToBrowser(array $info): Promise
      * Upload file from POST request.
      * Response can be passed to 'media' field in messages.sendMedia.
      *
-     * @throws \InvalidArgumentException
      * @return Promise
+     * @throws NoMediaException
      */
     public function uploadMediaForm(): Promise
     {
         if (empty($this->file)) {
-            throw new \InvalidArgumentException('File not found');
+            throw new NoMediaException('File not found');
         }
         return call(function() {
             $inputFile = yield $this->madelineProto->uploadFromStream(