From: Evan Minto <evan.minto@gmail.com>
Date: Mon, 6 Feb 2017 19:39:08 +0000 (-0800)
Subject: Simplify RABL
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3fa5d059977388066d71e475e484728f6019d04e;p=mastodon.git

Simplify RABL
---

diff --git a/app/views/accounts/show.rabl b/app/views/accounts/show.rabl
index 76aa4a809..def91b425 100644
--- a/app/views/accounts/show.rabl
+++ b/app/views/accounts/show.rabl
@@ -2,8 +2,7 @@ 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)) }
+attributes display_name: :name, username: :preferredUsername, note: :summary
+
+node(:icon)   { |account| full_asset_url(account.avatar.url(:original)) }
+node(:image)  { |account| full_asset_url(account.header.url(:original)) }