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.
95 lines
2.6 KiB
Ruby
95 lines
2.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class FollowingAccountsController < ApplicationController
|
|
include AccountControllerConcern
|
|
include SignatureVerification
|
|
|
|
before_action :require_account_signature!, if: -> { request.format == :json && authorized_fetch_mode? }
|
|
before_action :set_cache_headers
|
|
|
|
skip_around_action :set_locale, if: -> { request.format == :json }
|
|
skip_before_action :require_functional!, unless: :whitelist_mode?
|
|
|
|
def index
|
|
respond_to do |format|
|
|
format.html do
|
|
use_pack 'public'
|
|
expires_in 0, public: true unless user_signed_in?
|
|
|
|
next if @account.hide_collections?
|
|
|
|
follows
|
|
end
|
|
|
|
format.json do
|
|
if page_requested? && @account.hide_collections?
|
|
forbidden
|
|
next
|
|
end
|
|
|
|
expires_in(page_requested? ? 0 : 3.minutes, public: public_fetch_mode?)
|
|
|
|
render json: collection_presenter,
|
|
serializer: ActivityPub::CollectionSerializer,
|
|
adapter: ActivityPub::Adapter,
|
|
content_type: 'application/activity+json',
|
|
fields: restrict_fields_to
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def follows
|
|
return @follows if defined?(@follows)
|
|
|
|
scope = Follow.where(account: @account)
|
|
scope = scope.where.not(target_account_id: current_account.excluded_from_timeline_account_ids) if user_signed_in?
|
|
@follows = scope.recent.page(params[:page]).per(FOLLOW_PER_PAGE).preload(:target_account)
|
|
end
|
|
|
|
def page_requested?
|
|
params[:page].present?
|
|
end
|
|
|
|
def page_url(page)
|
|
account_following_index_url(@account, page: page) unless page.nil?
|
|
end
|
|
|
|
def next_page_url
|
|
page_url(follows.next_page) if follows.respond_to?(:next_page)
|
|
end
|
|
|
|
def prev_page_url
|
|
page_url(follows.prev_page) if follows.respond_to?(:prev_page)
|
|
end
|
|
|
|
def collection_presenter
|
|
if page_requested?
|
|
ActivityPub::CollectionPresenter.new(
|
|
id: account_following_index_url(@account, page: params.fetch(:page, 1)),
|
|
type: :ordered,
|
|
size: @account.following_count,
|
|
items: follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.target_account) },
|
|
part_of: account_following_index_url(@account),
|
|
next: next_page_url,
|
|
prev: prev_page_url
|
|
)
|
|
else
|
|
ActivityPub::CollectionPresenter.new(
|
|
id: account_following_index_url(@account),
|
|
type: :ordered,
|
|
size: @account.following_count,
|
|
first: page_url(1)
|
|
)
|
|
end
|
|
end
|
|
|
|
def restrict_fields_to
|
|
if page_requested? || !@account.hide_collections?
|
|
# Return all fields
|
|
else
|
|
%i(id type total_items)
|
|
end
|
|
end
|
|
end
|