From ae3a5e72eb89ef775d3f13778829232474bf3524 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 31 Oct 2021 22:21:27 +1100
Subject: [PATCH] Slow down Gmail API requests

---
 app/Filters/QueryFilters.php     | 10 ++++++++--
 app/Jobs/Mail/NinjaMailerJob.php |  5 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index b68a7d49da44..4d4860eb0077 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -213,12 +213,18 @@ abstract class QueryFilters
     public function with_trashed($value)
     {
 
-        if($value == 'true'){
+        if($value == 'false'){
 
-            $this->builder->withTrashed();
+            return $this->builder->where('is_deleted', 0);
 
         }
 
+        // if($value == 'true'){
+
+        //     $this->builder->withTrashed();
+
+        // }
+
         return $this->builder;
 
     }
diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 1597a73a1162..72cc5fcef935 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -212,6 +212,8 @@ class NinjaMailerJob implements ShouldQueue
 
             $google->getClient()->setAccessToken(json_encode($user->oauth_user_token));
 
+            //need to slow down gmail requests otherwise we hit 429's
+            sleep(1);
         }
         catch(\Exception $e) {
             $this->logMailError('Gmail Token Invalid', $this->company->clients()->first());
@@ -225,9 +227,6 @@ class NinjaMailerJob implements ShouldQueue
          *  just for this request.
         */
 
-        // config(['mail.driver' => 'gmail']);
-        // (new MailServiceProvider(app()))->register();
-
         $token = $user->oauth_user_token->access_token;
 
         $this->nmo