diff options
| author | Reverite <github@reverite.sh> | 2019-07-20 18:46:40 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-20 18:46:40 -0700 |
| commit | 266540080ef5659060faa7da502123f45bbc04f2 (patch) | |
| tree | 1c34751dd4e199737b7a2a4c511b756760941c52 /app/lib/formatter.rb | |
| parent | 40fd56351f0a466e0e3785cca4ee27f2a9060e8a (diff) | |
| parent | f1597e1ab90b1fb291f16977877c6ca79bf89676 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/lib/formatter.rb')
| -rw-r--r-- | app/lib/formatter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 4c11ca291..85bc8eb1f 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -314,7 +314,7 @@ class Formatter gaps = [] total_offset = 0 - escaped = html.gsub(/<[^>]*>/) do |match| + escaped = html.gsub(/<[^>]*>|&#[0-9]+;/) do |match| total_offset += match.length - 1 end_offset = Regexp.last_match.end(0) gaps << [end_offset - total_offset, total_offset] @@ -381,6 +381,6 @@ class Formatter end def mention_html(account) - "<span class=\"h-card\"><a href=\"#{encode(TagManager.instance.url_for(account))}\" class=\"u-url mention\">@<span>#{encode(account.username)}</span></a></span>" + "<span class=\"h-card\"><a href=\"#{encode(ActivityPub::TagManager.instance.url_for(account))}\" class=\"u-url mention\">@<span>#{encode(account.username)}</span></a></span>" end end |