fix(irc): join channel with password (#190)

This commit is contained in:
Ludvig Lundgren 2022-03-21 17:39:59 +01:00 committed by GitHub
parent de1291d110
commit 22f768148c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -152,20 +152,25 @@ func (r *IrcRepo) ListChannels(networkID int64) ([]domain.IrcChannel, error) {
//r.db.lock.RLock() //r.db.lock.RLock()
//defer r.db.lock.RUnlock() //defer r.db.lock.RUnlock()
rows, err := r.db.handler.Query("SELECT id, name, enabled FROM irc_channel WHERE network_id = ?", networkID) rows, err := r.db.handler.Query("SELECT id, name, enabled, password FROM irc_channel WHERE network_id = ?", networkID)
if err != nil { if err != nil {
log.Fatal().Err(err) log.Error().Stack().Err(err).Msgf("error querying channels for network: %v", networkID)
return nil, err
} }
defer rows.Close() defer rows.Close()
var channels []domain.IrcChannel var channels []domain.IrcChannel
for rows.Next() { for rows.Next() {
var ch domain.IrcChannel var ch domain.IrcChannel
var pass sql.NullString
if err := rows.Scan(&ch.ID, &ch.Name, &ch.Enabled); err != nil { if err := rows.Scan(&ch.ID, &ch.Name, &ch.Enabled, &pass); err != nil {
log.Fatal().Err(err) log.Error().Stack().Err(err).Msgf("error querying channels for network: %v", networkID)
return nil, err
} }
ch.Password = pass.String
channels = append(channels, ch) channels = append(channels, ch)
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {