Merge branch 'master' into glitch-soc/merge-upstream

2019-08-05 13:13:28 +02:00
parent ff0ceb28b3 6201bfdfba
commit e50554391a
52 changed files with 247 additions and 193 deletions
--- a/app/controllers/well_known/webfinger_controller.rb
+++ b/app/controllers/well_known/webfinger_controller.rb
@@ -9,17 +9,8 @@ module WellKnown
    def show
      @account = Account.find_local!(username_from_resource)

-      respond_to do |format|
-        format.any(:json, :html) do
-          render json: @account, serializer: WebfingerSerializer, content_type: 'application/jrd+json'
-        end
-
-        format.xml do
-          render content_type: 'application/xrd+xml'
-        end
-      end
-
      expires_in 3.days, public: true
+      render json: @account, serializer: WebfingerSerializer, content_type: 'application/jrd+json'
    rescue ActiveRecord::RecordNotFound
      head 404
    end