Refactor controllers for statuses, accounts, and more (#11249)
parent
f14776475d
commit
63c7fe8e48
41 changed files with 299 additions and 289 deletions
@ -0,0 +1,68 @@ |
|||||||
|
# frozen_string_literal: true |
||||||
|
|
||||||
|
class ActivityPub::RepliesController < Api::BaseController |
||||||
|
include SignatureAuthentication |
||||||
|
include Authorization |
||||||
|
include AccountOwnedConcern |
||||||
|
|
||||||
|
DESCENDANTS_LIMIT = 60 |
||||||
|
|
||||||
|
before_action :set_status |
||||||
|
before_action :set_cache_headers |
||||||
|
before_action :set_replies |
||||||
|
|
||||||
|
def index |
||||||
|
render json: replies_collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json', skip_activities: true |
||||||
|
end |
||||||
|
|
||||||
|
private |
||||||
|
|
||||||
|
def set_status |
||||||
|
@status = @account.statuses.find(params[:status_id]) |
||||||
|
authorize @status, :show? |
||||||
|
rescue Mastodon::NotPermittedError |
||||||
|
raise ActiveRecord::RecordNotFound |
||||||
|
end |
||||||
|
|
||||||
|
def set_replies |
||||||
|
@replies = page_params[:other_accounts] ? Status.where.not(account_id: @account.id) : @account.statuses |
||||||
|
@replies = @replies.where(in_reply_to_id: @status.id, visibility: [:public, :unlisted]) |
||||||
|
@replies = @replies.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id]) |
||||||
|
end |
||||||
|
|
||||||
|
def replies_collection_presenter |
||||||
|
page = ActivityPub::CollectionPresenter.new( |
||||||
|
id: account_status_replies_url(@account, @status, page_params), |
||||||
|
type: :unordered, |
||||||
|
part_of: account_status_replies_url(@account, @status), |
||||||
|
next: next_page, |
||||||
|
items: @replies.map { |status| status.local ? status : status.id } |
||||||
|
) |
||||||
|
|
||||||
|
return page if page_requested? |
||||||
|
|
||||||
|
ActivityPub::CollectionPresenter.new( |
||||||
|
id: account_status_replies_url(@account, @status), |
||||||
|
type: :unordered, |
||||||
|
first: page |
||||||
|
) |
||||||
|
end |
||||||
|
|
||||||
|
def page_requested? |
||||||
|
params[:page] == 'true' |
||||||
|
end |
||||||
|
|
||||||
|
def next_page |
||||||
|
account_status_replies_url( |
||||||
|
@account, |
||||||
|
@status, |
||||||
|
page: true, |
||||||
|
min_id: @replies&.last&.id, |
||||||
|
other_accounts: !(@replies&.last&.account_id == @account.id && @replies.size == DESCENDANTS_LIMIT) |
||||||
|
) |
||||||
|
end |
||||||
|
|
||||||
|
def page_params |
||||||
|
params_slice(:other_accounts, :min_id).merge(page: true) |
||||||
|
end |
||||||
|
end |
@ -0,0 +1,33 @@ |
|||||||
|
# frozen_string_literal: true |
||||||
|
|
||||||
|
module AccountOwnedConcern |
||||||
|
extend ActiveSupport::Concern |
||||||
|
|
||||||
|
included do |
||||||
|
before_action :set_account, if: :account_required? |
||||||
|
before_action :check_account_approval, if: :account_required? |
||||||
|
before_action :check_account_suspension, if: :account_required? |
||||||
|
end |
||||||
|
|
||||||
|
private |
||||||
|
|
||||||
|
def account_required? |
||||||
|
true |
||||||
|
end |
||||||
|
|
||||||
|
def set_account |
||||||
|
@account = Account.find_local!(username_param) |
||||||
|
end |
||||||
|
|
||||||
|
def username_param |
||||||
|
params[:account_username] |
||||||
|
end |
||||||
|
|
||||||
|
def check_account_approval |
||||||
|
not_found if @account.local? && @account.user_pending? |
||||||
|
end |
||||||
|
|
||||||
|
def check_account_suspension |
||||||
|
expires_in(3.minutes, public: true) && gone if @account.suspended? |
||||||
|
end |
||||||
|
end |
@ -0,0 +1,87 @@ |
|||||||
|
# frozen_string_literal: true |
||||||
|
|
||||||
|
module StatusControllerConcern |
||||||
|
extend ActiveSupport::Concern |
||||||
|
|
||||||
|
ANCESTORS_LIMIT = 40 |
||||||
|
DESCENDANTS_LIMIT = 60 |
||||||
|
DESCENDANTS_DEPTH_LIMIT = 20 |
||||||
|
|
||||||
|
def create_descendant_thread(starting_depth, statuses) |
||||||
|
depth = starting_depth + statuses.size |
||||||
|
|
||||||
|
if depth < DESCENDANTS_DEPTH_LIMIT |
||||||
|
{ |
||||||
|
statuses: statuses, |
||||||
|
starting_depth: starting_depth, |
||||||
|
} |
||||||
|
else |
||||||
|
next_status = statuses.pop |
||||||
|
|
||||||
|
{ |
||||||
|
statuses: statuses, |
||||||
|
starting_depth: starting_depth, |
||||||
|
next_status: next_status, |
||||||
|
} |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
def set_ancestors |
||||||
|
@ancestors = @status.reply? ? cache_collection(@status.ancestors(ANCESTORS_LIMIT, current_account), Status) : [] |
||||||
|
@next_ancestor = @ancestors.size < ANCESTORS_LIMIT ? nil : @ancestors.shift |
||||||
|
end |
||||||
|
|
||||||
|
def set_descendants |
||||||
|
@max_descendant_thread_id = params[:max_descendant_thread_id]&.to_i |
||||||
|
@since_descendant_thread_id = params[:since_descendant_thread_id]&.to_i |
||||||
|
|
||||||
|
descendants = cache_collection( |
||||||
|
@status.descendants( |
||||||
|
DESCENDANTS_LIMIT, |
||||||
|
current_account, |
||||||
|
@max_descendant_thread_id, |
||||||
|
@since_descendant_thread_id, |
||||||
|
DESCENDANTS_DEPTH_LIMIT |
||||||
|
), |
||||||
|
Status |
||||||
|
) |
||||||
|
|
||||||
|
@descendant_threads = [] |
||||||
|
|
||||||
|
if descendants.present? |
||||||
|
statuses = [descendants.first] |
||||||
|
starting_depth = 0 |
||||||
|
|
||||||
|
descendants.drop(1).each_with_index do |descendant, index| |
||||||
|
if descendants[index].id == descendant.in_reply_to_id |
||||||
|
statuses << descendant |
||||||
|
else |
||||||
|
@descendant_threads << create_descendant_thread(starting_depth, statuses) |
||||||
|
|
||||||
|
# The thread is broken, assume it's a reply to the root status |
||||||
|
starting_depth = 0 |
||||||
|
|
||||||
|
# ... unless we can find its ancestor in one of the already-processed threads |
||||||
|
@descendant_threads.reverse_each do |descendant_thread| |
||||||
|
statuses = descendant_thread[:statuses] |
||||||
|
|
||||||
|
index = statuses.find_index do |thread_status| |
||||||
|
thread_status.id == descendant.in_reply_to_id |
||||||
|
end |
||||||
|
|
||||||
|
if index.present? |
||||||
|
starting_depth = descendant_thread[:starting_depth] + index + 1 |
||||||
|
break |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
statuses = [descendant] |
||||||
|
end |
||||||
|
end |
||||||
|
|
||||||
|
@descendant_threads << create_descendant_thread(starting_depth, statuses) |
||||||
|
end |
||||||
|
|
||||||
|
@max_descendant_thread_id = @descendant_threads.pop[:statuses].first.id if descendants.size >= DESCENDANTS_LIMIT |
||||||
|
end |
||||||
|
end |
Loading…
Reference in new issue