diff --git a/app/controllers/legacy_controller.rb b/app/controllers/legacy_controller.rb index 5557a3146..784b19443 100644 --- a/app/controllers/legacy_controller.rb +++ b/app/controllers/legacy_controller.rb @@ -17,18 +17,10 @@ class LegacyController < ApplicationController end end - def users - @users = User.limit(100).search(params).paginate(params[:page]) - end - def tags @tags = Tag.limit(100).search(params).paginate(params[:page], :limit => params[:limit]) end - def artists - @artists = Artist.limit(100).search(search_params).paginate(params[:page]) - end - def unavailable render :plain => "this resource is no longer available", :status => 410 end diff --git a/app/models/user.rb b/app/models/user.rb index c56a19adb..071c42d04 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -483,15 +483,6 @@ class User < ApplicationRecord ] end - def to_legacy_json - return { - "name" => name, - "id" => id, - "level" => level, - "created_at" => created_at.strftime("%Y-%m-%d %H:%M") - }.to_json - end - def api_token api_key.try(:key) end diff --git a/app/views/legacy/artists.json.erb b/app/views/legacy/artists.json.erb deleted file mode 100644 index f7b4addaa..000000000 --- a/app/views/legacy/artists.json.erb +++ /dev/null @@ -1 +0,0 @@ -[<%= raw @artists.map(&:to_json).join(",") %>] diff --git a/app/views/legacy/artists.xml.erb b/app/views/legacy/artists.xml.erb deleted file mode 100644 index 60b65e14e..000000000 --- a/app/views/legacy/artists.xml.erb +++ /dev/null @@ -1,6 +0,0 @@ - - - <% @artists.each do |artist| %> - " is_active="<%= !artist.is_deleted? %>" name="<%= artist.name %>" updater_id="0" id="<%= artist.id %>" version="0"/> - <% end %> - diff --git a/app/views/legacy/users.json.erb b/app/views/legacy/users.json.erb deleted file mode 100644 index 296d0b8e0..000000000 --- a/app/views/legacy/users.json.erb +++ /dev/null @@ -1 +0,0 @@ -[<%= @users.map {|x| x.to_legacy_json}.join(", ").html_safe %>] diff --git a/app/views/legacy/users.xml.erb b/app/views/legacy/users.xml.erb deleted file mode 100644 index fe0dcb2c1..000000000 --- a/app/views/legacy/users.xml.erb +++ /dev/null @@ -1,6 +0,0 @@ - - - <% @users.each do |user| %> - - <% end %> - diff --git a/config/routes.rb b/config/routes.rb index d17321a92..8c5e55540 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -262,8 +262,6 @@ Rails.application.routes.draw do # legacy aliases get "/artist" => redirect {|params, req| "/artists?page=#{req.params[:page]}&search[name]=#{CGI.escape(req.params[:name].to_s)}"} - get "/artist/index.xml", :controller => "legacy", :action => "artists", :format => "xml" - get "/artist/index.json", :controller => "legacy", :action => "artists", :format => "json" get "/artist/index" => redirect {|params, req| "/artists?page=#{req.params[:page]}"} get "/artist/show/:id" => redirect("/artists/%{id}") get "/artist/show" => redirect {|params, req| "/artists?name=#{CGI.escape(req.params[:name].to_s)}"} @@ -335,8 +333,6 @@ Rails.application.routes.draw do get "/tag_implication" => redirect {|params, req| "/tag_implications?search[name_matches]=#{CGI.escape(req.params[:query].to_s)}"} - get "/user/index.xml", :controller => "legacy", :action => "users", :format => "xml" - get "/user/index.json", :controller => "legacy", :action => "users", :format => "json" get "/user" => redirect {|params, req| "/users?page=#{req.params[:page]}"} get "/user/index" => redirect {|params, req| "/users?page=#{req.params[:page]}"} get "/user/show/:id" => redirect("/users/%{id}")