From 48a542d85d12e4fcbfbde17a8add4ea06d52c934 Mon Sep 17 00:00:00 2001 From: girst Date: Mon, 30 Nov 2020 16:39:08 +0100 Subject: [PATCH] show playlist subscriptions in /feed/subscriptions "slight" oversight. :/ --- app/youtube/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/youtube/__init__.py b/app/youtube/__init__.py index 4f8871c..1f77c1d 100644 --- a/app/youtube/__init__.py +++ b/app/youtube/__init__.py @@ -33,11 +33,12 @@ def feed(): with sqlite3.connect(cf['global']['database']) as conn: c = conn.cursor() c.execute(""" - SELECT videos.id, channel_id, name, title, length, livestream, published, display + SELECT videos.id, channel_id, name, title, length, livestream, published, playlist_videos.playlist_id, display FROM videos 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 (channel_id IN (SELECT channel_id FROM subscriptions WHERE user=?) + WHERE (coalesce(playlist_videos.playlist_id, channel_id) IN (SELECT channel_id FROM subscriptions WHERE user=?) OR flags.display = 'pinned') AND flags.display IS NOT 'hidden' ORDER BY (display = 'pinned') DESC, crawled DESC @@ -51,8 +52,9 @@ def feed(): 'length': length, 'livestream': livestream, 'published': published, + 'playlist': playlist, 'pinned': display == 'pinned', - } for (video_id, channel_id, author, title, length, livestream, published, display) in c.fetchall()] + } for (video_id, channel_id, author, title, length, livestream, published, playlist, display) in c.fetchall()] return render_template('index.html.j2', rows=rows, page=page) @frontend.route('/watch') -- 2.39.3