Move notification email of server created into the event listener

Author: DaneEveritt

app/Notifications/ServerCreated.php

@@ -66,12 +66,12 @@ public function via($notifiable)
     public function toMail($notifiable)
     {
         return (new MailMessage)
-                    ->line('A new server as been assigned to your account.')
-                    ->line('Server Name: ' . $this->server->name)
-                    ->line('Memory: ' . $this->server->memory . ' MB')
-                    ->line('Node: ' . $this->server->node)
-                    ->line('Type: ' . $this->server->service . ' - ' . $this->server->option)
-                    ->action('Peel Off the Protective Wrap', route('server.index', $this->server->uuidShort))
-                    ->line('Please let us know if you have any additional questions or concerns!');
+            ->line('A new server as been assigned to your account.')
+            ->line('Server Name: ' . $this->server->name)
+            ->line('Memory: ' . $this->server->memory . ' MB')
+            ->line('Node: ' . $this->server->node)
+            ->line('Type: ' . $this->server->service . ' - ' . $this->server->option)
+            ->action('Peel Off the Protective Wrap', route('server.index', $this->server->uuidShort))
+            ->line('Please let us know if you have any additional questions or concerns!');
     }
 }

app/Observers/ServerObserver.php

@@ -26,9 +26,11 @@
 
 use Carbon;
 use Pterodactyl\Events;
+use Pterodactyl\Models\User;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Jobs\DeleteServer;
 use Pterodactyl\Jobs\SuspendServer;
+use Pterodactyl\Notifications\ServerCreated;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 
 class ServerObserver
@@ -55,6 +57,17 @@ public function creating(Server $server)
     public function created(Server $server)
     {
         event(new Events\Server\Created($server));
+
+        // Queue Notification Email
+        $user = User::findOrFail($server->owner);
+        $user->notify((new ServerCreated([
+            'name' => $server->name,
+            'memory' => $server->memory,
+            'node' => $node->name,
+            'service' => $service->name,
+            'option' => $option->name,
+            'uuidShort' => $server->uuidShort,
+        ])));
     }
 
     /**

app/Repositories/ServerRepository.php

@@ -32,7 +32,6 @@
 use Pterodactyl\Services\UuidService;
 use Pterodactyl\Services\DeploymentService;
 use Pterodactyl\Exceptions\DisplayException;
-use Pterodactyl\Notifications\ServerCreated;
 use Pterodactyl\Exceptions\DisplayValidationException;
 
 class ServerRepository
@@ -300,16 +299,6 @@ public function create(array $data)
                 ]);
             }
 
-            // Queue Notification Email
-            $user->notify((new ServerCreated([
-                'name' => $server->name,
-                'memory' => $server->memory,
-                'node' => $node->name,
-                'service' => $service->name,
-                'option' => $option->name,
-                'uuidShort' => $server->uuidShort,
-            ])));
-
             $client = Models\Node::guzzleRequest($node->id);
             $client->request('POST', '/servers', [
                 'headers' => [