From 6216ada5e5790b95804e5bd3fbb357f0603a857c Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Mon, 13 May 2024 15:28:53 +1000
Subject: [PATCH] Fix recording of netmails, when they contain taglines and
 origin lines

---
 app/Jobs/MessageProcess.php                   | 10 ++++++-
 app/Models/Netmail.php                        |  1 +
 ...024_05_13_154308_add_origin_to_netmail.php | 28 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2024_05_13_154308_add_origin_to_netmail.php

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 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('netmails', function (Blueprint $table) {
+			$table->string('origin')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('netmail', function (Blueprint $table) {
+			$table->dropColumn('origin');
+        });
+    }
+};