diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-04-19 00:53:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 00:53:31 +0200 |
| commit | ff87d1bc3ecdb81ff5c523f0964ecf223a503d30 (patch) | |
| tree | 7f2be25d2d555a63a9b6bd4c77dc8705bdb7f9c5 /app/services/process_mentions_service.rb | |
| parent | 1957209efd4054842a2ae0afd91b9fe0c38cbf0a (diff) | |
Rescue SSL errors when processing mentions, remove useless line (#7184)
Diffstat (limited to 'app/services/process_mentions_service.rb')
| -rw-r--r-- | app/services/process_mentions_service.rb | 4 |
1 files changed, 1 insertions, 3 deletions
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) |