From 1ae73e80c26d302611ffc34bbc6625903082f6ce Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sun, 22 Aug 2021 16:55:39 +1000
Subject: [PATCH] When MSGID has domain but no point

---
 app/Classes/FTN/Message.php          | 2 +-
 app/Console/Commands/StartServer.php | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php
index 795c1a1..ff0de5f 100644
--- a/app/Classes/FTN/Message.php
+++ b/app/Classes/FTN/Message.php
@@ -742,7 +742,7 @@ class Message extends FTNBase
 		// MSGID should be the basis of the source, we'll overrite our src from origin if we have it
 		$m = [];
 		if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\ +#',$this->msgid,$m)) {
-			$this->src = Address::parseFTN($m[1].(isset($m[2]) ? '.'.$m[2] : '').(isset($m[3]) ? '@'.$m[3] : ''));
+			$this->src = Address::parseFTN($m[1].((isset($m[2]) && $m[2] != '') ? '.'.$m[2] : '').(isset($m[3]) ? '@'.$m[3] : ''));
 		}
 
 		// Parse SEEN-BY
diff --git a/app/Console/Commands/StartServer.php b/app/Console/Commands/StartServer.php
index fe11aaa..c972beb 100644
--- a/app/Console/Commands/StartServer.php
+++ b/app/Console/Commands/StartServer.php
@@ -28,13 +28,6 @@ class StartServer extends Command
 	 */
 	protected $description = 'Start Server';
 
-	public function __construct()
-	{
-		parent::__construct();
-
-		Log::info(sprintf('%s:+ Server Starting (%d)',self::LOGKEY,getmypid()));
-	}
-
 	/**
 	 * Execute the console command.
 	 *
@@ -43,6 +36,7 @@ class StartServer extends Command
 	 */
 	public function handle()
 	{
+		Log::info(sprintf('%s:+ Server Starting (%d)',self::LOGKEY,getmypid()));
 		$o = Setup::findOrFail(config('app.id'));
 
 		$start = collect();