Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-11-02 18:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide Shorts in Invidious Popular too

Browse Source 
Invidious serves /api/v1/popular from the same RSS-fed table as the
subscription feed, so Shorts there arrive with no length as well.
This commit is contained in:
Arkadiusz Fal
2026-10-11 19:19:51 +02:00
parent 8ade5a54d0
commit 2c662b34e3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Yattee/Services/API/InvidiousAPI.swift
View File

@@ -27,7 +27,8 @@ actor InvidiousAPI: InstanceAPI {
func popular(instance: Instance) async throws -> [Video] { func popular(instance: Instance) async throws -> [Video] {
let endpoint = GenericEndpoint.get("/api/v1/popular") let endpoint = GenericEndpoint.get("/api/v1/popular")
let response: [InvidiousVideo] = try await httpClient.fetch(endpoint, baseURL: instance.url) let response: [InvidiousVideo] = try await httpClient.fetch(endpoint, baseURL: instance.url)
return response.map { $0.toVideo(baseURL: instance.url) } // Popular is read from the same RSS-fed table as the subscription feed.
return response.map { $0.toVideo(baseURL: instance.url, isShort: $0.isLikelyFeedShort) }
} }
func search(query: String, instance: Instance, page: Int, filters: SearchFilters = .defaults) async throws -> SearchResult { func search(query: String, instance: Instance, page: Int, filters: SearchFilters = .defaults) async throws -> SearchResult {
@@ -1199,13 +1200,14 @@ private struct InvidiousVideo: Decodable, Sendable {
let isUpcoming: Bool? let isUpcoming: Bool?
let premiereTimestamp: Int64? let premiereTimestamp: Int64?
/// Whether this subscription-feed entry is most likely a Short. /// Whether this subscription-feed or popular entry is most likely a Short.
/// ///
/// Invidious builds the feed from the channel's RSS, which lists Shorts, and /// Invidious builds the feed from the channel's RSS, which lists Shorts, and
/// takes each video's length from the channel's Videos tab, which doesn't. /// takes each video's length from the channel's Videos tab, which doesn't.
/// A Short therefore arrives with no length, and so does a stream or /// A Short therefore arrives with no length, and so does a stream or
/// premiere, which is why those are ruled out. Only meaningful for /// premiere, which is why those are ruled out. Only meaningful for
/// `/api/v1/auth/feed`: other lists give zero length for other reasons. /// `/api/v1/auth/feed` and `/api/v1/popular`, which Invidious reads from
/// the same table: other lists give zero length for other reasons.
var isLikelyFeedShort: Bool { var isLikelyFeedShort: Bool {
lengthSeconds == 0 && liveNow != true && isUpcoming != true && premiereTimestamp == nil lengthSeconds == 0 && liveNow != true && isUpcoming != true && premiereTimestamp == nil
} }