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

New attempt to making sure echomails have origin and senders path/seenby details (rework of #45d7823)

Browse Source
This commit is contained in:
Deon George
2023-11-22 13:14:21 +11:00
parent e8f4bf93bd
commit f639e3ffab
3 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Jobs/MessageProcess.php
View File

@@ -364,26 +364,10 @@ class MessageProcess implements ShouldQueue
if ($x=$this->msg->fboss_o) {
$o->fftn_id = $x->id;
/*
// Make sure our sender and packet source are in the path
if (! $this->msg->path->contains($x->ftn)) {
Log::alert(sprintf('%s:? Echomail adding sender to PATH [%s].',self::LOGKEY,$x->ftn));
$this->msg->path->push($x->ftn);
}
*/
} else {
$o->fftn_id = NULL; // @todo This should be the node that originated the message - but since that node is not in the DB it would be null
}
/*
if (! $this->msg->path->contains($this->pktsrc->id)) {
Log::alert(sprintf('%s:? Echomail adding pktsrc to PATH [%s].',self::LOGKEY,$x->ftn));
$this->msg->path->push($this->pktsrc->id);
}
*/
$o->echoarea_id = $ea->id;
$o->msgid = $this->msg->msgid;
$o->replyid = $this->msg->replyid;
@@ -395,6 +379,7 @@ class MessageProcess implements ShouldQueue
$o->set_path = $this->msg->path;
$o->set_seenby = $this->msg->seenby;
$o->set_recvtime = $this->recvtime;
$o->set_sender = $this->pktsrc->id;
// Record receiving packet and sender
$o->set_pkt = $this->packet;