mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-01 12:34:32 +00:00
221580a3af
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.
75 lines
2 KiB
Ruby
75 lines
2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ActivityPub::CollectionsController < ActivityPub::BaseController
|
|
include SignatureVerification
|
|
include AccountOwnedConcern
|
|
|
|
before_action :require_account_signature!, if: :authorized_fetch_mode?
|
|
before_action :set_items
|
|
before_action :set_size
|
|
before_action :set_type
|
|
before_action :set_cache_headers
|
|
|
|
def show
|
|
expires_in 3.minutes, public: public_fetch_mode?
|
|
render_with_cache json: collection_presenter, content_type: 'application/activity+json', serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
|
|
end
|
|
|
|
private
|
|
|
|
def set_items
|
|
case params[:id]
|
|
when 'featured'
|
|
@items = for_signed_account { cache_collection(@account.pinned_statuses.not_local_only, Status) }
|
|
@items = @items.map { |item| item.distributable? ? item : ActivityPub::TagManager.instance.uri_for(item) }
|
|
when 'tags'
|
|
@items = for_signed_account { @account.featured_tags }
|
|
when 'devices'
|
|
@items = @account.devices
|
|
else
|
|
not_found
|
|
end
|
|
end
|
|
|
|
def set_size
|
|
case params[:id]
|
|
when 'featured', 'devices', 'tags'
|
|
@size = @items.size
|
|
else
|
|
not_found
|
|
end
|
|
end
|
|
|
|
def set_type
|
|
case params[:id]
|
|
when 'featured'
|
|
@type = :ordered
|
|
when 'devices', 'tags'
|
|
@type = :unordered
|
|
else
|
|
not_found
|
|
end
|
|
end
|
|
|
|
def collection_presenter
|
|
ActivityPub::CollectionPresenter.new(
|
|
id: account_collection_url(@account, params[:id]),
|
|
type: @type,
|
|
size: @size,
|
|
items: @items
|
|
)
|
|
end
|
|
|
|
def for_signed_account
|
|
# Because in public fetch mode we cache the response, there would be no
|
|
# benefit from performing the check below, since a blocked account or domain
|
|
# would likely be served the cache from the reverse proxy anyway
|
|
|
|
if authorized_fetch_mode? && !signed_request_account.nil? && (@account.blocking?(signed_request_account) || (!signed_request_account.domain.nil? && @account.domain_blocking?(signed_request_account.domain)))
|
|
[]
|
|
else
|
|
yield
|
|
end
|
|
end
|
|
end
|