Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-10-24 05:32:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a Hide Shorts toggle to the view options

Browse Source 
Videos carry isShort from Yattee Server and Piped, and Invidious feed
entries are taken as Shorts when they arrive with no length and aren't
live or upcoming: the feed comes from RSS, which lists Shorts, while
lengths come from the Videos tab, which doesn't. Subscriptions, search
and instance browse hide videos known to be Shorts when the toggle is
on; videos whose source can't tell are always shown.
This commit is contained in:
Arkadiusz Fal
2026-10-11 14:06:15 +02:00
parent 2d3ae1b0e5
commit 8ade5a54d0
10 changed files with 108 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -592,7 +592,7 @@ actor InvidiousAPI: InstanceAPI {
// Combine notifications and videos arrays - Invidious returns feed items in notifications
let allVideos = (response.notifications ?? []) + response.videos
let videos = allVideos.map { $0.toVideo(baseURL: instance.url) }
let videos = allVideos.map { $0.toVideo(baseURL: instance.url, isShort: $0.isLikelyFeedShort) }
LoggingService.shared.debug(
"Invidious feed: \(response.notifications?.count ?? 0) notifications + \(response.videos.count) videos = \(videos.count) total",
@@ -1199,7 +1199,18 @@ private struct InvidiousVideo: Decodable, Sendable {
let isUpcoming: Bool?
let premiereTimestamp: Int64?
nonisolated func toVideo(baseURL: URL) -> Video {
/// Whether this subscription-feed entry is most likely a Short.
///
/// 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.
/// A Short therefore arrives with no length, and so does a stream or
/// premiere, which is why those are ruled out. Only meaningful for
/// `/api/v1/auth/feed`: other lists give zero length for other reasons.
var isLikelyFeedShort: Bool {
lengthSeconds == 0 && liveNow != true && isUpcoming != true && premiereTimestamp == nil
}
nonisolated func toVideo(baseURL: URL, isShort: Bool? = nil) -> Video {
let publishedReading = InvidiousSentinel.published(
published,
text: publishedText,
@@ -1219,7 +1230,8 @@ private struct InvidiousVideo: Decodable, Sendable {
thumbnails: videoThumbnails?.map { $0.toThumbnail(baseURL: baseURL) } ?? [],
isLive: liveNow ?? false,
isUpcoming: isUpcoming ?? false,
scheduledStartTime: premiereTimestamp.map { Date(timeIntervalSince1970: TimeInterval($0)) }
scheduledStartTime: premiereTimestamp.map { Date(timeIntervalSince1970: TimeInterval($0)) },
isShort: isShort
)
}
}