diff options
Diffstat (limited to 'irc.go')
| -rw-r--r-- | irc.go | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -21,13 +21,13 @@ type errorBack[T any] struct { errorBack chan error } -func ircBotSession() error { +func (s *server) ircBotSession() error { var err error var underlyingConn net.Conn - if config.IRC.TLS { - underlyingConn, err = tls.Dial(config.IRC.Net, config.IRC.Addr, nil) + if s.config.IRC.TLS { + underlyingConn, err = tls.Dial(s.config.IRC.Net, s.config.IRC.Addr, nil) } else { - underlyingConn, err = net.Dial(config.IRC.Net, config.IRC.Addr) + underlyingConn, err = net.Dial(s.config.IRC.Net, s.config.IRC.Addr) } if err != nil { return err @@ -41,11 +41,11 @@ func ircBotSession() error { return conn.WriteString(s + "\r\n") } - _, err = logAndWriteLn("NICK " + config.IRC.Nick) + _, err = logAndWriteLn("NICK " + s.config.IRC.Nick) if err != nil { return err } - _, err = logAndWriteLn("USER " + config.IRC.User + " 0 * :" + config.IRC.Gecos) + _, err = logAndWriteLn("USER " + s.config.IRC.User + " 0 * :" + s.config.IRC.Gecos) if err != nil { return err } @@ -86,7 +86,7 @@ func ircBotSession() error { if !ok { slog.Error("unable to convert source of JOIN to client") } - if c.Nick != config.IRC.Nick { + if c.Nick != s.config.IRC.Nick { continue } default: @@ -134,12 +134,12 @@ func ircSendDirect(s string) error { } // TODO: Delay and warnings? -func ircBotLoop() { - ircSendBuffered = make(chan string, config.IRC.SendQ) +func (s *server) ircBotLoop() { + ircSendBuffered = make(chan string, s.config.IRC.SendQ) ircSendDirectChan = make(chan errorBack[string]) for { - err := ircBotSession() + err := s.ircBotSession() slog.Error("irc session error", "error", err) } } |