Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00
parent f72ad67a39 894da3dcca
commit 6cd5b3bbe5
60 changed files with 738 additions and 319 deletions
--- a/app/serializers/activitypub/activity_serializer.rb
+++ b/app/serializers/activitypub/activity_serializer.rb
@@ -5,6 +5,7 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer

  has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer, unless: :announce?
  attribute :proper_uri, key: :object, if: :announce?
+  attribute :atom_uri, if: :announce?

  def id
    ActivityPub::TagManager.instance.activity_uri_for(object)
@@ -34,6 +35,10 @@ class ActivityPub::ActivitySerializer < ActiveModel::Serializer
    ActivityPub::TagManager.instance.uri_for(object.proper)
  end

+  def atom_uri
+    OStatus::TagManager.instance.uri_for(object)
+  end
+
  def announce?
    object.reblog?
  end