diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
commit | 322e907e0417da482789e4d24263f247f29a5769 (patch) | |
tree | 8356833bbbf82de571feb1d739e0db7e2a50c9be /app/serializers/rest/status_edit_serializer.rb | |
parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
parent | 3aebe711fd54d75c1ea35e65a5dc342e78508d15 (diff) |
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.
Diffstat (limited to 'app/serializers/rest/status_edit_serializer.rb')
-rw-r--r-- | app/serializers/rest/status_edit_serializer.rb | 12 |
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 |