Start migrating away from SOCKET_SEND_MESSAGE action.

src/actions/LoginActions.js

@@ -1,7 +1,7 @@
-import { LOGIN_GET_STATUS } from "../actions/ActionTypes";
+import { LOGIN_GET_STATUS } from "../constants/ActionTypes";
 
 export default {
-    requestStatus: () => ({
-        type: LOGIN_GET_STATUS,
+    getStatus: () => ({
+        type: LOGIN_GET_STATUS
     })
 };

src/components/LoginStatusPane.js

@@ -1,7 +1,6 @@
 import React, { PropTypes } from "react";
 import { connect } from "react-redux";
 
-import ControlRequest from "../utils/ControlRequest";
 import propTypeSymbol from "../utils/propTypeSymbol";
 import {
     LOGIN_STATUS_UNKNOWN,
@@ -20,9 +19,9 @@ class LoginStatusPane extends React.Component
     }
 
     componentDidMount() {
-        const { status, socketSend } = this.props;
+        const { status, loginActions } = this.props;
         if (status == LOGIN_STATUS_UNKNOWN) {
-            this.props.socketSend(ControlRequest.loginStatus());
+            loginActions.getStatus();
         }
     }
 
@@ -99,7 +98,9 @@ LoginStatusPane.propTypes = {
     username: PropTypes.string,
     motd: PropTypes.string,
     reason: PropTypes.string,
-    socketSend: PropTypes.func.isRequired
+    loginActions: PropTypes.shape({
+        getStatus: PropTypes.func.isRequired
+    }).isRequired
 };
 
 export default LoginStatusPane;

src/components/SolsticeApp.js

@@ -26,7 +26,7 @@ const SolsticeApp = (props) => {
         return (
             <div id={ID}>
                 <ConnectForm socket={socket} actions={actions} />
-                <LoginStatusPane {...login} socketSend={actions.socket.send} />
+                <LoginStatusPane {...login} loginActions={actions.login} />
             </div>
         );
     }

src/containers/App.js

@@ -4,6 +4,7 @@ import React, {PropTypes} from "react";
 import { bindActionCreators } from "redux";
 import { connect } from "react-redux";
 
+import LoginActions from "../actions/LoginActions";
 import RoomActions from "../actions/RoomActions";
 import SocketActions from "../actions/SocketActions";
 import SocketHandlerActions from "../actions/SocketHandlerActions";
@@ -23,6 +24,7 @@ const mapStateToProps = ({ socket, login })  => ({ socket, login });
 function mapDispatchToProps(dispatch) {
     return {
         actions: {
+            login: bindActionCreators(LoginActions, dispatch),
             room: bindActionCreators(RoomActions, dispatch),
             socket: bindActionCreators(SocketActions, dispatch),
             socketHandlers: bindActionCreators(SocketHandlerActions, dispatch)

src/containers/Footer.js

@@ -8,7 +8,7 @@ const Footer = ({ actions, login, socket }) => {
     return (
         <footer>
             <SocketStatusPane {...socket} />
-            <LoginStatusPane {...login} socketSend={actions.socket.send} />
+            <LoginStatusPane {...login} loginActions={actions.login} />
         </footer>
     );
 };

src/reducers/socket.js

@@ -1,13 +1,23 @@
 import * as types from "../constants/ActionTypes";
 import {
     STATE_OPENING, STATE_OPEN, STATE_CLOSING, STATE_CLOSED
-} from "../constants/socket.js";
+} from "../constants/socket";
+
+import ControlRequest from "../utils/ControlRequest";
 
 const initialState = {
     state: STATE_CLOSED
 };
 
 export default (state = initialState, action) => {
+    const sendRequest = (controlRequest) => {
+        try {
+            state.socket.send(JSON.stringify(controlRequest));
+        } catch (err) {
+            console.log(`Socket error: failed to send ${action.payload}`);
+        }
+    };
+
     switch (action.type) {
         case types.SOCKET_SET_OPENING:
         {
@@ -44,11 +54,11 @@ export default (state = initialState, action) => {
             return { ...state, state: state.socket.readyState };
 
         case types.SOCKET_SEND_MESSAGE:
-            try {
-                state.socket.send(JSON.stringify(action.payload));
-            } catch (err) {
-                console.log(`Socket error: failed to send ${action.payload}`);
-            }
+            sendRequest(action.payload);
+            return state;
+
+        case types.LOGIN_GET_STATUS:
+            sendRequest(ControlRequest.loginStatus());
             return state;
 
         default: