CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

Update a bunch of messages and fix reply struct embedding.

Browse source
This commit is contained in:
Jeremy Latt 2013-05-11 18:28:18 -07:00
parent 8e5ff51257
commit c42cd92f91
9 changed files with 292 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/irc/server.go
View file

@ -99,7 +99,7 @@ func (s Server) InterestedUsers(fromUser *User) UserSet {
// server functionality
func (s *Server) tryRegister(c *Client) {
if !c.registered && c.HasNick() && c.HasUser() && (s.password == nil || c.serverPass) {
if !c.registered && c.HasNick() && c.HasUsername() && (s.password == nil || c.serverPass) {
c.registered = true
replies := []Reply{RplWelcome(s, c), RplYourHost(s, c), RplCreated(s), RplMyInfo(s)}
for _, reply := range replies {
@ -112,15 +112,15 @@ func (s Server) Id() string {
return s.name
}
func (s Server) String() string {
func (s *Server) String() string {
return s.Id()
}
func (s Server) PublicId() string {
func (s *Server) PublicId() string {
return s.Id()
}
func (s Server) Nick() string {
func (s *Server) Nick() string {
return s.name
}
@ -132,7 +132,7 @@ func (s *Server) DeleteChannel(channel *Channel) {
// commands
//
func (m UnknownCommand) HandleServer(s *Server) {
func (m *UnknownCommand) HandleServer(s *Server) {
m.Client().Replies() <- ErrUnknownCommand(s, m.command)
}