diff options
| author | Starfall <us@starfall.systems> | 2022-03-30 12:33:18 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-03-30 12:33:18 -0500 |
| commit | f7491de676298b8f78084c00f0026f8cf36d92fc (patch) | |
| tree | 0ac29d1598efeb2a0de9bd1b54ae7590e88479da /app/lib/feed_manager.rb | |
| parent | f37056e6c351a08d09c3986586cc7d27bdea85ab (diff) | |
| parent | 363773d0e9ffa9f4efc564603327f225193a2bf1 (diff) | |
Update to Mastodon 2.5.0
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/lib/feed_manager.rb')
| -rw-r--r-- | app/lib/feed_manager.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index efc9da34b..6994f00ae 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -5,6 +5,7 @@ require 'singleton' class FeedManager include Singleton include Redisable + include FormattingHelper # Maximum number of items stored in a single feed MAX_ITEMS = 400 @@ -503,7 +504,7 @@ class FeedManager status = status.reblog if status.reblog? combined_text = [ - Formatter.instance.plaintext(status), + extract_status_plain_text(status), status.spoiler_text, status.preloadable_poll ? status.preloadable_poll.options.join("\n\n") : nil, status.ordered_media_attachments.map(&:description).join("\n\n"), |