diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-21 00:53:28 +0200 |
|---|---|---|
| committer | Holly 'Frinkel' Lotor <admin@frinkel.tech> | 2020-01-20 16:55:55 -0500 |
| commit | b0630ddc8261250c5edbf2907648695041649e98 (patch) | |
| tree | 9ca374e4e98598efced200e4a993875245ab93b6 /app/controllers/activitypub/collections_controller.rb | |
| parent | 9447566b8ed8e532c13dd97ecd53681029fdcec0 (diff) | |
Original upstream merge
Diffstat (limited to 'app/controllers/activitypub/collections_controller.rb')
| -rw-r--r-- | app/controllers/activitypub/collections_controller.rb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb index cd23506f3..217700d15 100644 --- a/app/controllers/activitypub/collections_controller.rb +++ b/app/controllers/activitypub/collections_controller.rb @@ -1,24 +1,21 @@ # frozen_string_literal: true -class ActivityPub::CollectionsController < Api::BaseController +class ActivityPub::CollectionsController < ActivityPub::BaseController include SignatureVerification + include AccountOwnedConcern - before_action :set_account + before_action :require_signature!, if: :authorized_fetch_mode? before_action :set_size before_action :set_statuses before_action :set_cache_headers def show - expires_in 3.minutes - render_with_cache json: collection_presenter, content_type: 'application/activity+json', serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, skip_activities: true + expires_in 3.minutes, public: public_fetch_mode? + render json: collection_presenter, content_type: 'application/activity+json', serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, skip_activities: true end private - def set_account - @account = Account.find_local!(params[:account_username]) - end - def set_statuses @statuses = scope_for_collection @statuses = cache_collection(@statuses, Status) |