ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

Remove migration breaks for watch history

Browse Source
This commit is contained in:
Omar Roth 2018-07-30 08:54:12 -05:00
parent 2e69774b1f
commit 24c79a3554
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/invidious.cr
View File

@ -280,7 +280,7 @@ get "/watch" do |env|
user = env.get? "user" user = env.get? "user"
if user if user
user = user.as(User) user = user.as(User)
if user.watched != ["N/A"] && !user.watched.includes? id if !user.watched.includes? id
PG_DB.exec("UPDATE users SET watched = watched || $1 WHERE id = $2", [id], user.id) PG_DB.exec("UPDATE users SET watched = watched || $1 WHERE id = $2", [id], user.id)
end end
@ -1670,11 +1670,7 @@ post "/login" do |env|
sid = Base64.encode(Random::Secure.random_bytes(50)) sid = Base64.encode(Random::Secure.random_bytes(50))
user = create_user(sid, email, password) user = create_user(sid, email, password)
if user.watched = ["N/A"] user_array = user.to_a
user_array = user.to_a[0..-2]
else
user_array = user.to_a
end
user_array[5] = user_array[5].to_json user_array[5] = user_array[5].to_json
args = arg_array(user_array) args = arg_array(user_array)

17
src/invidious/helpers.cr
View File

@ -148,10 +148,7 @@ class User
}, },
password: String?, password: String?,
token: String, token: String,
watched: { watched: Array(String),
type: Array(String),
default: ["N/A"],
},
}) })
end end
@ -825,11 +822,7 @@ def get_user(sid, client, headers, db, refresh = true)
if refresh && Time.now - user.updated > 1.minute if refresh && Time.now - user.updated > 1.minute
user = fetch_user(sid, client, headers, db) user = fetch_user(sid, client, headers, db)
if user.watched = ["N/A"] user_array = user.to_a
user_array = user.to_a[0..-2]
else
user_array = user.to_a
end
user_array[5] = user_array[5].to_json user_array[5] = user_array[5].to_json
args = arg_array(user_array) args = arg_array(user_array)
@ -839,11 +832,7 @@ def get_user(sid, client, headers, db, refresh = true)
end end
else else
user = fetch_user(sid, client, headers, db) user = fetch_user(sid, client, headers, db)
if user.watched = ["N/A"] user_array = user.to_a
user_array = user.to_a[0..-2]
else
user_array = user.to_a
end
user_array[5] = user_array[5].to_json user_array[5] = user_array[5].to_json
args = arg_array(user.to_a) args = arg_array(user.to_a)