iv-org/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-12-30 01:36:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'to_json' in struct PlaylistVideo

Browse Source
This commit is contained in:
Samantaz Fox 2021-10-29 14:59:53 +02:00
parent 0ec94405ce
commit 86f75758a7
No known key found for this signature in database
GPG Key ID: F42821059186176E
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/invidious/playlists.cr
View File

@ -57,7 +57,7 @@ struct PlaylistVideo
end end
end end
def to_json(locale, json : JSON::Builder, index : Int32?) def to_json(json : JSON::Builder, index : Int32? = nil)
json.object do json.object do
json.field "title", self.title json.field "title", self.title
json.field "videoId", self.id json.field "videoId", self.id
@ -81,14 +81,8 @@ struct PlaylistVideo
end end
end end
def to_json(locale, json : JSON::Builder? = nil, index : Int32? = nil) def to_json(_json : Nil, index : Int32? = nil)
if json JSON.build { |json| to_json(json, index: index) }
to_json(locale, json, index: index)
else
JSON.build do |json|
to_json(locale, json, index: index)
end
end
end end
end end
@ -144,7 +138,7 @@ struct Playlist
json.array do json.array do
videos = get_playlist_videos(PG_DB, self, offset: offset, locale: locale, video_id: video_id) videos = get_playlist_videos(PG_DB, self, offset: offset, locale: locale, video_id: video_id)
videos.each do |video| videos.each do |video|
video.to_json(locale, json) video.to_json(json)
end end
end end
end end
@ -224,7 +218,7 @@ struct InvidiousPlaylist
videos = get_playlist_videos(PG_DB, self, offset: offset, locale: locale, video_id: video_id) videos = get_playlist_videos(PG_DB, self, offset: offset, locale: locale, video_id: video_id)
videos.each_with_index do |video, index| videos.each_with_index do |video, index|
video.to_json(locale, json, offset + index) video.to_json(json, offset + index)
end end
end end
end end

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

@ -274,7 +274,10 @@ module Invidious::Routes::API::V1::Authenticated
env.response.headers["Location"] = "#{HOST_URL}/api/v1/auth/playlists/#{plid}/videos/#{playlist_video.index.to_u64.to_s(16).upcase}" env.response.headers["Location"] = "#{HOST_URL}/api/v1/auth/playlists/#{plid}/videos/#{playlist_video.index.to_u64.to_s(16).upcase}"
env.response.status_code = 201 env.response.status_code = 201
playlist_video.to_json(locale, index: playlist.index.size)
JSON.build do |json|
playlist_video.to_json(json, index: playlist.index.size)
end
end end
def self.delete_video_in_playlist(env) def self.delete_video_in_playlist(env)