move notification macro to main provider

tomatophp · Nov 25, 2024 · 797734b · 797734b
1 parent b538b58
commit 797734b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/src/FilamentAlertsPlugin.php b/src/FilamentAlertsPlugin.php
@@ -55,7 +55,6 @@ public function register(Panel $panel): void
                 EmailSettingsPage::class,
             ]);
         }
-
     }
 
     public function hideNotificationsResource(?bool $hideNotificationsResource = true): static
@@ -114,21 +113,6 @@ public function boot(Panel $panel): void
             }
         }
 
-        Notification::macro('sendUse', function (Model $user, string $driver = EmailDriver::class, array $data = []): static {
-            /** @var Notification $this */
-            app($driver)->sendIt(
-                title: $this->getTitle(),
-                body: $this->getBody(),
-                icon: $this->getIcon(),
-                type: $this->getStatus(),
-                url: count($this->getActions()) ? $this->getActions()[0]->getUrl() ?? null : null,
-                model: get_class($user),
-                modelId: $user->id
-            );
-
-            return $this;
-        });
-
         if (config('filament-alerts.predefined.users')) {
             FilamentAlerts::register(
                 NotificationUser::make(config('filament-alerts.try.model'))

diff --git a/src/FilamentAlertsServiceProvider.php b/src/FilamentAlertsServiceProvider.php
@@ -2,8 +2,11 @@
 
 namespace TomatoPHP\FilamentAlerts;
 
+use Filament\Notifications\Notification;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
+use TomatoPHP\FilamentAlerts\Services\Drivers\EmailDriver;
 use TomatoPHP\FilamentAlerts\Services\NotificationService;
 
 class FilamentAlertsServiceProvider extends ServiceProvider
@@ -49,6 +52,21 @@ public function register(): void
         $this->app->bind('filament-alerts', function () {
             return new NotificationService;
         });
+
+        Notification::macro('sendUse', function (Model $user, string $driver = EmailDriver::class, array $data = []): static {
+            /** @var Notification $this */
+            app($driver)->sendIt(
+                title: $this->getTitle(),
+                body: $this->getBody(),
+                icon: $this->getIcon(),
+                type: $this->getStatus(),
+                url: count($this->getActions()) ? $this->getActions()[0]->getUrl() ?? null : null,
+                model: get_class($user),
+                modelId: $user->id
+            );
+
+            return $this;
+        });
     }
 
     public function boot(): void {}