package main
import (
- "bytes"
"fmt"
- "io"
+ "io/ioutil"
"log"
- "os"
+ "net"
"regexp"
"sort"
"strings"
}
func (daemon *Daemon) SendMotd(client *Client) {
- if daemon.motd != "" {
- fd, err := os.Open(daemon.motd)
- if err == nil {
- defer fd.Close()
- motd := []byte{}
- var err error
- for err != io.EOF {
- buf := make([]byte, 1024)
- _, err = fd.Read(buf)
- motd = append(motd, bytes.TrimRight(buf, "\x00")...)
- }
+ if len(daemon.motd) == 0 {
+ client.ReplyNicknamed("422", "MOTD File is missing")
+ return
+ }
- client.ReplyNicknamed("375", "- "+daemon.hostname+" Message of the day -")
- for _, s := range bytes.Split(bytes.TrimRight(motd, "\n"), []byte("\n")) {
- client.ReplyNicknamed("372", "- "+string(s))
- }
- client.ReplyNicknamed("376", "End of /MOTD command")
- return
- } else {
- log.Println("Can not open motd file", daemon.motd, err)
- }
+ motd, err := ioutil.ReadFile(daemon.motd)
+ if err != nil {
+ log.Printf("Can not read motd file %s: %v", daemon.motd, err)
+ client.ReplyNicknamed("422", "Error reading MOTD File")
+ return
+ }
+
+ client.ReplyNicknamed("375", "- "+daemon.hostname+" Message of the day -")
+ for _, s := range strings.Split(strings.Trim(string(motd), "\n"), "\n") {
+ client.ReplyNicknamed("372", "- "+string(s))
}
- client.ReplyNicknamed("422", "MOTD File is missing")
+ client.ReplyNicknamed("376", "End of /MOTD command")
}
func (daemon *Daemon) SendWhois(client *Client, nicknames []string) {
continue
}
found = true
- client.ReplyNicknamed("311", c.nickname, c.username, c.conn.RemoteAddr().String(), "*", c.realname)
+ h := c.conn.RemoteAddr().String()
+ h, _, err := net.SplitHostPort(h)
+ if err != nil {
+ log.Printf("Can't parse RemoteAddr %q: %v", h, err)
+ h = "Unknown"
+ }
+ client.ReplyNicknamed("311", c.nickname, c.username, h, "*", c.realname)
client.ReplyNicknamed("312", c.nickname, daemon.hostname, daemon.hostname)
subscriptions := []string{}
for _, room := range daemon.rooms {