iv-org
/
invidious
mirror of https://gitea.invidious.io/iv-org/invidious
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Speed up filtering watched videos from feed

This commit is contained in:
Omar Roth 2019-02-17 19:53:42 -06:00
parent 6cea83991c
commit 421ad21b40
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/invidious.cr
View File

@ -1819,15 +1819,9 @@ get "/feed/subscriptions" do |env|
else
if preferences.latest_only
if preferences.unseen_only
if user.watched.empty?
watched = "'{}'"
else
watched = arg_array(user.watched)
end
videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE \
id NOT IN (#{watched}) ORDER BY ucid, published #{sort}",
user.watched, as: ChannelVideo)
NOT id = ANY (VALUES #{user.watched.map { |id| %(('#{id}')) }.join(",")}) \
ORDER BY ucid, published #{sort}", as: ChannelVideo)
else
videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} \
ORDER BY ucid, published #{sort}", as: ChannelVideo)
@ -1836,15 +1830,9 @@ get "/feed/subscriptions" do |env|
videos.sort_by! { |video| video.published }.reverse!
else
if preferences.unseen_only
if user.watched.empty?
watched = "'{}'"
else
watched = arg_array(user.watched, 3)
end
videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE \
id NOT IN (#{watched}) ORDER BY published #{sort} LIMIT $1 OFFSET $2",
[limit, offset] + user.watched, as: ChannelVideo)
NOT id = ANY (VALUES #{user.watched.map { |id| %(('#{id}')) }.join(",")}) \
ORDER BY published #{sort} LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
else
videos = PG_DB.query_all("SELECT * FROM #{view_name} \
ORDER BY published #{sort} LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)