|
@ -20,11 +20,13 @@ class ActivityPub::Activity::Create < ActivityPub::Activity |
|
|
private |
|
|
private |
|
|
|
|
|
|
|
|
def process_status |
|
|
def process_status |
|
|
|
|
|
media_attachments = process_attachments |
|
|
|
|
|
|
|
|
ApplicationRecord.transaction do |
|
|
ApplicationRecord.transaction do |
|
|
@status = Status.create!(status_params) |
|
|
@status = Status.create!(status_params) |
|
|
|
|
|
|
|
|
process_tags(@status) |
|
|
process_tags(@status) |
|
|
process_attachments(@status) |
|
|
|
|
|
|
|
|
attach_media(@status, media_attachments) |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
resolve_thread(@status) |
|
|
resolve_thread(@status) |
|
@ -105,22 +107,36 @@ class ActivityPub::Activity::Create < ActivityPub::Activity |
|
|
emoji.save |
|
|
emoji.save |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
def process_attachments(status) |
|
|
|
|
|
|
|
|
def process_attachments |
|
|
return if @object['attachment'].nil? |
|
|
return if @object['attachment'].nil? |
|
|
|
|
|
|
|
|
|
|
|
media_attachments = [] |
|
|
|
|
|
|
|
|
as_array(@object['attachment']).each do |attachment| |
|
|
as_array(@object['attachment']).each do |attachment| |
|
|
next if unsupported_media_type?(attachment['mediaType']) || attachment['url'].blank? |
|
|
next if unsupported_media_type?(attachment['mediaType']) || attachment['url'].blank? |
|
|
|
|
|
|
|
|
href = Addressable::URI.parse(attachment['url']).normalize.to_s |
|
|
href = Addressable::URI.parse(attachment['url']).normalize.to_s |
|
|
media_attachment = MediaAttachment.create(status: status, account: status.account, remote_url: href, description: attachment['name'].presence) |
|
|
|
|
|
|
|
|
media_attachment = MediaAttachment.create(account: @account, remote_url: href, description: attachment['name'].presence) |
|
|
|
|
|
media_attachments << media_attachment |
|
|
|
|
|
|
|
|
next if skip_download? |
|
|
next if skip_download? |
|
|
|
|
|
|
|
|
media_attachment.file_remote_url = href |
|
|
media_attachment.file_remote_url = href |
|
|
media_attachment.save |
|
|
media_attachment.save |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
media_attachments |
|
|
rescue Addressable::URI::InvalidURIError => e |
|
|
rescue Addressable::URI::InvalidURIError => e |
|
|
Rails.logger.debug e |
|
|
Rails.logger.debug e |
|
|
|
|
|
|
|
|
|
|
|
media_attachments |
|
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
def attach_media(status, media_attachments) |
|
|
|
|
|
return if media_attachments.blank? |
|
|
|
|
|
|
|
|
|
|
|
media = MediaAttachment.where(status_id: nil, id: media_attachments.take(4).map(&:id)) |
|
|
|
|
|
media.update(status_id: status.id) |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
def resolve_thread(status) |
|
|
def resolve_thread(status) |
|
|