diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-10-22 17:34:29 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-10-22 17:34:29 -0500 |
| commit | adf60e63806a4b8f843ce6722a9086044f0bb5cd (patch) | |
| tree | 722969bdb867727a65aeb78bfdab4fa5f60248a5 /app/services/resolve_mentions_service.rb | |
| parent | c36dd229f9dcb1d77c46d8db23297fc5781b4a97 (diff) | |
| parent | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/services/resolve_mentions_service.rb')
| -rw-r--r-- | app/services/resolve_mentions_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/resolve_mentions_service.rb b/app/services/resolve_mentions_service.rb index e51e9f1ef..6478dc902 100644 --- a/app/services/resolve_mentions_service.rb +++ b/app/services/resolve_mentions_service.rb @@ -28,7 +28,7 @@ class ResolveMentionsService < BaseService if mention_undeliverable?(mentioned_account) begin mentioned_account = resolve_account_service.call(Regexp.last_match(1)) - rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError + rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::UnexpectedResponseError mentioned_account = nil end end |