zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Serialize language into ActivityPub JSON (#7840) 

* Serialize language into ActivityPub JSON

* Only use contentMap if language is present
This commit is contained in:
Eugen Rochko 2018-06-18 22:43:01 +02:00 committed by GitHub
parent 50689f0d41
commit 908a9671d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/serializers/activitypub/note_serializer.rb
View File

@ -1,12 +1,15 @@
# frozen_string_literal: true # frozen_string_literal: true
class ActivityPub::NoteSerializer < ActiveModel::Serializer class ActivityPub::NoteSerializer < ActiveModel::Serializer
attributes :id, :type, :summary, :content, attributes :id, :type, :summary,
:in_reply_to, :published, :url, :in_reply_to, :published, :url,
:attributed_to, :to, :cc, :sensitive, :attributed_to, :to, :cc, :sensitive,
:atom_uri, :in_reply_to_atom_uri, :atom_uri, :in_reply_to_atom_uri,
:conversation :conversation
attribute :content, unless: :language?
attribute :content_map, if: :language?
has_many :media_attachments, key: :attachment has_many :media_attachments, key: :attachment
has_many :virtual_tags, key: :tag has_many :virtual_tags, key: :tag
@ -26,6 +29,14 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
Formatter.instance.format(object) Formatter.instance.format(object)
end end
def content_map
{ object.language => Formatter.instance.format(object) }
end
def language?
object.language.present?
end
def in_reply_to def in_reply_to
return unless object.reply? && !object.thread.nil? return unless object.reply? && !object.thread.nil?