tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default to json type for webfinger requests (#1583)

Browse Source
This commit is contained in:
Matt Jankowski
2017-04-12 10:03:37 -04:00
committed by Eugen
parent fd102059aa
commit b352a8e5d4
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/xrd_controller.rb
View File

@@ -1,7 +1,6 @@
# frozen_string_literal: true
class XrdController < ApplicationController
before_action :set_default_format_json, only: :webfinger
before_action :set_default_format_xml, only: :host_meta
def host_meta
@@ -31,10 +30,6 @@ class XrdController < ApplicationController
request.format = 'xml' if request.headers['HTTP_ACCEPT'].nil? && params[:format].nil?
end
def set_default_format_json
request.format = 'json' if request.headers['HTTP_ACCEPT'].nil? && params[:format].nil?
end
def username_from_resource
if resource_param =~ /\Ahttps?:\/\//
path_params = Rails.application.routes.recognize_path(resource_param)