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

This commit is contained in:
2023-12-18 15:13:16 +11:00
parent 1ded66990c
commit 13e51724c0
34 changed files with 68 additions and 93 deletions

View File

@@ -90,7 +90,7 @@ class Tic extends FTNBase
if (! $this->to)
throw new \Exception('No to address defined');
$sysaddress = ($x=Setup::findOrFail(config('app.id'))->system)->match($this->to->zone)->first();
$sysaddress = our_address($this->to->zone->domain,$this->to);
$result = collect();
@@ -233,7 +233,7 @@ class Tic extends FTNBase
// This should be one of my addresses
case 'to':
$ftns = Setup::findOrFail(config('app.id'))->system->addresses->pluck('ftn3d');
$ftns = our_address()->pluck('ftn3d');
if (! ($ftns->contains($m[2])))
throw new NotToMeException(sprintf('FTN Address [%s] not found or not one of my addresses',$m[2]));