e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Pull IRC client out

Browse source
This commit is contained in:
Ken-Håvard Lieng 2015-06-06 00:34:13 +02:00
parent 78b6a0859b
commit adcf12e1fa
11 changed files with 567 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/server.go
View file

@ -9,6 +9,7 @@ import (
"github.com/khlieng/name_pending/Godeps/_workspace/src/github.com/gorilla/websocket"
"github.com/khlieng/name_pending/Godeps/_workspace/src/github.com/julienschmidt/httprouter"
"github.com/khlieng/name_pending/irc"
"github.com/khlieng/name_pending/storage"
)
@ -63,16 +64,16 @@ func reconnect() {
channels := user.GetChannels()
for _, server := range user.GetServers() {
irc := NewIRC(server.Nick, server.Username)
irc.TLS = server.TLS
irc.Password = server.Password
irc.Realname = server.Realname
i := irc.NewClient(server.Nick, server.Username)
i.TLS = server.TLS
i.Password = server.Password
i.Realname = server.Realname
go func(server storage.Server) {
irc.Connect(server.Address)
session.setIRC(irc.Host, irc)
i.Connect(server.Address)
session.setIRC(i.Host, i)
go handleMessages(irc, session)
go handleIRC(i, session)
var joining []string
for _, channel := range channels {
@ -80,7 +81,7 @@ func reconnect() {
joining = append(joining, channel.Name)
}
}
irc.Join(joining...)
i.Join(joining...)
}(server)
}
}