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

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.

1 files changed, 10 insertions, 2 deletions

diff --git a/app/serializers/rest/status_edit_serializer.rb b/app/serializers/rest/status_edit_serializer.rb
index b123b4e09..a1f9e824e 100644
--- a/app/serializers/rest/status_edit_serializer.rb
+++ b/app/serializers/rest/status_edit_serializer.rb
@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 class REST::StatusEditSerializer < ActiveModel::Serializer
-  attributes :text, :spoiler_text, :media_attachments_changed,
-             :created_at
+  has_one :account, serializer: REST::AccountSerializer
+
+  attributes :content, :spoiler_text,
+             :media_attachments_changed, :created_at
+
+  has_many :emojis, serializer: REST::CustomEmojiSerializer
+
+  def content
+    Formatter.instance.format(object)
+  end
 end