treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix too late return

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen 2017-01-14 02:22:16 +01:00 committed by GitHub
parent 7cde08e30b
commit f63f0c4625
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/process_feed_service.rb
View File

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