mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2022-08-14.git
synced 2024-08-15 00:53:20 +00:00
DB: playlists: make that 'insert' never raises
This commit is contained in:
parent
c78f84d5c6
commit
714a001332
2 changed files with 6 additions and 18 deletions
|
@ -94,18 +94,14 @@ module Invidious::Database::Playlists
|
|||
# Salect
|
||||
# -------------------
|
||||
|
||||
def select(*, id : String, raise_on_fail : Bool = false) : InvidiousPlaylist?
|
||||
def select(*, id : String) : InvidiousPlaylist?
|
||||
request = <<-SQL
|
||||
SELECT * FROM playlists
|
||||
WHERE id = $1
|
||||
SQL
|
||||
|
||||
if raise_on_fail
|
||||
return PG_DB.query_one(request, id, as: InvidiousPlaylist)
|
||||
else
|
||||
return PG_DB.query_one?(request, id, as: InvidiousPlaylist)
|
||||
end
|
||||
end
|
||||
|
||||
def select_all(*, author : String) : Array(InvidiousPlaylist)
|
||||
request = <<-SQL
|
||||
|
|
|
@ -151,14 +151,10 @@ module Invidious::Routes::Playlists
|
|||
page = env.params.query["page"]?.try &.to_i?
|
||||
page ||= 1
|
||||
|
||||
begin
|
||||
playlist = Invidious::Database::Playlists.select(id: plid, raise_on_fail: true)
|
||||
playlist = Invidious::Database::Playlists.select(id: plid)
|
||||
if !playlist || playlist.author != user.email
|
||||
return env.redirect referer
|
||||
end
|
||||
rescue ex
|
||||
return env.redirect referer
|
||||
end
|
||||
|
||||
begin
|
||||
videos = get_playlist_videos(playlist, offset: (page - 1) * 100, locale: locale)
|
||||
|
@ -235,14 +231,10 @@ module Invidious::Routes::Playlists
|
|||
page = env.params.query["page"]?.try &.to_i?
|
||||
page ||= 1
|
||||
|
||||
begin
|
||||
playlist = Invidious::Database::Playlists.select(id: plid, raise_on_fail: true)
|
||||
playlist = Invidious::Database::Playlists.select(id: plid)
|
||||
if !playlist || playlist.author != user.email
|
||||
return env.redirect referer
|
||||
end
|
||||
rescue ex
|
||||
return env.redirect referer
|
||||
end
|
||||
|
||||
query = env.params.query["q"]?
|
||||
if query
|
||||
|
|
Loading…
Reference in a new issue