|
|
@ -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) |
|
|
|