diff --git a/app/Jobs/MessageProcess.php b/app/Jobs/MessageProcess.php index 1a52360..43eb939 100644 --- a/app/Jobs/MessageProcess.php +++ b/app/Jobs/MessageProcess.php @@ -116,6 +116,10 @@ class MessageProcess implements ShouldQueue $o->cost = $this->msg->cost; $o->msgid = $this->msg->msgid; + $o->tagline = $this->msg->tagline; + $o->tearline = $this->msg->tearline; + $o->origin = $this->msg->origin; + $o->subject = $this->msg->subject; $o->msg = $this->msg->message; @@ -372,7 +376,11 @@ class MessageProcess implements ShouldQueue $o->msgid = $this->msg->msgid; $o->replyid = $this->msg->replyid; - $o->msg = $this->msg->message_src."\r"; + $o->tagline = $this->msg->tagline; + $o->tearline = $this->msg->tearline; + $o->origin = $this->msg->origin; + + $o->msg = $this->msg->message; $o->msg_src = $this->msg->message_src; $o->msg_crc = md5($this->msg->message); diff --git a/app/Models/Netmail.php b/app/Models/Netmail.php index ddd4431..ff17fa3 100644 --- a/app/Models/Netmail.php +++ b/app/Models/Netmail.php @@ -204,6 +204,7 @@ final class Netmail extends Model implements Packet $o->message = $this->msg; $o->tagline = $this->tagline; $o->tearline = $this->tearline; + $o->origin = $this->origin; // VIA kludge $via = $this->via ?: collect(); diff --git a/database/migrations/2024_05_13_154308_add_origin_to_netmail.php b/database/migrations/2024_05_13_154308_add_origin_to_netmail.php new file mode 100644 index 0000000..c916c4e --- /dev/null +++ b/database/migrations/2024_05_13_154308_add_origin_to_netmail.php @@ -0,0 +1,28 @@ +string('origin')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('netmail', function (Blueprint $table) { + $table->dropColumn('origin'); + }); + } +};