wip #7868 @1

diff --git a/app/Fluidbook/Link/LinksData.php b/app/Fluidbook/Link/LinksData.php
index dc1c7a90e0b79f64c9f7364d44e711867f25787b..ab80ca47872f16f574ccb3e8d956502b8e47b6f1 100644 (file)
--- a/app/Fluidbook/Link/LinksData.php
+++ b/app/Fluidbook/Link/LinksData.php
@@ -3,8 +3,10 @@
 namespace App\Fluidbook\Link;
 
 use App\Fluidbook\Compiler\Compiler;
+use App\Jobs\AuditLinkRegister;
 use App\Jobs\OCR;
 use App\Models\FluidbookPublication;
+use App\Models\ShortLink;
 use App\Models\User;
 use App\SubForms\Link\Base;
 use Cubist\Util\Files\Files;
@@ -572,6 +574,9 @@ class LinksData
         copy($base . '.meta3.gz', $latestMeta);
 
         $fluidbook->touch();
+        if ($fluidbook->linkShortener != 0 && $fluidbook->linkShortener != "none") {
+            AuditLinkRegister::dispatch();
+        }
     }
 
 

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 96b2678133c14faa57a976a896b3704b44abb920..545eb0c37a45d7e842b6bebe50e32755d8bb015d 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -41,6 +41,7 @@ use App\Http\Controllers\Admin\Operations\FluidbookPublication\UpgradeOperation;
 use App\Http\Controllers\Admin\Operations\FluidbookPublication\YSLOperation;
 use App\Http\Controllers\Admin\Operations\InvoiceOperation;
 use App\Http\Controllers\Admin\Operations\FluidbookPublication\SettingsExportOperation;
+use App\Jobs\AuditLinkRegister;
 use App\Jobs\FluidbookImagesPreprocess;
 use App\Jobs\FluidbookSocialImage;
 use App\Jobs\GenerateDeliveryThumbnailsPreview;
@@ -368,6 +369,9 @@ class FluidbookPublication extends ToolboxStatusModel
             FluidbookImagesPreprocess::dispatch($this->id);
             FluidbookSocialImage::dispatch($this);
         }
+        if ($this->linkShortener != 0 && $this->linkShortener !== 'none') {
+            AuditLinkRegister::dispatch();
+        }
 
         return parent::onSaved();
     }

diff --git a/app/Models/ShortLink.php b/app/Models/ShortLink.php
index 5861dcab4c47e6b5ed3661ae2f6bda09b8c72c65..e3134dba7a53ec507890e186ed2d2059c3ceedff 100644 (file)
--- a/app/Models/ShortLink.php
+++ b/app/Models/ShortLink.php
@@ -80,6 +80,8 @@ class ShortLink extends ToolboxModel
                     ];
                     if (isset($auditLinks[$i->url])) {
                         $d = array_merge($d, $auditLinks[$i->url]);
+                    } else {
+                        continue;
                     }
                     $data[$d['id']] = $d;
                 }
@@ -90,11 +92,6 @@ class ShortLink extends ToolboxModel
         return $data;
     }
 
-    public static function shouldRefreshDatabase()
-    {
-        return true;
-    }
-
     public static function getDataLastChangeFile()
     {
         return Files::mkdir(resource_path('shortlink')) . 'lastchange';