From b8e7202cbfada21bc2120e54e35c185720620fd5 Mon Sep 17 00:00:00 2001
From: Harm <harm@harmfarm.nl>
Date: Fri, 23 Jan 2026 19:19:43 +0100
Subject: [PATCH] Filter shorts/livestreams in SQL

[src/invidious/users.cr]
- Filter out shorts and livestreams in SQL rather than via an array
  selector. This way, in the relevant cases, we will query and return
  "limit" amount of videos, rather than a possible lower amount
---
 src/invidious/users.cr | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/invidious/users.cr b/src/invidious/users.cr
index 963e93bda..f1ddf0b15 100644
--- a/src/invidious/users.cr
+++ b/src/invidious/users.cr
@@ -58,11 +58,18 @@ def get_subscription_feed(user, max_results = 40, page = 1)
         else
           values = "VALUES #{user.watched.map { |id| %(('#{id}')) }.join(",")}"
         end
-        videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE NOT id = ANY (#{values}) ORDER BY ucid, published DESC", as: ChannelVideo)
+        if user.preferences.hide_shorts_and_live
+          videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE NOT id = ANY (#{values}) AND length_seconds > 0 ORDER BY ucid, published DESC", as: ChannelVideo)
+        else
+          videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE NOT id = ANY (#{values}) ORDER BY ucid, published DESC", as: ChannelVideo)
+        end
       else
         # Show latest video from each channel
-
-        videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} ORDER BY ucid, published DESC", as: ChannelVideo)
+        if user.preferences.hide_shorts_and_live
+          videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE length_seconds > 0 ORDER BY ucid, published DESC", as: ChannelVideo)
+        else
+          videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} ORDER BY ucid, published DESC", as: ChannelVideo)
+        end
       end
 
       videos.sort_by!(&.published).reverse!
@@ -75,18 +82,21 @@ def get_subscription_feed(user, max_results = 40, page = 1)
         else
           values = "VALUES #{user.watched.map { |id| %(('#{id}')) }.join(",")}"
         end
-        videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE NOT id = ANY (#{values}) ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
+        if user.preferences.hide_shorts_and_live
+          videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE NOT id = ANY (#{values}) AND length_seconds > 0 ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
+        else
+          videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE NOT id = ANY (#{values}) ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
+        end
       else
         # Sort subscriptions as normal
-
-        videos = PG_DB.query_all("SELECT * FROM #{view_name} ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
+        if user.preferences.hide_shorts_and_live
+          videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE length_seconds > 0 ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
+        else
+          videos = PG_DB.query_all("SELECT * FROM #{view_name} ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
+        end
       end
     end
 
-    if user.preferences.hide_shorts_and_live
-      videos = videos.select { |v| v.length_seconds > 0 }
-    end
-
     case user.preferences.sort
     when "published - reverse"
       videos.sort_by!(&.published)