Fix some nil errors (#3338)

* Fix nil input not handled well in AuthorExtractor concern

* Fix hard error in ProcessFeedService when replied-to status has been deleted

* Fix nil errors in ProcessInteractionService when favourited status
cannot be found
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2017-05-27 00:53:38 +02:00 committed by GitHub
parent bd21afb5ed
commit 44cb08297c
3 changed files with 9 additions and 1 deletions

View File

@ -2,6 +2,8 @@
module AuthorExtractor
def author_from_xml(xml)
return nil if xml.nil?
# Try <email> for acct
acct = xml.at_xpath('./xmlns:author/xmlns:email', xmlns: TagManager::XMLNS)&.content

View File

@ -189,7 +189,7 @@ class ProcessFeedService < BaseService
def find_status(uri)
if TagManager.instance.local_id?(uri)
local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status')
return Status.find(local_id)
return Status.find_by(id: local_id)
end
Status.find_by(uri: uri)

View File

@ -108,12 +108,18 @@ class ProcessInteractionService < BaseService
def favourite!(xml, from_account)
current_status = status(xml)
return if current_status.nil?
favourite = current_status.favourites.where(account: from_account).first_or_create!(account: from_account)
NotifyService.new.call(current_status.account, favourite)
end
def unfavourite!(xml, from_account)
current_status = status(xml)
return if current_status.nil?
favourite = current_status.favourites.where(account: from_account).first
favourite&.destroy
end