diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-21 17:02:16 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-21 17:02:16 +0100 |
| commit | 9d55529318a285ced484b9216df9064914d6f790 (patch) | |
| tree | 5e6ac6135236c44e5a75105c7af64652a27adce4 /app/views | |
| parent | bf08d46e58c423688d870cf128ded7fd36009115 (diff) | |
Fix text color in dashboard inputs, sanitize remote status content in UI,
simplify FanOutOnWriteService, add /api/accounts/lookup method
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/accounts/_grid_card.html.haml | 2 | ||||
| -rw-r--r-- | app/views/api/accounts/lookup/index.rabl | 2 | ||||
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/views/accounts/_grid_card.html.haml b/app/views/accounts/_grid_card.html.haml index d7751a323..d107f5274 100644 --- a/app/views/accounts/_grid_card.html.haml +++ b/app/views/accounts/_grid_card.html.haml @@ -5,4 +5,4 @@ = link_to url_for_target(account) do %span.display_name= display_name(account) %span.username= "@#{account.acct}" - %p.note= truncate(account.note, length: 150) + %p.note= truncate(strip_tags(account.note), length: 150) diff --git a/app/views/api/accounts/lookup/index.rabl b/app/views/api/accounts/lookup/index.rabl new file mode 100644 index 000000000..f6ae172ed --- /dev/null +++ b/app/views/api/accounts/lookup/index.rabl @@ -0,0 +1,2 @@ +collection @accounts +extends('api/accounts/show') diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index 72d99af6f..11a9ac8e0 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -33,8 +33,7 @@ .counter-btn{ class: favourited_by_me_class(status) } %i.fa.fa-star %span.counter-number= status.reblog? ? status.reblog.favourites_count : status.favourites_count - .content - = status.reblog? ? (status.reblog.local? ? linkify(status.reblog) : status.reblog.content.html_safe) : (status.local? ? linkify(status) : status.content.html_safe) + .content= content_for_status(status.reblog? ? status.reblog : status) - if include_threads - status.descendants.with_includes.with_counters.each do |status| |