mode

config.yml

@@ -3,8 +3,8 @@ gotify:
   token: ALaGS4MVMWTEMcP
 
 cluster:
-  host: ve7cc.net:23
+  host: dxc.k0xm.net:7300
-  call: XV9Q
+  call: F4BPO
 
 log:
-  sqlitePath: "C:\Perso\Seafile\Radio\Logs\Log4OM\Vietnam.SQLite"
+  sqlitePath: "C:\\Perso\\Seafile\\Radio\\Logs\\Log4OM\\Vietnam.SQLite"

main.go

@@ -112,7 +112,7 @@ func sendToGotify(title string, sMess ClusterMessage, priority int, cfg Config)
 }
 
 func SanitizeClusterMessage(message string) ClusterMessage {
-	r := regexp.MustCompile(`DX\sde\s([A-Z0-9]+)[-#:]+[\s]+([0-9]+.[0-9])[\s]+([^\s]+)[\s]+([A-Z]+[0-9])\s+(.*dB).*(.{4})Z$`)
+	r := regexp.MustCompile(`DX\sde\s([A-Z0-9]+)[-#:]+[\s]+([0-9]+.[0-9])[\s]+([^\s]+)[\s]+(\bFT8\b|\bFT4\b|\bCW\b)+\s+(.*dB).*(.{4})Z$`)
 	matches := r.FindStringSubmatch(message)
 
 	mes := ClusterMessage{}
@@ -138,7 +138,7 @@ func SanitizeClusterMessage(message string) ClusterMessage {
 }
 
 func sendTelnetMessage(conn net.Conn, message string) {
-	if message != "XV9Q-5" {
+	if !strings.HasPrefix(message, "F4BPO") {
 		time.Sleep(2 * time.Second)
 	}
 	_, err := conn.Write([]byte(message + "\n"))
@@ -151,8 +151,8 @@ func sendTelnetMessage(conn net.Conn, message string) {
 func sendFilters(conn net.Conn) {
 	go sendTelnetMessage(conn, "set/ft8")
 	time.Sleep(1 * time.Second)
-	//go sendTelnetMessage(conn, "SET/FILTER DOC/PASS 3W")
+	go sendTelnetMessage(conn, "SET/FILTER DOC/PASS F")
-	//time.Sleep(1 * time.Second)
+	time.Sleep(1 * time.Second)
 	go sendTelnetMessage(conn, "set/skimmer")
 	time.Sleep(1 * time.Second)
 	go sendTelnetMessage(conn, "set/ft4")
@@ -177,7 +177,8 @@ func main() {
 	fmt.Println("PushDXCluster v0.1")
 	for {
 		// Connect to the Telnet server
-		conn, err := net.Dial("tcp", cfg.Cluster.Host)
+		addr, err := net.ResolveTCPAddr("tcp", cfg.Cluster.Host)
+		conn, err := net.DialTCP("tcp", nil, addr)
 		if err != nil {
 			log.Printf("Failed to connect to Telnet server: %v", err)
 			time.Sleep(5 * time.Second) // Wait before retrying
@@ -192,6 +193,8 @@ func main() {
 		// Loop to read from the Telnet server
 		for {
 			message, err := reader.ReadString('\n')
+			message, _ = strings.CutSuffix(message, "\n")
+			message, _ = strings.CutSuffix(message, "\r")
 			if err != nil {
 				log.Printf("Error reading from Telnet server: %v", err)
 				conn.Close()
@@ -203,14 +206,19 @@ func main() {
 			sMess := SanitizeClusterMessage(message)
 
 			if sMess.DX != "" {
-				log.Printf("Sanitized message: Reporter: %s, DX: %s, Freq: %s, Report: %s, Time: %s", sMess.From, sMess.DX, sMess.Freq, sMess.Report, sMess.Time)
+				log.Printf("Sanitized message: Reporter: %s, DX: %s, Freq: %s, Mode: %s, Report: %s, Time: %s", sMess.From, sMess.DX, sMess.Freq, sMess.Mode, sMess.Report, sMess.Time)
 			} else {
 				log.Printf("Received message: %s", message)
 			}
 
 			// Send Call to ID to the Server
 			if message != "" && strings.Contains("Please enter your call:", message) {
-				go sendTelnetMessage(conn, "XV9Q-5")
+				go sendTelnetMessage(conn, "F4BPO-2")
+				login = true
+			}
+
+			if message != "" && strings.Contains("login:", message) {
+				go sendTelnetMessage(conn, "F4BPO-2")
 				login = true
 			}
 
@@ -221,7 +229,7 @@ func main() {
 			}
 
 			// If calls is in the DX List then send a Gotify notification
-			if sMess.DX != "" && sMess.From == "XV9Q" && strings.Contains(DX, sMess.DX) {
+			if sMess.DX != "" && sMess.From == "F4BPO" && strings.Contains(DX, sMess.DX) {
 				sendToGotify("Spot", sMess, 5, *cfg)
 			}
 		}