From 65fae8782d13d97553db5c69a439df5c86e23fd1 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Mon, 8 Apr 2019 15:17:39 +0900
Subject: [PATCH] Fix #4562 (#4563)

---
 src/client/app/common/views/deck/deck.user-column.home.vue | 4 ++--
 src/client/app/desktop/views/home/user/user.timeline.vue   | 4 ++--
 src/client/app/mobile/views/components/user-timeline.vue   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/client/app/common/views/deck/deck.user-column.home.vue b/src/client/app/common/views/deck/deck.user-column.home.vue
index 7a11be536..ee24cad1c 100644
--- a/src/client/app/common/views/deck/deck.user-column.home.vue
+++ b/src/client/app/common/views/deck/deck.user-column.home.vue
@@ -85,7 +85,7 @@ export default Vue.extend({
 			this.makePromise = cursor => this.$root.api('users/notes', {
 				userId: this.user.id,
 				limit: fetchLimit + 1,
-				untilId: cursor ? cursor : undefined,
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365,
 				withFiles: this.withFiles,
 				includeMyRenotes: this.$store.state.settings.showMyRenotes,
 				includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
@@ -95,7 +95,7 @@ export default Vue.extend({
 					notes.pop();
 					return {
 						notes: notes,
-						cursor: notes[notes.length - 1].id
+						cursor: new Date(notes[notes.length - 1].createdAt).getTime()
 					};
 				} else {
 					return {
diff --git a/src/client/app/desktop/views/home/user/user.timeline.vue b/src/client/app/desktop/views/home/user/user.timeline.vue
index f5d14112d..4bdf4b6cd 100644
--- a/src/client/app/desktop/views/home/user/user.timeline.vue
+++ b/src/client/app/desktop/views/home/user/user.timeline.vue
@@ -36,13 +36,13 @@ export default Vue.extend({
 				includeReplies: this.mode == 'with-replies',
 				includeMyRenotes: this.mode != 'my-posts',
 				withFiles: this.mode == 'with-media',
-				untilId: cursor ? cursor : undefined
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
 			}).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();
 					return {
 						notes: notes,
-						cursor: notes[notes.length - 1].id
+						cursor: new Date(notes[notes.length - 1].createdAt).getTime()
 					};
 				} else {
 					return {
diff --git a/src/client/app/mobile/views/components/user-timeline.vue b/src/client/app/mobile/views/components/user-timeline.vue
index 1b73b5bc4..3ba4011c6 100644
--- a/src/client/app/mobile/views/components/user-timeline.vue
+++ b/src/client/app/mobile/views/components/user-timeline.vue
@@ -21,13 +21,13 @@ export default Vue.extend({
 				userId: this.user.id,
 				limit: fetchLimit + 1,
 				withFiles: this.withMedia,
-				untilId: cursor ? cursor : undefined
+				untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
 			}).then(notes => {
 				if (notes.length == fetchLimit + 1) {
 					notes.pop();
 					return {
 						notes: notes,
-						cursor: notes[notes.length - 1].id
+						cursor: new Date(notes[notes.length - 1].createdAt).getTime()
 					};
 				} else {
 					return {