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

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
This commit is contained in:
Thibaut Girka
2020-01-24 14:37:06 +01:00
parent a8c109baca 4bae4e972d
commit 9adeaf2bfc
251 changed files with 2910 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/formatter.rb
View File

@ -308,9 +308,9 @@ class Formatter
end
standard = Extractor.extract_entities_with_indices(text, options)
xmpp = Extractor.extract_xmpp_uris_with_indices(text, options)
extra = Extractor.extract_extra_uris_with_indices(text, options)
Extractor.remove_overlapping_entities(special + standard + xmpp)
Extractor.remove_overlapping_entities(special + standard + extra)
end
def html_friendly_extractor(html, options = {})