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

Now correctly showing packet receive time, and sending Notifications based on the packet address, not the node address

Browse Source
This commit is contained in:
Deon George
2023-08-05 21:32:45 +10:00
parent c8a2affbfa
commit 74a56d1e17
9 changed files with 74 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/Echomail.php
View File

@@ -22,6 +22,7 @@ final class Echomail extends Model implements Packet
private const LOGKEY = 'ME-';
private Collection $set_seenby;
private Collection $set_path;
private Carbon $set_recvtime;
private string $set_pkt;
private bool $no_export = FALSE;
@@ -51,6 +52,7 @@ final class Echomail extends Model implements Packet
case 'no_export':
case 'set_path':
case 'set_pkt':
case 'set_recvtime':
case 'set_seenby':
$this->{$key} = $value;
break;
@@ -87,9 +89,10 @@ final class Echomail extends Model implements Packet
}
// Our last node in the path is our sender
if (isset($model->set_pkt)) {
DB::update('UPDATE echomail_path set recv_pkt=? where address_id=? and echomail_id=?',[
if (isset($model->set_pkt) && isset($model->set_recvtime)) {
DB::update('UPDATE echomail_path set recv_pkt=?,recv_at=? where address_id=? and echomail_id=?',[
$model->set_pkt,
$model->set_recvtime,
$model->set_path->last(),
$model->id,
]);

7
app/Models/Netmail.php
View File

@@ -25,6 +25,7 @@ final class Netmail extends Model implements Packet
private Collection $set_path;
private Address $set_sender;
private Carbon $set_recvtime;
private string $set_pkt;
private const cast_utf8 = [
@@ -50,6 +51,7 @@ final class Netmail extends Model implements Packet
switch ($key) {
case 'set_path':
case 'set_pkt':
case 'set_recvtime':
case 'set_sender':
$this->{$key} = $value;
break;
@@ -86,9 +88,10 @@ final class Netmail extends Model implements Packet
}
// Our last node in the path is our sender
if (isset($model->set_pkt) && isset($model->set_sender)) {
DB::update('UPDATE netmail_path set recv_pkt=?,recv_id=? where address_id=? and netmail_id=?',[
if (isset($model->set_pkt) && isset($model->set_sender) && isset($model->set_recvtime)) {
DB::update('UPDATE netmail_path set recv_pkt=?,recv_at=?,recv_id=? where address_id=? and netmail_id=?',[
$model->set_pkt,
$model->set_recvtime,
$model->set_sender->id,
Arr::get($model->set_path->last(),'node')->id,
$model->id,