Merge pull request #8 from bolt/feature/configure-thumbnailing-option

Allow thumbnailing images to be configured
bolt · Oct 17, 2020 · fce1f19 · fce1f19
2 parents 8683f0b + 465a15d
commit fce1f19
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -12,6 +12,8 @@ default:
       '4|8': 'col-4|col-8'
       '6|6': 'col-6|col-6'
       '8|4': 'col-8|col-4'
+  image:
+    thumbnail: 1000×1000×max
 
 plugins:
   ~
diff --git a/src/ArticleConfig.php b/src/ArticleConfig.php
@@ -70,6 +70,7 @@ private function getDefaults(): array
                     '_csrf_token' => $this->csrfTokenManager->getToken('bolt_article')->getValue(),
                 ],
                 'multiple' => false,
+                'thumbnail' => '1000×1000×max',
             ],
             'minHeight' => '200px',
             'maxHeight' => '700px',

diff --git a/src/Controller/Upload.php b/src/Controller/Upload.php
@@ -4,6 +4,7 @@
 
 namespace Bolt\Article\Controller;
 
+use Bolt\Article\ArticleConfig;
 use Bolt\Configuration\Config;
 use Bolt\Controller\Backend\Async\AsyncZoneInterface;
 use Bolt\Controller\CsrfTrait;
@@ -37,12 +38,16 @@ class Upload implements AsyncZoneInterface
     /** @var Request */
     private $request;
 
-    public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, TextExtension $textExtension, RequestStack $requestStack)
+    /** @var ArticleConfig */
+    private $articleConfig;
+
+    public function __construct(Config $config, CsrfTokenManagerInterface $csrfTokenManager, TextExtension $textExtension, RequestStack $requestStack, ArticleConfig $articleConfig)
     {
         $this->config = $config;
         $this->csrfTokenManager = $csrfTokenManager;
         $this->textExtension = $textExtension;
         $this->request = $requestStack->getCurrentRequest();
+        $this->articleConfig = $articleConfig;
     }
 
     /**
@@ -102,9 +107,11 @@ public function handleUpload(Request $request): JsonResponse
         }
 
         if ($result->isValid()) {
+            $thumbnail = '/thumbs/' . $this->articleConfig->getConfig()['image']['thumbnail'] . '/';
+
             $resultMessage = [
                 'filekey' => [
-                    'url' => '/thumbs/1000×1000×max/' . $result->name,
+                    'url' => $thumbnail . $result->name,
                     'id' => 1,
                 ],
             ];