diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 19:48:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-09 19:48:05 +0100 |
commit | d602c92b310545eb733a58caed49717341abe27c (patch) | |
tree | 59b020274695be37d47d0a4c98962c2677e621e6 /app/serializers | |
parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
parent | d90da7d080d25355290e5d5e86c2c918d685add7 (diff) |
Merge pull request #1681 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
-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 |