diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 16:22:28 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-28 16:22:28 +0200 |
| commit | f313bf3e97ddd83e7847ae00f5bdb488942c943c (patch) | |
| tree | 5035b4504d35a85cb0b2fcbc65ce57ed5d0de71d /app/lib | |
| parent | a4e1830b5f15118bf2532401005376a0c6e896e6 (diff) | |
| parent | 30658924a80434e6a2bceb61267b911ea8d37898 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/feed_manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index fb1d9d2f8..6994f00ae 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -504,7 +504,7 @@ class FeedManager status = status.reblog if status.reblog? combined_text = [ - extract_plain_text(status.text, status.local?), + 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"), |