cybrespace/mastodon
4
3
Fork 3
Code Issues 7 Pull requests Releases Activity

Similarly to #2426, put creation of remote statuses in a transaction, (#3233)

Browse source 
so that public timeline/caching would not encounter incomplete data
This commit is contained in:
Eugen Rochko 2017-05-22 19:35:48 +02:00 • committed by GitHub
parent bda7391221
commit 4a4733b397
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/services/process_feed_service.rb
View file

@ -47,25 +47,30 @@ class ProcessFeedService < BaseService
return return
end end
status, just_created = nil
Rails.logger.debug "Creating remote status #{id}" Rails.logger.debug "Creating remote status #{id}"
status, just_created = status_from_xml(@xml)
return if status.nil? ApplicationRecord.transaction do
return status unless just_created status, just_created = status_from_xml(@xml)
if verb == :share return if status.nil?
original_status = shared_status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS)) return status unless just_created
status.reblog = original_status
if original_status.nil? if verb == :share
status.destroy original_status = shared_status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
return nil status.reblog = original_status
elsif original_status.reblog?
status.reblog = original_status.reblog if original_status.nil?
status.destroy
return nil
elsif original_status.reblog?
status.reblog = original_status.reblog
end
end end
end
status.save! status.save!
end
notify_about_mentions!(status) unless status.reblog? notify_about_mentions!(status) unless status.reblog?
notify_about_reblog!(status) if status.reblog? && status.reblog.account.local? notify_about_reblog!(status) if status.reblog? && status.reblog.account.local?