Fix some social images generator bugs (#7)

aerni · May 24, 2022 · 1f08375 · 1f08375
1 parent 7a2843a
commit 1f08375
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/resources/stubs/social_images/layout.antlers.html b/resources/stubs/social_images/layout.antlers.html
@@ -7,6 +7,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="{{ mix src='css/tailwind.css' }}">
+        <style>.phpdebugbar { display: none !important; }</style>
     </head>
 
     <body style="width: {{ width }}px; height: {{ height }}px;">

diff --git a/src/Actions/ClearImageGlideCache.php b/src/Actions/ClearImageGlideCache.php
@@ -17,7 +17,8 @@ public static function handle(string $path): void
 
         // Get the path of the cached image.
         $cachePath = $disk->getFilesRecursively('/')
-            ->firstWhere(fn ($cachePath) => str_contains($cachePath, $path));
+            ->filter(fn ($cachePath) => str_contains($cachePath, $path))
+            ->first();
 
         // Delete the cached image.
         if ($cachePath) {

diff --git a/src/Fieldtypes/SocialImageFieldtype.php b/src/Fieldtypes/SocialImageFieldtype.php
@@ -34,15 +34,21 @@ public function preload(): array
         return $meta;
     }
 
-    public function augment($value): string
+    public function augment($value): ?string
     {
         $parent = $this->field->parent();
         $type = $this->config()['image_type'];
 
         $image = SocialImage::all($parent)->get($type);
 
-        return $image->exists()
-            ? $image->absoluteUrl()
-            : $image->generate()->absoluteUrl();
+        if ($image->exists()) {
+            return $image->absoluteUrl();
+        }
+
+        if ($parent->generate_social_images) {
+            return $image->generate()->absoluteUrl();
+        }
+
+        return null;
     }
 }
diff --git a/src/Support/Helpers.php b/src/Support/Helpers.php
@@ -29,6 +29,13 @@ public static function isBlueprintCpRoute(): bool
      */
     public static function isCustomRoute(): bool
     {
-        return request()->route()->getAction('controller') !== 'Statamic\Http\Controllers\FrontendController@index';
+        $allowedControllerActions = collect([
+            'Aerni\AdvancedSeo\Http\Controllers\Web\SocialImagesController@show',
+            'Statamic\Http\Controllers\FrontendController@index',
+        ]);
+
+        $controllerAction = request()->route()->getAction('controller');
+
+        return $allowedControllerActions->doesntContain($controllerAction);
     }
 }