potsda.mn/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #3388 by moving re-entrant shared_status_from_xml before transaction block (#3622)

Browse source 
Steps to reproduce the original issue:
1. Have two remote accounts, A that you don't follow, and B that you follow.
2. Have A post a toot and reply to it.
3. Boost A's reply from remote account B.

This used to cause the local instance to get A's reply but fail to link it to
the original post.
This commit is contained in:
ThibG 2017-06-07 12:28:16 +02:00 committed by Eugen Rochko
parent 34bfea8bbf
commit 28d2920472
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/services/process_feed_service.rb
View file

@ -51,6 +51,11 @@ class ProcessFeedService < BaseService
Rails.logger.debug "Creating remote status #{id}" Rails.logger.debug "Creating remote status #{id}"
if verb == :share
original_status = shared_status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
return nil if original_status.nil?
end
ApplicationRecord.transaction do ApplicationRecord.transaction do
status, just_created = status_from_xml(@xml) status, just_created = status_from_xml(@xml)
@ -58,14 +63,10 @@ class ProcessFeedService < BaseService
return status unless just_created return status unless just_created
if verb == :share if verb == :share
original_status = shared_status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS)) if original_status.reblog?
status.reblog = original_status
if original_status.nil?
status.destroy
return nil
elsif original_status.reblog?
status.reblog = original_status.reblog status.reblog = original_status.reblog
else
status.reblog = original_status
end end
end end