From 51784df6a8e663196b5c75f048833db8e60272db Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 21 May 2024 21:41:23 +1000 Subject: [PATCH] Fix missed Notification using old Message::class --- app/Console/Commands/PacketProcess.php | 11 +++-------- app/Notifications/Netmails/EchomailBadAddress.php | 9 ++++----- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/Console/Commands/PacketProcess.php b/app/Console/Commands/PacketProcess.php index be222de..019a2de 100644 --- a/app/Console/Commands/PacketProcess.php +++ b/app/Console/Commands/PacketProcess.php @@ -3,9 +3,7 @@ namespace App\Console\Commands; use Illuminate\Console\Command; -use Illuminate\Support\Facades\Storage; -use App\Classes\File; use App\Classes\FTN\Packet; use App\Jobs\PacketProcess as Job; use App\Models\Address; @@ -60,16 +58,13 @@ class PacketProcess extends Command /** * Execute the console command. * - * @return void - * @throws \App\Exceptions\InvalidPacketException + * @return int|void + * @throws \Exception */ public function handle() { - //$fs = Storage::disk(config('fido.local_disk')); $rel_name = sprintf('%s/%s',config('fido.dir'),$this->argument('file')); - //$f = new File($fs->path($rel_name)); - $m = []; if ($this->argument('ftn')) { $ao = Address::findFTN($this->argument('ftn')); @@ -84,6 +79,6 @@ class PacketProcess extends Command Job::dispatchSync($rel_name,$ao->zone->domain,$this->option('dontqueue')); - return Command::SUCCESS; + return self::SUCCESS; } } \ No newline at end of file diff --git a/app/Notifications/Netmails/EchomailBadAddress.php b/app/Notifications/Netmails/EchomailBadAddress.php index 4e4aad8..80bb971 100644 --- a/app/Notifications/Netmails/EchomailBadAddress.php +++ b/app/Notifications/Netmails/EchomailBadAddress.php @@ -5,9 +5,8 @@ namespace App\Notifications\Netmails; use Carbon\Carbon; use Illuminate\Support\Facades\Log; -use App\Classes\FTN\Message; use App\Notifications\Netmails; -use App\Models\Netmail; +use App\Models\{Echomail,Netmail}; use App\Traits\{MessagePath,PageTemplate}; class EchomailBadAddress extends Netmails @@ -16,14 +15,14 @@ class EchomailBadAddress extends Netmails private const LOGKEY = 'NBA'; - private Message $mo; + private Echomail $mo; /** * Send a sysop a message if they give us a message with a bad address in it. * - * @param Message $mo + * @param Echomail $mo */ - public function __construct(Message $mo) + public function __construct(Echomail $mo) { parent::__construct();