VeritableValor/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2026-10-24 22:09:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: Add Video ID validation to imported watched videos and improve SQL query

Browse Source
This commit is contained in:
Fijxu 2026-09-14 01:03:35 -03:00
parent 41d044692c
commit 57cc097022
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/invidious/routes/api/v1/authenticated.cr
View File

@ -48,10 +48,12 @@ module Invidious::Routes::API::V1::Authenticated
"{}" "{}"
end end
Invidious::User::Import.from_invidious(user, body) Invidious::User::Import.from_invidious(user, body)
rescue env.response.status_code = 204
rescue ex : InfoException
return error_json(400, ex)
rescue ex
return error_json(500, ex)
end end
env.response.status_code = 204
end end
def self.get_history(env) def self.get_history(env)

7
src/invidious/user/imports.cr
View File

@ -97,7 +97,12 @@ struct Invidious::User
end end
if data["watch_history"]? if data["watch_history"]?
user.watched += data["watch_history"].as_a.map(&.as_s) user.watched += data["watch_history"].as_a.map do |video_id|
video_id = video_id.as_s
# Sanity check for the imported video IDs
raise InvalidVideoID.new(video_id) unless validate_video_id(video_id)
video_id
end
user.watched.reverse!.uniq!.reverse! user.watched.reverse!.uniq!.reverse!
Invidious::Database::Users.update_watch_history(user) Invidious::Database::Users.update_watch_history(user)
end end

14
src/invidious/users.cr
View File

@ -52,12 +52,7 @@ def get_subscription_feed(user, max_results = 40, page = 1)
# Show latest video from a channel that a user hasn't watched # Show latest video from a channel that a user hasn't watched
# "unseen_only" isn't really correct here, more accurate would be "unwatched_only" # "unseen_only" isn't really correct here, more accurate would be "unwatched_only"
if user.watched.empty? videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE NOT id = ANY ($1::text[]) ORDER BY ucid, published DESC", user.watched, as: ChannelVideo)
values = "'{}'"
else
values = "VALUES #{user.watched.map { |id| %(('#{id}')) }.join(",")}"
end
videos = PG_DB.query_all("SELECT DISTINCT ON (ucid) * FROM #{view_name} WHERE NOT id = ANY (#{values}) ORDER BY ucid, published DESC", as: ChannelVideo)
else else
# Show latest video from each channel # Show latest video from each channel
@ -69,12 +64,7 @@ def get_subscription_feed(user, max_results = 40, page = 1)
if user.preferences.unseen_only if user.preferences.unseen_only
# Only show unwatched # Only show unwatched
if user.watched.empty? videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE NOT id = ANY ($1::text[]) ORDER BY published DESC LIMIT $2 OFFSET $3", user.watched, limit, offset, as: ChannelVideo)
values = "'{}'"
else
values = "VALUES #{user.watched.map { |id| %(('#{id}')) }.join(",")}"
end
videos = PG_DB.query_all("SELECT * FROM #{view_name} WHERE NOT id = ANY (#{values}) ORDER BY published DESC LIMIT $1 OFFSET $2", limit, offset, as: ChannelVideo)
else else
# Sort subscriptions as normal # Sort subscriptions as normal