Skip to content

Implement support for feed pagination #2353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
FireMasterK wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Implement support for feed pagination #2353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d320cca
Implement support for feed pagination.
FireMasterK May 1, 2023
96a57b8
Add check to ensure videos are present before fetching more items.
FireMasterK May 4, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions src/components/FeedPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<hr />

<LoadingIndicatorPage :show-content="videosStore != null" class="video-grid">
<LoadingIndicatorPage :show-content="videos != null" class="video-grid">
<template v-for="video in videos" :key="video.url">
<VideoItem v-if="shouldShowVideo(video)" :is-feed="true" :item="video" />
</template>
Expand All @@ -44,12 +44,11 @@ export default {
},
data() {
return {
currentVideoCount: 0,
videoStep: 100,
videosStore: null,
videos: [],
videos: null,
videosCount: 0,
availableFilters: ["all", "shorts", "videos"],
selectedFilter: "all",
loading: false,
};
},
computed: {
Expand All @@ -60,16 +59,16 @@ export default {
},
mounted() {
this.fetchFeed().then(videos => {
this.videosStore = videos;
this.loadMoreVideos();
this.videos = videos;
this.videosCount = videos.length;
this.updateWatched(this.videos);
});

this.selectedFilter = this.getPreferenceString("feedFilter") ?? "all";
},
activated() {
document.title = this.$t("titles.feed") + " - Piped";
if (this.videos.length > 0) this.updateWatched(this.videos);
if (this.videos?.length > 0) this.updateWatched(this.videos);
window.addEventListener("scroll", this.handleScroll);
},
deactivated() {
Expand All @@ -90,13 +89,35 @@ export default {
});
}
},
loadMoreVideos() {
this.currentVideoCount = Math.min(this.currentVideoCount + this.videoStep, this.videosStore.length);
if (this.videos.length != this.videosStore.length)
this.videos = this.videosStore.slice(0, this.currentVideoCount);
async loadMoreVideos() {
const start = this.videos[this.videos.length - 1].uploaded;
if (this.authenticated) {
return await this.fetchJson(this.authApiUrl() + "/feed", {
authToken: this.getAuthToken(),
start,
}).then(videos => {
this.videos = this.videos.concat(videos);
this.videosCount = videos.length > 0 ? this.videos.length : -1;
this.loading = false;
});
} else {
return await this.fetchJson(this.authApiUrl() + "/feed/unauthenticated", {
channels: this.getUnauthenticatedChannels(),
start,
}).then(videos => {
this.videos = this.videos.concat(videos);
this.videosCount = videos.length > 0 ? this.videos.length : -1;
this.loading = false;
});
}
},
handleScroll() {
if (window.innerHeight + window.scrollY >= document.body.offsetHeight - window.innerHeight) {
if (this.loading) return;
if (this.videos == null) return;
if (this.videosCount > 0 && this.videosCount % 100 != 0) return;

this.loading = true;
this.loadMoreVideos();
}
},
Expand Down