v3.21.0

studio1902 · Oct 26, 2021 · 80746ca · 80746ca
1 parent f629754
commit 80746ca
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## 3.21.0 (2021-10-26)
+
+### What's new
+- Generating social images now works in multisite environments. #157 by @robdekort
+
 ## 3.20.0 (2021-10-26)
 
 ### What's improved

diff --git a/app/Jobs/GenerateSocialImagesJob.php b/app/Jobs/GenerateSocialImagesJob.php
@@ -53,20 +53,20 @@ public function handle()
             // Prepare.
             $id = $item->id();
             $title = Str::of($item->get('title'))->slug('-');
-            $app_url = config('app.url');
+            $absolute_url = $item->site()->absoluteUrl();
             $unique = time();
 
             // Generate, save and set default og image.
             $file = "{$title}-og-{$unique}.png";
-            $image = Browsershot::url("{$app_url}/social-images/{$id}")
+            $image = Browsershot::url("{$absolute_url}/social-images/{$id}")
                 ->windowSize(1200, 630)
                 ->select('#og')
                 ->save($disk->path($file));
             $item->set('og_image', $file)->save();
 
             // Generate, save and set default twitter image.
             $file = "{$title}-twitter-{$unique}.png";
-            $image = Browsershot::url("{$app_url}/social-images/{$id}")
+            $image = Browsershot::url("{$absolute_url}/social-images/{$id}")
                 ->windowSize(1200, 600)
                 ->select('#twitter')
                 ->save($disk->path($file));

diff --git a/dev/CHANGELOG.md b/dev/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release Notes
 
-## Unreleased
+## 3.21.0 (2021-10-26)
 
 ### What's new
 - Generating social images now works in multisite environments. #157 by @robdekort

diff --git a/routes/web.php b/routes/web.php
@@ -2,6 +2,7 @@
 
 use App\Http\Controllers\DynamicToken;
 use Illuminate\Support\Facades\Route;
+use Statamic\Facades\Site;
 
 /*
 |--------------------------------------------------------------------------
@@ -29,9 +30,11 @@
 ]);
 
 // The Social Image route to generate social images.
-// Route::statamic('/social-images/{id}', 'social_images', [
-//     'layout' => null
-// ]);
+Site::all()->each(function ($site) {
+    Route::statamic("{$site->url()}/social-images/{id}", 'social_images', [
+        'layout' => null,
+    ]);
+});
 
 // The Search route to display search results with `views/search.antlers.html`.
 // Route::statamic('/search', 'search', [