From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 18 Apr 2018 22:53:31 +0000 (+0200)
Subject: Rescue SSL errors when processing mentions, remove useless line (#7184)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ff87d1bc3ecdb81ff5c523f0964ecf223a503d30;p=mastodon.git

Rescue SSL errors when processing mentions, remove useless line (#7184)
---

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 8e285e1f7..dc8df4a9a 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -17,13 +17,11 @@ class ProcessMentionsService < BaseService
       if mention_undeliverable?(status, mentioned_account)
         begin
           mentioned_account = resolve_account_service.call($1)
-        rescue Goldfinger::Error, HTTP::Error
+        rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError
           mentioned_account = nil
         end
       end
 
-      mentioned_account ||= Account.find_remote(username, domain)
-
       next match if mention_undeliverable?(status, mentioned_account)
 
       mentioned_account.mentions.where(status: status).first_or_create(status: status)