graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-14 08:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix #4562 (#4563)

Browse source
This commit is contained in:
MeiMei 2019-04-08 15:17:39 +09:00 committed by syuilo
parent 13caf37991
commit fceebf7388
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/app/common/views/deck/deck.user-column.home.vue
View file

@ -85,7 +85,7 @@ export default Vue.extend({
this.makePromise = cursor => this.$root.api('users/notes', { this.makePromise = cursor => this.$root.api('users/notes', {
userId: this.user.id, userId: this.user.id,
limit: fetchLimit + 1, limit: fetchLimit + 1,
untilId: cursor ? cursor : undefined, untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365,
withFiles: this.withFiles, withFiles: this.withFiles,
includeMyRenotes: this.$store.state.settings.showMyRenotes, includeMyRenotes: this.$store.state.settings.showMyRenotes,
includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes, includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
@ -95,7 +95,7 @@ export default Vue.extend({
notes.pop(); notes.pop();
return { return {
notes: notes, notes: notes,
cursor: notes[notes.length - 1].id cursor: new Date(notes[notes.length - 1].createdAt).getTime()
}; };
} else { } else {
return { return {

4
src/client/app/desktop/views/home/user/user.timeline.vue
View file

@ -36,13 +36,13 @@ export default Vue.extend({
includeReplies: this.mode == 'with-replies', includeReplies: this.mode == 'with-replies',
includeMyRenotes: this.mode != 'my-posts', includeMyRenotes: this.mode != 'my-posts',
withFiles: this.mode == 'with-media', withFiles: this.mode == 'with-media',
untilId: cursor ? cursor : undefined untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
}).then(notes => { }).then(notes => {
if (notes.length == fetchLimit + 1) { if (notes.length == fetchLimit + 1) {
notes.pop(); notes.pop();
return { return {
notes: notes, notes: notes,
cursor: notes[notes.length - 1].id cursor: new Date(notes[notes.length - 1].createdAt).getTime()
}; };
} else { } else {
return { return {

4
src/client/app/mobile/views/components/user-timeline.vue
View file

@ -21,13 +21,13 @@ export default Vue.extend({
userId: this.user.id, userId: this.user.id,
limit: fetchLimit + 1, limit: fetchLimit + 1,
withFiles: this.withMedia, withFiles: this.withMedia,
untilId: cursor ? cursor : undefined untilDate: cursor ? cursor : new Date().getTime() + 1000 * 86400 * 365
}).then(notes => { }).then(notes => {
if (notes.length == fetchLimit + 1) { if (notes.length == fetchLimit + 1) {
notes.pop(); notes.pop();
return { return {
notes: notes, notes: notes,
cursor: notes[notes.length - 1].id cursor: new Date(notes[notes.length - 1].createdAt).getTime()
}; };
} else { } else {
return { return {