Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-10-23 13:12: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

30
Yattee/ViewModels/SearchViewModel.swift
View File

@@ -51,6 +51,9 @@ final class SearchViewModel {
/// Hide watched videos (controlled by view options, not filters)
var hideWatchedVideos: Bool = false
/// Hide Shorts (controlled by view options, not filters)
var hideShorts: Bool = false
/// Unified result items preserving API order (for InstanceBrowseView style display).
private(set) var resultItems: [SearchResultItem] = []
@@ -161,7 +164,7 @@ final class SearchViewModel {
if resetResults {
// Fresh results
videos = filterWatchedVideos(result.videos)
videos = filterHiddenVideos(result.videos)
channels = result.channels
playlists = result.playlists
@@ -169,8 +172,8 @@ final class SearchViewModel {
resultItems = result.orderedItems.enumerated().compactMap { _, item in
switch item {
case .video(let video):
// Skip watched videos if filter is enabled
if hideWatchedVideos && isVideoWatched(video) {
// Skip watched videos and Shorts if those filters are enabled
if isVideoHidden(video) {
return nil
}
if let index = videos.firstIndex(where: { $0.id == video.id }) {
@@ -189,7 +192,7 @@ final class SearchViewModel {
let existingChannelIDs = Set(channels.map(\.id))
let existingPlaylistIDs = Set(playlists.map(\.id))
let filteredNewVideos = filterWatchedVideos(result.videos)
let filteredNewVideos = filterHiddenVideos(result.videos)
let newVideos = filteredNewVideos.filter { !existingVideoIDs.contains($0.id) }
let newChannels = result.channels.filter { !existingChannelIDs.contains($0.id) }
let newPlaylists = result.playlists.filter { !existingPlaylistIDs.contains($0.id) }
@@ -203,8 +206,8 @@ final class SearchViewModel {
for item in result.orderedItems {
switch item {
case .video(let video):
// Skip watched videos if filter is enabled
if hideWatchedVideos && isVideoWatched(video) {
// Skip watched videos and Shorts if those filters are enabled
if isVideoHidden(video) {
continue
}
guard !existingVideoIDs.contains(video.id) else { continue }
@@ -331,8 +334,14 @@ final class SearchViewModel {
deArrowProvider.prefetch(videoIDs: youtubeIDs)
}
/// Filters out watched videos if hideWatchedVideos is enabled.
private func filterWatchedVideos(_ videos: [Video]) -> [Video] {
/// Filters out watched videos and Shorts when those filters are enabled.
private func filterHiddenVideos(_ videos: [Video]) -> [Video] {
var videos = videos
if hideShorts {
videos = videos.filter { !$0.isKnownShort }
}
guard hideWatchedVideos, let dataManager else {
return videos
}
@@ -343,6 +352,11 @@ final class SearchViewModel {
return !entry.isFinished
}
}
/// Whether the view options hide this video from results.
private func isVideoHidden(_ video: Video) -> Bool {
(hideShorts && video.isKnownShort) || (hideWatchedVideos && isVideoWatched(video))
}
/// Checks if a video is watched (finished).
private func isVideoWatched(_ video: Video) -> Bool {