From 02c23f047c6b17cce200826e195c7a1abcf99660 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sun, 21 Nov 2021 16:53:56 +1100
Subject: [PATCH] Fix for recording seen-by, add md5 to message body, fix
 incorrect log of dispatching messages

---
 app/Classes/File/Receive.php           | 2 +-
 app/Console/Commands/PacketProcess.php | 2 +-
 app/Jobs/MessageProcess.php            | 1 +
 app/Models/Echomail.php                | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Classes/File/Receive.php b/app/Classes/File/Receive.php
index 6cb2173..375372b 100644
--- a/app/Classes/File/Receive.php
+++ b/app/Classes/File/Receive.php
@@ -136,7 +136,7 @@ final class Receive extends Item
 					Log::info(sprintf('%s: - Packet has [%d] messages',self::LOGKEY,$po->count()));
 
 					// Queue messages if there are too many in the packet.
-					$queue = ($po->count() > config('app.queue_msgs'));
+					if ($queue = ($po->count() > config('app.queue_msgs')))
 						Log::info(sprintf('%s: - Messages will be sent to the queue for processing',self::LOGKEY));
 
 					$error = FALSE;
diff --git a/app/Console/Commands/PacketProcess.php b/app/Console/Commands/PacketProcess.php
index f76c1e9..6472a23 100644
--- a/app/Console/Commands/PacketProcess.php
+++ b/app/Console/Commands/PacketProcess.php
@@ -46,7 +46,7 @@ class PacketProcess extends Command
 			$this->info(sprintf('Processing message from [%s] with msgid [%s]',$msg->fboss,$msg->msgid));
 
 			// Dispatch job.
-			Job::dispatch($msg,$this->option('nobot'));
+			Job::dispatchSync($msg,$this->option('nobot'));
 		}
 	}
 }
diff --git a/app/Jobs/MessageProcess.php b/app/Jobs/MessageProcess.php
index efa425f..aa9707e 100644
--- a/app/Jobs/MessageProcess.php
+++ b/app/Jobs/MessageProcess.php
@@ -181,6 +181,7 @@ class MessageProcess implements ShouldQueue
 			$o->msgid = $this->msg->msgid;
 
 			$o->msg = $this->msg->message_src;
+			$o->msg_crc = md5($this->msg->message);
 			$o->path = $this->msg->pathaddress->jsonSerialize();
 			$o->rogue_path = $this->msg->rogue_path->jsonSerialize();
 			$o->seenby = $this->msg->seenaddress->jsonSerialize();
diff --git a/app/Models/Echomail.php b/app/Models/Echomail.php
index 917eb8f..960b80c 100644
--- a/app/Models/Echomail.php
+++ b/app/Models/Echomail.php
@@ -64,7 +64,7 @@ final class Echomail extends Model implements Packet
 				]);
 			}
 
-			$model->seenby = $model->seenby->merge($export_ao);
+			$model->seenby = $model->seenby->merge($export_ao)->pluck('id')->toArray();
 			$model->save();
 		});
 	}