Merge remote-tracking branch 'origin/main' into plugin-submission-checks

# Conflicts:
#	resources/views/customer/plugins/create.blade.php
#	resources/views/customer/plugins/index.blade.php

Author: simonhamp

app/Console/Commands/SendTestEmail.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Models\User;
+use Illuminate\Notifications\Events\NotificationSending;
+
+class SuppressMailNotificationListener
+{
+    public function handle(NotificationSending $event): bool
+    {
+        if ($event->channel !== 'mail') {
+            return true;
+        }
+
+        if (! $event->notifiable instanceof User) {
+            return true;
+        }
+
+        return $event->notifiable->receives_notification_emails;
+    }
+}

app/Listeners/SuppressMailNotificationListener.php

@@ -6,12 +6,16 @@
 use Illuminate\Support\Facades\Hash;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
+use Livewire\Attributes\Url;
 use Livewire\Component;
 
 #[Layout('components.layouts.dashboard')]
 #[Title('Settings')]
 class Settings extends Component
 {
+    #[Url]
+    public string $tab = 'account';
+
     public string $name = '';
 
     public string $currentPassword = '';
@@ -22,9 +26,25 @@ class Settings extends Component
 
     public string $deleteConfirmPassword = '';
 
+    public bool $receivesNotificationEmails = true;
+
+    public bool $receivesNewPluginNotifications = true;
+
     public function mount(): void
     {
         $this->name = auth()->user()->name ?? '';
+        $this->receivesNotificationEmails = auth()->user()->receives_notification_emails;
+        $this->receivesNewPluginNotifications = auth()->user()->receives_new_plugin_notifications;
+    }
+
+    public function updatedReceivesNotificationEmails(bool $value): void
+    {
+        auth()->user()->update(['receives_notification_emails' => $value]);
+    }
+
+    public function updatedReceivesNewPluginNotifications(bool $value): void
+    {
+        auth()->user()->update(['receives_new_plugin_notifications' => $value]);
     }
 
     public function updateName(): void

app/Livewire/Customer/Settings.php

@@ -7,6 +7,7 @@
 use App\Enums\PluginTier;
 use App\Enums\PluginType;
 use App\Enums\PriceTier;
+use App\Notifications\NewPluginAvailable;
 use App\Notifications\PluginApproved;
 use App\Notifications\PluginRejected;
 use App\Services\PluginSyncService;
@@ -20,6 +21,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Support\Facades\Notification;
 
 class Plugin extends Model
 {
@@ -537,6 +539,7 @@ public function getRepositoryOwnerAndName(): ?array
     public function approve(int $approvedById): void
     {
         $previousStatus = $this->status;
+        $isFirstApproval = $this->approved_at === null;
 
         $this->update([
             'status' => PluginStatus::Approved,
@@ -555,6 +558,15 @@ public function approve(int $approvedById): void
 
         $this->user->notify(new PluginApproved($this));
 
+        if ($isFirstApproval) {
+            $recipients = User::query()
+                ->where('receives_new_plugin_notifications', true)
+                ->where('id', '!=', $this->user_id)
+                ->get();
+
+            Notification::send($recipients, new NewPluginAvailable($this));
+        }
+
         resolve(PluginSyncService::class)->sync($this);
     }
 

app/Models/Plugin.php

@@ -358,6 +358,8 @@ protected function casts(): array
         return [
             'email_verified_at' => 'datetime',
             'password' => 'hashed',
+            'receives_notification_emails' => 'boolean',
+            'receives_new_plugin_notifications' => 'boolean',
             'mobile_repo_access_granted_at' => 'datetime',
             'claude_plugins_repo_access_granted_at' => 'datetime',
             'discord_role_granted_at' => 'datetime',

app/Models/User.php

@@ -27,7 +27,7 @@ public function __construct(
      */
     public function via(object $notifiable): array
     {
-        return ['mail'];
+        return ['mail', 'database'];
     }
 
     public function toMail(object $notifiable): MailMessage
@@ -53,6 +53,8 @@ public function toMail(object $notifiable): MailMessage
     public function toArray(object $notifiable): array
     {
         return [
+            'title' => "You've been granted the {$this->bundle->name} bundle!",
+            'body' => "You now have access to {$this->grantedPlugins->count()} plugins in the {$this->bundle->name} bundle.",
             'bundle_id' => $this->bundle->id,
             'bundle_name' => $this->bundle->name,
             'granted_plugin_ids' => $this->grantedPlugins->pluck('id')->toArray(),

app/Notifications/BundleGranted.php

@@ -23,7 +23,7 @@ public function __construct(
      */
     public function via(object $notifiable): array
     {
-        return ['mail'];
+        return ['mail', 'database'];
     }
 
     public function toMail(object $notifiable): MailMessage
@@ -48,6 +48,8 @@ public function toMail(object $notifiable): MailMessage
     public function toArray(object $notifiable): array
     {
         return [
+            'title' => "New plugin added to your {$this->bundle->name} bundle!",
+            'body' => "{$this->plugin->name} has been added to your bundle — it's yours for free.",
             'plugin_id' => $this->plugin->id,
             'plugin_name' => $this->plugin->name,
             'bundle_id' => $this->bundle->id,

app/Notifications/BundlePluginAdded.php

@@ -18,7 +18,20 @@ public function __construct(
 
     public function via($notifiable): array
     {
-        return ['mail'];
+        return ['mail', 'database'];
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray($notifiable): array
+    {
+        return [
+            'title' => 'Thank You for Making NativePHP Mobile Free',
+            'body' => 'NativePHP for Mobile is now free for everyone — thanks to early supporters like you.',
+            'license_id' => $this->license->id,
+            'license_key' => $this->license->key,
+        ];
     }
 
     public function toMail($notifiable): MailMessage

app/Notifications/LegacyLicenseThankYou.php

@@ -19,7 +19,7 @@ public function __construct(
 
     public function via($notifiable): array
     {
-        return ['mail'];
+        return ['mail', 'database'];
     }
 
     public function toMail($notifiable): MailMessage
@@ -43,6 +43,20 @@ public function toMail($notifiable): MailMessage
             ->salutation("Best regards,\nThe NativePHP Team");
     }
 
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray($notifiable): array
+    {
+        return [
+            'title' => $this->getSubject(),
+            'body' => $this->getMainMessage(),
+            'license_id' => $this->license->id,
+            'license_key' => $this->license->key,
+            'days_until_expiry' => $this->daysUntilExpiry,
+        ];
+    }
+
     private function getSubject(): string
     {
         return match ($this->daysUntilExpiry) {

app/Notifications/LicenseExpiryWarning.php

@@ -25,7 +25,7 @@ public function __construct(
      */
     public function via(object $notifiable): array
     {
-        return ['mail'];
+        return ['mail', 'database'];
     }
 
     public function toMail(object $notifiable): MailMessage
@@ -58,6 +58,8 @@ public function toMail(object $notifiable): MailMessage
     public function toArray(object $notifiable): array
     {
         return [
+            'title' => 'Your NativePHP License Key',
+            'body' => 'Your license key has been generated and is ready to use.',
             'license_key' => $this->licenseKey,
             'firstName' => $this->firstName,
         ];