From 886510d721f21e73972477bc8c8abbe71c1247bf Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Mon, 23 Jul 2018 14:04:53 +0900
Subject: [PATCH] Clean up

---
 locales/index.js                              |  4 +-
 .../components/games/reversi/reversi.room.vue | 14 +++----
 src/server/api/stream/games/reversi-game.ts   | 38 +++++++++----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/locales/index.js b/locales/index.js
index f11ce7b57..1d760db8a 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -19,9 +19,9 @@ const langs = {
 	'es': loadLang('es')
 };
 
-Object.entries(langs).map(([, locale]) => {
+Object.values(langs).forEach(locale => {
 	// Extend native language (Japanese)
-	locale = Object.assign({}, native, locale);
+	Object.assign(locale, native);
 });
 
 module.exports = langs;
diff --git a/src/client/app/common/views/components/games/reversi/reversi.room.vue b/src/client/app/common/views/components/games/reversi/reversi.room.vue
index 03152dcf1..841f6b366 100644
--- a/src/client/app/common/views/components/games/reversi/reversi.room.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.room.vue
@@ -112,7 +112,7 @@ export default Vue.extend({
 
 	computed: {
 		mapCategories(): string[] {
-			const categories = Object.entries(maps).map(x => x[1].category);
+			const categories = Object.values(maps).map(x => x.category);
 			return categories.filter((item, pos) => categories.indexOf(item) == pos);
 		},
 		isAccepted(): boolean {
@@ -179,8 +179,8 @@ export default Vue.extend({
 			if (this.game.settings.map == null) {
 				this.mapName = null;
 			} else {
-				const foundMap = Object.entries(maps).find(x => x[1].data.join('') == this.game.settings.map.join(''));
-				this.mapName = foundMap ? foundMap[1].name : '-Custom-';
+				const found = Object.values(maps).find(x => x.data.join('') == this.game.settings.map.join(''));
+				this.mapName = found ? found.name : '-Custom-';
 			}
 		},
 
@@ -206,7 +206,7 @@ export default Vue.extend({
 			if (v == null) {
 				this.game.settings.map = null;
 			} else {
-				this.game.settings.map = Object.entries(maps).find(x => x[1].name == v)[1].data;
+				this.game.settings.map = Object.values(maps).find(x => x.name == v).data;
 			}
 			this.$forceUpdate();
 			this.updateSettings();
@@ -217,9 +217,9 @@ export default Vue.extend({
 			const y = Math.floor(pos / this.game.settings.map[0].length);
 			const newPixel =
 				pixel == ' ' ? '-' :
-				pixel == '-' ? 'b' :
-				pixel == 'b' ? 'w' :
-				' ';
+					pixel == '-' ? 'b' :
+						pixel == 'b' ? 'w' :
+							' ';
 			const line = this.game.settings.map[y].split('');
 			line[x] = newPixel;
 			this.$set(this.game.settings.map, y, line.join(''));
diff --git a/src/server/api/stream/games/reversi-game.ts b/src/server/api/stream/games/reversi-game.ts
index bcbfad0a7..da949e90f 100644
--- a/src/server/api/stream/games/reversi-game.ts
+++ b/src/server/api/stream/games/reversi-game.ts
@@ -87,8 +87,8 @@ export default function(request: websocket.request, connection: websocket.connec
 		const set = game.user1Id.equals(user._id) ? {
 			form1: form
 		} : {
-			form2: form
-		};
+				form2: form
+			};
 
 		await ReversiGame.update({ _id: gameId }, {
 			$set: set
@@ -117,8 +117,8 @@ export default function(request: websocket.request, connection: websocket.connec
 		const set = game.user1Id.equals(user._id) ? {
 			form2: form
 		} : {
-			form1: form
-		};
+				form1: form
+			};
 
 		await ReversiGame.update({ _id: gameId }, {
 			$set: set
@@ -193,7 +193,7 @@ export default function(request: websocket.request, connection: websocket.connec
 				function getRandomMap() {
 					const mapCount = Object.entries(maps).length;
 					const rnd = Math.floor(Math.random() * mapCount);
-					return Object.entries(maps).find((x, i) => i == rnd)[1].data;
+					return Object.values(maps)[rnd].data;
 				}
 
 				const map = freshGame.settings.map != null ? freshGame.settings.map : getRandomMap();
@@ -227,11 +227,11 @@ export default function(request: websocket.request, connection: websocket.connec
 					await ReversiGame.update({
 						_id: gameId
 					}, {
-						$set: {
-							isEnded: true,
-							winnerId: winner
-						}
-					});
+							$set: {
+								isEnded: true,
+								winnerId: winner
+							}
+						});
 
 					publishReversiGameStream(gameId, 'ended', {
 						winnerId: winner,
@@ -293,15 +293,15 @@ export default function(request: websocket.request, connection: websocket.connec
 		await ReversiGame.update({
 			_id: gameId
 		}, {
-			$set: {
-				crc32,
-				isEnded: o.isEnded,
-				winnerId: winner
-			},
-			$push: {
-				logs: log
-			}
-		});
+				$set: {
+					crc32,
+					isEnded: o.isEnded,
+					winnerId: winner
+				},
+				$push: {
+					logs: log
+				}
+			});
 
 		publishReversiGameStream(gameId, 'set', Object.assign(log, {
 			next: o.turn