GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00
Code Issues Projects Releases Wiki Activity

good ol' fashioned refactoring

Browse Source
This commit is contained in:
Jeremy Latt 2014-02-22 13:15:31 -08:00
parent c7298c55b9
commit c5c7469cf0
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
irc/channel.go
View File

@ -29,6 +29,7 @@ func NewChannel(s *Server, name string) *Channel {
name: name, name: name,
server: s, server: s,
} }
s.channels[name] = channel
return channel return channel
} }
@ -37,8 +38,7 @@ func (channel *Channel) IsEmpty() bool {
} }
func (channel *Channel) Names(client *Client) { func (channel *Channel) Names(client *Client) {
client.MultilineReply(channel.Nicks(), RPL_NAMREPLY, client.RplNamReply(channel)
"= %s :%s", channel.name)
client.RplEndOfNames(channel) client.RplEndOfNames(channel)
} }

10
irc/reply.go
View File

@ -308,6 +308,16 @@ func (target *Client) RplListEnd(server *Server) {
":End of LIST") ":End of LIST")
} }
func (target *Client) RplNamReply(channel *Channel) {
target.MultilineReply(channel.Nicks(), RPL_NAMREPLY,
"= %s :%s", channel)
}
func (target *Client) RplWhoisChannels(client *Client) {
target.MultilineReply(client.WhoisChannelsNames(), RPL_WHOISCHANNELS,
"%s :%s", client.Nick())
}
// //
// errors (also numeric) // errors (also numeric)
// //

4
irc/server.go
View File

@ -390,7 +390,6 @@ func (m *JoinCommand) HandleServer(s *Server) {
channel := s.channels[name] channel := s.channels[name]
if channel == nil { if channel == nil {
channel = NewChannel(s, name) channel = NewChannel(s, name)
s.channels[name] = channel
} }
channel.Join(client, key) channel.Join(client, key)
} }
@ -528,8 +527,7 @@ func (m *WhoisCommand) HandleServer(server *Server) {
client.RplWhoisOperator(mclient) client.RplWhoisOperator(mclient)
} }
client.RplWhoisIdle(mclient) client.RplWhoisIdle(mclient)
client.MultilineReply(mclient.WhoisChannelsNames(), RPL_WHOISCHANNELS, client.RplWhoisChannels(mclient)
"%s :%s", mclient.Nick())
client.RplEndOfWhois() client.RplEndOfWhois()
} }
} }