mirror of
https://github.com/iv-org/invidious.git
synced 2025-08-14 16:48:29 +00:00
Deprecate /view_all_playlist & use /feed/playlists
This commit is contained in:
parent
dfaccb070e
commit
6e92541d1a
@ -338,7 +338,6 @@ Invidious::Routing.get "/redirect", Invidious::Routes::Misc, :cross_instance_red
|
|||||||
Invidious::Routing.get "/embed/", Invidious::Routes::Embed, :redirect
|
Invidious::Routing.get "/embed/", Invidious::Routes::Embed, :redirect
|
||||||
Invidious::Routing.get "/embed/:id", Invidious::Routes::Embed, :show
|
Invidious::Routing.get "/embed/:id", Invidious::Routes::Embed, :show
|
||||||
|
|
||||||
Invidious::Routing.get "/view_all_playlists", Invidious::Routes::Playlists, :index
|
|
||||||
Invidious::Routing.get "/create_playlist", Invidious::Routes::Playlists, :new
|
Invidious::Routing.get "/create_playlist", Invidious::Routes::Playlists, :new
|
||||||
Invidious::Routing.post "/create_playlist", Invidious::Routes::Playlists, :create
|
Invidious::Routing.post "/create_playlist", Invidious::Routes::Playlists, :create
|
||||||
Invidious::Routing.get "/subscribe_playlist", Invidious::Routes::Playlists, :subscribe
|
Invidious::Routing.get "/subscribe_playlist", Invidious::Routes::Playlists, :subscribe
|
||||||
|
@ -3,6 +3,31 @@ module Invidious::Routes::Feeds
|
|||||||
env.redirect "/view_all_playlists"
|
env.redirect "/view_all_playlists"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.playlists(env)
|
||||||
|
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
||||||
|
|
||||||
|
user = env.get? "user"
|
||||||
|
referer = get_referer(env)
|
||||||
|
|
||||||
|
return env.redirect "/" if user.nil?
|
||||||
|
|
||||||
|
user = user.as(User)
|
||||||
|
|
||||||
|
items_created = PG_DB.query_all("SELECT * FROM playlists WHERE author = $1 AND id LIKE 'IV%' ORDER BY created", user.email, as: InvidiousPlaylist)
|
||||||
|
items_created.map! do |item|
|
||||||
|
item.author = ""
|
||||||
|
item
|
||||||
|
end
|
||||||
|
|
||||||
|
items_saved = PG_DB.query_all("SELECT * FROM playlists WHERE author = $1 AND id NOT LIKE 'IV%' ORDER BY created", user.email, as: InvidiousPlaylist)
|
||||||
|
items_saved.map! do |item|
|
||||||
|
item.author = ""
|
||||||
|
item
|
||||||
|
end
|
||||||
|
|
||||||
|
templated "view_all_playlists"
|
||||||
|
end
|
||||||
|
|
||||||
def self.popular(env)
|
def self.popular(env)
|
||||||
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
||||||
|
|
||||||
@ -285,7 +310,6 @@ module Invidious::Routes::Feeds
|
|||||||
content = "#{HOST_URL}#{URI.parse(match["url"]).request_target}"
|
content = "#{HOST_URL}#{URI.parse(match["url"]).request_target}"
|
||||||
document = document.gsub(match[0], "<uri>#{content}</uri>")
|
document = document.gsub(match[0], "<uri>#{content}</uri>")
|
||||||
end
|
end
|
||||||
|
|
||||||
document
|
document
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ module Invidious::Routes::Misc
|
|||||||
end
|
end
|
||||||
when "Playlists"
|
when "Playlists"
|
||||||
if user
|
if user
|
||||||
env.redirect "/view_all_playlists"
|
env.redirect "/feed/playlists"
|
||||||
else
|
else
|
||||||
env.redirect "/feed/popular"
|
env.redirect "/feed/popular"
|
||||||
end
|
end
|
||||||
|
@ -1,29 +1,4 @@
|
|||||||
module Invidious::Routes::Playlists
|
module Invidious::Routes::Playlists
|
||||||
def self.index(env)
|
|
||||||
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
|
||||||
|
|
||||||
user = env.get? "user"
|
|
||||||
referer = get_referer(env)
|
|
||||||
|
|
||||||
return env.redirect "/" if user.nil?
|
|
||||||
|
|
||||||
user = user.as(User)
|
|
||||||
|
|
||||||
items_created = PG_DB.query_all("SELECT * FROM playlists WHERE author = $1 AND id LIKE 'IV%' ORDER BY created", user.email, as: InvidiousPlaylist)
|
|
||||||
items_created.map! do |item|
|
|
||||||
item.author = ""
|
|
||||||
item
|
|
||||||
end
|
|
||||||
|
|
||||||
items_saved = PG_DB.query_all("SELECT * FROM playlists WHERE author = $1 AND id NOT LIKE 'IV%' ORDER BY created", user.email, as: InvidiousPlaylist)
|
|
||||||
items_saved.map! do |item|
|
|
||||||
item.author = ""
|
|
||||||
item
|
|
||||||
end
|
|
||||||
|
|
||||||
templated "view_all_playlists"
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.new(env)
|
def self.new(env)
|
||||||
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
locale = LOCALES[env.get("preferences").as(Preferences).locale]?
|
||||||
|
|
||||||
@ -148,7 +123,7 @@ module Invidious::Routes::Playlists
|
|||||||
PG_DB.exec("DELETE FROM playlist_videos * WHERE plid = $1", plid)
|
PG_DB.exec("DELETE FROM playlist_videos * WHERE plid = $1", plid)
|
||||||
PG_DB.exec("DELETE FROM playlists * WHERE id = $1", plid)
|
PG_DB.exec("DELETE FROM playlists * WHERE id = $1", plid)
|
||||||
|
|
||||||
env.redirect "/view_all_playlists"
|
env.redirect "/feed/playlists"
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.edit(env)
|
def self.edit(env)
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<% if playlist.is_a? InvidiousPlaylist %>
|
<% if playlist.is_a? InvidiousPlaylist %>
|
||||||
<b>
|
<b>
|
||||||
<% if playlist.author == user.try &.email %>
|
<% if playlist.author == user.try &.email %>
|
||||||
<a href="/view_all_playlists"><%= author %></a> |
|
<a href="/feed/playlists"><%= author %></a> |
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= author %> |
|
<%= author %> |
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -312,7 +312,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
<a href="/view_all_playlists"><%= translate(locale, "View all playlists") %></a>
|
<a href="/feed/playlists"><%= translate(locale, "View all playlists") %></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="pure-control-group">
|
<div class="pure-control-group">
|
||||||
|
Loading…
Reference in New Issue
Block a user