summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordelthas <delthas@dille.cc>2022-12-02 16:38:13 +0100
committerdelthas <delthas@dille.cc>2022-12-02 16:38:13 +0100
commitec332dde26838db6680b360212ef20cfed4de760 (patch)
tree4dab7a6796bc0e8feb1cb85bbe9a15adedaaa2c8
parentImplement /NP (diff)
Fix failing to parse host:port IRC URLs
This fixes a regression introduced in [1]. [1]: 68e1efcf0612c635ea186676559883e791552d30
-rw-r--r--config.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/config.go b/config.go
index 0aab25a..a06dc0c 100644
--- a/config.go
+++ b/config.go
@@ -3,7 +3,6 @@ package senpai
import (
"errors"
"fmt"
- "net"
"net/url"
"os"
"os/exec"
@@ -152,9 +151,13 @@ func LoadConfigFile(filename string) (cfg Config, err error) {
case "irc":
// Could be TLS or plaintext, keep TLS as is.
default:
- return cfg, fmt.Errorf("invalid IRC addr scheme: %v", cfg.Addr)
+ if u.Host != "" {
+ return cfg, fmt.Errorf("invalid IRC addr scheme: %v", cfg.Addr)
+ }
+ }
+ if u.Host != "" {
+ cfg.Addr = u.Host
}
- cfg.Addr = net.JoinHostPort(u.Hostname(), u.Port())
}
return
}