From 8ff8f14d4eeb5aa1a55cdb533da47736a09e1ad6 Mon Sep 17 00:00:00 2001 From: syuilo 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 @@

%fa:map-marker%{{ user.profile.location }}

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 @@
投稿 投稿と返信 + メディア
@@ -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 @@
- - + +