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

Further enhancement with #9063a2a - to ensure our message addressing and content picks the right address

Browse Source
This commit is contained in:
Deon George
2023-12-18 15:13:16 +11:00
parent 1ded66990c
commit 13e51724c0
34 changed files with 68 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Notifications/Echomails.php
View File

@@ -40,14 +40,13 @@ abstract class Echomails extends Notification //implements ShouldQueue
/**
* Get the mail representation of the notification.
*
* @param System $so
* @param mixed $notifiable
* @return Echomail
* @throws \Exception
*/
abstract public function toEchomail(System $so,object $notifiable): Echomail;
abstract public function toEchomail(object $notifiable): Echomail;
protected function setupEchomail(Message $mo,System $so,object $notifiable): Echomail
protected function setupEchomail(Message $mo,object $notifiable): Echomail
{
$echoarea = $notifiable->routeNotificationFor(static::via);
$eo = Echoarea::where('name',$echoarea)->singleOrFail();
@@ -61,7 +60,7 @@ abstract class Echomails extends Notification //implements ShouldQueue
$o->datetime = Carbon::now();
$o->tzoffset = $o->datetime->utcOffset();
$o->fftn_id = ($x=$so->match($mo->fboss_o->zone)->first())->id;
$o->fftn_id = ($x=our_address($mo->fboss_o->zone->domain,$mo->fboss_o))->id;
$o->flags = (Message::FLAG_LOCAL);
$o->tearline = sprintf('%s (%04X)',Setup::PRODUCT_NAME,Setup::PRODUCT_ID);