mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 21:15:05 +01:00
Code Issues Projects Releases Wiki Activity

fix validation error (media only status) (#6684)

Browse Source 
* fix validation error (media only status)

* Incorporating review suggestions

* Reflect similar fix to OStatus side

* Fix not to include media in transaction

* Restore the limit of the number of media

* Fix not to return nil
This commit is contained in:
MitarashiDango 2018-03-08 09:22:47 +09:00 committed by Eugen Rochko
parent 4ca60c665e
commit 6dcf96271e
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/lib/activitypub/activity/create.rb
View File

@ -20,13 +20,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
private private
def process_status def process_status
media_attachments = process_attachments status_params = process_status_params
ApplicationRecord.transaction do ApplicationRecord.transaction do
@status = Status.create!(status_params) @status = Status.create!(status_params)
process_tags(@status) process_tags(@status)
attach_media(@status, media_attachments)
end end
resolve_thread(@status) resolve_thread(@status)
@ -40,7 +39,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
status status
end end
def status_params def process_status_params
{ {
uri: @object['id'], uri: @object['id'],
url: object_url || @object['id'], url: object_url || @object['id'],
@ -54,6 +53,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
visibility: visibility_from_audience, visibility: visibility_from_audience,
thread: replied_to_status, thread: replied_to_status,
conversation: conversation_from_uri(@object['conversation']), conversation: conversation_from_uri(@object['conversation']),
media_attachments: process_attachments.take(4),
} }
end end
@ -108,7 +108,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end end
def process_attachments def process_attachments
return if @object['attachment'].nil? return [] if @object['attachment'].nil?
media_attachments = [] media_attachments = []
@ -132,13 +132,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
media_attachments media_attachments
end 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
def resolve_thread(status) def resolve_thread(status)
return unless status.reply? && status.thread.nil? return unless status.reply? && status.thread.nil?
ThreadResolveWorker.perform_async(status.id, in_reply_to_uri) ThreadResolveWorker.perform_async(status.id, in_reply_to_uri)

13
app/lib/ostatus/activity/creation.rb
View File

@ -29,7 +29,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
# Skip if the reblogged status is not public # Skip if the reblogged status is not public
return if cached_reblog && !(cached_reblog.public_visibility? || cached_reblog.unlisted_visibility?) return if cached_reblog && !(cached_reblog.public_visibility? || cached_reblog.unlisted_visibility?)
media_attachments = save_media media_attachments = save_media.take(4)
ApplicationRecord.transaction do ApplicationRecord.transaction do
status = Status.create!( status = Status.create!(
@ -44,12 +44,12 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
language: content_language, language: content_language,
visibility: visibility_scope, visibility: visibility_scope,
conversation: find_or_create_conversation, conversation: find_or_create_conversation,
thread: thread? ? find_status(thread.first) || find_activitypub_status(thread.first, thread.second) : nil thread: thread? ? find_status(thread.first) || find_activitypub_status(thread.first, thread.second) : nil,
media_attachments: media_attachments
) )
save_mentions(status) save_mentions(status)
save_hashtags(status) save_hashtags(status)
attach_media(status, media_attachments)
save_emojis(status) save_emojis(status)
end end
@ -159,13 +159,6 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
media_attachments media_attachments
end end
def attach_media(parent, media_attachments)
return if media_attachments.blank?
media = MediaAttachment.where(status_id: nil, id: media_attachments.take(4).map(&:id))
media.update(status_id: parent.id)
end
def save_emojis(parent) def save_emojis(parent)
do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media? do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?