Refactor formatter (#17828)
* Refactor formatter * Move custom emoji pre-rendering logic to view helpers * Move more methods out of Formatter * Fix code style issues * Remove Formatter * Add inline poll options to RSS feeds * Remove unused helper method * Fix code style issues * Various fixes and improvements * Fix test
This commit is contained in:
parent
2dd30804b6
commit
cefa526c6d
44 changed files with 932 additions and 1024 deletions
|
@ -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
|
||||
|
@ -445,7 +446,7 @@ class FeedManager
|
|||
status = status.reblog if status.reblog?
|
||||
|
||||
combined_text = [
|
||||
Formatter.instance.plaintext(status),
|
||||
extract_plain_text(status.text, status.local?),
|
||||
status.spoiler_text,
|
||||
status.preloadable_poll ? status.preloadable_poll.options.join("\n\n") : nil,
|
||||
status.ordered_media_attachments.map(&:description).join("\n\n"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue