mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2022-03-16.git
synced 2024-08-15 00:53:18 +00:00
Add user preferences
This commit is contained in:
Omar Roth
parent
f68b27da7c
commit
96c520b02b
8 changed files with 223 additions and 95 deletions
|
|
@ -17,6 +17,14 @@ macro rendered(filename)
|
|||
render "src/invidious/views/#{{{filename}}}.ecr"
|
||||
end
|
||||
|
||||
DEFAULT_USER_PREFERENCES = Preferences.from_json({
|
||||
"video_loop" => false,
|
||||
"autoplay" => false,
|
||||
"quality" => "hd720",
|
||||
"volume" => 100,
|
||||
"dark_mode" => false,
|
||||
}.to_json)
|
||||
|
||||
class Config
|
||||
YAML.mapping({
|
||||
crawl_threads: Int32,
|
||||
|
|
@ -86,12 +94,6 @@ class Video
|
|||
end
|
||||
|
||||
class InvidiousChannel
|
||||
module XMLConverter
|
||||
def self.from_rs(rs)
|
||||
XML.parse_html(rs.read(String))
|
||||
end
|
||||
end
|
||||
|
||||
add_mapping({
|
||||
id: String,
|
||||
author: String,
|
||||
|
|
@ -111,12 +113,33 @@ class ChannelVideo
|
|||
end
|
||||
|
||||
class User
|
||||
module PreferencesConverter
|
||||
def self.from_rs(rs)
|
||||
Preferences.from_json(rs.read(String))
|
||||
end
|
||||
end
|
||||
|
||||
add_mapping({
|
||||
id: String,
|
||||
updated: Time,
|
||||
notifications: Array(String),
|
||||
subscriptions: Array(String),
|
||||
email: String,
|
||||
preferences: {
|
||||
type: Preferences,
|
||||
default: DEFAULT_USER_PREFERENCES,
|
||||
converter: PreferencesConverter,
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
class Preferences
|
||||
JSON.mapping({
|
||||
video_loop: Bool,
|
||||
autoplay: Bool,
|
||||
quality: String,
|
||||
volume: Int32,
|
||||
dark_mode: Bool,
|
||||
})
|
||||
end
|
||||
|
||||
|
|
@ -674,11 +697,11 @@ def fetch_channel(ucid, client, db, pull_all_videos = true)
|
|||
return channel
|
||||
end
|
||||
|
||||
def get_user(sid, client, headers, db)
|
||||
def get_user(sid, client, headers, db, refresh = true)
|
||||
if db.query_one?("SELECT EXISTS (SELECT true FROM users WHERE id = $1)", sid, as: Bool)
|
||||
user = db.query_one("SELECT * FROM users WHERE id = $1", sid, as: User)
|
||||
|
||||
if Time.now - user.updated > 1.minute
|
||||
if refresh && Time.now - user.updated > 1.minute
|
||||
user = fetch_user(sid, client, headers, db)
|
||||
user_array = user.to_a
|
||||
args = arg_array(user_array)
|
||||
|
|
@ -723,7 +746,7 @@ def fetch_user(sid, client, headers, db)
|
|||
email = ""
|
||||
end
|
||||
|
||||
user = User.new(sid, Time.now, [] of String, channels, email)
|
||||
user = User.new(sid, Time.now, [] of String, channels, email, DEFAULT_USER_PREFERENCES)
|
||||
return user
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<% end %>
|
||||
|
||||
<h1><%= author %></h1>
|
||||
<% if authorized %>
|
||||
<% if user %>
|
||||
<% if subscriptions.includes? ucid %>
|
||||
<p>
|
||||
<a href="/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>">
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<link rel="stylesheet" href="https://unpkg.com/purecss@1.0.0/build/grids-responsive-min.css">
|
||||
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.6/css/all.css">
|
||||
<link rel="stylesheet" href="/css/default.css">
|
||||
<% if env.get? "darktheme" %>
|
||||
<% if env.get?("user") && env.get("user").as(User).preferences.dark_mode %>
|
||||
<link rel="stylesheet" href="/css/darktheme.css">
|
||||
<% else %>
|
||||
<link rel="stylesheet" href="/css/lighttheme.css">
|
||||
|
|
@ -21,46 +21,46 @@
|
|||
<div class="pure-u-1 pure-u-md-1-5"></div>
|
||||
<div class="pure-u-1 pure-u-md-3-5">
|
||||
<div class="pure-g" style="padding:1em;">
|
||||
<div class="pure-u-1 pure-u-md-1-5">
|
||||
<div class="pure-u-1 pure-u-md-4-24">
|
||||
<center><a href="/" class="pure-menu-heading">Invidious</a></center>
|
||||
</div>
|
||||
<div class="pure-u-1 pure-u-md-3-5">
|
||||
<div class="pure-u-1 pure-u-md-12-24">
|
||||
<form class="pure-form" action="/search" method="get">
|
||||
<fieldset>
|
||||
<input type="search" style="width:100%;" name="q" placeholder="search" value="<%= env.params.query["q"]? %>">
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
<div class="pure-u-1 pure-u-md-1-5">
|
||||
<% if env.get? "authorized" %>
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-1-3">
|
||||
<a href="/feed/subscriptions" class="pure-menu-heading">
|
||||
<% notifications = env.get("notifications").as(Int32) %>
|
||||
<% if notifications > 0 %>
|
||||
<center><%= notifications %> <i class="fas fa-bell"></i></center>
|
||||
<% else %>
|
||||
<center><i class="far fa-bell"></i></center>
|
||||
<% end %>
|
||||
</a>
|
||||
<div class="pure-u-1 pure-u-md-8-24">
|
||||
<% if env.get? "user" %>
|
||||
<div class="pure-g">
|
||||
<div class="pure-u-1-3">
|
||||
<a href="/feed/subscriptions" class="pure-menu-heading">
|
||||
<% notifications = env.get("user").as(User).notifications.size %>
|
||||
<% if notifications > 0 %>
|
||||
<center><%= notifications %> <i class="fas fa-bell"></i></center>
|
||||
<% else %>
|
||||
<center><i class="far fa-bell"></i></center>
|
||||
<% end %>
|
||||
</a>
|
||||
</div>
|
||||
<div class="pure-u-1-3">
|
||||
<a href="/preferences" class="pure-menu-heading">
|
||||
<center><i class="fas fa-cog"></i></center>
|
||||
</a>
|
||||
</div>
|
||||
<div class="pure-u-1-3">
|
||||
<a href="/signout" class="pure-menu-heading">
|
||||
<center>Sign out</center>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="pure-u-2-3">
|
||||
<center><a href="/signout" class="pure-menu-heading">Sign out</a></center>
|
||||
</div>
|
||||
</div>
|
||||
<% else %>
|
||||
<center><a href="/login" class="pure-menu-heading">Login</a></center>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<%= content %>
|
||||
<center class="h-box">
|
||||
<% if env.get? "darktheme" %>
|
||||
<a href="/modify_theme?light">Light theme</a>
|
||||
<% else %>
|
||||
<a href="/modify_theme?dark">Dark theme</a>
|
||||
<% end %>
|
||||
</center>
|
||||
<center class="h-box">
|
||||
Released under AGPLv3 by <a href="https://github.com/omarroth">Omar Roth</a> -
|
||||
source available <a href="https://github.com/omarroth/invidious">here</a>
|
||||
|
|
|
|||
50
src/invidious/views/preferences.ecr
Normal file
50
src/invidious/views/preferences.ecr
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
<% content_for "header" do %>
|
||||
<title>Preferences - Invidious</title>
|
||||
<% end %>
|
||||
|
||||
<script>
|
||||
function update_value(element) {
|
||||
document.getElementById('volume-value').innerText = element.value;
|
||||
}
|
||||
</script>
|
||||
|
||||
<form class="pure-form pure-form-aligned" action="/preferences?referer=<%= referer %>" method="post">
|
||||
<fieldset>
|
||||
<legend>Player preferences</legend>
|
||||
|
||||
<div class="pure-control-group">
|
||||
<label for="video_loop">Always loop: </label>
|
||||
<input name="video_loop" id="video_loop" type="checkbox" <% if user.preferences.video_loop %>checked<% end %>>
|
||||
</div>
|
||||
|
||||
<div class="pure-control-group">
|
||||
<label for="autoplay">Autoplay: </label>
|
||||
<input name="autoplay" id="autoplay" type="checkbox" <% if user.preferences.autoplay %>checked<% end %>>
|
||||
</div>
|
||||
|
||||
<div class="pure-control-group">
|
||||
<label for="quality">Preferred video quality: </label>
|
||||
<select name="quality" id="quality" selected="<%= user.preferences.quality %>">
|
||||
<option>hd720</option>
|
||||
<option>medium</option>
|
||||
<option>small</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="pure-control-group">
|
||||
<label for="volume">Player volume: </label>
|
||||
<input name="volume" id="volume" oninput="update_value(this);" type="range" min="0" max="100" step="5" value="<%= user.preferences.volume %>">
|
||||
<span class="pure-form-message-inline" id="volume-value"><%= user.preferences.volume %></span>
|
||||
</div>
|
||||
|
||||
<legend>Visual preferences</legend>
|
||||
<div class="pure-control-group">
|
||||
<label for="dark_mode">Dark mode: </label>
|
||||
<input name="dark_mode" id="dark_mode" type="checkbox" <% if user.preferences.dark_mode %>checked<% end %>>
|
||||
</div>
|
||||
|
||||
<div class="pure-controls">
|
||||
<button type="submit" class="pure-button pure-button-primary">Save preferences</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
|
@ -17,8 +17,12 @@
|
|||
<% end %>
|
||||
<% else %>
|
||||
<% fmt_stream.each_with_index do |fmt, i| %>
|
||||
<% if preferences %>
|
||||
<source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= preferences.quality == fmt["label"].split(" - ")[0] %>">
|
||||
<% else %>
|
||||
<source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>">
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</video>
|
||||
</div>
|
||||
|
|
@ -26,6 +30,10 @@
|
|||
<script>
|
||||
var options = {
|
||||
preload: "auto",
|
||||
<% if preferences %>
|
||||
<% if preferences.autoplay %>autoplay: true, <% end %>
|
||||
<% if preferences.video_loop %>loop: true, <% end %>
|
||||
<% end %>
|
||||
playbackRates: [0.5, 1, 1.5, 2],
|
||||
controlBar: {
|
||||
children: [
|
||||
|
|
@ -81,6 +89,9 @@ var player = videojs('player', options, function() {
|
|||
});
|
||||
});
|
||||
|
||||
<% if preferences %>
|
||||
player.volume(<%= preferences.volume.to_f / 100 %>);
|
||||
<% end %>
|
||||
player.offset({
|
||||
start: <%= video_start %>,
|
||||
end: <%= video_end %>
|
||||
|
|
@ -165,7 +176,7 @@ player.src(currentSources);
|
|||
<h3><%= video.author %></h3>
|
||||
</a>
|
||||
</p>
|
||||
<% if authorized %>
|
||||
<% if user %>
|
||||
<% if subscriptions.includes? video.ucid %>
|
||||
<p>
|
||||
<a href="/subscription_ajax?action_remove_subscriptions=1&c=<%= video.ucid %>">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue