From 8ff8f14d4eeb5aa1a55cdb533da47736a09e1ad6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 16 Apr 2018 15:13:31 +0900
Subject: [PATCH] Fix #1486

---
 .../desktop/views/pages/user/user.header.vue    |  4 +---
 .../desktop/views/pages/user/user.timeline.vue  | 17 ++++++++++-------
 src/client/app/mobile/views/pages/user.vue      | 10 +++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/client/app/desktop/views/pages/user/user.header.vue b/src/client/app/desktop/views/pages/user/user.header.vue
index 15d1187fdd..7a0672d3d7 100644
--- a/src/client/app/desktop/views/pages/user/user.header.vue
+++ b/src/client/app/desktop/views/pages/user/user.header.vue
@@ -13,9 +13,7 @@
 			<p class="location" v-if="user.host === null && user.profile.location">%fa:map-marker%{{ user.profile.location }}</p>
 		</div>
 		<footer>
-			<router-link :to="user | userPage" :data-active="$parent.page == 'home'">%fa:home%概要</router-link>
-			<router-link :to="user | userPage('media')" :data-active="$parent.page == 'media'">%fa:image%メディア</router-link>
-			<router-link :to="user | userPage('graphs')" :data-active="$parent.page == 'graphs'">%fa:chart-bar%グラフ</router-link>
+			<router-link :to="user | userPage" :data-active="$parent.page == 'home'">%fa:home%ホーム</router-link>
 		</footer>
 	</div>
 </div>
diff --git a/src/client/app/desktop/views/pages/user/user.timeline.vue b/src/client/app/desktop/views/pages/user/user.timeline.vue
index 87d133174b..55d6072a9d 100644
--- a/src/client/app/desktop/views/pages/user/user.timeline.vue
+++ b/src/client/app/desktop/views/pages/user/user.timeline.vue
@@ -3,6 +3,7 @@
 	<header>
 		<span :data-is-active="mode == 'default'" @click="mode = 'default'">投稿</span>
 		<span :data-is-active="mode == 'with-replies'" @click="mode = 'with-replies'">投稿と返信</span>
+		<span :data-is-active="mode == 'with-media'" @click="mode = 'with-media'">メディア</span>
 	</header>
 	<div class="loading" v-if="fetching">
 		<mk-ellipsis-icon/>
@@ -31,16 +32,16 @@ export default Vue.extend({
 			date: null
 		};
 	},
-	watch: {
-		mode() {
-			this.fetch();
-		}
-	},
 	computed: {
 		empty(): boolean {
 			return this.notes.length == 0;
 		}
 	},
+	watch: {
+		mode() {
+			this.fetch();
+		}
+	},
 	mounted() {
 		document.addEventListener('keydown', this.onDocumentKeydown);
 		window.addEventListener('scroll', this.onScroll);
@@ -63,7 +64,8 @@ export default Vue.extend({
 			(this as any).api('users/notes', {
 				userId: this.user.id,
 				untilDate: this.date ? this.date.getTime() : undefined,
-				with_replies: this.mode == 'with-replies'
+				includeReplies: this.mode == 'with-replies',
+				withMedia: this.mode == 'with-media'
 			}).then(notes => {
 				this.notes = notes;
 				this.fetching = false;
@@ -75,7 +77,8 @@ export default Vue.extend({
 			this.moreFetching = true;
 			(this as any).api('users/notes', {
 				userId: this.user.id,
-				with_replies: this.mode == 'with-replies',
+				includeReplies: this.mode == 'with-replies',
+				withMedia: this.mode == 'with-media',
 				untilId: this.notes[this.notes.length - 1].id
 			}).then(notes => {
 				this.moreFetching = false;
diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue
index ee7aabb1fd..f802bdecf7 100644
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@@ -44,15 +44,15 @@
 		</header>
 		<nav>
 			<div class="nav-container">
-				<a :data-is-active=" page == 'home' " @click="page = 'home'">%i18n:@overview%</a>
-				<a :data-is-active=" page == 'notes' " @click="page = 'notes'">%i18n:@timeline%</a>
-				<a :data-is-active=" page == 'media' " @click="page = 'media'">%i18n:@media%</a>
+				<a :data-is-active="page == 'home'" @click="page = 'home'">%i18n:@overview%</a>
+				<a :data-is-active="page == 'notes'" @click="page = 'notes'">%i18n:@timeline%</a>
+				<a :data-is-active="page == 'media'" @click="page = 'media'">%i18n:@media%</a>
 			</div>
 		</nav>
 		<div class="body">
 			<x-home v-if="page == 'home'" :user="user"/>
-			<mk-user-timeline v-if="page == 'notes'" :user="user"/>
-			<mk-user-timeline v-if="page == 'media'" :user="user" with-media/>
+			<mk-user-timeline v-if="page == 'notes'" :user="user" key="tl"/>
+			<mk-user-timeline v-if="page == 'media'" :user="user" :with-media="true" key="media"/>
 		</div>
 	</main>
 </mk-ui>