diff options
author | ThibG <thib@sitedethib.com> | 2019-08-05 17:58:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-05 17:58:39 +0200 |
commit | 0aee74d78a801285ac33647791da9cb1ede9ddf4 (patch) | |
tree | 0cf032b9cecdfc4058f59dfaa5c6197e463a5ffe /app/controllers/well_known/webfinger_controller.rb | |
parent | ff0ceb28b3f1b19a6851a482f8203e434e50f167 (diff) | |
parent | 68eb58b8058579f551b8aa94e800283cd0f93f7f (diff) |
Merge pull request #1187 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/well_known/webfinger_controller.rb')
-rw-r--r-- | app/controllers/well_known/webfinger_controller.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb index 53f7f1e27..50bace217 100644 --- 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 |