~ Cleanup

app/Console/Kernel.php

@@ -3,31 +3,23 @@
 namespace App\Console;
 
 use App\Jobs\RefreshIP;
-use Native\Laravel\Facades\MenuBar;
-use Illuminate\Support\Facades\Http;
-use Native\Laravel\Facades\Settings;
-use Native\Laravel\Facades\Notification;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
 {
-
-
-
-protected function schedule(Schedule $schedule): void
-{
-    // update IP address every minute
-    $schedule->job(RefreshIP::class)->everyMinute();
-}
-
-
-
-
-protected function commands(): void
-{
-$this->load(__DIR__.'/Commands');
-
-require base_path('routes/console.php');
-}
+    protected function schedule(Schedule $schedule): void
+    {
+        // update IP address every minute
+        $schedule->call(function(){
+            RefreshIP::dispatchSync();
+        })->everyMinute();
+    }
+
+    protected function commands(): void
+    {
+        $this->load(__DIR__.'/Commands');
+
+        require base_path('routes/console.php');
+    }
 }

app/Jobs/RefreshIP.php

@@ -3,7 +3,11 @@
 namespace App\Jobs;
 
 use App\Services\IP;
+use Illuminate\Support\Str;
 use Illuminate\Bus\Queueable;
+use Native\Laravel\Menu\Menu;
+use App\Events\ClickedCopyV4Link;
+use App\Events\ClickedCopyV6Link;
 use Native\Laravel\Facades\MenuBar;
 use Native\Laravel\Facades\Settings;
 use Illuminate\Queue\SerializesModels;
@@ -13,7 +17,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 
-class RefreshIP implements ShouldQueue
+class RefreshIP
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 

app/Listeners/CopyIPv4Address.php

@@ -11,14 +11,6 @@
 
 class CopyIPv4Address
 {
-    /**
-     * Create the event listener.
-     */
-    public function __construct()
-    {
-        //
-    }
-
     /**
      * Handle the event.
      */

app/Listeners/CopyIPv6Address.php

@@ -11,14 +11,6 @@
 
 class CopyIPv6Address
 {
-    /**
-     * Create the event listener.
-     */
-    public function __construct()
-    {
-        //
-    }
-
     /**
      * Handle the event.
      */

app/Providers/NativeAppServiceProvider.php

@@ -18,11 +18,11 @@ public function boot(): void
         $externalIpv4 = IP::getV4();
         $externalIpv6 = IP::getV6();
 
-        $menu = MenuBar::create()
+        MenuBar::create()
             ->icon(public_path('menuBarIcon.png'))
             ->withContextMenu(
                 Menu::new()
-                    ->event(ClickedCopyV4Link::class, 'IPv4: ' . $externalIpv4)
+                    ->event(ClickedCopyV4Link::class, 'IPv4: ' . $externalIpv4 ?: 'N/A')
                     ->event(ClickedCopyV6Link::class, 'IPv6: ' . (Str::contains($externalIpv6, '::') ? $externalIpv6 : 'N/A'))
                     ->separator()
                     ->link('https://whatismyipaddress.com', 'What Is My IP?')
@@ -33,13 +33,9 @@ public function boot(): void
                 'url' => 'https://whatismyipaddress.com/'
             ])
             ->label('Booting...')
+            ->onlyShowContextMenu()
         ;
 
-        if (PHP_OS_FAMILY === 'Linux') {
-            // without this, the context menu will not show on linux systems
-            $menu->onlyShowContextMenu();
-        }
-
         RefreshIP::dispatchSync(onInit: true);
     }
 }

app/Services/IP.php

@@ -9,16 +9,16 @@ class IP
     public static function getV4(): string|bool
     {
         return Http::get('https://ipv4.seeip.org')->throw(function($error){
-            report($error);   
-            
+            report($error);
+
             return false;
         })->body();
     }
 
     public static function getV6(): string|bool
     {
-        return Http::get('https://ipv6.seeip.org')->throw(function(){
-            report($e);
+        return Http::get('https://ipv6.seeip.org')->throw(function($error){
+            report($error);
 
             return false;
         })->body();