From d6948ec7203c792acd0125ea5f25f8faa8cfd153 Mon Sep 17 00:00:00 2001 From: girst Date: Mon, 30 Nov 2020 16:42:24 +0100 Subject: [PATCH] followup-fix for playlists in feed this caused videos that are in any playlist to only be displayed if the user subscribed via playlists. fixed. --- app/youtube/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/youtube/__init__.py b/app/youtube/__init__.py index 1f77c1d..c0edec9 100644 --- a/app/youtube/__init__.py +++ b/app/youtube/__init__.py @@ -38,12 +38,13 @@ def feed(): JOIN channels ON videos.channel_id = channels.id LEFT JOIN playlist_videos ON (videos.id = playlist_videos.video_id) LEFT JOIN flags ON (videos.id = flags.video_id) AND (flags.user = ?) - WHERE (coalesce(playlist_videos.playlist_id, channel_id) IN (SELECT channel_id FROM subscriptions WHERE user=?) + WHERE (channel_id IN (SELECT channel_id FROM subscriptions WHERE user=? AND type = 'channel') + OR playlist_videos.playlist_id IN (SELECT channel_id FROM subscriptions WHERE user=? AND type = 'playlist') OR flags.display = 'pinned') AND flags.display IS NOT 'hidden' ORDER BY (display = 'pinned') DESC, crawled DESC LIMIT 36 - OFFSET 36*?""", (token, token, page)) + OFFSET 36*?""", (token, token, token, page)) rows = [{ 'video_id': video_id, 'channel_id': channel_id, -- 2.39.3