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

Dont send empty whois results to the client

Browse Source
This commit is contained in:
Ken-Håvard Lieng 2017-05-29 00:52:19 +02:00
parent 0689c74101
commit a084e6d0af
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
assets/bindata.go
View File

File diff suppressed because one or more lines are too long

20
client/src/js/modules/socket.js
View File

@ -87,18 +87,16 @@ export default function handleSocket({ socket, store: { dispatch, getState } })
}, },
whois(data) { whois(data) {
if (data.nick) { const tab = getState().tab.selected;
const tab = getState().tab.selected;
dispatch(print([ dispatch(print([
`Nick: ${data.nick}`, `Nick: ${data.nick}`,
`Username: ${data.username}`, `Username: ${data.username}`,
`Realname: ${data.realname}`, `Realname: ${data.realname}`,
`Host: ${data.host}`, `Host: ${data.host}`,
`Server: ${data.server}`, `Server: ${data.server}`,
`Channels: ${data.channels}` `Channels: ${data.channels}`
], tab.server, tab.name)); ], tab.server, tab.name));
}
}, },
print(message) { print(message) {

4
server/irc_handler.go
View File

@ -201,7 +201,9 @@ func (i *ircHandler) whoisChannels(msg *irc.Message) {
} }
func (i *ircHandler) whoisEnd(msg *irc.Message) { func (i *ircHandler) whoisEnd(msg *irc.Message) {
i.session.sendJSON("whois", i.whois) if i.whois.Nick != "" {
i.session.sendJSON("whois", i.whois)
}
i.whois = WhoisReply{} i.whois = WhoisReply{}
} }