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

Add message logging and search server side

Browse source
This commit is contained in:
khlieng 2015-04-29 23:54:44 +02:00
parent 6378131a9d
commit 3365832ce3
738 changed files with 143131 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

42
websocket_handler.go
View file

@ -3,6 +3,7 @@ package main
import (
"encoding/json"
"log"
"strings"
"github.com/khlieng/name_pending/Godeps/_workspace/src/golang.org/x/net/websocket"
"github.com/khlieng/name_pending/storage"
@ -84,25 +85,32 @@ func handleWS(ws *websocket.Conn) {
irc.Password = data.Password
irc.Realname = data.Realname
err := irc.Connect(data.Server)
if err != nil {
session.sendError(err, irc.Host)
log.Println(err)
if idx := strings.Index(data.Server, ":"); idx < 0 {
session.setIRC(data.Server, irc)
} else {
session.setIRC(irc.Host, irc)
go handleMessages(irc, session)
session.user.AddServer(storage.Server{
Name: data.Name,
Address: irc.Host,
TLS: data.TLS,
Password: data.Password,
Nick: data.Nick,
Username: data.Username,
Realname: data.Realname,
})
session.setIRC(data.Server[:idx], irc)
}
go func() {
err := irc.Connect(data.Server)
if err != nil {
session.deleteIRC(irc.Host)
session.sendError(err, irc.Host)
log.Println(err)
} else {
go handleMessages(irc, session)
session.user.AddServer(storage.Server{
Name: data.Name,
Address: irc.Host,
TLS: data.TLS,
Password: data.Password,
Nick: data.Nick,
Username: data.Username,
Realname: data.Realname,
})
}
}()
} else {
log.Println(addr, "already connected to", data.Server)
}