Merge branch 'main' into vue-3

app/Http/Controllers/SitemapController.php

@@ -16,6 +16,7 @@ class SitemapController extends Controller
      */
     protected $urls = [
         ['/', 1],
+        ['/pricing', 0.9],
         ['/privacy-policy', 0.5],
         ['/terms-conditions', 0.5],
         ['/login', 0.4],

app/Models/License.php

@@ -34,7 +34,7 @@ class License extends Model
         return $query->where('status', self::STATUS_ACTIVE);
     }
 
-    public function getMaxFileSizeAttribute()
+    public function getMaxFileSizeAttribute(): int
     {
         return [
             1 => 25000000, // 25 MB,
@@ -43,7 +43,7 @@ class License extends Model
         ][$this->meta['tier']];
     }
 
-    public function getCustomDomainLimitCountAttribute()
+    public function getCustomDomainLimitCountAttribute(): ?int
     {
         return [
             1 => 1,

app/Models/Workspace.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Http\Requests\AnswerFormRequest;
 use App\Models\Forms\Form;
 use App\Models\Traits\CachableAttributes;
 use App\Models\Traits\CachesAttributes;
@@ -71,7 +70,7 @@ class Workspace extends Model implements CachableAttributes
             return null;
         }
 
-        return $this->remember('custom_domain_count', 15 * 60, function(): int {
+        return $this->remember('custom_domain_count', 15 * 60, function(): ?int {
             foreach ($this->owners as $owner) {
                 if ($owner->is_subscribed) {
                     if ($license = $owner->activeLicense()) {

app/Service/Forms/Webhooks/DiscordHandler.php

@@ -68,7 +68,7 @@ class DiscordHandler extends AbstractWebhookHandler
                 "description" => implode(' - ', $externalLinks)
             ];
         }
-        
+
         return [
             'content' => 'New submission for your form **' . $this->form->title . '**',
             'tts' => false,