Skip to content

Commit 714a001

Browse files
committed
DB: playlists: make that 'insert' never raises
1 parent c78f84d commit 714a001

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

src/invidious/database/playlists.cr

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,13 @@ module Invidious::Database::Playlists
9494
# Salect
9595
# -------------------
9696

97-
def select(*, id : String, raise_on_fail : Bool = false) : InvidiousPlaylist?
97+
def select(*, id : String) : InvidiousPlaylist?
9898
request = <<-SQL
9999
SELECT * FROM playlists
100100
WHERE id = $1
101101
SQL
102102

103-
if raise_on_fail
104-
return PG_DB.query_one(request, id, as: InvidiousPlaylist)
105-
else
106-
return PG_DB.query_one?(request, id, as: InvidiousPlaylist)
107-
end
103+
return PG_DB.query_one?(request, id, as: InvidiousPlaylist)
108104
end
109105

110106
def select_all(*, author : String) : Array(InvidiousPlaylist)

src/invidious/routes/playlists.cr

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,8 @@ module Invidious::Routes::Playlists
151151
page = env.params.query["page"]?.try &.to_i?
152152
page ||= 1
153153

154-
begin
155-
playlist = Invidious::Database::Playlists.select(id: plid, raise_on_fail: true)
156-
if !playlist || playlist.author != user.email
157-
return env.redirect referer
158-
end
159-
rescue ex
154+
playlist = Invidious::Database::Playlists.select(id: plid)
155+
if !playlist || playlist.author != user.email
160156
return env.redirect referer
161157
end
162158

@@ -235,12 +231,8 @@ module Invidious::Routes::Playlists
235231
page = env.params.query["page"]?.try &.to_i?
236232
page ||= 1
237233

238-
begin
239-
playlist = Invidious::Database::Playlists.select(id: plid, raise_on_fail: true)
240-
if !playlist || playlist.author != user.email
241-
return env.redirect referer
242-
end
243-
rescue ex
234+
playlist = Invidious::Database::Playlists.select(id: plid)
235+
if !playlist || playlist.author != user.email
244236
return env.redirect referer
245237
end
246238

0 commit comments

Comments
 (0)