up

config.yml

@@ -3,8 +3,8 @@ gotify:
   token: ALaGS4MVMWTEMcP
 
 cluster:
-  host: ve7cc.net:23
-  call: XV9Q
+  host: dxc.k0xm.net:7300
+  call: F4BPO
 
 log:
   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{}
@@ -151,7 +151,7 @@ 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)
 	go sendTelnetMessage(conn, "set/skimmer")
 	time.Sleep(1 * time.Second)
@@ -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()