split LOGIN and LOGOUT from RECEIVE_ME

src/actions/index.js

@@ -483,39 +483,29 @@ export function receivePixelUpdate(
   };
 }
 
+export function loginUser(
+  me: Object,
+): Action {
+  console.log('login', me);
+  return {
+    type: 'LOGIN',
+    ...me,
+  };
+}
+
 export function receiveMe(
   me: Object,
 ): Action {
-  const {
-    name,
-    messages,
-    mailreg,
-    totalPixels,
-    dailyTotalPixels,
-    ranking,
-    dailyRanking,
-    minecraftname,
-    blockDm,
-    canvases,
-    channels,
-    blocked,
-    userlvl,
-  } = me;
   return {
     type: 'RECEIVE_ME',
-    name: (name) || null,
+    ...me,
-    messages: (messages) || [],
+  };
-    mailreg: (mailreg) || false,
+}
-    totalPixels,
+
-    dailyTotalPixels,
+export function logoutUser(
-    ranking,
+): Action {
-    dailyRanking,
+  return {
-    minecraftname,
+    type: 'LOGOUT',
-    blockDm: !!blockDm,
-    canvases,
-    channels,
-    blocked,
-    userlvl,
   };
 }
 
@@ -819,11 +809,9 @@ export function startDm(query): PromiseAction {
         'OK',
       ));
     } else {
-      const cid = res[0];
+      const cid = Object.keys(res)[0];
-      if (cid) {
+      dispatch(addChatChannel(res));
-        dispatch(addChatChannel(res));
+      dispatch(setChatChannel(cid));
-        dispatch(setChatChannel(cid));
-      }
     }
     dispatch(setApiFetching(false));
   };

src/actions/types.js

@@ -94,6 +94,23 @@ export type Action =
     blocked: Array,
     userlvl: number,
   }
+  | { type: 'LOGIN',
+    name: string,
+    waitSeconds: number,
+    messages: Array,
+    mailreg: boolean,
+    totalPixels: number,
+    dailyTotalPixels: number,
+    ranking: number,
+    dailyRanking: number,
+    minecraftname: string,
+    blockDm: boolean,
+    canvases: Object,
+    channels: Object,
+    blocked: Array,
+    userlvl: number,
+  }
+  | { type: 'LOGOUT' }
   | { type: 'RECEIVE_STATS', totalRanking: Object, totalDailyRanking: Object }
   | { type: 'SET_NAME', name: string }
   | { type: 'SET_MINECRAFT_NAME', minecraftname: string }

src/components/DeleteAccount.jsx

@@ -4,8 +4,11 @@
  */
 
 import React from 'react';
+import { connect } from 'react-redux';
 import { validatePassword, parseAPIresponse } from '../utils/validation';
 
+import { logoutUser } from '../actions';
+
 function validate(password) {
   const errors = [];
 
@@ -64,8 +67,8 @@ class DeleteAccount extends React.Component {
       });
       return;
     }
-    const { setName } = this.props;
+    const { logout } = this.props;
-    setName(null);
+    logout();
   }
 
   render() {
@@ -94,4 +97,12 @@ class DeleteAccount extends React.Component {
   }
 }
 
-export default DeleteAccount;
+function mapDispatchToProps(dispatch) {
+  return {
+    async logout() {
+      dispatch(logoutUser());
+    },
+  };
+}
+
+export default connect(null, mapDispatchToProps)(DeleteAccount);

src/components/LogInForm.jsx

@@ -3,9 +3,11 @@
  * @flow
  */
 import React from 'react';
+import { connect } from 'react-redux';
 import {
   validateEMail, validateName, validatePassword, parseAPIresponse,
 } from '../utils/validation';
+import { loginUser } from '../actions';
 
 
 function validate(nameoremail, password) {
@@ -60,7 +62,7 @@ class LogInForm extends React.Component {
     e.preventDefault();
 
     const { nameoremail, password, submitting } = this.state;
-    const { me: setMe } = this.props;
+    const { login } = this.props;
     if (submitting) return;
 
     const errors = validate(nameoremail, password);
@@ -80,7 +82,7 @@ class LogInForm extends React.Component {
       });
       return;
     }
-    setMe(me);
+    login(me);
   }
 
   render() {
@@ -116,4 +118,12 @@ class LogInForm extends React.Component {
   }
 }
 
-export default LogInForm;
+function mapDispatchToProps(dispatch) {
+  return {
+    login(me) {
+      dispatch(loginUser(me));
+    },
+  };
+}
+
+export default connect(null, mapDispatchToProps)(LogInForm);

src/components/SignUpForm.jsx

@@ -9,7 +9,7 @@ import {
   validateEMail, validateName, validatePassword, parseAPIresponse,
 } from '../utils/validation';
 
-import { showUserAreaModal, receiveMe } from '../actions';
+import { showUserAreaModal, loginUser } from '../actions';
 
 
 function validate(name, email, password, confirmPassword) {
@@ -94,8 +94,8 @@ class SignUpForm extends React.Component {
       });
       return;
     }
-    const { doMe, userarea } = this.props;
+    const { login, userarea } = this.props;
-    doMe(me);
+    login(me);
     userarea();
   }
 
@@ -163,8 +163,8 @@ class SignUpForm extends React.Component {
 
 function mapDispatchToProps(dispatch) {
   return {
-    doMe(me) {
+    login(me) {
-      dispatch(receiveMe(me));
+      dispatch(loginUser(me));
     },
     userarea() {
       dispatch(showUserAreaModal());

src/components/UserArea.jsx

@@ -14,6 +14,7 @@ import ChangeName from './ChangeName';
 import ChangeMail from './ChangeMail';
 import DeleteAccount from './DeleteAccount';
 import SocialSettings from './SocialSettings';
+import { logoutUser } from '../actions';
 
 import { numberToString } from '../core/utils';
 
@@ -172,7 +173,6 @@ class UserArea extends React.Component {
         {(deleteAccountExtended)
           && (
           <DeleteAccount
-            setName={setName}
             done={() => { this.setState({ deleteAccountExtended: false }); }}
           />
           )}
@@ -226,4 +226,18 @@ function mapStateToProps(state: State) {
   return { name, mailreg, stats };
 }
 
-export default connect(mapStateToProps)(UserArea);
+function mapDispatchToProps(dispatch) {
+  return {
+    async logout() {
+      const response = await fetch(
+        './api/auth/logout',
+        { credentials: 'include' },
+      );
+      if (response.ok) {
+        dispatch(logoutUser());
+      }
+    },
+  };
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(UserArea);

src/components/UserAreaModal.jsx

@@ -10,7 +10,7 @@ import type { State } from '../reducers';
 
 
 import {
-  showRegisterModal, showForgotPasswordModal, setName, setMailreg, receiveMe,
+  showRegisterModal, showForgotPasswordModal, setName, setMailreg,
 } from '../actions';
 import LogInForm from './LogInForm';
 import Tabs from './Tabs';
@@ -87,8 +87,6 @@ const UserAreaModal = ({
   name,
   register,
   forgotPassword,
-  doMe,
-  logout,
   setUserName,
   setUserMailreg,
   userlvl,
@@ -99,14 +97,12 @@ const UserAreaModal = ({
         <LogInArea
           register={register}
           forgotPassword={forgotPassword}
-          me={doMe}
         />
       )
       : (
         <Tabs>
           <div label="Profile">
             <UserArea
-              logout={logout}
               setName={setUserName}
               setMailreg={setUserMailreg}
             />
@@ -142,25 +138,12 @@ function mapDispatchToProps(dispatch) {
     forgotPassword() {
       dispatch(showForgotPasswordModal());
     },
-    doMe(me) {
-      dispatch(receiveMe(me));
-    },
     setUserName(name) {
       dispatch(setName(name));
     },
     setUserMailreg(mailreg) {
       dispatch(setMailreg(mailreg));
     },
-    async logout() {
-      const response = await fetch(
-        './api/auth/logout',
-        { credentials: 'include' },
-      );
-      if (response.ok) {
-        const resp = await response.json();
-        dispatch(receiveMe(resp.me));
-      }
-    },
   };
 }
 

src/core/constants.js

@@ -71,16 +71,6 @@ export const TILE_SIZE = 256;
 // how much to scale for a new tiled zoomlevel
 export const TILE_ZOOM_LEVEL = 4;
 
-// TODO get rid of those or use it myself
-export const social = {
-  facebook: 'https://www.facebook.com/pixelplanetfun/',
-  reddit: 'https://reddit.com/r/PixelPlanetFun',
-  twitter: 'https://twitter.com/pixelplanetfun',
-  discord: 'https://pixelplanet.fun/discord',
-  telegram: 'https://telegram.me/pixelplanetfun',
-  youtube: 'https://www.youtube.com/c/PixelPlanetFun',
-};
-
 export const COOKIE_SESSION_NAME = 'pixelplanet.session';
 
 export const SECOND = 1000;

src/core/utils.js

@@ -137,7 +137,6 @@ export function getCellInsideChunk(
   canvasSize: number,
   pixel: Cell,
 ): Cell {
-  // TODO assert is positive!
   return pixel.map((x) => mod(x + canvasSize / 2, TILE_SIZE));
 }
 

src/data/models/User.js

@@ -198,7 +198,18 @@ class User {
     if (this.regUser == null) {
       return {
         name: null,
+        mailVerified: false,
+        mcVerified: false,
+        minecraftname: null,
+        blockDm: false,
+        totalPixels: 0,
+        dailyTotalPixels: 0,
+        ranking: null,
+        dailyRanking: null,
+        mailreg: false,
+        userlvl: 0,
         channels: this.channels,
+        blocked: this.blocked,
       };
     }
     const { regUser } = this;

src/reducers/chat.js

@@ -41,7 +41,8 @@ export default function chat(
   action: Action,
 ): ChatState {
   switch (action.type) {
-    case 'RECEIVE_ME': {
+    case 'RECEIVE_ME':
+    case 'LOGIN': {
       return {
         ...state,
         channels: action.channels,
@@ -49,6 +50,26 @@ export default function chat(
       };
     }
 
+    case 'LOGOUT': {
+      const channels = { ...state.channels };
+      const messages = { ...state.messages };
+      const keys = Object.keys(channels);
+      for (let i = 0; i < messages.length; i += 1) {
+        const cid = keys[i];
+        if (channels[cid][1] === 0) {
+          delete messages[cid];
+          delete channels[cid];
+        }
+      }
+      return {
+        ...state,
+        inputMessage: '',
+        channels,
+        blocked: [],
+        messages,
+      };
+    }
+
     case 'BLOCK_USER': {
       const { userId, userName } = action;
       const blocked = [
@@ -88,6 +109,7 @@ export default function chat(
 
     case 'ADD_CHAT_CHANNEL': {
       const { channel } = action;
+      console.log('adding channel', channel);
       return {
         ...state,
         channels: {

src/reducers/gui.js

@@ -145,7 +145,8 @@ export default function gui(
       };
     }
 
-    case 'RECEIVE_ME': {
+    case 'RECEIVE_ME':
+    case 'LOGIN': {
       const { channels } = action;
       const cids = Object.keys(channels);
       const chatRead = { ...state.chatRead };

src/reducers/modal.js

@@ -49,12 +49,10 @@ export default function modal(
       };
     }
 
-    case 'RECEIVE_ME': {
+    case 'LOGOUT': {
-      const { name } = action;
-      const chatOpen = (name) ? state.chatOpen : false;
       return {
         ...state,
-        chatOpen,
+        chatOpen: false,
       };
     }
 

src/reducers/user.js

@@ -139,7 +139,8 @@ export default function user(
       };
     }
 
-    case 'RECEIVE_ME': {
+    case 'RECEIVE_ME':
+    case 'LOGIN': {
       const {
         name,
         mailreg,
@@ -169,6 +170,19 @@ export default function user(
       };
     }
 
+    case 'LOGOUT': {
+      return {
+        ...state,
+        name: null,
+        messages: [],
+        mailreg: false,
+        minecraftname: null,
+        blockDm: false,
+        userlvl: 0,
+        nameRegExp: null,
+      };
+    }
+
     case 'RECEIVE_STATS': {
       const { totalRanking, totalDailyRanking } = action;
       return {

src/routes/api/auth/logout.js

@@ -4,9 +4,6 @@
  */
 import type { Request, Response } from 'express';
 
-import getMe from '../../../core/me';
-import chatProvider from '../../../core/ChatProvider';
-
 export default async (req: Request, res: Response) => {
   const { user } = req;
   if (!user) {
@@ -17,16 +14,9 @@ export default async (req: Request, res: Response) => {
     return;
   }
 
-  const me = await getMe(user);
   req.logout();
   res.status(200);
   res.json({
     success: true,
-    me: {
-      name: null,
-      waitSeconds: me.waitSeconds,
-      canvases: me.canvases,
-      channels: chatProvider.defaultChannels,
-    },
   });
 };

src/routes/api/block.js

@@ -98,7 +98,6 @@ async function block(req: Request, res: Response) {
     dmu2id = userId;
   }
 
-  // TODO test if this removes association too
   const channel = await Channel.findOne({
     where: {
       type: 1,

src/socket/ProtocolClient.js

@@ -23,7 +23,6 @@ const chunks = [];
 class ProtocolClient extends EventEmitter {
   url: string;
   ws: WebSocket;
-  name: string;
   canvasId: number;
   channelId: number;
   timeConnected: number;
@@ -37,7 +36,6 @@ class ProtocolClient extends EventEmitter {
     this.isConnecting = false;
     this.isConnected = false;
     this.ws = null;
-    this.name = null;
     this.canvasId = '0';
     this.channelId = 0;
     this.msgQueue = [];
@@ -96,14 +94,6 @@ class ProtocolClient extends EventEmitter {
     this.ws.close();
   }
 
-  setName(name) {
-    if (this.isConnected && this.name !== name) {
-      console.log('Name change requieres WebSocket restart');
-      this.name = name;
-      this.reconnect();
-    }
-  }
-
   setCanvas(canvasId) {
     /* canvasId can be string or integer, thanks to
      * JSON not allowing integer keys
@@ -181,13 +171,11 @@ class ProtocolClient extends EventEmitter {
           // signal
           const [signal, args] = data;
           this.emit(signal, args);
+          break;
         }
         default:
           // nothing
       }
-    } else {
-      // string = name
-      this.name = data;
     }
   }
 

src/socket/SocketServer.js

@@ -88,10 +88,6 @@ class SocketServer extends WebSocketEvents {
       ws.rateLimiter = new RateLimiter(20, 15, true);
       cheapDetector(user.ip);
 
-      if (ws.name) {
-        ws.send(`"${ws.name}"`);
-      }
-
       ws.send(OnlineCounter.dehydrate({
         online: this.wss.clients.size || 0,
       }));
@@ -337,16 +333,17 @@ class SocketServer extends WebSocketEvents {
          */
         const dmUserId = chatProvider.checkIfDm(user, channelId);
         if (dmUserId) {
+          console.log('is dm');
           const dmWs = this.findWsByUserId(dmUserId);
-          if (dmWs) {
+          if (!dmWs 
-            const { user: dmUser } = dmWs;
+            || !chatProvider.userHasChannelAccess(dmWs.user, channelId)
-            if (!dmUser || !dmUser.userHasChannelAccess(channelId)) {
+          ) {
-              ChatProvider.addUserToChannel(
+            console.log('adding channel')
-                dmUserId,
+            ChatProvider.addUserToChannel(
-                channelId,
+              dmUserId,
-                [ws.name, 1, Date.now(), user.id],
+              channelId,
-              );
+              [ws.name, 1, Date.now(), user.id],
-            }
+            );
           }
         }
 

src/store/protocolClientHook.js

@@ -18,19 +18,10 @@ export default (store) => (next) => (action) => {
       break;
     }
 
-    /*
+    case 'SET_NAME':
-     * TODO
+    case 'LOGIN:':
-     * make LOGIN / LOGOUT Actions instead of comparing name changes
+    case 'LOGOUT': {
-     */
+      ProtocolClient.reconnect();
-    case 'RECEIVE_ME': {
-      const { name } = action;
-      ProtocolClient.setName(name);
-      break;
-    }
-
-    case 'SET_NAME': {
-      const { name } = action;
-      ProtocolClient.setName(name);
       break;
     }