diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-11-13 01:17:59 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-11-13 01:17:59 +0900 |
| commit | 81805b01cc5c47d0b77e2a8f46351e7d33be40a3 (patch) | |
| tree | 55b6b700a0980185b875c546ffde6f24c1eb4b5e /src/client | |
| parent | 10.49.0 (diff) | |
| download | sharkey-81805b01cc5c47d0b77e2a8f46351e7d33be40a3.tar.gz sharkey-81805b01cc5c47d0b77e2a8f46351e7d33be40a3.tar.bz2 sharkey-81805b01cc5c47d0b77e2a8f46351e7d33be40a3.zip | |
sort user timeline by date (#3210)
Diffstat (limited to 'src/client')
6 files changed, 15 insertions, 9 deletions
diff --git a/src/client/app/desktop/views/pages/deck/deck.user-column.vue b/src/client/app/desktop/views/pages/deck/deck.user-column.vue index 3404280c81..53bb54b5a6 100644 --- a/src/client/app/desktop/views/pages/deck/deck.user-column.vue +++ b/src/client/app/desktop/views/pages/deck/deck.user-column.vue @@ -155,7 +155,8 @@ export default Vue.extend({ this.$root.api('users/notes', { userId: this.user.id, fileType: image, - limit: 9 + limit: 9, + untilDate: new Date().getTime() + 1000 * 86400 * 365 }).then(notes => { notes.forEach(note => { note.files.forEach(file => { @@ -254,6 +255,7 @@ export default Vue.extend({ this.$root.api('users/notes', { userId: this.user.id, limit: fetchLimit + 1, + untilDate: new Date().getTime() + 1000 * 86400 * 365, withFiles: this.withFiles, includeMyRenotes: this.$store.state.settings.showMyRenotes, includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes, @@ -274,7 +276,7 @@ export default Vue.extend({ const promise = this.$root.api('users/notes', { userId: this.user.id, limit: fetchLimit + 1, - untilId: (this.$refs.timeline as any).tail().id, + untilDate: new Date((this.$refs.timeline as any).tail().createdAt).getTime(), withFiles: this.withFiles, includeMyRenotes: this.$store.state.settings.showMyRenotes, includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes, diff --git a/src/client/app/desktop/views/pages/user/user.photos.vue b/src/client/app/desktop/views/pages/user/user.photos.vue index 4c7589a11b..af86238039 100644 --- a/src/client/app/desktop/views/pages/user/user.photos.vue +++ b/src/client/app/desktop/views/pages/user/user.photos.vue @@ -27,7 +27,8 @@ export default Vue.extend({ this.$root.api('users/notes', { userId: this.user.id, withFiles: true, - limit: 9 + limit: 9, + untilDate: new Date().getTime() + 1000 * 86400 * 365 }).then(notes => { notes.forEach(note => { note.files.forEach(file => { 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 affa1f11f4..9b673a2bfd 100644 --- a/src/client/app/desktop/views/pages/user/user.timeline.vue +++ b/src/client/app/desktop/views/pages/user/user.timeline.vue @@ -63,7 +63,7 @@ export default Vue.extend({ this.$root.api('users/notes', { userId: this.user.id, limit: fetchLimit + 1, - untilDate: this.date ? this.date.getTime() : undefined, + untilDate: this.date ? this.date.getTime() : new Date().getTime() + 1000 * 86400 * 365, includeReplies: this.mode == 'with-replies', withFiles: this.mode == 'with-media' }).then(notes => { @@ -86,7 +86,7 @@ export default Vue.extend({ limit: fetchLimit + 1, includeReplies: this.mode == 'with-replies', withFiles: this.mode == 'with-media', - untilId: (this.$refs.timeline as any).tail().id + untilDate: new Date((this.$refs.timeline as any).tail().createdAt).getTime() }); promise.then(notes => { diff --git a/src/client/app/mobile/views/components/user-timeline.vue b/src/client/app/mobile/views/components/user-timeline.vue index 6773b75763..e8d7adc8b5 100644 --- a/src/client/app/mobile/views/components/user-timeline.vue +++ b/src/client/app/mobile/views/components/user-timeline.vue @@ -44,7 +44,8 @@ export default Vue.extend({ this.$root.api('users/notes', { userId: this.user.id, withFiles: this.withMedia, - limit: fetchLimit + 1 + limit: fetchLimit + 1, + untilDate: new Date().getTime() + 1000 * 86400 * 365 }).then(notes => { if (notes.length == fetchLimit + 1) { notes.pop(); @@ -66,7 +67,7 @@ export default Vue.extend({ userId: this.user.id, withFiles: this.withMedia, limit: fetchLimit + 1, - untilId: (this.$refs.timeline as any).tail().id + untilDate: new Date((this.$refs.timeline as any).tail().createdAt).getTime() }); promise.then(notes => { diff --git a/src/client/app/mobile/views/pages/user/home.notes.vue b/src/client/app/mobile/views/pages/user/home.notes.vue index d01292b619..fab998a43a 100644 --- a/src/client/app/mobile/views/pages/user/home.notes.vue +++ b/src/client/app/mobile/views/pages/user/home.notes.vue @@ -22,7 +22,8 @@ export default Vue.extend({ }, mounted() { this.$root.api('users/notes', { - userId: this.user.id + userId: this.user.id, + untilDate: new Date().getTime() + 1000 * 86400 * 365 }).then(notes => { this.notes = notes; this.fetching = false; diff --git a/src/client/app/mobile/views/pages/user/home.photos.vue b/src/client/app/mobile/views/pages/user/home.photos.vue index e1d9d0470b..a1ee378a78 100644 --- a/src/client/app/mobile/views/pages/user/home.photos.vue +++ b/src/client/app/mobile/views/pages/user/home.photos.vue @@ -29,7 +29,8 @@ export default Vue.extend({ this.$root.api('users/notes', { userId: this.user.id, withFiles: true, - limit: 6 + limit: 6, + untilDate: new Date().getTime() + 1000 * 86400 * 365 }).then(notes => { notes.forEach(note => { note.media.forEach(media => { |