2 files changed, 26 insertions, 8 deletions
diff --git a/app/controllers/xrd_controller.rb b/app/controllers/xrd_controller.rb
index 9201eb6c1..e00485f5e 100644
--- a/app/controllers/xrd_controller.rb
+++ b/app/controllers/xrd_controller.rb
@@ -1,27 +1,29 @@
 class XrdController < ApplicationController
-  before_action :set_format
-
   def host_meta
     @webfinger_template = "#{webfinger_url}?resource={uri}"
+
+    respond_to do |format|
+      format.xml { render content_type: 'application/xrd+xml' }
+    end
   end
 
   def webfinger
     @account = Account.find_local!(username_from_resource)
     @canonical_account_uri = "acct:#{@account.username}@#{Rails.configuration.x.local_domain}"
     @magic_key = pem_to_magic_key(@account.keypair.public_key)
+
+    respond_to do |format|
+      format.xml  { render content_type: 'application/xrd+xml' }
+      format.json { render content_type: 'application/jrd+json' }
+    end
   rescue ActiveRecord::RecordNotFound
     head 404
   end
 
   private
 
-  def set_format
-    request.format = 'xml'
-    response.headers['Content-Type'] = 'application/xrd+xml'
-  end
-
   def username_from_resource
-    if resource_param.start_with?('acct:')
+    if resource_param.start_with?('acct:') || resource_param.include?('@')
       resource_param.split('@').first.gsub('acct:', '')
     else
       url = Addressable::URI.parse(resource_param)
diff --git a/app/views/xrd/webfinger.json.rabl b/app/views/xrd/webfinger.json.rabl
new file mode 100644
index 000000000..0de17ac19
--- /dev/null
+++ b/app/views/xrd/webfinger.json.rabl
@@ -0,0 +1,16 @@
+object @account
+
+node(:subject) { @canonical_account_uri }
+
+node(:aliases) do
+  [TagManager.instance.url_for(@account)]
+end
+
+node(:links) do
+  [
+    { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account) },
+    { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') },
+    { rel: 'salmon', href: api_salmon_url(@account.id) },
+    { rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}" }
+  ]
+end