commit ec332dd

delthas  ·  2022-12-02 15:38:13 +0000 UTC
parent 5ff0f2c
Fix failing to parse host:port IRC URLs

This fixes a regression introduced in [1].

[1]: 68e1efcf0612c635ea186676559883e791552d30
1 files changed,  +6, -3
+6, -3
 1@@ -3,7 +3,6 @@ package senpai
 2 import (
 3 	"errors"
 4 	"fmt"
 5-	"net"
 6 	"net/url"
 7 	"os"
 8 	"os/exec"
 9@@ -152,9 +151,13 @@ func LoadConfigFile(filename string) (cfg Config, err error) {
10 		case "irc":
11 			// Could be TLS or plaintext, keep TLS as is.
12 		default:
13-			return cfg, fmt.Errorf("invalid IRC addr scheme: %v", cfg.Addr)
14+			if u.Host != "" {
15+				return cfg, fmt.Errorf("invalid IRC addr scheme: %v", cfg.Addr)
16+			}
17+		}
18+		if u.Host != "" {
19+			cfg.Addr = u.Host
20 		}
21-		cfg.Addr = net.JoinHostPort(u.Hostname(), u.Port())
22 	}
23 	return
24 }