Handle kick, rename server to network

client/js/components/pages/Chat/Chat.js

@@ -11,40 +11,40 @@ export default class Chat extends Component {
     const { tab, part, closePrivateChat, disconnect } = this.props;
 
     if (isChannel(tab)) {
-      part([tab.name], tab.server);
+      part([tab.name], tab.network);
     } else if (tab.name) {
-      closePrivateChat(tab.server, tab.name);
+      closePrivateChat(tab.network, tab.name);
     } else {
-      disconnect(tab.server);
+      disconnect(tab.network);
     }
   };
 
   handleSearch = phrase => {
     const { tab, searchMessages } = this.props;
     if (isChannel(tab)) {
-      searchMessages(tab.server, tab.name, phrase);
+      searchMessages(tab.network, tab.name, phrase);
     }
   };
 
   handleNickClick = nick => {
     const { tab, openPrivateChat, select } = this.props;
-    openPrivateChat(tab.server, nick);
-    select(tab.server, nick);
+    openPrivateChat(tab.network, nick);
+    select(tab.network, nick);
   };
 
   handleTitleChange = title => {
-    const { setServerName, tab } = this.props;
-    setServerName(title, tab.server);
+    const { setNetworkName, tab } = this.props;
+    setNetworkName(title, tab.network);
   };
 
   handleNickChange = nick => {
     const { setNick, tab } = this.props;
-    setNick(nick, tab.server, true);
+    setNick(nick, tab.network, true);
   };
 
   handleNickEditDone = nick => {
     const { setNick, tab } = this.props;
-    setNick(nick, tab.server);
+    setNick(nick, tab.network);
   };
 
   render() {
@@ -57,7 +57,7 @@ export default class Chat extends Component {
       nick,
       search,
       showUserList,
-      status,
+      error,
       tab,
       title,
       users,
@@ -77,14 +77,14 @@ export default class Chat extends Component {
     } else if (tab.name) {
       chatClass = 'chat-private';
     } else {
-      chatClass = 'chat-server';
+      chatClass = 'chat-network';
     }
 
     return (
       <div className={chatClass}>
         <ChatTitle
           channel={channel}
-          status={status}
+          error={error}
           tab={tab}
           title={title}
           openModal={openModal}

client/js/components/pages/Chat/ChatTitle.js

@@ -3,11 +3,11 @@ import { FiUsers, FiSearch, FiX } from 'react-icons/fi';
 import Navicon from 'components/ui/Navicon';
 import Button from 'components/ui/Button';
 import Editable from 'components/ui/Editable';
-import { isValidServerName } from 'state/servers';
+import { isValidNetworkName } from 'state/networks';
 import { isChannel } from 'utils';
 
 const ChatTitle = ({
-  status,
+  error,
   title,
   tab,
   channel,
@@ -26,11 +26,9 @@ const ChatTitle = ({
     closeTitle = 'Disconnect';
   }
 
-  let serverError = null;
-  if (!tab.name && status.error) {
-    serverError = (
-      <span className="chat-topic error">Error: {status.error}</span>
-    );
+  let networkError = null;
+  if (!tab.name && error) {
+    networkError = <span className="chat-topic error">Error: {error}</span>;
   }
 
   return (
@@ -41,13 +39,13 @@ const ChatTitle = ({
           className="chat-title"
           editable={!tab.name}
           value={title}
-          validate={isValidServerName}
+          validate={isValidNetworkName}
           onChange={onTitleChange}
         >
           <span className="chat-title">{title}</span>
         </Editable>
         <div className="chat-topic-wrap">
-          {channel && channel.topic && (
+          {channel?.topic && (
             <span
               className="chat-topic"
               onClick={() => openModal('topic', channel.name)}
@@ -55,7 +53,7 @@ const ChatTitle = ({
               {channel.topic}
             </span>
           )}
-          {serverError}
+          {networkError}
         </div>
         {tab.name && (
           <Button
@@ -80,7 +78,7 @@ const ChatTitle = ({
       </div>
       <div className="userlist-bar">
         <FiUsers />
-        {channel && channel.users.length}
+        {channel?.users.length}
       </div>
     </div>
   );

client/js/components/pages/Chat/MessageBox.js

@@ -36,7 +36,7 @@ export default class MessageBox extends PureComponent {
   addMore = debounce(() => {
     const { tab, onAddMore } = this.props;
     this.ready = true;
-    onAddMore(tab.server, tab.name);
+    onAddMore(tab.network, tab.name);
   }, scrollbackDebounce);
 
   constructor(props) {
@@ -130,7 +130,7 @@ export default class MessageBox extends PureComponent {
 
   updateScrollKey = () => {
     const { tab } = this.props;
-    this.scrollKey = `msg:${tab.server}:${tab.name}`;
+    this.scrollKey = `msg:${tab.network}:${tab.name}`;
     return this.scrollKey;
   };
 
@@ -222,7 +222,7 @@ export default class MessageBox extends PureComponent {
     if (this.shouldAdd) {
       const { tab, onAddMore } = this.props;
       this.shouldAdd = false;
-      onAddMore(tab.server, tab.name);
+      onAddMore(tab.network, tab.name);
     }
   };
 

client/js/components/pages/Chat/MessageInput.js

@@ -21,9 +21,9 @@ const MessageInput = ({
   const handleKey = e => {
     if (e.key === 'Enter' && e.target.value) {
       if (e.target.value[0] === '/') {
-        onCommand(e.target.value, tab.name, tab.server);
+        onCommand(e.target.value, tab.name, tab.network);
       } else if (tab.name) {
-        onMessage(e.target.value, tab.name, tab.server);
+        onMessage(e.target.value, tab.name, tab.network);
       }
 
       add(e.target.value);