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

Add origin to replied messages, fix address in BadMessage notification
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 39s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in -23h34m54s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Deon George
2024-07-30 20:54:47 +10:00
parent 62a9139d14
commit 616393edcc
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Notifications/Netmails.php
View File

@@ -72,7 +72,7 @@ abstract class Netmails extends Notification //implements ShouldQueue
protected function sourceSummary(Echomail|Netmail $o,string $item=NULL): string
{
return sprintf("Your %s was received here on [%s] and it looks like you sent it on [%s].",
return sprintf("The %s was received here on [%s] and it looks like your system sent it on [%s].",
$item ?: sprintf('%s with ID [%s] to [%s]',$o instanceof Netmail ? 'Netmail' : 'Echomail',$o->msgid,$o->to),
Carbon::now()->utc()->toDateTimeString(),
$o->date->utc()->toDateTimeString(),

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

@@ -49,7 +49,7 @@ class EchomailBadAddress extends Netmails
$msg->addText($this->sourceSummary($this->mo)."\r\r");
$msg->addText(sprintf("The address in this echomail [%s] is the wrong address for the domain [%s].\r\r",$this->mo->fftn,$ao->zone->domain->name));
$msg->addText(sprintf("The address in this echomail [%s] is the wrong address for the domain [%s].\r\r",$this->mo->set_fftn,$ao->zone->domain->name));
$msg->addText("This echomail has been rejected and not stored here - so no downstream nodes will receive it. If you think this is a mistake, please let me know.\r\r");