hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

signup-info-prompt
Eugen Rochko 2018-04-19 00:53:31 +02:00 committed by GitHub
parent 1957209efd
commit ff87d1bc3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/process_mentions_service.rb
View File

@ -17,13 +17,11 @@ class ProcessMentionsService < BaseService
if mention_undeliverable?(status, mentioned_account) if mention_undeliverable?(status, mentioned_account)
begin begin
mentioned_account = resolve_account_service.call($1) 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 mentioned_account = nil
end end
end end
mentioned_account ||= Account.find_remote(username, domain)
next match if mention_undeliverable?(status, mentioned_account) next match if mention_undeliverable?(status, mentioned_account)
mentioned_account.mentions.where(status: status).first_or_create(status: status) mentioned_account.mentions.where(status: status).first_or_create(status: status)