Add latest_only and sort options for subscription feed

This commit is contained in:
Omar Roth 2018-07-18 09:15:58 -05:00
parent 9c3bf5fd27
commit 18f8a4ae1a
3 changed files with 50 additions and 3 deletions

View File

@ -740,6 +740,13 @@ post "/preferences" do |env|
max_results = env.params.body["max_results"]?.try &.as(String).to_i max_results = env.params.body["max_results"]?.try &.as(String).to_i
max_results ||= 40 max_results ||= 40
sort = env.params.body["sort"]?.try &.as(String)
sort ||= "published"
latest_only = env.params.body["latest_only"]?.try &.as(String)
latest_only ||= "off"
latest_only = latest_only == "on"
preferences = { preferences = {
"video_loop" => video_loop, "video_loop" => video_loop,
"autoplay" => autoplay, "autoplay" => autoplay,
@ -748,6 +755,8 @@ post "/preferences" do |env|
"volume" => volume, "volume" => volume,
"dark_mode" => dark_mode, "dark_mode" => dark_mode,
"max_results" => max_results, "max_results" => max_results,
"sort" => sort,
"latest_only" => latest_only,
}.to_json }.to_json
PG_DB.exec("UPDATE users SET preferences = $1 WHERE email = $2", preferences, user.email) PG_DB.exec("UPDATE users SET preferences = $1 WHERE email = $2", preferences, user.email)
@ -762,6 +771,7 @@ get "/feed/subscriptions" do |env|
if user if user
user = user.as(User) user = user.as(User)
preferences = user.preferences
# Refresh account # Refresh account
headers = HTTP::Headers.new headers = HTTP::Headers.new
@ -770,7 +780,7 @@ get "/feed/subscriptions" do |env|
client = make_client(YT_URL) client = make_client(YT_URL)
user = get_user(user.id, client, headers, PG_DB) user = get_user(user.id, client, headers, PG_DB)
max_results = user.preferences.max_results max_results = preferences.max_results
max_results ||= env.params.query["maxResults"]?.try &.to_i max_results ||= env.params.query["maxResults"]?.try &.to_i
max_results ||= 40 max_results ||= 40
@ -785,10 +795,29 @@ get "/feed/subscriptions" do |env|
offset = (page - 1) * max_results offset = (page - 1) * max_results
end end
args = arg_array(user.subscriptions, 3) if preferences.latest_only
videos = PG_DB.query_all("SELECT * FROM channel_videos WHERE ucid IN (#{args}) \ 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)
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) ORDER BY published DESC LIMIT $1 OFFSET $2", [limit, offset] + user.subscriptions, as: ChannelVideo)
end
case preferences.sort
when "alphabetically"
videos.sort_by! { |video| video.title }
when "alphabetically - reverse"
videos.sort_by! { |video| video.title }.reverse!
when "channel name"
videos.sort_by! { |video| video.author }
when "channel name - reverse"
videos.sort_by! { |video| video.author }.reverse!
end
# TODO: Add option to disable picking out notifications from regular feed
notifications = PG_DB.query_one("SELECT notifications FROM users WHERE email = $1", user.email, as: Array(String)) notifications = PG_DB.query_one("SELECT notifications FROM users WHERE email = $1", user.email, as: Array(String))
notifications = videos.select { |v| notifications.includes? v.id } notifications = videos.select { |v| notifications.includes? v.id }

View File

@ -25,6 +25,8 @@ DEFAULT_USER_PREFERENCES = Preferences.from_json({
"volume" => 100, "volume" => 100,
"dark_mode" => false, "dark_mode" => false,
"max_results" => 40, "max_results" => 40,
"sort" => "published",
"latest_only" => false,
}.to_json) }.to_json)
class Config class Config
@ -144,6 +146,8 @@ class Preferences
volume: Int32, volume: Int32,
dark_mode: Bool, dark_mode: Bool,
max_results: Int32, max_results: Int32,
sort: String,
latest_only: Bool,
}) })
end end

View File

@ -58,6 +58,20 @@ function update_value(element) {
<input name="max_results" id="max_results" type="number" value="<%= user.preferences.max_results %>"> <input name="max_results" id="max_results" type="number" value="<%= user.preferences.max_results %>">
</div> </div>
<div class="pure-control-group">
<label for="sort">Sort videos by: </label>
<select name="sort" id="sort">
<% ["published", "alphabetically", "alphabetically - reverse", "channel name", "channel name - reverse"].each do |option| %>
<option <% if user.preferences.sort == option %> selected <% end %>><%= option %></option>
<% end %>
</select>
</div>
<div class="pure-control-group">
<label for="latest_only">Only show latest video from channel: </label>
<input name="latest_only" id="latest_only" type="checkbox" <% if user.preferences.latest_only %>checked<% end %>>
</div>
<div class="pure-controls"> <div class="pure-controls">
<button type="submit" class="pure-button pure-button-primary">Save preferences</button> <button type="submit" class="pure-button pure-button-primary">Save preferences</button>
</div> </div>