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

2022-03-28 16:22:28 +02:00
parent a4e1830b5f 30658924a8
commit f313bf3e97
24 changed files with 100 additions and 112 deletions
--- 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"),