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

Add negative offset for subscription feed

This commit is contained in:
Omar Roth 2018-04-17 16:27:55 -05:00
parent 84aef70803
commit 742fa6a705
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/invidious.cr
View File

@ -647,12 +647,19 @@ get "/feed/subscriptions" do |env|
authorized = env.get? "authorized" authorized = env.get? "authorized"
if authorized if authorized
max_results = env.params.query["maxResults"]?.try &.to_i max_results = env.params.query["maxResults"]?.try &.to_i || 40
max_results ||= 40
page = env.params.query["page"]?.try &.to_i page = env.params.query["page"]?.try &.to_i
page ||= 1 page ||= 1
if max_results < 0
limit = nil
offset = (page - 1) * 1
else
limit = max_results
offset = (page - 1) * max_results
end
headers = HTTP::Headers.new headers = HTTP::Headers.new
headers["Cookie"] = env.request.headers["Cookie"] headers["Cookie"] = env.request.headers["Cookie"]
@ -663,9 +670,12 @@ get "/feed/subscriptions" do |env|
youtube_pool << client youtube_pool << client
args = arg_array(user.subscriptions, 3) args = arg_array(user.subscriptions, 3)
offset = (page - 1) * max_results
videos = PG_DB.query_all("SELECT * FROM channel_videos WHERE ucid IN (#{args}) \ videos = PG_DB.query_all("SELECT * FROM channel_videos WHERE ucid IN (#{args}) \
ORDER BY published DESC LIMIT $1 OFFSET $2", [max_results, offset] + user.subscriptions, as: ChannelVideo) ORDER BY published DESC LIMIT $1 OFFSET $2", [limit, offset] + user.subscriptions, as: ChannelVideo)
if !limit
videos = videos[0..max_results]
end
PG_DB.exec("UPDATE users SET notifications = $1 WHERE id = $2", [] of String, sid) PG_DB.exec("UPDATE users SET notifications = $1 WHERE id = $2", [] of String, sid)
env.set "notifications", 0 env.set "notifications", 0