From 8685c6407afefabefa73abe634547f0f86c707a7 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 19 Aug 2021 16:59:12 +1000
Subject: [PATCH] Fix ping blank messages

---
 app/Classes/FTN/Process.php      | 4 +++-
 app/Classes/FTN/Process/Ping.php | 4 +++-
 app/Models/Netmail.php           | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Classes/FTN/Process.php b/app/Classes/FTN/Process.php
index ee412a7..ab67b6a 100644
--- a/app/Classes/FTN/Process.php
+++ b/app/Classes/FTN/Process.php
@@ -6,6 +6,8 @@ use Illuminate\Support\Arr;
 
 abstract class Process
 {
+	private const LOGKEY = 'R--';
+
 	protected const MSG_WIDTH = 79;
 
 	/**
@@ -63,7 +65,7 @@ abstract class Process
 		for ($c; $c<count($logo);$c++)
 			$msg .= utf8_decode(Arr::get($logo,$c))."\r";
 
-		$msg = utf8_decode(join("\r",static::msg_footer()))."\r";
+		$msg .= utf8_decode(join("\r",static::msg_footer()))."\r";
 
 		return $msg;
 	}
diff --git a/app/Classes/FTN/Process/Ping.php b/app/Classes/FTN/Process/Ping.php
index 6f91112..54cbf61 100644
--- a/app/Classes/FTN/Process/Ping.php
+++ b/app/Classes/FTN/Process/Ping.php
@@ -16,6 +16,8 @@ use App\Models\{Netmail,Setup};
  */
 final class Ping extends Process
 {
+	private const LOGKEY = 'RP-';
+
 	private static array $logo = [
 		'ÚÄ¿þÚÄ¿ÚÄ¿',
 		'³ ³Â³ ³Àij',
@@ -27,7 +29,7 @@ final class Ping extends Process
 		if (strtolower($msg->user_to) !== 'ping')
 			return FALSE;
 
-		Log::info(sprintf('Processing PING message from (%s) [%s]',$msg->user_from,$msg->fftn));
+		Log::info(sprintf('%s:- Processing PING message from (%s) [%s]',self::LOGKEY,$msg->user_from,$msg->fftn));
 		$ftns = Setup::findOrFail(config('app.id'))->system->match($msg->fftn_o->zone)->first();
 
 		$reply = sprintf("Your ping was received here on %s and it looks like you sent it on %s. If that is correct, then it took %s to get here.\r",
diff --git a/app/Models/Netmail.php b/app/Models/Netmail.php
index 331a908..3f556d4 100644
--- a/app/Models/Netmail.php
+++ b/app/Models/Netmail.php
@@ -76,10 +76,10 @@ final class Netmail extends Model implements Packet
 			$o->message = $this->msg;
 
 			if ($this->tagline)
-				$o->message .= $this->tagline;
+				$o->message .= '...'.$this->tagline;
 
 			if ($this->tearline)
-				$o->tearline .= $this->tearline;
+				$o->tearline .= '---'.$this->tearline;
 
 			// VIA kludge
 			$via = $this->via ?: collect();