mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update Timeline.vue

This commit is contained in:
Daniel Supernault 2019-03-03 19:32:31 -07:00
parent 8a030f5194
commit 23459b9afd
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/assets/js/components/Timeline.vue
View File

@ -437,17 +437,20 @@
}, },
fetchTimelineApi() { fetchTimelineApi() {
let homeTimeline = '/api/v1/timelines/home?page=1'; let homeTimeline = '/api/v1/timelines/home';
let localTimeline = '/api/v1/timelines/public?page=1'; let localTimeline = '/api/v1/timelines/public';
let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline; let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline;
axios.get(apiUrl).then(res => { axios.get(apiUrl, {
params: {
max_id: 0,
limit: 4
}
}).then(res => {
let data = res.data; let data = res.data;
this.feed.push(...data); this.feed.push(...data);
let ids = data.map(status => status.id); let ids = data.map(status => status.id);
this.min_id = Math.min(...ids); this.min_id = Math.max(...ids);
if(this.page == 1) { this.max_id = Math.min(...ids);
this.max_id = Math.max(...ids);
}
$('.timeline .pagination').removeClass('d-none'); $('.timeline .pagination').removeClass('d-none');
this.loading = false; this.loading = false;
this.fetchNotifications(); this.fetchNotifications();
@ -461,17 +464,16 @@
let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline; let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline;
axios.get(apiUrl, { axios.get(apiUrl, {
params: { params: {
page: this.page, max_id: this.max_id,
limit: 4
}, },
}).then(res => { }).then(res => {
if (res.data.length && this.loading == false) { if (res.data.length && this.loading == false) {
let data = res.data; let data = res.data;
this.feed.push(...data); this.feed.push(...data);
let ids = data.map(status => status.id); let ids = data.map(status => status.id);
this.min_id = Math.min(...ids); this.min_id = Math.max(...ids);
if(this.page == 1) { this.max_id = Math.min(...ids);
this.max_id = Math.max(...ids);
}
this.page += 1; this.page += 1;
$state.loaded(); $state.loaded();
this.loading = false; this.loading = false;