diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-05 20:53:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 20:53:07 +0200 |
| commit | e4ca5414a37b7973247a283a364b27052c8f9d1c (patch) | |
| tree | dcb7769320c5a35b229ef579a20aa2fff209ea94 /app/serializers/activitypub | |
| parent | 2c2f649200ba5b742ba9d17ac5ba553c752b59aa (diff) | |
| parent | eef8802325d75b2668b131a765c5555f4be8c2ce (diff) | |
Merge pull request #1032 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/activitypub')
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index d11cfa59a..67f596e78 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -2,7 +2,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer context_extensions :atom_uri, :conversation, :sensitive, - :hashtag, :emoji, :focal_point + :hashtag, :emoji, :focal_point, :blurhash attributes :id, :type, :summary, :in_reply_to, :published, :url, @@ -153,7 +153,7 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer class MediaAttachmentSerializer < ActivityPub::Serializer include RoutingHelper - attributes :type, :media_type, :url, :name + attributes :type, :media_type, :url, :name, :blurhash attribute :focal_point, if: :focal_point? def type |