Fallback to old on-the-fly URI for follows/blocks if no stored URI (#7371)

Fix #7367
7 years ago · 2f63d52b92
parent c7d1a2e400
commit 2f63d52b92
2 changed files with 2 additions and 2 deletions
--- a/app/serializers/activitypub/block_serializer.rb
+++ b/app/serializers/activitypub/block_serializer.rb
@ -5,7 +5,7 @@ class ActivityPub::BlockSerializer < ActiveModel::Serializer
  attribute :virtual_object, key: :object

  def id
-    [ActivityPub::TagManager.instance.uri_for(object.account), '#blocks/', object.id].join
+    ActivityPub::TagManager.instance.uri_for(object) || [ActivityPub::TagManager.instance.uri_for(object.account), '#blocks/', object.id].join
  end

  def type
--- a/app/serializers/activitypub/follow_serializer.rb
+++ b/app/serializers/activitypub/follow_serializer.rb
@ -5,7 +5,7 @@ class ActivityPub::FollowSerializer < ActiveModel::Serializer
  attribute :virtual_object, key: :object

  def id
-    ActivityPub::TagManager.instance.uri_for(object)
+    ActivityPub::TagManager.instance.uri_for(object) || [ActivityPub::TagManager.instance.uri_for(object.account), '#follows/', object.id].join
  end

  def type