diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-11 16:47:36 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-11 16:47:36 +0100 |
| commit | 447cfef62d74a670ddd600c0240f41746ac2fe0a (patch) | |
| tree | 5c3ed8838f90435b4c4c52a366059cbbd2a24a67 /app/helpers/stream_entries_helper.rb | |
| parent | b919f39b3186c5f022d3965cf6023ff9041e91ca (diff) | |
Improving feed queries, switching API to doorkeeper authentication
Diffstat (limited to 'app/helpers/stream_entries_helper.rb')
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 2a59553ab..60955a0a7 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -23,8 +23,9 @@ module StreamEntriesHelper def linkify(status) mention_hash = {} status.mentions.each { |m| mention_hash[m.acct] = m } + coder = HTMLEntities.new - auto_link(CGI.escapeHTML(status.text), link: :urls, html: { target: '_blank', rel: 'nofollow' }).gsub(Account::MENTION_RE) do |m| + auto_link(coder.encode(status.text), link: :urls, html: { target: '_blank', rel: 'nofollow' }).gsub(Account::MENTION_RE) do |m| account = mention_hash[Account::MENTION_RE.match(m)[1]] "#{m.split('@').first}<a href=\"#{url_for_target(account)}\" class=\"mention\">@<span>#{account.acct}</span></a>" end.html_safe |