@@ -596,6 +600,9 @@ class Status extends ImmutablePureComponent {
{/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
+ {withReference}
+ {withExpiration}
+ {withLimited}
{status.get('edited_at') && *}
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index e53fb535bc..9919b831cb 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -15,6 +15,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
attribute :bookmarked, if: :current_user?
attribute :pinned, if: :pinnable?
attribute :reactions, if: :reactions?
+ attribute :expires_at, if: :will_expire?
has_many :filtered, serializer: REST::FilterResultSerializer, if: :current_user?
attribute :content, unless: :source_requested?
@@ -205,6 +206,14 @@ class REST::StatusSerializer < ActiveModel::Serializer
object.active_mentions.to_a.sort_by(&:id)
end
+ def will_expire?
+ object.scheduled_expiration_status.present?
+ end
+
+ def expires_at
+ object.scheduled_expiration_status.scheduled_at
+ end
+
private
def relationships