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

Embed servers, channels and users in index.html

Browse source
This commit is contained in:
Ken-Håvard Lieng 2016-01-26 22:10:44 +01:00
parent 04d61dd9a6
commit 22d8b8b363
7 changed files with 123 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/websocket_handler.go
View file

@ -26,8 +26,8 @@ func newWSHandler(conn *websocket.Conn, session *Session) *wsHandler {
session: session,
addr: conn.RemoteAddr().String(),
}
h.initHandlers()
h.init()
h.initHandlers()
return h
}
@ -63,13 +63,13 @@ func (h *wsHandler) init() {
h.session.numWS(), "WebSocket connections")
channels := h.session.user.GetChannels()
for i, channel := range channels {
/*for i, channel := range channels {
channels[i].Topic = channelStore.GetTopic(channel.Server, channel.Name)
}
h.session.sendJSON("channels", channels)
h.session.sendJSON("servers", h.session.user.GetServers())
h.session.sendJSON("connection_update", h.session.getConnectionStates())
h.session.sendJSON("connection_update", h.session.getConnectionStates())*/
for _, channel := range channels {
h.session.sendJSON("users", Userlist{