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

Improve port handling

Browse source
This commit is contained in:
Ken-Håvard Lieng 2016-01-14 05:56:53 +01:00
parent 2bffef825d
commit 13a3d96b44
7 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/src/js/reducers/channels.js
View file

@ -168,22 +168,20 @@ export default createReducer(Map(), {
return state.withMutations(s => {
action.data.forEach(server => {
if (!state.has(server.address)) {
s.set(server.address, Map());
if (!state.has(server.host)) {
s.set(server.host, Map());
}
});
});
},
[actions.CONNECT](state, action) {
let { server } = action;
const i = server.indexOf(':');
if (i > 0) {
server = server.slice(0, i);
}
if (!state.has(server)) {
return state.set(server, Map());
const { host } = action;
if (!state.has(host)) {
return state.set(host, Map());
}
return state;
},

18
client/src/js/reducers/servers.js
View file

@ -11,18 +11,16 @@ const Server = Record({
export default createReducer(Map(), {
[actions.CONNECT](state, action) {
let { server } = action;
const { nick, options } = action;
const { host, nick, options } = action;
const i = server.indexOf(':');
if (i > 0) {
server = server.slice(0, i);
if (!state.has(host)) {
return state.set(host, new Server({
nick,
name: options.name || host
}));
}
return state.set(server, new Server({
nick,
name: options.name || server
}));
return state;
},
[actions.DISCONNECT](state, action) {
@ -41,7 +39,7 @@ export default createReducer(Map(), {
return state.withMutations(s => {
action.data.forEach(server => {
s.set(server.address, new Server(server));
s.set(server.host, new Server(server));
});
});
},