Merge pull request #61 from boostcamp-2020/develop

Week2 Hotfixes

Author: ramram1048

src/backend/sockets/chat.js

@@ -1,9 +1,14 @@
 import Games from '@game/Games';
 
-export const onSendChat = (socket, { message }) => {
+function onSendChat({ message }) {
+  const socket = this;
   const roomID = Games.findRoomID(socket.id);
   if (!roomID) return;
 
   const { nickname } = Games.findUserInfo(socket.id);
   socket.in(roomID).emit('send chat', { message, nickname });
-};
+}
+
+export default function onChat(socket) {
+  socket.on('send chat', onSendChat);
+}

src/backend/sockets/index.js

@@ -1,14 +1,14 @@
 import io from 'socket.io';
-import { onJoinPlayer } from './waitingRoom';
-import { onSendChat } from './chat';
+import onWaitingRoom from './waitingRoom';
+import onChat from './chat';
 
 const socketIO = io();
 
 socketIO.on('connection', (socket) => {
   console.log('a user connected');
 
-  socket.on('join player', (params) => onJoinPlayer(socket, { ...params }));
-  socket.on('send chat', (params) => onSendChat(socket, { ...params }));
+  onWaitingRoom(socket);
+  onChat(socket);
 });
 
 export default socketIO;

src/backend/sockets/waitingRoom.js

@@ -1,6 +1,7 @@
 import Games from '@game/Games';
 
-export const onJoinPlayer = (socket, { roomID }) => {
+function onJoinPlayer({ roomID }) {
+  const socket = this;
   if (!roomID || !Games.isEnterableRoom(roomID)) return;
 
   Games.enterUser({ socketID: socket.id, roomID });
@@ -11,4 +12,8 @@ export const onJoinPlayer = (socket, { roomID }) => {
     roomID,
     players: [],
   });
-};
+}
+
+export default function onWaitingRoom(socket) {
+  socket.on('join player', onJoinPlayer);
+}

src/backend/utils/generateRandom.js

@@ -1,10 +1,17 @@
+import nickname from './nickname.json';
+
 const randomStrings = new Set();
 
 const generateRandomString = () =>
   Math.random().toString(36).substr(2, 5).toUpperCase();
 
 export default {
-  nickname: () => '코딩하는 덕싯',
+  nickname: () => {
+    const { adjective: adj, noun } = nickname;
+    const randomAdj = adj[Math.floor(Math.random() * adj.length)];
+    const randomNoun = noun[Math.floor(Math.random() * noun.length)];
+    return `${randomAdj} ${randomNoun}`;
+  },
   color: () => '#222222',
   code: () => {
     let randomString = generateRandomString();

src/backend/utils/nickname.json

@@ -0,0 +1,4 @@
+{
+    "adjective": ["코딩하는", "열정적인", "JS덕후", "얼죽아", "카페인중독", "패션왕", "집에만 있는", "밤새는", "배고픈", "고독한", "발명왕", "청소를 좋아하는", "명탐정"],
+    "noun": ["덕싯", "캠퍼", "뽀로로", "도라에몽", "개발자", "코딩왕", "미식가", "산타클로스", "집사", "프론트 개발자", "백엔드 개발자", "iOS 개발자", "코난", "아티스트"]
+}