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

Send logged messages when joining a channel

Browse source
This commit is contained in:
Ken-Håvard Lieng 2017-05-20 23:22:56 +02:00
parent a4e9eeefed
commit 62a69dfd44
3 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
server/websocket_handler.go
View file

@ -79,20 +79,7 @@ func (h *wsHandler) init(r *http.Request) {
Users: channelStore.GetUsers(channel.Server, channel.Name),
})
messages, hasMore, err := h.session.user.GetLastMessages(channel.Server, channel.Name, 50)
if err == nil && len(messages) > 0 {
res := Messages{
Server: channel.Server,
To: channel.Name,
Messages: messages,
}
if hasMore {
res.Next = messages[0].ID
}
h.session.sendJSON("messages", res)
}
h.session.sendLastMessages(channel.Server, channel.Name, 50)
}
}
@ -281,21 +268,7 @@ func (h *wsHandler) fetchMessages(b []byte) {
var data FetchMessages
json.Unmarshal(b, &data)
messages, hasMore, err := h.session.user.GetMessages(data.Server, data.Channel, 200, data.Next)
if err == nil && len(messages) > 0 {
res := Messages{
Server: data.Server,
To: data.Channel,
Messages: messages,
Prepend: true,
}
if hasMore {
res.Next = messages[0].ID
}
h.session.sendJSON("messages", res)
}
h.session.sendMessages(data.Server, data.Channel, 200, data.Next)
}
func (h *wsHandler) initHandlers() {