Normalise tagline/tearline/origin

app/Classes/FTN/Message.php

@@ -673,7 +673,7 @@ class Message extends FTNBase
 	 * @return Echomail|Netmail
 	 * @throws InvalidPacketException
 	 */
-	private function unpackMessage(string $message,Echomail|Netmail $o): Echomail|Netmail
+	public function unpackMessage(string $message,Echomail|Netmail $o): Echomail|Netmail
 	{
 		// Remove DOS \n\r
 		$message = preg_replace("/\n\r/","\r",$message);
@@ -796,6 +796,9 @@ class Message extends FTNBase
 				$ptr_content_start = $ptr_end-$ptr_start;
 			}
 
+			// Trim any right \r from the message
+			$o->msg = rtrim($o->msg,"\r");
+
 			// Quick validation that we are done
 			if ($ptr_content_start !== strlen($content))
 				throw new InvalidPacketException('There is more data in the message content?');
@@ -847,9 +850,6 @@ class Message extends FTNBase
 				'replyid' => 'sometimes|min:1',
 				'msg' => 'required|min:1',		// @todo max message length?
 				'msg_crc' => 'required|size:32',
-				'tagline' => 'sometimes|min:1|max:255',
-				'tearline' => 'sometimes|min:1|max:255',
-				'origin' => 'sometimes|min:1|max:255',
 				'local' => 'sometimes|boolean',
 				'fftn_id' => 'required|exists:App\Models\Address,id',
 				'tftn_id' => $this->isNetmail() ? 'required|exists:App\Models\Address,id' : 'prohibited',