tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Account notes (bios) can now contain links. Character limit upped to 160

Browse Source
This commit is contained in:
Eugen Rochko
2016-11-07 01:14:12 +01:00
parent b835f4aa1c
commit 23fc424b7a
6 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/lib/formatter.rb
View File

@ -8,7 +8,7 @@ class Formatter
include ActionView::Helpers::SanitizeHelper
def format(status)
return reformat(status) unless status.local?
return reformat(status.content) unless status.local?
html = status.text
html = encode(html)
@ -20,8 +20,17 @@ class Formatter
html.html_safe
end
def reformat(status)
sanitize(status.content, tags: %w(a br p), attributes: %w(href rel))
def reformat(html)
sanitize(html, tags: %w(a br p), attributes: %w(href rel))
end
def simplified_format(account)
return reformat(account.note) unless account.local?
html = encode(account.note)
html = link_urls(html)
html.html_safe
end
private