wip #8026 @2

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookQuote/AssignOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookQuote/AssignOperation.php
index b841b73c003d43e84fb896a3b1b27d9a2c9f5312..64578d81a0dcf4fff066759084410c5f8d8f73ec 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookQuote/AssignOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookQuote/AssignOperation.php
@@ -3,11 +3,8 @@
 namespace App\Http\Controllers\Admin\Operations\FluidbookQuote;
 
 use App\Mail\FluidbookQuoteAssign;
-use App\Mail\FluidbookQuoteReceived;
 use App\Models\FluidbookQuote;
-use App\Models\User;
 use App\Slack\Mattermost;
-use App\Slack\Slack;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Route;

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookQuote/ConfirmAssignmentOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookQuote/ConfirmAssignmentOperation.php
index 14cecc3688ae363c7a7194268729986dd7503a52..6270a63fd591c4551de431a037599012e77bc78e 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookQuote/ConfirmAssignmentOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookQuote/ConfirmAssignmentOperation.php
@@ -2,11 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Operations\FluidbookQuote;
 
-use App\Mail\FluidbookQuoteAssign;
-use App\Mail\FluidbookQuoteReceived;
 use App\Models\FluidbookQuote;
-use App\Models\User;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Route;
 use Prologue\Alerts\Facades\Alert;

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
index ea66a025e216f75b8a52b75125dd216a0d8d5262..7a2b6e8cbf6d56b46e9bac65b21f3f6fb050bd69 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookQuote/CreateFromWebsite.php
@@ -11,13 +11,12 @@ use App\Models\Company;
 use App\Models\FluidbookQuote;
 use App\Models\AuthUser;
 use App\Slack\Mattermost;
-use App\Slack\Slack;
 use Cubist\Backpack\Middleware\CORSMiddleware;
 use Cubist\Util\ArrayUtil;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Route;
-use Spatie\Permission\Models\Role;
+use League\CommonMark\Exception\CommonMarkException;
 
 // __('!! Demandes de devis fluidbook')
 trait CreateFromWebsite
@@ -43,6 +42,9 @@ trait CreateFromWebsite
         return false;
     }
 
+    /**
+     * @throws CommonMarkException
+     */
     protected function createFromWebsite()
     {
         $post = $this->validateCreateRequest();
@@ -118,9 +120,11 @@ trait CreateFromWebsite
                 }
             }
 
-            $quoteMail = new FluidbookQuoteReceived();
-            $quoteMail->setData($post);
-            Mail::send($quoteMail);
+            if (!$spam) {
+                $quoteMail = new FluidbookQuoteReceived();
+                $quoteMail->setData($post);
+                Mail::send($quoteMail);
+            }
         }
 
         return response()->json($resp);

diff --git a/app/Models/LinkShortener.php b/app/Models/LinkShortener.php
index 9154bda1d097f15ecd987ec2a8fcefb80f2ab7d3..92829c8b4da71208aaebdbbab83007175ae423f1 100644 (file)
--- a/app/Models/LinkShortener.php
+++ b/app/Models/LinkShortener.php
@@ -56,19 +56,26 @@ class LinkShortener extends ToolboxModel
         return self::$_cache[$id];
     }
 
-    public static function expand($shorturl, $shortener)
+    public static function expand($shorturl, $shortener, $force = false)
     {
-        $res = self::_request('expand', ['shorturl' => $shorturl], $shortener, $code);
-        return $res->longurl ?? false;
+        $cacheKey = 'shorturl_expand_' . $shorturl;
+        if ($force) {
+            cache()->delete($cacheKey);
+        }
+        return cache()->remember($cacheKey, 3600, function () use ($shorturl, $shortener) {
+            $res = self::_request('expand', ['shorturl' => $shorturl], $shortener, $code);
+            return $res->longurl ?? false;
+        });
     }
 
-    public static function shorturl($url, $shortener, $force = true)
+    public static function shorturl($url, $shortener, $force = false)
     {
         $cacheKey = 'shorturl_' . $shortener . '_' . $url;
         if ($force) {
             cache()->delete($cacheKey);
         }
         return cache()->remember($cacheKey, 3600, function () use ($url, $shortener) {
+            start_measure('shorten url ' . $url);
             $res = self::_request('shorturl', ['url' => $url], $shortener, $code);
             if ($code === 200) {
 
@@ -76,6 +83,7 @@ class LinkShortener extends ToolboxModel
             if (isset($res->shorturl) && $res->shorturl) {
                 return $res->shorturl;
             }
+            stop_measure('shorten url ' . $url);
         });
     }