Handle kick, rename server to network

client/js/containers/App.js

@@ -4,7 +4,7 @@ import { getConnected } from 'state/app';
 import { getSortedChannels } from 'state/channels';
 import { openModal, getHasOpenModals } from 'state/modals';
 import { getPrivateChats } from 'state/privateChats';
-import { getServers } from 'state/servers';
+import { getNetworks } from 'state/networks';
 import { getSelectedTab, select } from 'state/tab';
 import { getShowTabList, hideMenu } from 'state/ui';
 import connect from 'utils/connect';
@@ -14,7 +14,7 @@ const mapState = createStructuredSelector({
   channels: getSortedChannels,
   connected: getConnected,
   privateChats: getPrivateChats,
-  servers: getServers,
+  networks: getNetworks,
   showTabList: getShowTabList,
   tab: getSelectedTab,
   newVersionAvailable: state => state.app.newVersionAvailable,

client/js/containers/Chat.js

@@ -27,11 +27,11 @@ import { openPrivateChat, closePrivateChat } from 'state/privateChats';
 import { getSearch, searchMessages, toggleSearch } from 'state/search';
 import {
   getCurrentNick,
-  getCurrentServerStatus,
+  getCurrentNetworkError,
   disconnect,
   setNick,
-  setServerName
-} from 'state/servers';
+  setNetworkName
+} from 'state/networks';
 import { getSettings } from 'state/settings';
 import { getSelectedTab, select } from 'state/tab';
 import { getShowUserList, toggleUserList } from 'state/ui';
@@ -45,7 +45,7 @@ const mapState = createStructuredSelector({
   nick: getCurrentNick,
   search: getSearch,
   showUserList: getShowUserList,
-  status: getCurrentServerStatus,
+  error: getCurrentNetworkError,
   tab: getSelectedTab,
   title: getSelectedTabTitle,
   users: getSelectedChannelUsers,
@@ -67,7 +67,7 @@ const mapDispatch = dispatch => ({
       select,
       sendMessage,
       setNick,
-      setServerName,
+      setNetworkName,
       toggleSearch,
       toggleUserList
     },

client/js/containers/Connect.js

@@ -2,7 +2,7 @@ import { createStructuredSelector } from 'reselect';
 import Connect from 'components/pages/Connect';
 import { getConnectDefaults, getApp } from 'state/app';
 import { join } from 'state/channels';
-import { connect as connectServer } from 'state/servers';
+import { connect as connectNetwork } from 'state/networks';
 import { select } from 'state/tab';
 import connect from 'utils/connect';
 
@@ -14,7 +14,7 @@ const mapState = createStructuredSelector({
 
 const mapDispatch = {
   join,
-  connect: connectServer,
+  connect: connectNetwork,
   select
 };
 

client/js/containers/TabListItem.js

@@ -4,8 +4,8 @@ import TabListItem from 'components/TabListItem';
 import connect from 'utils/connect';
 
 const mapState = createStructuredSelector({
-  error: (state, { server, target }) => {
-    const messages = get(state, ['messages', server, target]);
+  error: (state, { network, target }) => {
+    const messages = get(state, ['messages', network, target]);
 
     if (messages && messages.length > 0) {
       return messages[messages.length - 1].type === 'error';