Improve port handling

client/src/js/actions/server.js

@@ -2,9 +2,15 @@ import * as actions from '../actions';
 import { updateSelection } from './tab';
 
 export function connect(server, nick, options) {
+  let host = server;
+  const i = server.indexOf(':');
+  if (i > 0) {
+    host = server.slice(0, i);
+  }
+
   return {
     type: actions.CONNECT,
-    server,
+    host,
     nick,
     options,
     socket: {

client/src/js/reducers/channels.js

@@ -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;
   },
 

client/src/js/reducers/servers.js

@@ -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));
       });
     });
   },