PrivateCoffee/invidious
4
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Move user state into before_all

Browse source
This commit is contained in:
Omar Roth 2018-07-05 18:43:26 -05:00
parent b10d0dce78
commit 1ada71e5ba
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/invidious.cr
View file

@ -221,8 +221,13 @@ before_all do |env|
sid = env.request.cookies["SID"].value sid = env.request.cookies["SID"].value
env.set "sid", sid env.set "sid", sid
subscriptions = PG_DB.query_one?("SELECT subscriptions FROM users WHERE id = $1", sid, as: Array(String))
subscriptions ||= [] of String
env.set "subscriptions", subscriptions
notifications = PG_DB.query_one?("SELECT cardinality(notifications) FROM users WHERE id = $1", sid, as: Int32) notifications = PG_DB.query_one?("SELECT cardinality(notifications) FROM users WHERE id = $1", sid, as: Int32)
notifications ||= 0 notifications ||= 0
env.set "notifications", notifications env.set "notifications", notifications
end end
@ -236,6 +241,12 @@ get "/" do |env|
end end
get "/watch" do |env| get "/watch" do |env|
authorized = env.get? "authorized"
if authorized
subscriptions = env.get("subscriptions").as(Array(String))
end
subscriptions ||= [] of String
if env.params.query["v"]? if env.params.query["v"]?
id = env.params.query["v"] id = env.params.query["v"]
else else
@ -262,14 +273,6 @@ get "/watch" do |env|
end end
listen ||= false listen ||= false
authorized = env.get? "authorized"
if authorized
sid = env.get("sid").as(String)
subscriptions = PG_DB.query_one?("SELECT subscriptions FROM users WHERE id = $1", sid, as: Array(String))
end
subscriptions ||= [] of String
client = make_client(YT_URL) client = make_client(YT_URL)
begin begin
video = get_video(id, client, PG_DB) video = get_video(id, client, PG_DB)
@ -876,7 +879,6 @@ get "/videoplayback*" do |env|
if path != "/videoplayback" if path != "/videoplayback"
path = path.lchop("/videoplayback/") path = path.lchop("/videoplayback/")
path = path.split("/") path = path.split("/")
# puts path
raw_params = {} of String => Array(String) raw_params = {} of String => Array(String)
path.each_slice(2) do |pair| path.each_slice(2) do |pair|
@ -1030,5 +1032,6 @@ end
public_folder "assets" public_folder "assets"
add_handler FilteredCompressHandler.new add_handler FilteredCompressHandler.new
add_context_storage_type(Array(String))
Kemal.run Kemal.run