about summary refs log tree commit diff
path: root/app/views/accounts
diff options
context:
space:
mode:
authorEvan Minto <evan.minto@gmail.com>2017-02-06 01:19:05 -0800
committerEvan Minto <evan.minto@gmail.com>2017-02-06 01:19:26 -0800
commit94e213c6c11fb3476a6c151425052775427574e1 (patch)
tree93d3ef2c7c6d96801693e9268f24c481a2bb6af5 /app/views/accounts
parent8bd8ea7c0406a8eeb145471475b105366e195e6a (diff)
Reuse existing controller and route
Diffstat (limited to 'app/views/accounts')
-rw-r--r--app/views/accounts/show.html.haml1
-rw-r--r--app/views/accounts/show.rabl9
2 files changed, 9 insertions, 1 deletions
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index cd5398908..c194ce33d 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -4,7 +4,6 @@
 - content_for :header_tags do
   %link{ rel: 'salmon', href: api_salmon_url(@account.id) }/
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
-  %link{ rel: 'alternate', type: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams#"', href: "http://mastodon.dev/api/v1/activitypub/accounts/#{@account.username}" }/
 
   %meta{ property: 'og:site_name', content: 'Mastodon' }/
   %meta{ property: 'og:type', content: 'profile' }/
diff --git a/app/views/accounts/show.rabl b/app/views/accounts/show.rabl
new file mode 100644
index 000000000..76aa4a809
--- /dev/null
+++ b/app/views/accounts/show.rabl
@@ -0,0 +1,9 @@
+extends 'activitypub/types/person.rabl'
+
+object @account
+
+node(:url)                { |account| TagManager.instance.url_for(account) }
+node(:name)               { |account| account.display_name }
+node(:preferredUsername)  { |account| account.username }
+node(:summary)            { |account| account.note }
+node(:icon)               { |account| full_asset_url(account.avatar.url(:original)) }