diff options
| author | Samantaz Fox <coding@samantaz.fr> | 2022-01-07 18:05:59 +0100 |
|---|---|---|
| committer | Samantaz Fox <coding@samantaz.fr> | 2022-01-25 23:53:00 +0100 |
| commit | 714a0013320f6126f6ac918e65264919582181b4 (patch) | |
| tree | 13863fc66af225f5e2985eda6b11fa4eee0ef21c | |
| parent | c78f84d5c6677551ca32d57187887bfb37d77750 (diff) | |
| download | invidious-714a0013320f6126f6ac918e65264919582181b4.tar.gz invidious-714a0013320f6126f6ac918e65264919582181b4.tar.bz2 invidious-714a0013320f6126f6ac918e65264919582181b4.zip | |
DB: playlists: make that 'insert' never raises
| -rw-r--r-- | src/invidious/database/playlists.cr | 8 | ||||
| -rw-r--r-- | src/invidious/routes/playlists.cr | 16 |
2 files changed, 6 insertions, 18 deletions
diff --git a/src/invidious/database/playlists.cr b/src/invidious/database/playlists.cr index 7a5f61dc..a37310d6 100644 --- a/src/invidious/database/playlists.cr +++ b/src/invidious/database/playlists.cr @@ -94,17 +94,13 @@ 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 + return PG_DB.query_one?(request, id, as: InvidiousPlaylist) end def select_all(*, author : String) : Array(InvidiousPlaylist) diff --git a/src/invidious/routes/playlists.cr b/src/invidious/routes/playlists.cr index d437b79c..1c4f1bef 100644 --- a/src/invidious/routes/playlists.cr +++ b/src/invidious/routes/playlists.cr @@ -151,12 +151,8 @@ 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) - if !playlist || playlist.author != user.email - return env.redirect referer - end - rescue ex + playlist = Invidious::Database::Playlists.select(id: plid) + if !playlist || playlist.author != user.email return env.redirect referer end @@ -235,12 +231,8 @@ 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) - if !playlist || playlist.author != user.email - return env.redirect referer - end - rescue ex + playlist = Invidious::Database::Playlists.select(id: plid) + if !playlist || playlist.author != user.email return env.redirect referer end |