GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-29 15:40:02 +01:00
Code Issues Projects Releases Wiki Activity

beef up whois

Browse Source
This commit is contained in:
Jeremy Latt 2014-02-17 19:08:57 -08:00
parent bd3ca4ae47
commit 9a5f21e78c
3 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/client.go
View File

@ -165,6 +165,10 @@ func (client *Client) IdleTime() time.Duration {
return time.Since(client.atime) return time.Since(client.atime)
} }
func (client *Client) IdleSeconds() uint64 {
return uint64(client.IdleTime().Seconds())
}
func (client *Client) HasNick() bool { func (client *Client) HasNick() bool {
return client.nick != "" return client.nick != ""
} }

32
irc/reply.go
View File

@ -246,11 +246,39 @@ func RplYoureOper(server *Server) Reply {
return NewNumericReply(server, RPL_YOUREOPER, ":You are now an IRC operator") return NewNumericReply(server, RPL_YOUREOPER, ":You are now an IRC operator")
} }
func RplWhoisUser(server *Server, client *Client) Reply { func RplWhoisUser(client *Client) Reply {
return NewNumericReply(server, RPL_WHOISUSER, "%s %s %s * :%s", return NewNumericReply(client.server, RPL_WHOISUSER, "%s %s %s * :%s",
client.Nick(), client.username, client.hostname, client.realname) client.Nick(), client.username, client.hostname, client.realname)
} }
func RplWhoisOperator(client *Client) Reply {
return NewNumericReply(client.server, RPL_WHOISOPERATOR,
"%s :is an IRC operator", client.Nick())
}
func RplWhoisIdle(client *Client) Reply {
return NewNumericReply(client.server, RPL_WHOISIDLE,
"%s %d :seconds idle", client.Nick(), client.IdleSeconds())
}
// TODO check message length
func RplWhoisChannels(client *Client) Reply {
chstrs := make([]string, len(client.channels))
index := 0
for channel := range client.channels {
if channel.members[client][ChannelOperator] {
chstrs[index] = "@" + channel.name
} else if channel.members[client][Voice] {
chstrs[index] = "+" + channel.name
} else {
chstrs[index] = channel.name
}
index += 1
}
return NewNumericReply(client.server, RPL_WHOISCHANNELS,
"%s :%s", client.Nick(), strings.Join(chstrs, " "))
}
func RplEndOfWhois(server *Server) Reply { func RplEndOfWhois(server *Server) Reply {
return NewNumericReply(server, RPL_ENDOFWHOIS, ":End of WHOIS list") return NewNumericReply(server, RPL_ENDOFWHOIS, ":End of WHOIS list")
} }

13
irc/server.go
View File

@ -451,12 +451,19 @@ func (m *WhoisCommand) HandleServer(server *Server) {
for _, mask := range m.masks { for _, mask := range m.masks {
// TODO implement wildcard matching // TODO implement wildcard matching
mclient := server.clients[mask] mclient := server.clients.Get(mask)
if mclient != nil { if mclient == nil {
client.Reply(RplWhoisUser(server, mclient)) client.Reply(ErrNoSuchNick(server, mask))
continue
} }
client.Reply(RplWhoisUser(mclient))
if client.flags[Operator] {
client.Reply(RplWhoisOperator(mclient))
} }
client.Reply(RplWhoisIdle(mclient))
client.Reply(RplWhoisChannels(mclient))
client.Reply(RplEndOfWhois(server)) client.Reply(RplEndOfWhois(server))
}
} }
func (msg *ChannelModeCommand) HandleServer(server *Server) { func (msg *ChannelModeCommand) HandleServer(server *Server) {