Further enhancement with #9063a2a - to ensure our message addressing and content picks the right address
This commit is contained in:
@@ -15,11 +15,9 @@ trait MsgID
|
||||
public function save(array $options = [])
|
||||
{
|
||||
// Only create a MSGID for locally generated content
|
||||
if ((! $this->exists) && ($this->flags & Message::FLAG_LOCAL)) {
|
||||
$ftns = Setup::findOrFail(config('app.id'))->system->match($this->fftn->zone)->first();
|
||||
|
||||
if (is_null(Arr::get($this->attributes,'msgid')))
|
||||
$this->attributes['msgid'] = sprintf('%s %08x',$ftns->ftn4d,timew());
|
||||
if ((! $this->exists) && ($this->flags & Message::FLAG_LOCAL) && (is_null(Arr::get($this->attributes,'msgid')))) {
|
||||
$ftn = our_address($this->fftn->zone->domain,$this->fftn);
|
||||
$this->attributes['msgid'] = sprintf('%s %08x',$ftn->ftn4d,timew());
|
||||
}
|
||||
|
||||
return parent::save($options);
|
||||
|
Reference in New Issue
Block a user