fix(irc): irc join cmd channel with password (#193)

This commit is contained in:
Ludvig Lundgren 2022-03-22 00:33:59 +01:00 committed by GitHub
parent 0b0a48e306
commit 7455b2973d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -338,18 +338,19 @@ func (h *Handler) sendToAnnounceProcessor(channel string, msg string) error {
} }
func (h *Handler) HandleJoinChannel(channel string, password string) error { func (h *Handler) HandleJoinChannel(channel string, password string) error {
// support channel password m := ircmsg.Message{
ch := channel Command: "JOIN",
if password != "" { Params: []string{channel},
ch = fmt.Sprintf("%v %v", channel, password)
} }
log.Trace().Msgf("%v: JOIN sending %v", h.network.Server, ch) // support channel password
if password != "" {
m.Params = []string{channel, password}
}
time.Sleep(1 * time.Second) log.Debug().Msgf("%v: sending JOIN command %v", h.network.Server, strings.Join(m.Params, " "))
//err := h.client.Write(m.String()) err := h.client.SendIRCMessage(m)
err := h.client.Join(ch)
if err != nil { if err != nil {
log.Error().Stack().Err(err).Msgf("error handling join: %v", channel) log.Error().Stack().Err(err).Msgf("error handling join: %v", channel)
return err return err
@ -529,7 +530,7 @@ func (h *Handler) handleMode(msg ircmsg.Message) {
return return
} }
time.Sleep(10 * time.Second) time.Sleep(5 * time.Second)
if h.network.NickServ.Password != "" && !strings.Contains(msg.Params[0], h.client.Nick) || !strings.Contains(msg.Params[1], "+r") { if h.network.NickServ.Password != "" && !strings.Contains(msg.Params[0], h.client.Nick) || !strings.Contains(msg.Params[1], "+r") {
log.Trace().Msgf("%v: MODE: Not correct permission yet: %v", h.network.Server, msg.Params) log.Trace().Msgf("%v: MODE: Not correct permission yet: %v", h.network.Server, msg.Params)