Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Change ActivityPub path generation to all happen in ActivityPub::TagManager (#33527)

Browse source
This commit is contained in:
Claire 2025-01-13 10:39:05 +01:00 • committed by GitHub
parent 53885b0fdb
commit d517fa5ab7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 82 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/serializers/activitypub/actor_serializer.rb
View file

@ -44,7 +44,7 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
delegate :suspended?, :instance_actor?, to: :object
def id
object.instance_actor? ? instance_actor_url : account_url(object)
ActivityPub::TagManager.instance.uri_for(object)
end
def type
@ -60,27 +60,27 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
end
def following
account_following_index_url(object)
ActivityPub::TagManager.instance.following_uri_for(object)
end
def followers
account_followers_url(object)
ActivityPub::TagManager.instance.followers_uri_for(object)
end
def inbox
object.instance_actor? ? instance_actor_inbox_url : account_inbox_url(object)
ActivityPub::TagManager.instance.inbox_uri_for(object)
end
def outbox
object.instance_actor? ? instance_actor_outbox_url : account_outbox_url(object)
ActivityPub::TagManager.instance.outbox_uri_for(object)
end
def featured
account_collection_url(object, :featured)
ActivityPub::TagManager.instance.collection_uri_for(object, :featured)
end
def featured_tags
account_collection_url(object, :tags)
ActivityPub::TagManager.instance.collection_uri_for(object, :tags)
end
def endpoints

2
app/serializers/activitypub/add_serializer.rb
View file

@ -38,6 +38,6 @@ class ActivityPub::AddSerializer < ActivityPub::Serializer
end
def target
account_collection_url(object.account, :featured)
ActivityPub::TagManager.instance.collection_uri_for(object.account, :featured)
end
end

2
app/serializers/activitypub/remove_serializer.rb
View file

@ -38,6 +38,6 @@ class ActivityPub::RemoveSerializer < ActivityPub::Serializer
end
def target
account_collection_url(object.account, :featured)
ActivityPub::TagManager.instance.collection_uri_for(object.account, :featured)
end
end

4
app/serializers/webfinger_serializer.rb
View file

@ -13,7 +13,7 @@ class WebfingerSerializer < ActiveModel::Serializer
if object.instance_actor?
[instance_actor_url]
else
[short_account_url(object), account_url(object)]
[short_account_url(object), ActivityPub::TagManager.instance.uri_for(object)]
end
end
@ -43,6 +43,6 @@ class WebfingerSerializer < ActiveModel::Serializer
end
def self_href
object.instance_actor? ? instance_actor_url : account_url(object)
ActivityPub::TagManager.instance.uri_for(object)
end
end