mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2022-04-11.git
synced 2024-08-15 00:43:26 +00:00
Merge pull request #53 from omarroth/notifications-only
Add option to view only notifications
This commit is contained in:
Omar Roth
GitHub
commit
51903462ef
3 changed files with 107 additions and 69 deletions
158
src/invidious.cr
158
src/invidious.cr
|
|
@ -1817,20 +1817,25 @@ post "/preferences" do |env|
|
||||||
unseen_only ||= "off"
|
unseen_only ||= "off"
|
||||||
unseen_only = unseen_only == "on"
|
unseen_only = unseen_only == "on"
|
||||||
|
|
||||||
|
notifications_only = env.params.body["notifications_only"]?.try &.as(String)
|
||||||
|
notifications_only ||= "off"
|
||||||
|
notifications_only = notifications_only == "on"
|
||||||
|
|
||||||
preferences = {
|
preferences = {
|
||||||
"video_loop" => video_loop,
|
"video_loop" => video_loop,
|
||||||
"autoplay" => autoplay,
|
"autoplay" => autoplay,
|
||||||
"speed" => speed,
|
"speed" => speed,
|
||||||
"quality" => quality,
|
"quality" => quality,
|
||||||
"volume" => volume,
|
"volume" => volume,
|
||||||
"comments" => comments,
|
"comments" => comments,
|
||||||
"redirect_feed" => redirect_feed,
|
"redirect_feed" => redirect_feed,
|
||||||
"dark_mode" => dark_mode,
|
"dark_mode" => dark_mode,
|
||||||
"thin_mode" => thin_mode,
|
"thin_mode" => thin_mode,
|
||||||
"max_results" => max_results,
|
"max_results" => max_results,
|
||||||
"sort" => sort,
|
"sort" => sort,
|
||||||
"latest_only" => latest_only,
|
"latest_only" => latest_only,
|
||||||
"unseen_only" => unseen_only,
|
"unseen_only" => unseen_only,
|
||||||
|
"notifications_only" => notifications_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)
|
||||||
|
|
@ -1871,61 +1876,84 @@ get "/feed/subscriptions" do |env|
|
||||||
offset = (page - 1) * max_results
|
offset = (page - 1) * max_results
|
||||||
end
|
end
|
||||||
|
|
||||||
if preferences.latest_only
|
|
||||||
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
|
|
||||||
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
|
|
||||||
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,
|
notifications = PG_DB.query_one("SELECT notifications FROM users WHERE email = $1", user.email,
|
||||||
as: Array(String))
|
as: Array(String))
|
||||||
|
if preferences.notifications_only && !notifications.empty?
|
||||||
|
args = arg_array(notifications)
|
||||||
|
|
||||||
notifications = videos.select { |v| notifications.includes? v.id }
|
videos = PG_DB.query_all("SELECT * FROM channel_videos WHERE id IN (#{args})
|
||||||
videos = videos - notifications
|
ORDER BY published DESC", notifications, as: ChannelVideo)
|
||||||
|
notifications = [] of ChannelVideo
|
||||||
|
|
||||||
|
videos.sort_by! { |video| video.published }.reverse!
|
||||||
|
|
||||||
|
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
|
||||||
|
else
|
||||||
|
if preferences.latest_only
|
||||||
|
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
|
||||||
|
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
|
||||||
|
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 = videos.select { |v| notifications.includes? v.id }
|
||||||
|
videos = videos - notifications
|
||||||
|
end
|
||||||
|
|
||||||
if !limit
|
if !limit
|
||||||
videos = videos[0..max_results]
|
videos = videos[0..max_results]
|
||||||
|
|
|
||||||
|
|
@ -176,10 +176,15 @@ class Preferences
|
||||||
nilable: true,
|
nilable: true,
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
max_results: Int32,
|
max_results: Int32,
|
||||||
sort: String,
|
sort: String,
|
||||||
latest_only: Bool,
|
latest_only: Bool,
|
||||||
unseen_only: Bool,
|
unseen_only: Bool,
|
||||||
|
notifications_only: {
|
||||||
|
type: Bool,
|
||||||
|
nilable: true,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -97,6 +97,11 @@ function update_value(element) {
|
||||||
<input name="unseen_only" id="unseen_only" type="checkbox" <% if user.preferences.unseen_only %>checked<% end %>>
|
<input name="unseen_only" id="unseen_only" type="checkbox" <% if user.preferences.unseen_only %>checked<% end %>>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="pure-control-group">
|
||||||
|
<label for="notifications_only">Only show notifications: </label>
|
||||||
|
<input name="notifications_only" id="notifications_only" type="checkbox" <% if user.preferences.notifications_only %>checked<% end %>>
|
||||||
|
</div>
|
||||||
|
|
||||||
<legend>Data preferences</legend>
|
<legend>Data preferences</legend>
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<label>
|
<label>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue