From a8083eb52bc268829caa2d5453dec5d9a3c5185f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 29 Apr 2018 17:54:50 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3=E3=81=AA?=
 =?UTF-8?q?=E3=81=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/mios.ts                        |  8 +++-----
 src/client/app/desktop/views/components/settings.vue |  2 +-
 src/client/app/desktop/views/pages/welcome.vue       | 12 ++++--------
 src/client/app/mobile/views/pages/welcome.vue        | 12 ++++--------
 src/client/app/store.ts                              | 10 ++++++----
 src/server/api/stream/home.ts                        |  5 +++--
 6 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/client/app/common/mios.ts b/src/client/app/common/mios.ts
index 7dcae4794..3973e4ae8 100644
--- a/src/client/app/common/mios.ts
+++ b/src/client/app/common/mios.ts
@@ -332,7 +332,7 @@ export default class MiOS extends EventEmitter {
 		const cachedSettings = JSON.parse(localStorage.getItem('settings'));
 
 		if (cachedSettings) {
-			this.store.commit('settings/init', cachedSettings);
+			this.store.dispatch('settings/merge', cachedSettings);
 		}
 		//#endregion
 
@@ -350,7 +350,7 @@ export default class MiOS extends EventEmitter {
 			fetchme(cachedMe.token, freshData => {
 				merge(cachedMe, freshData);
 
-				this.store.commit('settings/init', freshData.clientSettings);
+				this.store.dispatch('settings/merge', freshData.clientSettings);
 			});
 		} else {
 			// Get token from cookie
@@ -358,9 +358,7 @@ export default class MiOS extends EventEmitter {
 
 			fetchme(i, me => {
 				if (me) {
-					Object.entries(me.clientSettings).forEach(([key, value]) => {
-						this.store.commit('settings/set', { key, value });
-					});
+					this.store.dispatch('settings/merge', me.clientSettings);
 
 					fetched(me);
 				} else {
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index af6ab1266..77606d425 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -41,7 +41,7 @@
 			</div>
 			<div class="div">
 				<mk-switch v-model="darkmode" text="ダークモード"/>
-				<mk-switch v-model="clientSettings.circleIcons" @change="onChangeCircleIcons" text="丸いアイコンを使用"/>
+				<mk-switch v-model="clientSettings.circleIcons" @change="onChangeCircleIcons" text="円形のアイコンを使用"/>
 				<mk-switch v-model="clientSettings.gradientWindowHeader" @change="onChangeGradientWindowHeader" text="ウィンドウのタイトルバーにグラデーションを使用"/>
 			</div>
 			<mk-switch v-model="clientSettings.showPostFormOnTopOfTl" @change="onChangeShowPostFormOnTopOfTl" text="タイムライン上部に投稿フォームを表示する"/>
diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue
index 3d6765c97..898b6b217 100644
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@@ -8,7 +8,7 @@
 					<p>ようこそ！ <b>Misskey</b>はTwitter風ミニブログSNSです。思ったことや皆と共有したいことを投稿しましょう。タイムラインを見れば、皆の関心事をすぐにチェックすることもできます。<a :href="aboutUrl">詳しく...</a></p>
 					<p><button class="signup" @click="signup">はじめる</button><button class="signin" @click="signin">ログイン</button></p>
 					<div class="users">
-						<mk-avatar class="avatar" :key="user.id" :user="user"/>
+						<mk-avatar class="avatar" v-for="user in users" :key="user.id" :user="user"/>
 					</div>
 				</div>
 				<div>
@@ -215,13 +215,9 @@ export default Vue.extend({
 						> *
 							display inline-block
 							margin 4px
-
-							> *
-								display inline-block
-								width 38px
-								height 38px
-								vertical-align top
-								border-radius 6px
+							width 38px
+							height 38px
+							border-radius 6px
 
 				> div:last-child
 
diff --git a/src/client/app/mobile/views/pages/welcome.vue b/src/client/app/mobile/views/pages/welcome.vue
index 4d236d7aa..64cfa5a46 100644
--- a/src/client/app/mobile/views/pages/welcome.vue
+++ b/src/client/app/mobile/views/pages/welcome.vue
@@ -22,7 +22,7 @@
 			<mk-welcome-timeline/>
 		</div>
 		<div class="users">
-			<mk-avatar class="avatar" :key="user.id" :user="user"/>
+			<mk-avatar class="avatar" v-for="user in users" :key="user.id" :user="user"/>
 		</div>
 		<footer>
 			<small>{{ copyright }}</small>
@@ -183,13 +183,9 @@ export default Vue.extend({
 			> *
 				display inline-block
 				margin 4px
-
-				> *
-					display inline-block
-					width 38px
-					height 38px
-					vertical-align top
-					border-radius 6px
+				width 38px
+				height 38px
+				border-radius 6px
 
 		> footer
 			text-align center
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index 706fd6555..a2ae1632d 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -41,10 +41,6 @@ export default (os: MiOS) => new Vuex.Store({
 			},
 
 			mutations: {
-				init(state, settings) {
-					state.data = settings;
-				},
-
 				set(state, x: { key: string; value: any }) {
 					state.data[x.key] = x.value;
 				},
@@ -66,6 +62,12 @@ export default (os: MiOS) => new Vuex.Store({
 			},
 
 			actions: {
+				merge(ctx, settings) {
+					Object.entries(settings).forEach(([key, value]) => {
+						ctx.commit('set', { key, value });
+					});
+				},
+
 				set(ctx, x) {
 					ctx.commit('set', x);
 
diff --git a/src/server/api/stream/home.ts b/src/server/api/stream/home.ts
index f62927884..54fde2d77 100644
--- a/src/server/api/stream/home.ts
+++ b/src/server/api/stream/home.ts
@@ -70,12 +70,13 @@ export default async function(
 		}
 	});
 
-	connection.on('message', data => {
+	connection.on('message', async data => {
 		const msg = JSON.parse(data.utf8Data);
 
 		switch (msg.type) {
 			case 'api':
-				call(msg.endpoint, user, app, msg.data).then(res => {
+				// 新鮮なデータを利用するためにユーザーをフェッチ
+				call(msg.endpoint, await User.findOne({ _id: user._id }), app, msg.data).then(res => {
 					connection.send(JSON.stringify({
 						type: `api-res:${msg.id}`,
 						body: { res }