Refactor controllers for statuses, accounts, and more (#11249)
This commit is contained in:
parent
f14776475d
commit
63c7fe8e48
41 changed files with 299 additions and 289 deletions
|
@ -40,7 +40,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
|
|||
end
|
||||
|
||||
def announceable?(status)
|
||||
status.account_id == @account.id || status.public_visibility? || status.unlisted_visibility?
|
||||
status.account_id == @account.id || status.distributable?
|
||||
end
|
||||
|
||||
def related_to_local_activity?
|
||||
|
|
|
@ -42,7 +42,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
|||
resolve_thread(@status)
|
||||
fetch_replies(@status)
|
||||
distribute(@status)
|
||||
forward_for_reply if @status.public_visibility? || @status.unlisted_visibility?
|
||||
forward_for_reply if @status.distributable?
|
||||
end
|
||||
|
||||
def find_existing_status
|
||||
|
|
|
@ -31,7 +31,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
|
|||
|
||||
return if @status.nil?
|
||||
|
||||
if @status.public_visibility? || @status.unlisted_visibility?
|
||||
if @status.distributable?
|
||||
forward_for_reply
|
||||
forward_for_reblogs
|
||||
end
|
||||
|
|
|
@ -51,7 +51,7 @@ class ActivityPub::TagManager
|
|||
def replies_uri_for(target, page_params = nil)
|
||||
raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
|
||||
|
||||
replies_account_status_url(target.account, target, page_params)
|
||||
account_status_replies_url(target.account, target, page_params)
|
||||
end
|
||||
|
||||
# Primary audience of a status
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue