bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fix counts of items waiting for node idle notifications
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 33s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in -17h44m39s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George 2024-10-09 15:41:08 +11:00
parent 5e7bf0554a
commit 32d31cea90
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Notifications/Emails/NodeMarkedDown.php
View File

@ -53,9 +53,9 @@ class NodeMarkedDown extends Notification //implements ShouldQueue
$this->ao->system->last_seen?->diffInDays($now))) $this->ao->system->last_seen?->diffInDays($now)))
->line('') ->line('')
->line('You have (waiting for collection):') ->line('You have (waiting for collection):')
->line(sprintf('* %s Netmails',number_format($this->ao->uncollected_netmail))) ->line(sprintf('* %s Netmails',number_format($this->ao->netmailWaiting()->count())))
->line(sprintf('* %s Echomails',number_format($this->ao->uncollected_echomail))) ->line(sprintf('* %s Echomails',number_format($this->ao->echomailWaiting()->count())))
->line(sprintf('* %s Files',number_format($this->ao->uncollected_files))) ->line(sprintf('* %s Files',number_format($this->ao->filesWaiting()->count())))
->line('') ->line('')
->line(sprintf('Your system will automatically be **DE-LISTED** if your system hasnt polled to collected your mail/file(s) by **%s**',$now->addDays(7)->format('Y-m-d'))) ->line(sprintf('Your system will automatically be **DE-LISTED** if your system hasnt polled to collected your mail/file(s) by **%s**',$now->addDays(7)->format('Y-m-d')))
->line('If you think you\'ve received this email by mistake or need help, please let me know.'); ->line('If you think you\'ve received this email by mistake or need help, please let me know.');

6
app/Notifications/Emails/NodeMarkedHold.php
View File

@ -53,9 +53,9 @@ class NodeMarkedHold extends Notification //implements ShouldQueue
$this->ao->system->last_seen?->diffInDays($now))) $this->ao->system->last_seen?->diffInDays($now)))
->line('') ->line('')
->line('You have (waiting for collection):') ->line('You have (waiting for collection):')
->line(sprintf('* %s Netmails',number_format($this->ao->uncollected_netmail))) ->line(sprintf('* %s Netmails',number_format($this->ao->netmailWaiting()->count())))
->line(sprintf('* %s Echomails',number_format($this->ao->uncollected_echomail))) ->line(sprintf('* %s Echomails',number_format($this->ao->echomailWaiting()->count())))
->line(sprintf('* %s Files',number_format($this->ao->uncollected_files))) ->line(sprintf('* %s Files',number_format($this->ao->filesWaiting()->count())))
->line('') ->line('')
->line(sprintf('To clear this status, all you need to do make sure your system polls and collects mail by **%s**',($this->ao->system->last_seen ?: Carbon::now())->addDays(config('fido.idle.down'))->format('Y-m-d'))) ->line(sprintf('To clear this status, all you need to do make sure your system polls and collects mail by **%s**',($this->ao->system->last_seen ?: Carbon::now())->addDays(config('fido.idle.down'))->format('Y-m-d')))
->line('If you think you\'ve received this email by mistake or need help, please let me know.'); ->line('If you think you\'ve received this email by mistake or need help, please let me know.');

2
app/Notifications/Netmails/NodeDelisted.php
View File

@ -44,7 +44,7 @@ class NodeDelisted extends Netmails //implements ShouldQueue
$msg = $this->page(TRUE,'delist'); $msg = $this->page(TRUE,'delist');
$msg->addText(sprintf("Hi %s,\r\r",$this->ao->system->sysop)) $msg->addText(sprintf("Hi %s,\r\r",$this->ao->system->sysop))
->addText(sprintf("Your system has been marked **DE-LISTED**, because it hasnt polled **%s** with address %s since **%s** (%d days).\r",$this->ao->zone->domain->name,$this->ao->ftn4d,$this->ao->system->last_seen?->format('Y-m-d') ?: 'Not seen',$this->ao->system->last_seen?->diffInDays($now))) ->addText(sprintf("Your system has been **DE-LISTED**, because it hasnt polled **%s** with address %s since **%s** (%d days).\r",$this->ao->zone->domain->name,$this->ao->ftn4d,$this->ao->system->last_seen?->format('Y-m-d') ?: 'Not seen',$this->ao->system->last_seen?->diffInDays($now)))
->addText("\r") ->addText("\r")
->addText("If you think this was a mistake, please let me know.\r\r") ->addText("If you think this was a mistake, please let me know.\r\r")
->addText(sprintf('If you think about returning to %s, then reach out and we can get you back online pretty quickly.',$x)); ->addText(sprintf('If you think about returning to %s, then reach out and we can get you back online pretty quickly.',$x));

6
app/Notifications/Netmails/NodeMarkedDown.php
View File

@ -46,9 +46,9 @@ class NodeMarkedDown extends Netmails //implements ShouldQueue
->addText(sprintf("Your system has been marked **DOWN**, because it hasnt polled **%s** with address %s since **%s** (%d days).\r",$this->ao->zone->domain->name,$this->ao->ftn4d,$this->ao->system->last_seen?->format('Y-m-d') ?: 'Not seen',$this->ao->system->last_seen?->diffInDays($now))) ->addText(sprintf("Your system has been marked **DOWN**, because it hasnt polled **%s** with address %s since **%s** (%d days).\r",$this->ao->zone->domain->name,$this->ao->ftn4d,$this->ao->system->last_seen?->format('Y-m-d') ?: 'Not seen',$this->ao->system->last_seen?->diffInDays($now)))
->addText("\r") ->addText("\r")
->addText("You have (waiting for collection):\r") ->addText("You have (waiting for collection):\r")
->addText(sprintf("* %s Netmails\r",number_format($this->ao->uncollected_netmail))) ->addText(sprintf('* %s Netmails',number_format($this->ao->netmailWaiting()->count())))
->addText(sprintf("* %s Echomails\r",number_format($this->ao->uncollected_echomail))) ->addText(sprintf('* %s Echomails',number_format($this->ao->echomailWaiting()->count())))
->addText(sprintf("* %s Files\r",number_format($this->ao->uncollected_files))) ->addText(sprintf('* %s Files',number_format($this->ao->filesWaiting()->count())))
->addText("\r") ->addText("\r")
->addText(sprintf("Your system will automatically be **DE-LISTED** if your system hasnt polled to collected your mail/file(s) by **%s**\r\r",$now->addDays(7)->format('Y-m-d'))) ->addText(sprintf("Your system will automatically be **DE-LISTED** if your system hasnt polled to collected your mail/file(s) by **%s**\r\r",$now->addDays(7)->format('Y-m-d')))
->addText("If you think you've received this netmail by mistake or need help, please let me know.\r"); ->addText("If you think you've received this netmail by mistake or need help, please let me know.\r");

6
app/Notifications/Netmails/NodeMarkedHold.php
View File

@ -47,9 +47,9 @@ class NodeMarkedHold extends Netmails //implements ShouldQueue
->addText(sprintf("Your system has been marked **HOLD**, because it hasnt polled **%s** with address %s since **%s** (%d days).\r",$this->ao->zone->domain->name,$this->ao->ftn4d,$this->ao->system->last_seen?->format('Y-m-d') ?: 'Not seen',$this->ao->system->last_seen?->diffInDays($now))) ->addText(sprintf("Your system has been marked **HOLD**, because it hasnt polled **%s** with address %s since **%s** (%d days).\r",$this->ao->zone->domain->name,$this->ao->ftn4d,$this->ao->system->last_seen?->format('Y-m-d') ?: 'Not seen',$this->ao->system->last_seen?->diffInDays($now)))
->addText("\r") ->addText("\r")
->addText("You have (waiting for collection):\r") ->addText("You have (waiting for collection):\r")
->addText(sprintf("* %s Netmails\r",number_format($this->ao->uncollected_netmail))) ->addText(sprintf('* %s Netmails',number_format($this->ao->netmailWaiting()->count())))
->addText(sprintf("* %s Echomails\r",number_format($this->ao->uncollected_echomail))) ->addText(sprintf('* %s Echomails',number_format($this->ao->echomailWaiting()->count())))
->addText(sprintf("* %s Files\r",number_format($this->ao->uncollected_files))) ->addText(sprintf('* %s Files',number_format($this->ao->filesWaiting()->count())))
->addText("\r") ->addText("\r")
->addText(sprintf("To clear this status, all you need to do make sure your system polls and collects mail by **%s**\r\r",($this->ao->system->last_seen ?: Carbon::now())->addDays(config('fido.idle.down'))->format('Y-m-d'))) ->addText(sprintf("To clear this status, all you need to do make sure your system polls and collects mail by **%s**\r\r",($this->ao->system->last_seen ?: Carbon::now())->addDays(config('fido.idle.down'))->format('Y-m-d')))
->addText("If you think you've received this netmail by mistake or need help, please let me know.\r"); ->addText("If you think you've received this netmail by mistake or need help, please let me know.\r");