Skip to content

Update Alexandria from master #1238

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

Merged
bedeho merged 3 commits into from
Sep 5, 2020
Merged

Update Alexandria from master #1238

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33cb84e
Video sorting fix
Aug 31, 2020
1cfeed8
Merge pull request #1204 from Lezek123/video-sort-hotfix
mnaamani Sep 3, 2020
3495312
Merge branch 'master' into update-from-master
mnaamani Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pioneer/packages/joy-media/src/transport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ export abstract class MediaTransport {

async videosByChannelId (channelId: ChannelId, limit?: number, additionalFilter?: (x: VideoType) => boolean): Promise<VideoType[]> {
let videos = (await this.allVideos())
.filter((x) => channelId && channelId.eq(x.channelId) && (additionalFilter || (() => true))(x))
.sort((x) => -1 * x.id);
.filter(x => channelId && channelId.eq(x.channelId) && (additionalFilter || (() => true))(x))
.sort((a, b) => b.id - a.id);

if (limit && limit > 0) {
videos = videos.slice(0, limit);
Expand Down Expand Up @@ -218,7 +218,7 @@ export abstract class MediaTransport {
async allPublicVideoChannels (): Promise<ChannelEntity[]> {
return (await this.allVideoChannels())
.filter(isPublicChannel)
.sort((x) => -1 * x.id);
.sort((a, b) => b.id - a.id);
}

async latestPublicVideoChannels (limit = 6): Promise<ChannelEntity[]> {
Expand Down Expand Up @@ -247,7 +247,7 @@ export abstract class MediaTransport {

return (await this.allVideos())
.filter(isPublicAndNotCurated)
.sort((x) => -1 * x.id);
.sort((a, b) => b.id - a.id);
}

async latestPublicVideos (limit = 12): Promise<VideoType[]> {
Expand Down