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

- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
This commit is contained in:
Claire
2021-05-07 18:21:59 +02:00
483 changed files with 13397 additions and 7694 deletions

View File

@@ -13,7 +13,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
:inbox, :outbox, :featured, :featured_tags,
:preferred_username, :name, :summary,
:url, :manually_approves_followers,
:discoverable
:discoverable, :published
has_one :public_key, serializer: ActivityPub::PublicKeySerializer
@@ -158,6 +158,10 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
!object.suspended? && !object.also_known_as.empty?
end
def published
object.created_at.midnight.iso8601
end
class CustomEmojiSerializer < ActivityPub::EmojiSerializer
end

View File

@@ -55,6 +55,10 @@ class REST::AccountSerializer < ActiveModel::Serializer
full_asset_url(object.suspended? ? object.header.default_url : object.header_static_url)
end
def created_at
object.created_at.midnight.iso8601
end
def last_status_at
object.last_status_at&.to_date&.iso8601
end