logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: f63f0c46253f8d3c5524645160cbfe0c70cdec2f
parent: 7cde08e30b2fec4bf768b24a8bec7889f0076158
Author: Eugen <eugen@zeonfederated.com>
Date:   Sat, 14 Jan 2017 02:22:16 +0100

Fix too late return

Diffstat:

Mapp/services/process_feed_service.rb4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb @@ -44,6 +44,8 @@ class ProcessFeedService < BaseService Rails.logger.debug "Creating remote status #{id}" status = status_from_xml(@xml) + return if status.nil? + if verb == :share original_status = status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS)) status.reblog = original_status @@ -56,8 +58,6 @@ class ProcessFeedService < BaseService end end - return if status.nil? - status.save! NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?