From 23fc424b7aea139a0aff5cd347f46c81e50c2c56 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 7 Nov 2016 01:14:12 +0100 Subject: Account notes (bios) can now contain links. Character limit upped to 160 --- app/views/accounts/_header.html.haml | 2 +- app/views/api/v1/accounts/show.rabl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/views') diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index fb9abd691..ec2233b77 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -12,7 +12,7 @@ %small= "@#{@account.username}" .details .bio - %p= @account.note + .account__header__content= Formatter.instance.simplified_format(@account) .details-counters .counter{ class: active_nav_class(account_url(@account)) } diff --git a/app/views/api/v1/accounts/show.rabl b/app/views/api/v1/accounts/show.rabl index 0d9e268a1..623329059 100644 --- a/app/views/api/v1/accounts/show.rabl +++ b/app/views/api/v1/accounts/show.rabl @@ -1,7 +1,8 @@ object @account -attributes :id, :username, :acct, :display_name, :note +attributes :id, :username, :acct, :display_name +node(:note) { |account| Formatter.instance.simplified_format(account) } node(:url) { |account| TagManager.instance.url_for(account) } node(:avatar) { |account| full_asset_url(account.avatar.url(:large, false)) } node(:header) { |account| full_asset_url(account.header.url(:medium, false)) } -- cgit