hotfix: Check username loaded from save.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "net64plus",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "compatVersion": "1.0.0",
   "description": "Net64+ client",
   "main": "index.js",
@@ -56,7 +56,7 @@
     "dompurify": "^1.0.4",
     "electron": "1.8",
     "history": "^4.7.2",
-    "immer": "^0.8.1",
+    "immer": "^1.3.1",
     "marked": "^0.4.0",
     "node-emoji": "^1.8.1",
     "protobufjs": "^6.8.4",

src/models/State.model.ts

@@ -43,9 +43,10 @@ export interface ChatStateDraft {
 }
 export type ChatState = Readonly<ChatStateDraft>
 
-export interface State {
-  readonly save: SaveState
-  readonly router: RouterState
-  readonly connection: ConnectionState
-  readonly chat: ChatState
+export interface StateDraft {
+  save: SaveState
+  router: RouterState
+  connection: ConnectionState
+  chat: ChatState
 }
+export type State = Readonly<StateDraft>

src/renderer/components/views/SettingsView.tsx

@@ -22,8 +22,8 @@ interface SettingsViewState {
   warning: string
 }
 
-const MIN_LENGTH_USERNAME = 3
-const MAX_LENGTH_USERNAME = 24
+export const MIN_LENGTH_USERNAME = 3
+export const MAX_LENGTH_USERNAME = 24
 
 class View extends React.PureComponent<SettingsViewProps, SettingsViewState> {
   constructor (public props: SettingsViewProps) {

src/renderer/reducers/index.ts

@@ -1,12 +1,14 @@
 import { createStore, applyMiddleware, combineReducers, Store, ReducersMapObject } from 'redux'
 import { routerMiddleware, RouterState } from 'react-router-redux'
 import { History } from 'history'
+import produce from 'immer'
 
 import { save } from './save'
 import { router } from './router'
 import { connection } from './connection'
 import { chat } from './chat'
-import { State, SaveState, ElectronSaveData } from '../../models/State.model'
+import { MIN_LENGTH_USERNAME, MAX_LENGTH_USERNAME } from '../components/views/SettingsView'
+import { State, SaveState, ElectronSaveData, StateDraft } from '../../models/State.model'
 
 export let initialState: State
 
@@ -21,7 +23,15 @@ const APP_SAVE_DATA: ElectronSaveData = {
 }
 
 export function initReducer (history: History, electronSave: SaveState): Store<State> {
-  const appSaveData: ElectronSaveData = Object.assign({}, APP_SAVE_DATA, electronSave.appSaveData)
+  let appSaveData: ElectronSaveData = Object.assign({}, APP_SAVE_DATA, electronSave.appSaveData)
+  const username = appSaveData.username.replace(/\W/g, '')
+  if (
+    username !== appSaveData.username ||
+    username.length < MIN_LENGTH_USERNAME ||
+    username.length > MAX_LENGTH_USERNAME
+  ) {
+    appSaveData = Object.assign({}, APP_SAVE_DATA)
+  }
   const appSavePath: string = electronSave.appSavePath || ''
   initialState = {
     save: {

src/renderer/utils/chat.util.ts

@@ -2,6 +2,7 @@ import * as marked from 'marked'
 import { emojify } from 'node-emoji'
 
 import { store } from '..'
+import { MAX_LENGTH_USERNAME } from '../components/views/SettingsView'
 import { addGlobalChatMessage, clearGlobalChatMessages } from '../actions/chat'
 import { ChatMessage } from '../../models/State.model'
 
@@ -14,7 +15,7 @@ export function addGlobalMessage (message: string, username: string) {
     key: date.getUTCMilliseconds(),
     time: `${String(date.getHours()).padStart(2, '00')}:${String(date.getMinutes()).padStart(2, '00')}:${String(date.getSeconds()).padStart(2, '00')}`,
     message: sanitizedMessage,
-    username
+    username: sanitize(username).substr(0, MAX_LENGTH_USERNAME)
   }
   store.dispatch(addGlobalChatMessage(chatMessage))
 }

yarn.lock

@@ -3740,9 +3740,9 @@ ignore@^3.0.11, ignore@^3.0.9, ignore@^3.2.0, ignore@^3.3.3, ignore@^3.3.6:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
-immer@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-0.8.1.tgz#44d7d0779947da32eb34314addaac5a82c9ec5ad"
+immer@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-1.3.1.tgz#3a8c18d9d618c8b7169760a79beec24a1da6a43e"
 
 import-local@^1.0.0:
   version "1.0.0"