mirror of
https://github.com/iv-org/invidious
synced 2024-11-09 01:10:27 +00:00
Merge pull request #48 from omarroth/add-watch-history
Add watch history
This commit is contained in:
Omar Roth
GitHub
commit
50222fb1bc
@ -12,6 +12,7 @@ CREATE TABLE public.users
|
||||
preferences text COLLATE pg_catalog."default",
|
||||
password text COLLATE pg_catalog."default",
|
||||
token text COLLATE pg_catalog."default",
|
||||
watched text[] COLLATE pg_catalog."default",
|
||||
CONSTRAINT users_email_key UNIQUE (email),
|
||||
CONSTRAINT users_id_key UNIQUE (id)
|
||||
)
|
||||
|
||||
@ -271,20 +271,24 @@ get "/" do |env|
|
||||
end
|
||||
|
||||
get "/watch" do |env|
|
||||
user = env.get? "user"
|
||||
if user
|
||||
user = user.as(User)
|
||||
preferences = user.preferences
|
||||
subscriptions = user.subscriptions.as(Array(String))
|
||||
end
|
||||
subscriptions ||= [] of String
|
||||
|
||||
if env.params.query["v"]?
|
||||
id = env.params.query["v"]
|
||||
else
|
||||
next env.redirect "/"
|
||||
end
|
||||
|
||||
user = env.get? "user"
|
||||
if user
|
||||
user = user.as(User)
|
||||
if user.watched != ["N/A"] && !user.watched.includes? id
|
||||
PG_DB.exec("UPDATE users SET watched = watched || $1 WHERE id = $2", [id], user.id)
|
||||
end
|
||||
|
||||
preferences = user.preferences
|
||||
subscriptions = user.subscriptions.as(Array(String))
|
||||
end
|
||||
subscriptions ||= [] of String
|
||||
|
||||
autoplay = env.params.query["autoplay"]?.try &.to_i
|
||||
video_loop = env.params.query["video_loop"]?.try &.to_i
|
||||
|
||||
@ -1652,8 +1656,12 @@ post "/login" do |env|
|
||||
|
||||
sid = Base64.encode(Random::Secure.random_bytes(50))
|
||||
user = create_user(sid, email, password)
|
||||
if user.watched = ["N/A"]
|
||||
user_array = user.to_a[0..-2]
|
||||
else
|
||||
user_array = user.to_a
|
||||
end
|
||||
|
||||
user_array = user.to_a
|
||||
user_array[5] = user_array[5].to_json
|
||||
args = arg_array(user_array)
|
||||
|
||||
@ -1754,6 +1762,10 @@ post "/preferences" do |env|
|
||||
latest_only ||= "off"
|
||||
latest_only = latest_only == "on"
|
||||
|
||||
unseen_only = env.params.body["unseen_only"]?.try &.as(String)
|
||||
unseen_only ||= "off"
|
||||
unseen_only = unseen_only == "on"
|
||||
|
||||
preferences = {
|
||||
"video_loop" => video_loop,
|
||||
"autoplay" => autoplay,
|
||||
@ -1767,6 +1779,7 @@ post "/preferences" do |env|
|
||||
"max_results" => max_results,
|
||||
"sort" => sort,
|
||||
"latest_only" => latest_only,
|
||||
"unseen_only" => unseen_only,
|
||||
}.to_json
|
||||
|
||||
PG_DB.exec("UPDATE users SET preferences = $1 WHERE email = $2", preferences, user.email)
|
||||
@ -1808,14 +1821,41 @@ get "/feed/subscriptions" do |env|
|
||||
end
|
||||
|
||||
if preferences.latest_only
|
||||
args = arg_array(user.subscriptions)
|
||||
videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM channel_videos WHERE \
|
||||
ucid IN (#{args}) ORDER BY ucid, published DESC", user.subscriptions, as: ChannelVideo)
|
||||
if preferences.unseen_only
|
||||
ucids = arg_array(user.subscriptions)
|
||||
if user.watched.empty?
|
||||
watched = "'{}'"
|
||||
else
|
||||
watched = arg_array(user.watched, user.subscriptions.size + 1)
|
||||
end
|
||||
|
||||
videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM channel_videos WHERE \
|
||||
ucid IN (#{ucids}) AND id NOT IN (#{watched}) ORDER BY ucid, published DESC",
|
||||
user.subscriptions + user.watched, as: ChannelVideo)
|
||||
else
|
||||
args = arg_array(user.subscriptions)
|
||||
videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM channel_videos WHERE \
|
||||
ucid IN (#{args}) ORDER BY ucid, published DESC", user.subscriptions, as: ChannelVideo)
|
||||
end
|
||||
|
||||
videos.sort_by! { |video| video.published }.reverse!
|
||||
else
|
||||
args = arg_array(user.subscriptions, 3)
|
||||
videos = PG_DB.query_all("SELECT * FROM channel_videos WHERE ucid IN (#{args}) \
|
||||
ORDER BY published DESC LIMIT $1 OFFSET $2", [limit, offset] + user.subscriptions, as: ChannelVideo)
|
||||
if preferences.unseen_only
|
||||
ucids = arg_array(user.subscriptions, 3)
|
||||
if user.watched.empty?
|
||||
watched = "'{}'"
|
||||
else
|
||||
watched = arg_array(user.watched, user.subscriptions.size + 3)
|
||||
end
|
||||
|
||||
videos = PG_DB.query_all("SELECT * FROM channel_videos WHERE ucid IN (#{ucids}) \
|
||||
AND id NOT IN (#{watched}) ORDER BY published DESC LIMIT $1 OFFSET $2",
|
||||
[limit, offset] + user.subscriptions + user.watched, as: ChannelVideo)
|
||||
else
|
||||
args = arg_array(user.subscriptions, 3)
|
||||
videos = PG_DB.query_all("SELECT * FROM channel_videos WHERE ucid IN (#{args}) \
|
||||
ORDER BY published DESC LIMIT $1 OFFSET $2", [limit, offset] + user.subscriptions, as: ChannelVideo)
|
||||
end
|
||||
end
|
||||
|
||||
case preferences.sort
|
||||
@ -2213,6 +2253,20 @@ get "/subscription_ajax" do |env|
|
||||
env.redirect referer
|
||||
end
|
||||
|
||||
get "/clear_watch_history" do |env|
|
||||
user = env.get? "user"
|
||||
referer = env.request.headers["referer"]?
|
||||
referer ||= "/"
|
||||
|
||||
if user
|
||||
user = user.as(User)
|
||||
|
||||
PG_DB.exec("UPDATE users SET watched = '{}' WHERE id = $1", user.id)
|
||||
end
|
||||
|
||||
env.redirect referer
|
||||
end
|
||||
|
||||
get "/user/:user" do |env|
|
||||
user = env.params.url["user"]
|
||||
env.redirect "/channel/#{user}"
|
||||
|
||||
@ -29,6 +29,7 @@ DEFAULT_USER_PREFERENCES = Preferences.from_json({
|
||||
"max_results" => 40,
|
||||
"sort" => "published",
|
||||
"latest_only" => false,
|
||||
"unseen_only" => false,
|
||||
}.to_json)
|
||||
|
||||
class Config
|
||||
@ -147,6 +148,10 @@ class User
|
||||
},
|
||||
password: String?,
|
||||
token: String,
|
||||
watched: {
|
||||
type: Array(String),
|
||||
default: ["N/A"],
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
@ -177,6 +182,7 @@ class Preferences
|
||||
max_results: Int32,
|
||||
sort: String,
|
||||
latest_only: Bool,
|
||||
unseen_only: Bool,
|
||||
})
|
||||
end
|
||||
|
||||
@ -819,7 +825,12 @@ def get_user(sid, client, headers, db, refresh = true)
|
||||
|
||||
if refresh && Time.now - user.updated > 1.minute
|
||||
user = fetch_user(sid, client, headers, db)
|
||||
user_array = user.to_a
|
||||
if user.watched = ["N/A"]
|
||||
user_array = user.to_a[0..-2]
|
||||
else
|
||||
user_array = user.to_a
|
||||
end
|
||||
|
||||
user_array[5] = user_array[5].to_json
|
||||
args = arg_array(user_array)
|
||||
|
||||
@ -828,7 +839,12 @@ def get_user(sid, client, headers, db, refresh = true)
|
||||
end
|
||||
else
|
||||
user = fetch_user(sid, client, headers, db)
|
||||
user_array = user.to_a
|
||||
if user.watched = ["N/A"]
|
||||
user_array = user.to_a[0..-2]
|
||||
else
|
||||
user_array = user.to_a
|
||||
end
|
||||
|
||||
user_array[5] = user_array[5].to_json
|
||||
args = arg_array(user.to_a)
|
||||
|
||||
@ -866,7 +882,7 @@ def fetch_user(sid, client, headers, db)
|
||||
|
||||
token = Base64.encode(Random::Secure.random_bytes(32))
|
||||
|
||||
user = User.new(sid, Time.now, [] of String, channels, email, DEFAULT_USER_PREFERENCES, nil, token)
|
||||
user = User.new(sid, Time.now, [] of String, channels, email, DEFAULT_USER_PREFERENCES, nil, token, [] of String)
|
||||
return user
|
||||
end
|
||||
|
||||
@ -874,7 +890,7 @@ def create_user(sid, email, password)
|
||||
password = Crypto::Bcrypt::Password.create(password, cost: 10)
|
||||
token = Base64.encode(Random::Secure.random_bytes(32))
|
||||
|
||||
user = User.new(sid, Time.now, [] of String, [] of String, email, DEFAULT_USER_PREFERENCES, password.to_s, token)
|
||||
user = User.new(sid, Time.now, [] of String, [] of String, email, DEFAULT_USER_PREFERENCES, password.to_s, token, [] of String)
|
||||
|
||||
return user
|
||||
end
|
||||
|
||||
@ -88,10 +88,22 @@ function update_value(element) {
|
||||
</div>
|
||||
|
||||
<div class="pure-control-group">
|
||||
<label for="latest_only">Only show latest video from channel: </label>
|
||||
<label for="latest_only">Only show latest <% if user.preferences.unseen_only %>unseen<% end %> video from channel: </label>
|
||||
<input name="latest_only" id="latest_only" type="checkbox" <% if user.preferences.latest_only %>checked<% end %>>
|
||||
</div>
|
||||
|
||||
<div class="pure-control-group">
|
||||
<label for="unseen_only">Only show unseen: </label>
|
||||
<input name="unseen_only" id="unseen_only" type="checkbox" <% if user.preferences.unseen_only %>checked<% end %>>
|
||||
</div>
|
||||
|
||||
<legend>Data preferences</legend>
|
||||
<div class="pure-control-group">
|
||||
<label>
|
||||
<a href="/clear_watch_history">Clear watch history</a>
|
||||
</labe>
|
||||
</div>
|
||||
|
||||
<div class="pure-controls">
|
||||
<button type="submit" class="pure-button pure-button-primary">Save preferences</button>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user