wait #5732 @1

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php
index 65c781caa966b75007b3342e0d2cfaede6998f3b..f032468422bd146419328396133ebb7c6971b6da 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/Services/SocialImageOperation.php
@@ -90,7 +90,7 @@ trait SocialImageOperation
                     touch($lock);
 
                     $force = (file_exists($res) && filemtime($res) < $limit) || isset($_GET['forcecompile']);
-                    $url = route('fluidbook_preview_with_time', ['version' => 'online', 'id' => $id, 'hash' => $fluidbook->hash, 'time' => time(), 'nointerface' => 1, 'force' => $force ? '1' : '0']);
+                    $url = route('fluidbook_preview_with_time', ['version' => 'online', 'id' => $id, 'hash' => $fluidbook->hash, 'time' => time(), 'nointerface' => 1, 'force' => $force ? '1' : '0', 'puppeteer' => '1']);
 
                     $w = 1200;
                     $h = 628;
@@ -102,7 +102,7 @@ trait SocialImageOperation
                     $cl->setArg('delay', 10);
                     $cl->setArg('scale', 0.5);
                     $cl->setArg('dest', $res);
-                    $cl->setArg('url', $url);
+                    $cl->setArg('url', '"'.$url.'"');
                     $cl->execute();
                     $cl->debug();
                     unlink($lock);

diff --git a/app/Jobs/GenerateThemePreview.php b/app/Jobs/GenerateThemePreview.php
index 7b8c0f7c132d80c5b7acc78735cffb2a58683f8e..62cfd455755718b0d838e673edb16b53a5fbc67d 100644 (file)
--- a/app/Jobs/GenerateThemePreview.php
+++ b/app/Jobs/GenerateThemePreview.php
@@ -45,7 +45,7 @@ class GenerateThemePreview extends Base
         $cl->setArg('destloader', self::getPreviewPath($this->theme->getIdValue(), 'loader'));
         $cl->setArg('destburger', self::getPreviewPath($this->theme->getIdValue(), 'burger'));
         $cl->setArg('page', 2);
-        $url = $this->theme->getPreviewURL(['shortLoading' => 1, 'transition' => 1]);
+        $url = $this->theme->getPreviewURL(['shortLoading' => 1, 'transition' => 1, 'puppeteer' => 1]);
         $cl->setArg('url', $url);
         $cl->execute();
     }

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index ab7c047f88f6df66c874392918780846c645f17e..def4285120380fafc5374afd792931f92fb15dae 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -729,7 +729,7 @@ class FluidbookPublication extends ToolboxSettingsModel
 
     public function incrementPreviewVisit()
     {
-        if (!backpack_user()) {
+        if (!backpack_user() && !request('puppeteer', false)) {
             $this->visits_counter++;
             $this->saveQuietly();
             if ($this->visits_counter % 20 === 0) {

diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php
index 269135e0c0b26d9ab12bac23b88ce3ec21e48050..d56bcc9d67d5a80d19faa48d39a563314f7ce238 100644 (file)
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@ -800,19 +800,8 @@ class FluidbookTheme extends ToolboxSettingsModel
 
     public static function getThemePreviewURL($id, $params = [], $page = 2)
     {
-        $defaultParams = ['shortLoading' => '1'];
-        $params = array_merge($defaultParams, $params);
-
-        if (count($params) > 0) {
-            $g = [];
-            foreach ($params as $k => $v) {
-                $g[] = $k . '=' . urlencode($v);
-            }
-            $get = '?' . implode('&', $g);
-        } else {
-            $get = '';
-        }
-        return backpack_url('fluidbook-publication/preview/20098-' . $id . '_f2e0452eed6dba9878016ce5603fdc54_' . time() . '/' . $get . '#/page/' . $page);
+        $defaultParams = ['version' => 'online', 'id' => '20098-' . $id, 'hash' => 'f2e0452eed6dba9878016ce5603fdc54', 'time' => time(), 'nointerface' => 1, 'force' => 0, 'shortLoading' => 1, 'puppeteer' => 0];
+        return route('fluidbook_preview_with_time', array_merge($defaultParams, $params));
     }