bbs/clrghouz
1
0
Fork 0
Code Issues 4 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
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)))
->line('')
->line('You have (waiting for collection):')
->line(sprintf('* %s Netmails',number_format($this->ao->uncollected_netmail)))
->line(sprintf('* %s Echomails',number_format($this->ao->uncollected_echomail)))
->line(sprintf('* %s Files',number_format($this->ao->uncollected_files)))
->line(sprintf('* %s Netmails',number_format($this->ao->netmailWaiting()->count())))
->line(sprintf('* %s Echomails',number_format($this->ao->echomailWaiting()->count())))
->line(sprintf('* %s Files',number_format($this->ao->filesWaiting()->count())))
->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('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)))
->line('')
->line('You have (waiting for collection):')
->line(sprintf('* %s Netmails',number_format($this->ao->uncollected_netmail)))
->line(sprintf('* %s Echomails',number_format($this->ao->uncollected_echomail)))
->line(sprintf('* %s Files',number_format($this->ao->uncollected_files)))
->line(sprintf('* %s Netmails',number_format($this->ao->netmailWaiting()->count())))
->line(sprintf('* %s Echomails',number_format($this->ao->echomailWaiting()->count())))
->line(sprintf('* %s Files',number_format($this->ao->filesWaiting()->count())))
->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('If you think you\'ve received this email by mistake or need help, please let me know.');