Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Persist activity URI of a FeatureRequest (#38393)

Browse Source
This commit is contained in:
David Roetzel
2026-03-25 15:32:15 +01:00
committed by GitHub
parent a0f6b6d365
commit c9eefd0ae7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/lib/activitypub/activity/feature_request.rb
View File

@@ -23,8 +23,7 @@ class ActivityPub::Activity::FeatureRequest < ActivityPub::Activity
def accept_request!
collection_item = @collection.collection_items.create!(
account: @featured_account,
state: :accepted
collection_item_attributes(:accepted)
)
queue_delivery!(collection_item, ActivityPub::AcceptFeatureRequestSerializer)
@@ -32,13 +31,16 @@ class ActivityPub::Activity::FeatureRequest < ActivityPub::Activity
def reject_request!
collection_item = @collection.collection_items.build(
account: @featured_account,
state: :rejected
collection_item_attributes(:rejected)
)
queue_delivery!(collection_item, ActivityPub::RejectFeatureRequestSerializer)
end
def collection_item_attributes(state = :accepted)
{ account: @featured_account, activity_uri: @json['id'], state: }
end
def queue_delivery!(collection_item, serializer)
json = JSON.generate(serialize_payload(collection_item, serializer))
ActivityPub::DeliveryWorker.perform_async(json, @featured_account.id, @account.inbox_url)

2
spec/lib/activitypub/activity/feature_request_spec.rb
View File

@@ -32,6 +32,7 @@ RSpec.describe ActivityPub::Activity::FeatureRequest do
.with(satisfying do |body|
response_json = JSON.parse(body)
response_json['type'] == 'Accept' &&
response_json['object'] == 'https://example.com/feature_requests/1' &&
response_json['to'] == sender.uri
end, recipient.id, sender.inbox_url)
end
@@ -46,6 +47,7 @@ RSpec.describe ActivityPub::Activity::FeatureRequest do
.with(satisfying do |body|
response_json = JSON.parse(body)
response_json['type'] == 'Reject' &&
response_json['object'] == 'https://example.com/feature_requests/1' &&
response_json['to'] == sender.uri
end, recipient.id, sender.inbox_url)
end